diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/麻醉助手02/Aim_yisheng_02.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/麻醉助手02/Aim_yisheng_02.fbx.meta index d17f4feb..7450376d 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/麻醉助手02/Aim_yisheng_02.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24、26/麻醉助手02/Aim_yisheng_02.fbx.meta @@ -266,7 +266,7 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 1 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index 23d59843..c5fd67db 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -2002,7 +2002,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} propertyPath: m_LocalPosition.y - value: 0.03 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} propertyPath: m_LocalPosition.z @@ -3489,37 +3489,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a81212f665c12b945bf40df9066e156d, type: 3} m_PrefabInstance: {fileID: 564376455} m_PrefabAsset: {fileID: 0} ---- !u!1 &572109423 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 572109424} - m_Layer: 0 - m_Name: 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &572109424 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572109423} - serializedVersion: 2 - m_LocalRotation: {x: -0.6887165, y: -0.16021754, z: 0.16021745, w: 0.6887165} - m_LocalPosition: {x: -0.4038, y: 1.415403, z: -0.024435854} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1466600653} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &584268099 PrefabInstance: m_ObjectHideFlags: 0 @@ -4214,37 +4183,6 @@ Animation: m_PlayAutomatically: 0 m_AnimatePhysics: 0 m_CullingType: 0 ---- !u!1 &671819116 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 671819117} - m_Layer: 0 - m_Name: 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &671819117 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 671819116} - serializedVersion: 2 - m_LocalRotation: {x: -0.6887165, y: -0.16021754, z: 0.16021745, w: 0.6887165} - m_LocalPosition: {x: -0.3735, y: 1.415403, z: -0.024435854} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 965358907} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &715309539 PrefabInstance: m_ObjectHideFlags: 0 @@ -4494,8 +4432,8 @@ Transform: - {fileID: 715309540} - {fileID: 2097343170} - {fileID: 383561005} - - {fileID: 1934761429} - {fileID: 1134320677} + - {fileID: 1808297605} - {fileID: 1690066284} - {fileID: 930017810} - {fileID: 1814823523} @@ -4525,8 +4463,6 @@ Transform: - {fileID: 612243219} - {fileID: 1236535284} - {fileID: 1954514686} - - {fileID: 965358907} - - {fileID: 1466600653} - {fileID: 2059628565} - {fileID: 528442385} - {fileID: 923671401} @@ -4554,106 +4490,6 @@ Transform: - {fileID: 1461444725} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &753295739 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1934761429} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalPosition.x - value: -0.42163193 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalPosition.y - value: 1.4719326 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalPosition.z - value: -0.009022322 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_BlendShapeWeights.Array.size - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_Name - value: chuangjin - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: -2288559587192429154, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - insertIndex: -1 - addedObject: {fileID: 753295742} - m_SourcePrefab: {fileID: 100100000, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} ---- !u!4 &753295740 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - m_PrefabInstance: {fileID: 753295739} - m_PrefabAsset: {fileID: 0} ---- !u!1 &753295741 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -2288559587192429154, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} - m_PrefabInstance: {fileID: 753295739} - m_PrefabAsset: {fileID: 0} ---- !u!64 &753295742 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753295741} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 6586665899078786308, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} --- !u!1001 &758617108 PrefabInstance: m_ObjectHideFlags: 0 @@ -5504,39 +5340,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9cc680fa84a70794fb652ebc5b1e0af5, type: 3} m_PrefabInstance: {fileID: 954945444} m_PrefabAsset: {fileID: 0} ---- !u!1 &965358906 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 965358907} - m_Layer: 0 - m_Name: 48QieGeDian - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &965358907 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965358906} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1062644257} - - {fileID: 671819117} - m_Father: {fileID: 738442634} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1000666090 PrefabInstance: m_ObjectHideFlags: 0 @@ -11129,37 +10932,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 29fc8260ad19c3747b9f5fda6afdce07, type: 3} m_PrefabInstance: {fileID: 1054679790} m_PrefabAsset: {fileID: 0} ---- !u!1 &1062644256 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1062644257} - m_Layer: 0 - m_Name: 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1062644257 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1062644256} - serializedVersion: 2 - m_LocalRotation: {x: -0.6887165, y: -0.16021754, z: 0.16021745, w: 0.6887165} - m_LocalPosition: {x: -0.4038, y: 1.415403, z: -0.024435854} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 965358907} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1064989358 PrefabInstance: m_ObjectHideFlags: 0 @@ -20796,40 +20568,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6685111115918638199, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} m_PrefabInstance: {fileID: 1461444724} m_PrefabAsset: {fileID: 0} ---- !u!1 &1466600652 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1466600653} - m_Layer: 0 - m_Name: 50Point - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1466600653 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1466600652} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 572109424} - - {fileID: 1505264151} - - {fileID: 1531002184} - m_Father: {fileID: 738442634} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1487715406 GameObject: m_ObjectHideFlags: 0 @@ -20861,37 +20599,6 @@ Transform: m_Children: [] m_Father: {fileID: 799663103} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1505264150 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1505264151} - m_Layer: 0 - m_Name: 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1505264151 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1505264150} - serializedVersion: 2 - m_LocalRotation: {x: -0.6887165, y: -0.16021754, z: 0.16021745, w: 0.6887165} - m_LocalPosition: {x: -0.3735, y: 1.415403, z: -0.024435854} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1466600653} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1517565859 GameObject: m_ObjectHideFlags: 0 @@ -20923,37 +20630,6 @@ Transform: m_Children: [] m_Father: {fileID: 612243219} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1531002183 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1531002184} - m_Layer: 0 - m_Name: 3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1531002184 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1531002183} - serializedVersion: 2 - m_LocalRotation: {x: -0.6887165, y: -0.16021754, z: 0.16021745, w: 0.6887165} - m_LocalPosition: {x: -0.324, y: 1.415403, z: -0.024435854} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1466600653} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1570728474 stripped GameObject: m_CorrespondingSourceObject: {fileID: -5582756691893199951, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} @@ -29948,6 +29624,76 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 536f14d0d9dfc34468ad86749a37d6d8, type: 3} m_PrefabInstance: {fileID: 1779932771} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1808297604 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 738442634} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalPosition.x + value: -0.42163193 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalPosition.y + value: 1.4719326 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalPosition.z + value: -0.009022322 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_Name + value: chuangjin + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2223639932434330405, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_PlayAutomatically + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} +--- !u!4 &1808297605 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + m_PrefabInstance: {fileID: 1808297604} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1814823522 PrefabInstance: m_ObjectHideFlags: 0 @@ -30131,38 +29877,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} m_PrefabInstance: {fileID: 1932204885} m_PrefabAsset: {fileID: 0} ---- !u!1 &1934761428 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1934761429} - m_Layer: 0 - m_Name: ChuangJinParent - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1934761429 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1934761428} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.03, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 753295740} - m_Father: {fileID: 738442634} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1937034609 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index 6c2e80ea..044e7ed1 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -1146,14 +1146,16 @@ - + + + @@ -1209,28 +1211,23 @@ + + + + + - - - + - + - - + + @@ -1394,16 +1391,29 @@ - + - + + + + + + + + + + + + + + @@ -1469,15 +1479,18 @@ - + + + + - + - + @@ -1529,18 +1542,26 @@ - + + + + + + + + + - + - - + + @@ -1715,6 +1736,7 @@ + @@ -1783,6 +1805,7 @@ + @@ -1822,10 +1845,8 @@ - - - - + + @@ -1842,18 +1863,28 @@ - + + + + + + + + - + - + - + + + + @@ -1881,14 +1912,19 @@ - + + + + + + - + - + @@ -2632,19 +2668,19 @@ - + - + - + - + @@ -2717,14 +2753,14 @@ - - + + - +