Selaa lähdekoodia

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

zhangjx 3 kuukautta sitten
vanhempi
commit
32e09bcd72
17 muutettua tiedostoa jossa 457 lisäystä ja 521 poistoa
  1. 1 1
      ChivaTechFramework/Assets/GameAssets/Prefab.meta
  2. 97 192
      ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型传动机构和转动部件大修.unity
  3. 317 200
      ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型接地刀闸及关联部件大修.unity
  4. 19 50
      ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型法兰部件更换.unity
  5. 11 42
      ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型解体大修.unity
  6. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/23.mp3
  7. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/23_old.mp3
  8. 1 2
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/23_old.mp3.meta
  9. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/25.mp3
  10. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/25_old.mp3
  11. 7 0
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/25_old.mp3.meta
  12. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/52.mp3
  13. 1 16
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/52.mp3.meta
  14. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型接地刀闸及关联部件大修/52.mp3
  15. 2 17
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型接地刀闸及关联部件大修/52.mp3.meta
  16. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型接地刀闸及关联部件大修/54.mp3
  17. 1 1
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型接地刀闸及关联部件大修/54.mp3.meta

+ 1 - 1
ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具/尖嘴钳&链条钳&摇把&二次插头/尖嘴钳&链条钳&摇把_Tex.meta → ChivaTechFramework/Assets/GameAssets/Prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d7169f2046eb3634fa0acdbbadbd1b44
+guid: 6e61bf281206a464b8f4cb1821ea91a7
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 97 - 192
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型传动机构和转动部件大修.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.6065158, g: 0.57741016, b: 0.60061586, a: 1}
+  m_IndirectSpecularColor: {r: 0.606516, g: 0.57741016, b: 0.60061616, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -43349,7 +43349,6 @@ MonoBehaviour:
     SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects:
-    - {fileID: 460046409}
     - {fileID: 388495226}
     - {fileID: 1241148479}
     SerializedBytesString: 
@@ -43363,38 +43362,23 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 3
-    - Name: 
-      Entry: 7
-      Data: 1|AniDriver_SimpleMoveRot, Assembly-CSharp
-    - Name: animationSequence
-      Entry: 3
-      Data: 1
-    - Name: mSimpleMoveItem
-      Entry: 10
-      Data: 0
-    - Name: reverse
-      Entry: 5
-      Data: false
-    - Name: 
-      Entry: 8
-      Data: 
+      Data: 2
     - Name: 
       Entry: 7
-      Data: 2|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 3|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 2|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 1
+      Data: 0
     - Name: 
       Entry: 13
       Data: 
@@ -43409,20 +43393,20 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 4|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 3|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 5|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 4|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 2
+      Data: 1
     - Name: 
       Entry: 13
       Data: 
@@ -98183,7 +98167,6 @@ MonoBehaviour:
     SerializedBytes: 
     ReferencedUnityObjects:
     - {fileID: 2039491484}
-    - {fileID: 263030419}
     - {fileID: 275475445}
     SerializedBytesString: 
     Prefab: {fileID: 0}
@@ -98196,7 +98179,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 3
+      Data: 2
     - Name: 
       Entry: 7
       Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
@@ -98227,35 +98210,20 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 3|AniDriver_SimpleMoveRot, Assembly-CSharp
-    - Name: animationSequence
-      Entry: 3
-      Data: 1
-    - Name: mSimpleMoveItem
-      Entry: 10
-      Data: 1
-    - Name: reverse
-      Entry: 5
-      Data: false
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 7
-      Data: 4|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 3|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 5|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 4|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 2
+      Data: 1
     - Name: 
       Entry: 13
       Data: 
@@ -123143,7 +123111,6 @@ MonoBehaviour:
     SerializedBytes: 
     ReferencedUnityObjects:
     - {fileID: 388495226}
-    - {fileID: 130414017}
     - {fileID: 1241148479}
     SerializedBytesString: 
     Prefab: {fileID: 0}
@@ -123156,7 +123123,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 3
+      Data: 2
     - Name: 
       Entry: 7
       Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
@@ -123187,35 +123154,20 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 3|AniDriver_SimpleMoveRot, Assembly-CSharp
-    - Name: animationSequence
-      Entry: 3
-      Data: 1
-    - Name: mSimpleMoveItem
-      Entry: 10
-      Data: 1
-    - Name: reverse
-      Entry: 5
-      Data: false
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 7
-      Data: 4|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 3|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 5|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 4|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 2
+      Data: 1
     - Name: 
       Entry: 13
       Data: 
@@ -143678,11 +143630,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 491869842}
   m_LocalRotation: {x: 0.000000029802322, y: 0.70710677, z: -0.000000044703484, w: 0.7071068}
-  m_LocalPosition: {x: 0.035106465, y: -0.004050586, z: -2.2179897}
-  m_LocalScale: {x: 4.212104, y: 4.2121, z: 4.2120986}
+  m_LocalPosition: {x: 0.035106275, y: -0.0040507675, z: 0.0103174355}
+  m_LocalScale: {x: 4.2121058, y: 4.2121005, z: 4.2120986}
   m_Children: []
   m_Father: {fileID: 707748009}
-  m_RootOrder: 19
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &491869844
 MeshCollider:
@@ -205588,8 +205540,8 @@ Transform:
   - {fileID: 1508888758}
   - {fileID: 1595222106}
   - {fileID: 65900022}
-  - {fileID: 1246925932}
   - {fileID: 491869843}
+  - {fileID: 1246925932}
   - {fileID: 431853030}
   m_Father: {fileID: 673226680}
   m_RootOrder: 0
@@ -240437,7 +240389,6 @@ MonoBehaviour:
     SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects:
-    - {fileID: 96690898}
     - {fileID: 2039491484}
     - {fileID: 275475445}
     SerializedBytesString: 
@@ -240451,38 +240402,23 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 3
-    - Name: 
-      Entry: 7
-      Data: 1|AniDriver_SimpleMoveRot, Assembly-CSharp
-    - Name: animationSequence
-      Entry: 3
-      Data: 1
-    - Name: mSimpleMoveItem
-      Entry: 10
-      Data: 0
-    - Name: reverse
-      Entry: 5
-      Data: false
-    - Name: 
-      Entry: 8
-      Data: 
+      Data: 2
     - Name: 
       Entry: 7
-      Data: 2|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 3|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 2|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 1
+      Data: 0
     - Name: 
       Entry: 13
       Data: 
@@ -240497,20 +240433,20 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 4|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 3|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 5|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 4|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 2
+      Data: 1
     - Name: 
       Entry: 13
       Data: 
@@ -353758,11 +353694,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1246925931}
   m_LocalRotation: {x: 0.000000029802322, y: 0.70710677, z: -0.000000044703484, w: 0.7071068}
-  m_LocalPosition: {x: 0.03510609, y: -0.0040508686, z: 2.2386246}
-  m_LocalScale: {x: 4.212104, y: 4.2121, z: 4.2120986}
+  m_LocalPosition: {x: 0.035106275, y: -0.0040507675, z: 0.0103174355}
+  m_LocalScale: {x: 4.2121058, y: 4.2121005, z: 4.2120986}
   m_Children: []
   m_Father: {fileID: 707748009}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1246925933
 MeshCollider:
@@ -450077,13 +450013,13 @@ MonoBehaviour:
     SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects:
+    - {fileID: 950563249}
     - {fileID: 296058072}
     - {fileID: 220592562}
     - {fileID: 1194494010}
     - {fileID: 2077598285}
     - {fileID: 1210057880}
     - {fileID: 936109779}
-    - {fileID: 950563249}
     SerializedBytesString: 
     Prefab: {fileID: 0}
     PrefabModificationsReferencedUnityObjects: []
@@ -450098,60 +450034,74 @@ MonoBehaviour:
       Data: 3
     - Name: 
       Entry: 7
-      Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 1|AniDriver_RotateBySelf, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
+      Data: 1
+    - Name: target
+      Entry: 10
       Data: 0
-    - Name: objs
+    - Name: axis
+      Entry: 3
+      Data: 2
+    - Name: initAngle
       Entry: 7
-      Data: 2|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
-        mscorlib
+      Data: UnityEngine.Vector3, UnityEngine.CoreModule
     - Name: 
-      Entry: 12
-      Data: 3
+      Entry: 4
+      Data: -90
     - Name: 
-      Entry: 10
+      Entry: 4
       Data: 0
     - Name: 
-      Entry: 10
-      Data: 1
-    - Name: 
-      Entry: 10
-      Data: 2
+      Entry: 4
+      Data: 0
     - Name: 
-      Entry: 13
+      Entry: 8
       Data: 
+    - Name: targetAngle
+      Entry: 7
+      Data: UnityEngine.Vector3, UnityEngine.CoreModule
+    - Name: 
+      Entry: 4
+      Data: -90
+    - Name: 
+      Entry: 4
+      Data: 0
+    - Name: 
+      Entry: 4
+      Data: -90
     - Name: 
       Entry: 8
       Data: 
-    - Name: activeObjs
-      Entry: 5
-      Data: true
+    - Name: duration
+      Entry: 4
+      Data: 2
     - Name: 
       Entry: 8
       Data: 
     - Name: 
       Entry: 7
-      Data: 3|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 2|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: 3|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 3
     - Name: 
       Entry: 10
-      Data: 3
+      Data: 1
     - Name: 
       Entry: 10
-      Data: 4
+      Data: 2
     - Name: 
       Entry: 10
-      Data: 5
+      Data: 3
     - Name: 
       Entry: 13
       Data: 
@@ -450160,55 +450110,41 @@ MonoBehaviour:
       Data: 
     - Name: activeObjs
       Entry: 5
-      Data: false
+      Data: true
     - Name: 
       Entry: 8
       Data: 
     - Name: 
       Entry: 7
-      Data: 5|AniDriver_RotateBySelf, Assembly-CSharp
+      Data: 4|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
-    - Name: target
-      Entry: 10
-      Data: 6
-    - Name: axis
-      Entry: 3
-      Data: 2
-    - Name: initAngle
+    - Name: objs
       Entry: 7
-      Data: UnityEngine.Vector3, UnityEngine.CoreModule
-    - Name: 
-      Entry: 4
-      Data: -90
-    - Name: 
-      Entry: 4
-      Data: 0
+      Data: 5|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+        mscorlib
     - Name: 
-      Entry: 4
-      Data: 0
+      Entry: 12
+      Data: 3
     - Name: 
-      Entry: 8
-      Data: 
-    - Name: targetAngle
-      Entry: 7
-      Data: UnityEngine.Vector3, UnityEngine.CoreModule
+      Entry: 10
+      Data: 4
     - Name: 
-      Entry: 4
-      Data: -90
+      Entry: 10
+      Data: 5
     - Name: 
-      Entry: 4
-      Data: 0
+      Entry: 10
+      Data: 6
     - Name: 
-      Entry: 4
-      Data: -90
+      Entry: 13
+      Data: 
     - Name: 
       Entry: 8
       Data: 
-    - Name: duration
-      Entry: 4
-      Data: 2
+    - Name: activeObjs
+      Entry: 5
+      Data: false
     - Name: 
       Entry: 8
       Data: 
@@ -592213,7 +592149,6 @@ MonoBehaviour:
     SerializedBytes: 
     ReferencedUnityObjects:
     - {fileID: 1813189192}
-    - {fileID: 1356755343}
     - {fileID: 1070199454}
     SerializedBytesString: 
     Prefab: {fileID: 0}
@@ -592226,7 +592161,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 3
+      Data: 2
     - Name: 
       Entry: 7
       Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
@@ -592257,35 +592192,20 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 3|AniDriver_SimpleMoveRot, Assembly-CSharp
-    - Name: animationSequence
-      Entry: 3
-      Data: 1
-    - Name: mSimpleMoveItem
-      Entry: 10
-      Data: 1
-    - Name: reverse
-      Entry: 5
-      Data: false
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 7
-      Data: 4|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 3|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 5|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 4|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 2
+      Data: 1
     - Name: 
       Entry: 13
       Data: 
@@ -593709,7 +593629,8 @@ MonoBehaviour:
   m_CurrentAniData: {fileID: 70933644}
   aniName: "01\u73B0\u573A\u52D8\u5BDF\r"
   currentStepID: 1
-  selection: []
+  selection:
+  - {fileID: 181160183}
 --- !u!1 &2088838749
 GameObject:
   m_ObjectHideFlags: 0
@@ -602579,7 +602500,6 @@ MonoBehaviour:
     SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects:
-    - {fileID: 2069888335}
     - {fileID: 1813189192}
     - {fileID: 1070199454}
     SerializedBytesString: 
@@ -602593,38 +602513,23 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 3
-    - Name: 
-      Entry: 7
-      Data: 1|AniDriver_SimpleMoveRot, Assembly-CSharp
-    - Name: animationSequence
-      Entry: 3
-      Data: 1
-    - Name: mSimpleMoveItem
-      Entry: 10
-      Data: 0
-    - Name: reverse
-      Entry: 5
-      Data: false
-    - Name: 
-      Entry: 8
-      Data: 
+      Data: 2
     - Name: 
       Entry: 7
-      Data: 2|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 3|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 2|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 1
+      Data: 0
     - Name: 
       Entry: 13
       Data: 
@@ -602639,20 +602544,20 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 4|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 3|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 5|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 4|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 2
+      Data: 1
     - Name: 
       Entry: 13
       Data: 

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 317 - 200
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型接地刀闸及关联部件大修.unity


+ 19 - 50
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型法兰部件更换.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.6065158, g: 0.57741016, b: 0.60061586, a: 1}
+  m_IndirectSpecularColor: {r: 0.606516, g: 0.57741016, b: 0.60061616, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -193020,7 +193020,6 @@ MonoBehaviour:
     ReferencedUnityObjects:
     - {fileID: 2016772410}
     - {fileID: 113009957}
-    - {fileID: 277099641}
     - {fileID: 1696836614}
     SerializedBytesString: 
     Prefab: {fileID: 0}
@@ -193033,7 +193032,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 4
+      Data: 3
     - Name: 
       Entry: 7
       Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
@@ -193092,35 +193091,20 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 5|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: 6|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 5|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 7|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 6|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 3
+      Data: 2
     - Name: 
       Entry: 13
       Data: 
@@ -212018,7 +212002,8 @@ MonoBehaviour:
   m_CurrentAniData: {fileID: 241716403}
   aniName: "01\u73B0\u573A\u52D8\u5BDF\r"
   currentStepID: 1
-  selection: []
+  selection:
+  - {fileID: 1152846518}
 --- !u!1 &595118363
 GameObject:
   m_ObjectHideFlags: 0
@@ -234674,7 +234659,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 657716001}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.17334557, y: 0.0527, z: 0.083}
+  m_LocalPosition: {x: 0.17334557, y: 0.0527, z: 0.2905}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1152846519}
@@ -409036,7 +409021,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1152846518}
   m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0.46946716, y: 3.8778439, z: 0.05731201}
+  m_LocalPosition: {x: -0.46946716, y: 3.6692, z: 0.05731201}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 657716002}
@@ -567900,7 +567885,6 @@ MonoBehaviour:
     SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects:
-    - {fileID: 277099641}
     - {fileID: 2016772410}
     - {fileID: 1696836614}
     - {fileID: 113009957}
@@ -567915,38 +567899,23 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 4
-    - Name: 
-      Entry: 7
-      Data: 1|AniDriver_SimpleMoveRot, Assembly-CSharp
-    - Name: animationSequence
-      Entry: 3
-      Data: 1
-    - Name: mSimpleMoveItem
-      Entry: 10
-      Data: 0
-    - Name: reverse
-      Entry: 5
-      Data: false
-    - Name: 
-      Entry: 8
-      Data: 
+      Data: 3
     - Name: 
       Entry: 7
-      Data: 2|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 3|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 2|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 1
+      Data: 0
     - Name: 
       Entry: 13
       Data: 
@@ -567961,20 +567930,20 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 4|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 3|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 5|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 4|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 2
+      Data: 1
     - Name: 
       Entry: 13
       Data: 
@@ -567989,20 +567958,20 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 6|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 5|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 7|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 6|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 3
+      Data: 2
     - Name: 
       Entry: 13
       Data: 

+ 11 - 42
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型解体大修.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.6065158, g: 0.57741016, b: 0.60061586, a: 1}
+  m_IndirectSpecularColor: {r: 0.606516, g: 0.57741016, b: 0.60061616, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -242858,7 +242858,6 @@ MonoBehaviour:
     ReferencedUnityObjects:
     - {fileID: 1268059675}
     - {fileID: 188307557}
-    - {fileID: 198965013}
     SerializedBytesString: 
     Prefab: {fileID: 0}
     PrefabModificationsReferencedUnityObjects: []
@@ -242870,7 +242869,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 3
+      Data: 2
     - Name: 
       Entry: 7
       Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
@@ -242927,21 +242926,6 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
-    - Name: 
-      Entry: 7
-      Data: 5|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: 13
       Data: 
@@ -467516,7 +467500,8 @@ MonoBehaviour:
   m_CurrentAniData: {fileID: 558796924}
   aniName: "\r\u68C0\u4FEE\u524D\u51C6\u5907-1-\u73B0\u573A\u52D8\u5BDF\r"
   currentStepID: 1
-  selection: []
+  selection:
+  - {fileID: 1946951883}
 --- !u!1 &1189293672
 GameObject:
   m_ObjectHideFlags: 0
@@ -771702,7 +771687,6 @@ MonoBehaviour:
     SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects:
-    - {fileID: 198965013}
     - {fileID: 188307557}
     - {fileID: 1268059675}
     SerializedBytesString: 
@@ -771716,38 +771700,23 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 3
-    - Name: 
-      Entry: 7
-      Data: 1|AniDriver_SimpleMoveRot, Assembly-CSharp
-    - Name: animationSequence
-      Entry: 3
-      Data: 1
-    - Name: mSimpleMoveItem
-      Entry: 10
-      Data: 0
-    - Name: reverse
-      Entry: 5
-      Data: false
-    - Name: 
-      Entry: 8
-      Data: 
+      Data: 2
     - Name: 
       Entry: 7
-      Data: 2|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 3|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 2|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 1
+      Data: 0
     - Name: 
       Entry: 13
       Data: 
@@ -771762,20 +771731,20 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 4|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 3|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 5|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 4|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 10
-      Data: 2
+      Data: 1
     - Name: 
       Entry: 13
       Data: 

BIN
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/23.mp3


BIN
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/23_old.mp3


+ 1 - 2
ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具/推车.meta → ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/23_old.mp3.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 3ab4200d27faaf549aaf2e0ab6d6d371
-folderAsset: yes
+guid: e44ad7080e34e6a498b1dcdf304f75d4
 DefaultImporter:
   externalObjects: {}
   userData: 

BIN
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/25.mp3


BIN
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/25_old.mp3


+ 7 - 0
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/25_old.mp3.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2bbaadfdcbcf9054f8c9df6e8d2c8f12
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/52.mp3


+ 1 - 16
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修/52.mp3.meta

@@ -1,22 +1,7 @@
 fileFormatVersion: 2
 guid: d99305fa458e2a84a9fdc1f7d58b6ce5
-AudioImporter:
+DefaultImporter:
   externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型接地刀闸及关联部件大修/52.mp3


+ 2 - 17
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型接地刀闸及关联部件大修/52.mp3.meta

@@ -1,22 +1,7 @@
 fileFormatVersion: 2
-guid: 48598d107791a7341b694fee4176e3f5
-AudioImporter:
+guid: d7e9f3936cd52064da8101027378783c
+DefaultImporter:
   externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BIN
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型接地刀闸及关联部件大修/54.mp3


+ 1 - 1
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型接地刀闸及关联部件大修/54.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 10104842a68c2944f835baafaf949b95
+guid: a18ba59be2d910f40a7e611f565d1d87
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä