Merge branch 'feature/jinxin' into develop_合作分支

ChivaTechFramework/Assets/Scenes/云南/220kV主变-主变解体大修(吊罩检修)-下.unity

@@ -26,7 +26,7 @@ RenderSettings:
   m_AmbientIntensity: 1
   m_AmbientMode: 0
   m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 2100000, guid: b0dfbedcee3f73743ae9a9c8717366e2, type: 2}
+  m_SkyboxMaterial: {fileID: 2100000, guid: e1843aff8ca2ef64682d609008811815, 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.7756447, g: 0.73850256, b: 0.7679365, a: 1}
+  m_IndirectSpecularColor: {r: 0.606516, g: 0.57741016, b: 0.60061616, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -10583,7 +10583,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 43767386}
   m_LocalRotation: {x: 0.0000005364418, y: 0.00000013411045, z: 0.25881904, w: 0.9659259}
-  m_LocalPosition: {x: 64.58504, y: 3.9939697, z: 81.88484}
+  m_LocalPosition: {x: 64.5773, y: 4.0075, z: 81.88484}
   m_LocalScale: {x: 1, y: 1.2377, z: 1}
   m_Children: []
   m_Father: {fileID: 845506068}
@@ -20988,7 +20988,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &81456570
 Transform:
   m_ObjectHideFlags: 0
@@ -36334,11 +36334,12 @@ MonoBehaviour:
   m_AddAnimationDataNames: 
   aniDataSelectReName: "\u50A8\u6CB9\u67DC\u62C6\u9664-236-\u62C6\u9664\u50A8\u6CB9\u67DC\u6709\u8F7D\u5206\u63A5\u5F00\u5173\u7BA1\u8DEF "
   m_AniDataReName: 
-  jumpTargetAnimation: "\u50A8\u6CB9\u67DC\u56DE\u88C5-336-\u56DE\u88C5\u74E6\u65AF\u7EE7\u7535\u5668\u5230\u50A8\u6CB9\u67DC\u7BA1\u8DEF\r"
+  jumpTargetAnimation: "110kV \u4E2D\u6027\u70B9\u5957\u7BA1\u56DE\u88C5-387-\u6253\u5F00\u5C01\u677F\r"
   m_CurrentAniData: {fileID: 70687393}
   aniName: "\u6563\u70ED\u7247\u5B89\u88C5-270-\u62C6\u9664\u5C01\u677F\r"
   currentStepID: 1
-  selection: []
+  selection:
+  - {fileID: 3630749572901537883}
 --- !u!1 &126113575
 GameObject:
   m_ObjectHideFlags: 0
@@ -107625,7 +107626,7 @@ Transform:
   m_GameObject: {fileID: 417435173}
   m_LocalRotation: {x: -0.000000014901158, y: 0.000000029802315, z: 0.00000034272662,
     w: -1}
-  m_LocalPosition: {x: -0.00000075556807, y: -0.0000013301857, z: 0.029838616}
+  m_LocalPosition: {x: 0.7891371, y: 1.3947947, z: 0.029828679}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2028964595}
@@ -137486,6 +137487,7 @@ GameObject:
   - component: {fileID: 553158686}
   - component: {fileID: 553158688}
   - component: {fileID: 553158687}
+  - component: {fileID: 553158689}
   m_Layer: 0
   m_Name: "\u5BF9\u8C61003"
   m_TagString: Untagged
@@ -137554,6 +137556,20 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 553158685}
   m_Mesh: {fileID: 8775619837978819758, guid: 432e71060254321459506bf838ed648d, type: 3}
+--- !u!64 &553158689
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 553158685}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 8775619837978819758, guid: 432e71060254321459506bf838ed648d, type: 3}
 --- !u!1 &553782231
 GameObject:
   m_ObjectHideFlags: 0
@@ -155869,6 +155885,7 @@ MonoBehaviour:
     SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects:
+    - {fileID: 3630749572901537883}
     - {fileID: 1287263477}
     - {fileID: 2001797800}
     - {fileID: 1170454836}
@@ -155884,25 +155901,38 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 4
+      Data: 6
     - Name: 
       Entry: 7
-      Data: 1|AniDriver_SimpleMoveRot, Assembly-CSharp
+      Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
+      Data: 0
+    - Name: objs
+      Entry: 7
+      Data: 2|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+        mscorlib
+    - Name: 
+      Entry: 12
       Data: 1
-    - Name: mSimpleMoveItem
+    - Name: 
       Entry: 10
       Data: 0
-    - Name: reverse
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: activeObjs
       Entry: 5
-      Data: true
+      Data: false
     - Name: 
       Entry: 8
       Data: 
     - Name: 
       Entry: 7
-      Data: 2|AniDriver_SimpleMoveRot, Assembly-CSharp
+      Data: 3|AniDriver_SimpleMoveRot, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 1
@@ -155917,20 +155947,63 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 3|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 4|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 4|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 5|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
+      Entry: 10
+      Data: 0
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: activeObjs
+      Entry: 5
+      Data: true
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 6|AniDriver_SimpleMoveRot, Assembly-CSharp
+    - Name: animationSequence
+      Entry: 3
+      Data: 1
+    - Name: mSimpleMoveItem
       Entry: 10
       Data: 2
+    - Name: reverse
+      Entry: 5
+      Data: true
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 7|AniDriver_ActiveObjs, Assembly-CSharp
+    - Name: animationSequence
+      Entry: 3
+      Data: 0
+    - Name: objs
+      Entry: 7
+      Data: 8|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+        mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 10
+      Data: 3
     - Name: 
       Entry: 13
       Data: 
@@ -155945,13 +156018,13 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 5|AniDriver_LuoShuanAniamtion, Assembly-CSharp
+      Data: 9|AniDriver_LuoShuanAniamtion, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 1
     - Name: mLuoShuanMenuAnimation
       Entry: 10
-      Data: 3
+      Data: 4
     - Name: reverse
       Entry: 5
       Data: true
@@ -158233,7 +158306,7 @@ Transform:
   m_GameObject: {fileID: 606332974}
   m_LocalRotation: {x: 0.000000079025305, y: -0.000000005268318, z: -0.0000003874301,
     w: -1}
-  m_LocalPosition: {x: -9.762683e-10, y: -0.000011437059, z: -0.09274819}
+  m_LocalPosition: {x: 0.000000010528918, y: -0.000019051484, z: 0.9990715}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
   m_Children: []
   m_Father: {fileID: 1528702282}
@@ -174778,6 +174851,7 @@ GameObject:
   - component: {fileID: 678093432}
   - component: {fileID: 678093434}
   - component: {fileID: 678093433}
+  - component: {fileID: 678093435}
   m_Layer: 0
   m_Name: "\u5BF9\u8C61001"
   m_TagString: Untagged
@@ -174846,6 +174920,20 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 678093431}
   m_Mesh: {fileID: 2112626415416172861, guid: 432e71060254321459506bf838ed648d, type: 3}
+--- !u!64 &678093435
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 678093431}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 2112626415416172861, guid: 432e71060254321459506bf838ed648d, type: 3}
 --- !u!1 &678434118
 GameObject:
   m_ObjectHideFlags: 0
@@ -175353,7 +175441,7 @@ Transform:
   m_GameObject: {fileID: 679812348}
   m_LocalRotation: {x: -0.00000006322024, y: -0.00000006322026, z: 0.00000005960463,
     w: 1}
-  m_LocalPosition: {x: -0.0000000013445345, y: -0.0000025802458, z: -0.12762827}
+  m_LocalPosition: {x: 0.000000010160388, y: -0.0000098042065, z: 0.9641898}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
   m_Children: []
   m_Father: {fileID: 78157518}
@@ -223520,7 +223608,7 @@ Transform:
   m_GameObject: {fileID: 926782132}
   m_LocalRotation: {x: 0.000000018626473, y: -0.00000001490111, z: -0.00000055134296,
     w: -1}
-  m_LocalPosition: {x: 0.000014580163, y: 0.000000017965814, z: -0.09274351}
+  m_LocalPosition: {x: 0.000007649392, y: -0.00000019353591, z: 0.99907523}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
   m_Children: []
   m_Father: {fileID: 1907920383}
@@ -261686,7 +261774,7 @@ Transform:
   m_GameObject: {fileID: 1100576496}
   m_LocalRotation: {x: 0.000000014901147, y: 0.000000014901144, z: 0.0000001937151,
     w: 1}
-  m_LocalPosition: {x: 0.000010155922, y: 0.000000024724626, z: -0.127634}
+  m_LocalPosition: {x: 0.0000025743723, y: -0.00000018677729, z: 0.9641858}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
   m_Children: []
   m_Father: {fileID: 1907920383}
@@ -307684,7 +307772,7 @@ Transform:
   m_GameObject: {fileID: 1295780163}
   m_LocalRotation: {x: 0.000000018626473, y: -0.00000001490111, z: -0.00000055134296,
     w: -1}
-  m_LocalPosition: {x: 0.000015621406, y: 0.000000017966016, z: -0.09274455}
+  m_LocalPosition: {x: 0.000008690635, y: -0.0000001935356, z: 0.9990737}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
   m_Children: []
   m_Father: {fileID: 505037187}
@@ -310874,7 +310962,7 @@ Transform:
   m_GameObject: {fileID: 1311017984}
   m_LocalRotation: {x: -0.00000012644051, y: 0.00000005960463, z: 0.00000025288105,
     w: -1}
-  m_LocalPosition: {x: -0.0000030596339, y: 0, z: 0.029834127}
+  m_LocalPosition: {x: 1.6025559, y: 0, z: 0.02982419}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1398862014}
@@ -315014,7 +315102,7 @@ Transform:
   m_GameObject: {fileID: 1329384692}
   m_LocalRotation: {x: -0.00000006322024, y: -0.00000006322026, z: 0.00000005960463,
     w: 1}
-  m_LocalPosition: {x: -0.0000000013448688, y: 0.00000028317297, z: -0.12763347}
+  m_LocalPosition: {x: 0.000000010160349, y: -0.000007461409, z: 0.9641862}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
   m_Children: []
   m_Father: {fileID: 1528702282}
@@ -315754,6 +315842,7 @@ GameObject:
   - component: {fileID: 1334094205}
   - component: {fileID: 1334094207}
   - component: {fileID: 1334094206}
+  - component: {fileID: 1334094208}
   m_Layer: 0
   m_Name: "\u5BF9\u8C61002"
   m_TagString: Untagged
@@ -315822,6 +315911,20 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1334094204}
   m_Mesh: {fileID: 4017482625668419684, guid: 432e71060254321459506bf838ed648d, type: 3}
+--- !u!64 &1334094208
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1334094204}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 4017482625668419684, guid: 432e71060254321459506bf838ed648d, type: 3}
 --- !u!1 &1334338163
 GameObject:
   m_ObjectHideFlags: 0
@@ -426364,7 +426467,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1819930589}
   m_LocalRotation: {x: -0.000000044703473, y: -0, z: 0.00000011920926, w: -1}
-  m_LocalPosition: {x: -0.000005632433, y: -0.000009976392, z: -0.107360564}
+  m_LocalPosition: {x: 0.7891319, y: 1.3947854, z: -0.10737087}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2028964595}
@@ -463814,7 +463917,7 @@ Transform:
   m_GameObject: {fileID: 1867511809}
   m_LocalRotation: {x: 0.000000079025305, y: -0.000000005268318, z: -0.0000003874301,
     w: -1}
-  m_LocalPosition: {x: -9.752369e-10, y: -0.000013779855, z: -0.092744544}
+  m_LocalPosition: {x: 0.000000010528947, y: -0.00002087366, z: 0.9990741}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
   m_Children: []
   m_Father: {fileID: 78157518}
@@ -478937,7 +479040,7 @@ Transform:
   m_GameObject: {fileID: 1936792701}
   m_LocalRotation: {x: 0.000000014901147, y: 0.000000014901144, z: 0.0000001937151,
     w: 1}
-  m_LocalPosition: {x: 0.000010155922, y: 0.000000024724525, z: -0.12763348}
+  m_LocalPosition: {x: 0.0000030949936, y: -0.0000001867772, z: 0.96418524}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
   m_Children: []
   m_Father: {fileID: 505037187}
@@ -510664,7 +510767,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2068684159}
   m_LocalRotation: {x: -0.000000115903816, y: -0, z: -0.00000089562036, w: -1}
-  m_LocalPosition: {x: -0.000009158007, y: 0, z: -0.107366964}
+  m_LocalPosition: {x: 1.602549, y: 0, z: -0.10737698}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1398862014}
@@ -617810,7 +617913,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7353040215322160146}
   m_LocalRotation: {x: -0, y: -0.0000000074505797, z: 0.0000003650784, w: -1}
-  m_LocalPosition: {x: 0.002695322, y: -0.015060425, z: 2.7019212}
+  m_LocalPosition: {x: 0.0026922226, y: -0.015060425, z: 2.2019231}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7718717752252476158}
@@ -1407140,7 +1407243,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2407715186485405994}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.0026932955, y: -0.01525116, z: 2.7893786}
+  m_LocalPosition: {x: 0.0026900768, y: -0.01525116, z: 2.2893806}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7718717752252476158}
@@ -1481783,7 +1481886,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 732154151823550904}
   m_LocalRotation: {x: -0.00000037252903, y: -1, z: -0, w: 0.000000052154064}
-  m_LocalPosition: {x: 0.0026971102, y: -0.015075684, z: 2.6716344}
+  m_LocalPosition: {x: 0.0026938915, y: -0.015075684, z: 2.171636}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7718717752252476158}