From 16d7ec0eae44253102a3f9531b709f3fcd51a8ea Mon Sep 17 00:00:00 2001
From: Lihao7788 <2470304407@qq.com>
Date: Wed, 22 Jan 2025 10:47:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/Render/Black.mat | 135 ++++++++++++++++
Assets/Render/Black.mat.meta | 8 +
Assets/Scenes/Main.unity | 211 +++++--------------------
Data/Xml/Pig1.xml | 26 ++--
Data/Xml/Pig2.xml | 37 ++---
Data/Xml/Pig3.xml | 29 ++--
Data/Xml/Pig4.xml | 292 +++++++++++++++++++----------------
Data/Xml/Pig5.xml | 31 ++--
Data/Xml/Pig6.xml | 33 ++--
9 files changed, 413 insertions(+), 389 deletions(-)
create mode 100644 Assets/Render/Black.mat
create mode 100644 Assets/Render/Black.mat.meta
diff --git a/Assets/Render/Black.mat b/Assets/Render/Black.mat
new file mode 100644
index 00000000..c7cc17cf
--- /dev/null
+++ b/Assets/Render/Black.mat
@@ -0,0 +1,135 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-418367394989416806
+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: 5
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Black
+ m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
+ m_Parent: {fileID: 0}
+ m_ModifiedSerializedProperties: 0
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ 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}
+ - _Tex:
+ m_Texture: {fileID: 8900000, guid: 00e83f8a3290d3a448d439c6f8ef12b4, type: 3}
+ 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
+ - _Blend: 0
+ - _BumpScale: 1
+ - _ClearCoatMask: 0
+ - _ClearCoatSmoothness: 0
+ - _Cull: 2
+ - _Cutoff: 0.5
+ - _DetailAlbedoMapScale: 1
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _EnvironmentReflections: 1
+ - _Exposure: 1
+ - _GlossMapScale: 0
+ - _Glossiness: 0
+ - _GlossyReflections: 0
+ - _Metallic: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.005
+ - _QueueOffset: 0
+ - _ReceiveShadows: 1
+ - _Rotation: 125
+ - _Smoothness: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _Surface: 0
+ - _WorkflowMode: 1
+ - _ZWrite: 1
+ m_Colors:
+ - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+ - _Tint: {r: 0, g: 0, b: 0, a: 0.5}
+ m_BuildTextureStacks: []
diff --git a/Assets/Render/Black.mat.meta b/Assets/Render/Black.mat.meta
new file mode 100644
index 00000000..e3de383a
--- /dev/null
+++ b/Assets/Render/Black.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1569bab32567d6f4a884d7b552e5c0e3
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index 4e9ba90c..7021c8d5 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -15,7 +15,7 @@ RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 1
- m_FogColor: {r: 0.65080994, g: 0.666729, b: 0.7075472, a: 1}
+ m_FogColor: {r: 1, g: 1, b: 1, a: 1}
m_FogMode: 3
m_FogDensity: 0.05
m_LinearFogStart: 0
@@ -25,8 +25,8 @@ RenderSettings:
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
- m_SubtractiveShadowColor: {r: 0.13296545, g: 0.19145328, b: 0.33962262, a: 1}
- m_SkyboxMaterial: {fileID: 2100000, guid: db2797f054deeeb45a608c8d7b861909, type: 2}
+ m_SubtractiveShadowColor: {r: 0, g: 0, b: 0, a: 1}
+ m_SkyboxMaterial: {fileID: 2100000, guid: 1569bab32567d6f4a884d7b552e5c0e3, type: 2}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.54292166, g: 0.5874881, b: 0.6115494, a: 1}
+ m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -98,7 +98,7 @@ LightmapSettings:
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
- m_LightingSettings: {fileID: 4890085278179872738, guid: 477cc4148fad3449482a3bc3178594e2, type: 2}
+ m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
@@ -326,6 +326,37 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
animSpeed: 1
+--- !u!1 &793392284
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 793392285}
+ m_Layer: 0
+ m_Name: "\u732A\u4EA7\u623F\u4ED4\u732A\u63A5\u751F\u4E0E\u4FDD\u5065"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &793392285
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 793392284}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 3.9715388, y: 1.2787358, z: -0.6857879}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1089184132
GameObject:
m_ObjectHideFlags: 0
@@ -370,178 +401,10 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1548041028
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1548041030}
- - component: {fileID: 1548041029}
- m_Layer: 0
- m_Name: Global Volume
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &1548041029
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1548041028}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IsGlobal: 1
- priority: 0
- blendDistance: 0
- weight: 1
- sharedProfile: {fileID: 11400000, guid: cc15d5c774ad0e9439ba4753a231849c, type: 2}
---- !u!4 &1548041030
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1548041028}
- 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: []
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1655025498
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1655025501}
- - component: {fileID: 1655025500}
- - component: {fileID: 1655025499}
- m_Layer: 0
- m_Name: Directional Light
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &1655025499
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1655025498}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Version: 3
- m_UsePipelineSettings: 1
- m_AdditionalLightsShadowResolutionTier: 2
- m_LightLayerMask: 1
- m_RenderingLayers: 1
- m_CustomShadowLayers: 0
- m_ShadowLayerMask: 1
- m_ShadowRenderingLayers: 1
- m_LightCookieSize: {x: 1, y: 1}
- m_LightCookieOffset: {x: 0, y: 0}
- m_SoftShadowQuality: 1
---- !u!108 &1655025500
-Light:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1655025498}
- m_Enabled: 1
- serializedVersion: 10
- m_Type: 1
- m_Shape: 0
- m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
- m_Intensity: 1
- m_Range: 10
- m_SpotAngle: 30
- m_InnerSpotAngle: 21.80208
- m_CookieSize: 10
- m_Shadows:
- m_Type: 2
- m_Resolution: -1
- m_CustomResolution: -1
- m_Strength: 1
- m_Bias: 0.05
- m_NormalBias: 0.4
- m_NearPlane: 0.2
- m_CullingMatrixOverride:
- e00: 1
- e01: 0
- e02: 0
- e03: 0
- e10: 0
- e11: 1
- e12: 0
- e13: 0
- e20: 0
- e21: 0
- e22: 1
- e23: 0
- e30: 0
- e31: 0
- e32: 0
- e33: 1
- m_UseCullingMatrixOverride: 0
- m_Cookie: {fileID: 0}
- m_DrawHalo: 0
- m_Flare: {fileID: 0}
- m_RenderMode: 0
- m_CullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- m_RenderingLayerMask: 1
- m_Lightmapping: 4
- m_LightShadowCasterMode: 0
- m_AreaSize: {x: 1, y: 1}
- m_BounceIntensity: 1
- m_ColorTemperature: 6570
- m_UseColorTemperature: 0
- m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
- m_UseBoundingSphereOverride: 0
- m_UseViewFrustumForShadowCasterCull: 1
- m_ShadowRadius: 0
- m_ShadowAngle: 0
---- !u!4 &1655025501
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1655025498}
- serializedVersion: 2
- m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
- m_LocalPosition: {x: 0, y: 3, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- - {fileID: 1548041030}
- - {fileID: 1655025501}
- {fileID: 547432243}
- {fileID: 1089184134}
+ - {fileID: 793392285}
diff --git a/Data/Xml/Pig1.xml b/Data/Xml/Pig1.xml
index 052e1c9a..d67163a8 100644
--- a/Data/Xml/Pig1.xml
+++ b/Data/Xml/Pig1.xml
@@ -1226,8 +1226,8 @@
-
-
+
+
@@ -1267,8 +1267,7 @@
-
-
+
@@ -1310,8 +1309,7 @@
-
-
+
@@ -1377,8 +1375,8 @@
-
-
+
+
@@ -1430,8 +1428,8 @@
-
-
+
+
@@ -1497,8 +1495,8 @@
-
-
+
+
@@ -1567,8 +1565,8 @@
-
-
+
+
diff --git a/Data/Xml/Pig2.xml b/Data/Xml/Pig2.xml
index a8bd019b..0004d8c6 100644
--- a/Data/Xml/Pig2.xml
+++ b/Data/Xml/Pig2.xml
@@ -375,7 +375,9 @@
-
+
+
+
@@ -563,9 +565,9 @@
-
-
-
+
+
+
@@ -586,7 +588,8 @@
-
+
+
@@ -911,8 +914,8 @@
-
-
+
+
@@ -953,8 +956,7 @@
-
-
+
@@ -999,8 +1001,8 @@
-
-
+
+
@@ -1058,8 +1060,8 @@
-
-
+
+
@@ -1096,8 +1098,8 @@
-
-
+
+
@@ -1146,9 +1148,8 @@
-
-
-
+
+
diff --git a/Data/Xml/Pig3.xml b/Data/Xml/Pig3.xml
index cd357945..2a86879f 100644
--- a/Data/Xml/Pig3.xml
+++ b/Data/Xml/Pig3.xml
@@ -1270,8 +1270,7 @@
-
-
+
@@ -1313,8 +1312,8 @@
-
-
+
+
@@ -1359,8 +1358,8 @@
-
-
+
+
@@ -1495,8 +1494,8 @@
-
-
+
+
@@ -1553,8 +1552,8 @@
-
-
+
+
@@ -1618,8 +1617,8 @@
-
-
+
+
@@ -1707,8 +1706,8 @@
-
-
+
+
@@ -1738,7 +1737,7 @@
-
+
diff --git a/Data/Xml/Pig4.xml b/Data/Xml/Pig4.xml
index 84b4d8db..5d49190e 100644
--- a/Data/Xml/Pig4.xml
+++ b/Data/Xml/Pig4.xml
@@ -6,7 +6,7 @@
-
+
@@ -138,6 +138,15 @@
ExamPrefab/CameraPos/Camera_ShuKouChose
+
+ 口鼻
+
+ ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoZhu/group4/SM_XiaoZhu_qiege2:joint1/SM_XiaoZhu_qiege2:joint2/SM_XiaoZhu_qiege2:joint3/SM_XiaoZhu_qiege2:joint4/SM_XiaoZhu_qiege2:joint5/SM_XiaoZhu_qiege2:joint6/SM_XiaoZhu_qiege2:joint42/SM_XiaoZhu_qiege2:joint43/SM_XiaoZhu_qiege2:joint44/KouBi
+
+
+
+
+
@@ -818,7 +827,7 @@
-
+
@@ -950,7 +959,7 @@
-
+
@@ -963,9 +972,8 @@
-
-
-
+
+
@@ -994,7 +1002,7 @@
-
+
@@ -1005,8 +1013,8 @@
-
-
+
+
@@ -1036,7 +1044,7 @@
-
+
@@ -1050,7 +1058,7 @@
-
+
@@ -1077,6 +1085,9 @@
+
+
+
@@ -1120,7 +1131,7 @@
-
+
@@ -1130,9 +1141,9 @@
-
-
+
+
@@ -1161,7 +1172,7 @@
-
+
@@ -1174,8 +1185,8 @@
-
-
+
+
@@ -1194,160 +1205,171 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
-
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Data/Xml/Pig5.xml b/Data/Xml/Pig5.xml
index 17bf6faf..fe3cfa07 100644
--- a/Data/Xml/Pig5.xml
+++ b/Data/Xml/Pig5.xml
@@ -1309,8 +1309,8 @@
-
-
+
+
@@ -1350,8 +1350,7 @@
-
-
+
@@ -1389,8 +1388,8 @@
-
-
+
+
@@ -1541,8 +1540,8 @@
-
-
+
+
@@ -1611,8 +1610,8 @@
-
-
+
+
@@ -1672,8 +1671,8 @@
-
-
+
+
@@ -1736,7 +1735,7 @@
-
+
@@ -1770,7 +1769,7 @@
-
+
@@ -1854,8 +1853,8 @@
-
-
+
+
diff --git a/Data/Xml/Pig6.xml b/Data/Xml/Pig6.xml
index 7e64cbef..6628f22d 100644
--- a/Data/Xml/Pig6.xml
+++ b/Data/Xml/Pig6.xml
@@ -1152,8 +1152,8 @@
-
-
+
+
@@ -1192,8 +1192,8 @@
-
-
+
+
@@ -1232,8 +1232,8 @@
-
-
+
+
@@ -1304,8 +1304,8 @@
-
-
+
+
@@ -1380,8 +1380,8 @@
-
-
+
+
@@ -1481,7 +1481,7 @@
-
+
@@ -1517,8 +1517,8 @@
-
-
+
+
@@ -1549,7 +1549,7 @@
-
+
@@ -1580,9 +1580,8 @@
-
-
-
+
+