diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta index 335936ea..6c61308f 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta @@ -46,10 +46,39 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: 46chuangjin + name: 46chuangjin1 takeName: internalID: 3060610079319413300 firstFrame: 3800 + lastFrame: 3880 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 0 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: 46chuangjin2 + takeName: + internalID: -6004787696405322892 + firstFrame: 3880 lastFrame: 3960 wrapMode: 0 orientationOffsetY: 0 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.txt index 1ba3c990..21905dbf 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.txt +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.txt @@ -1 +1,2 @@ -3800-3960 46chuangjin \ No newline at end of file +3800-3880 46chuangjin1 +3880-3960 46chuangjin2 \ No newline at end of file diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.fbx.meta index 43fec67b..95a42495 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.fbx.meta @@ -41,10 +41,39 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: 46jianjian + name: 46jianjian1 takeName: internalID: 3060610079319413300 firstFrame: 3800 + lastFrame: 3880 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 0 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: 46jianjian2 + takeName: + internalID: -6004787696405322892 + firstFrame: 3880 lastFrame: 3960 wrapMode: 0 orientationOffsetY: 0 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.txt index 15ec9ae1..195102fe 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.txt +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.txt @@ -1 +1,2 @@ -3800-3960 46jianjian \ No newline at end of file +3800-3880 46jianjian1 +3880-3960 46jianjian2 \ No newline at end of file diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.fbx.meta index 93bbe720..c7bf823b 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.fbx.meta @@ -36,10 +36,39 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: 46zhudao + name: 46zhudao1 takeName: internalID: 3060610079319413300 firstFrame: 3800 + lastFrame: 3880 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 0 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: 46zhudao2 + takeName: + internalID: -6004787696405322892 + firstFrame: 3880 lastFrame: 3960 wrapMode: 0 orientationOffsetY: 0 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.txt index 41733ab2..0b777275 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.txt +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.txt @@ -1 +1,2 @@ -3800-3960 46zhudao \ No newline at end of file +3800-3880 46zhudao1 +3880-3960 46zhudao2 \ No newline at end of file diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.fbx.meta index bc296ad3..603b33fa 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.fbx.meta @@ -36,10 +36,39 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: 46zhushou + name: 46zhushou1 takeName: internalID: 3060610079319413300 firstFrame: 3800 + lastFrame: 3880 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 0 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: 46zhushou2 + takeName: + internalID: -6004787696405322892 + firstFrame: 3880 lastFrame: 3960 wrapMode: 0 orientationOffsetY: 0 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.txt index cff938c7..82ba3f31 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.txt +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.txt @@ -1 +1,2 @@ -3800-3960 46zhushou \ No newline at end of file +3800-3880 46zhushou1 +3880-3960 46zhushou2 \ No newline at end of file diff --git a/Assets/Resources/Mat/Unlit_FangZhiWu_BuLiao.mat b/Assets/Resources/Mat/Unlit_FangZhiWu_BuLiao.mat new file mode 100644 index 00000000..e14751d3 --- /dev/null +++ b/Assets/Resources/Mat/Unlit_FangZhiWu_BuLiao.mat @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Unlit_FangZhiWu_BuLiao + m_Shader: {fileID: 4800000, guid: 7ec7ea0347c1fee40a5c8602857ccb3d, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2001 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Ao: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 28bdd2838a137d54e92ca7d392c81a80, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NorMal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _R: 0.5 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Mat/Unlit_FangZhiWu_BuLiao.mat.meta b/Assets/Resources/Mat/Unlit_FangZhiWu_BuLiao.mat.meta new file mode 100644 index 00000000..a8b31122 --- /dev/null +++ b/Assets/Resources/Mat/Unlit_FangZhiWu_BuLiao.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 14a06566083d2454f981cab460bd6c9c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Mat/qiege.mat b/Assets/Resources/Mat/qiege.mat new file mode 100644 index 00000000..6f2df553 --- /dev/null +++ b/Assets/Resources/Mat/qiege.mat @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4312697193538113775 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: qiege + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 0} + - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Mat/qiege.mat.meta b/Assets/Resources/Mat/qiege.mat.meta new file mode 100644 index 00000000..633ebb2b --- /dev/null +++ b/Assets/Resources/Mat/qiege.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bafed1b9f9c51704c9e4c1ca1c5d908d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index 6dc12cb9..3f3e4ce2 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -13932,7 +13932,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6056746226357768549, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3} propertyPath: m_Animations.Array.size - value: 37 + value: 38 objectReference: {fileID: 0} - target: {fileID: 6056746226357768549, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3} propertyPath: m_Animations.Array.data[21] @@ -13998,6 +13998,10 @@ PrefabInstance: propertyPath: m_Animations.Array.data[36] value: objectReference: {fileID: -6004787696405322892, guid: 383f6f82144eac545bea932bd6aeebd1, type: 3} + - target: {fileID: 6056746226357768549, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3} + propertyPath: m_Animations.Array.data[37] + value: + objectReference: {fileID: -6004787696405322892, guid: a2a1f988a08d26440b0eda4029929157, type: 3} - target: {fileID: 6063314166731132115, guid: 17fe3c8ffc157d340ba23f9d5dc322a2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0.0002019175 @@ -45012,7 +45016,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -9189648273554680409, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -0.00000019867969 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} propertyPath: m_LocalPosition.x @@ -45058,6 +45062,10 @@ PrefabInstance: propertyPath: m_Materials.Array.data[1] value: objectReference: {fileID: 2100000, guid: e2d56916f80c37a45b2cf27fdfae95b9, type: 2} + - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: e2d56916f80c37a45b2cf27fdfae95b9, type: 2} - target: {fileID: -2763498958514396688, guid: c88a7609779fa1d4090ead6612db10d5, type: 3} propertyPath: m_BlendShapeWeights.Array.size value: 3 @@ -55308,6 +55316,7 @@ Animation: - {fileID: -6004787696405322892, guid: c5eaedb1fe2aec1448d2afcc3eea9a5c, type: 3} - {fileID: 3060610079319413300, guid: f8a7bd7c22cd7f34cae9ecc575fb0979, type: 3} - {fileID: 3060610079319413300, guid: 6b1fd1932ba889f4d90c21cc17c0a8a2, type: 3} + - {fileID: -6004787696405322892, guid: a03311e14cdec924aa5ae3bde1a2206e, type: 3} m_WrapMode: 0 m_PlayAutomatically: 0 m_AnimatePhysics: 0 @@ -55526,6 +55535,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 738442634} m_Modifications: + - target: {fileID: -8965906279360307853, guid: 908b8af6b761b254e9027e24e62744ff, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 10.499159 + objectReference: {fileID: 0} + - target: {fileID: -8965906279360307853, guid: 908b8af6b761b254e9027e24e62744ff, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8965906279360307853, guid: 908b8af6b761b254e9027e24e62744ff, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 908b8af6b761b254e9027e24e62744ff, type: 3} propertyPath: m_LocalPosition.x value: -0.41942832 @@ -55578,6 +55599,18 @@ PrefabInstance: propertyPath: m_PlayAutomatically value: 0 objectReference: {fileID: 0} + - target: {fileID: 6674159944334177362, guid: 908b8af6b761b254e9027e24e62744ff, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 79.227486 + objectReference: {fileID: 0} + - target: {fileID: 6674159944334177362, guid: 908b8af6b761b254e9027e24e62744ff, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -62.501904 + objectReference: {fileID: 0} + - target: {fileID: 6674159944334177362, guid: 908b8af6b761b254e9027e24e62744ff, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -150.06194 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index 25a25d14..958bd23b 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -4,8 +4,7 @@ LouDiXuMuQvan Exam 犬小肠部分切除吻合术虚拟仿真实训 - - 该软件是以犬为对象,针对小肠切除术和吻合术的专业实训。是以典型的工作任务为驱动,以工作流程为主线所进行的内容设计。包含术前准备和手术过程两个主要操作环节。其中术前准备中囊括了器械、药品、耗材、手术人员、手术动物等的准备内容。手术过程则包含了术部开刀、去除病变小肠、肠端吻合、缝合切口以及术后处理的详细过程。旨在让学生通过实训内容,了解犬小肠切除与吻合的专业知识,掌握工作流程及操作要点。 + 该软件是以犬为对象,针对小肠切除术和吻合术的专业实训。是以典型的工作任务为驱动,以工作流程为主线所进行的内容设计。包含术前准备和手术过程两个主要操作环节。其中术前准备中囊括了器械、药品、耗材、手术人员、手术动物等的准备内容。手术过程则包含了术部开刀、去除病变小肠、肠端吻合、缝合切口以及术后处理的详细过程。旨在让学生通过实训内容,了解犬小肠切除与吻合的专业知识,掌握工作流程及操作要点。 骨刀 @@ -1541,13 +1540,21 @@ - - - - - + + + + + + + + + + + + + @@ -1702,6 +1709,11 @@ + + + + + @@ -1713,6 +1725,8 @@ + + @@ -2038,8 +2052,6 @@ - - @@ -2217,6 +2229,8 @@ + + @@ -2494,6 +2508,9 @@ + + + @@ -2516,7 +2533,6 @@ - @@ -2543,7 +2559,6 @@ - @@ -2562,10 +2577,11 @@ - + +