2 Коміти bc0d90c568 ... 8a817470b1

Автор SHA1 Опис Дата
  FYX 8a817470b1 Merge branch 'feature/新制作' into develop_合作分支 4 тижнів тому
  FYX 2484f4dd8d [+]问题修改 4 тижнів тому

+ 0 - 6
ChivaTechFramework/Assets/Scenes/云南/220kV隔离开关-GW4A型解体大修.unity

@@ -461803,12 +461803,6 @@ MonoBehaviour:
     opData: {fileID: 691368663}
     opValue: 0
     toggleType: 
-  - OpDataName: "\u5DE5\u5668\u5177\u51C6\u5907"
-    Description: "\u5DE5\u5668\u5177\u51C6\u5907"
-    guid: 49f62700-ba37-4e0d-ba4e-70428f569ec7
-    opData: {fileID: 0}
-    opValue: 0
-    toggleType: 
   - OpDataName: "\u5DE5\u5668\u5177\u548C\u8017\u6750\u5907\u54C1\u7684\u51C6\u5907\r"
     Description: "\u5DE5\u5668\u5177\u548C\u8017\u6750\u5907\u54C1\u7684\u51C6\u5907\r"
     guid: 6a7adb83-8b25-4d0a-9a17-f4cc05787ebd

+ 2 - 2
ChivaTechFramework/Assets/Scenes/云南/主变高压套管更换(穿缆式).unity

@@ -44,7 +44,7 @@ RenderSettings:
 LightmapSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 11
-  m_GIWorkflowMode: 1
+  m_GIWorkflowMode: 0
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -251469,7 +251469,7 @@ Light:
   m_BounceIntensity: 1
   m_ColorTemperature: 6570
   m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 1.9983e-41, z: 0, w: -1}
+  m_BoundingSphereOverride: {x: 0, y: 9.848e-42, z: 0, w: 2.79007e+20}
   m_UseBoundingSphereOverride: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0

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

@@ -48509,7 +48509,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 275349977}
-  - component: {fileID: 275349980}
   - component: {fileID: 275349979}
   - component: {fileID: 275349978}
   m_Layer: 0
@@ -48562,23 +48561,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 448d5fcaf015fc844bf522645b80f0b6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!111 &275349980
-Animation:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 275349976}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Animation: {fileID: 1827226128182048838, guid: d1b67da1a7b02cb43937f1f8f5641671,
-    type: 3}
-  m_Animations:
-  - {fileID: 1827226128182048838, guid: d1b67da1a7b02cb43937f1f8f5641671, type: 3}
-  m_WrapMode: 0
-  m_PlayAutomatically: 1
-  m_AnimatePhysics: 0
-  m_CullingType: 1
 --- !u!1 &275575262
 GameObject:
   m_ObjectHideFlags: 0
@@ -160480,7 +160462,8 @@ MonoBehaviour:
   m_CurrentAniData: {fileID: 1109210070}
   aniName: "01\u73B0\u573A\u52D8\u5BDF\r"
   currentStepID: 1
-  selection: []
+  selection:
+  - {fileID: 1110665760}
 --- !u!1 &854262383
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型控制、传动部分解体检修.unity

@@ -44,7 +44,7 @@ RenderSettings:
 LightmapSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 11
-  m_GIWorkflowMode: 1
+  m_GIWorkflowMode: 0
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1

+ 1 - 19
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/断路器操动机构解体检修(储能电机及减速器更换).unity

@@ -61867,7 +61867,7 @@ MonoBehaviour:
   aniName: "01\u5DE5\u5668\u5177\u548C\u8017\u6750\u5907\u54C1\u7684\u51C6\u5907\r"
   currentStepID: 1
   selection:
-  - {fileID: 1621902193}
+  - {fileID: 1718377629}
 --- !u!1 &711575077
 GameObject:
   m_ObjectHideFlags: 0
@@ -148169,7 +148169,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1718377632}
-  - component: {fileID: 1718377631}
   - component: {fileID: 1718377630}
   - component: {fileID: 1718377633}
   m_Layer: 0
@@ -148191,23 +148190,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 448d5fcaf015fc844bf522645b80f0b6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!111 &1718377631
-Animation:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1718377629}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Animation: {fileID: 1827226128182048838, guid: d1b67da1a7b02cb43937f1f8f5641671,
-    type: 3}
-  m_Animations:
-  - {fileID: 1827226128182048838, guid: d1b67da1a7b02cb43937f1f8f5641671, type: 3}
-  m_WrapMode: 0
-  m_PlayAutomatically: 1
-  m_AnimatePhysics: 0
-  m_CullingType: 1
 --- !u!4 &1718377632
 Transform:
   m_ObjectHideFlags: 0

BIN
ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/220kV隔离开关-GW4A型传动机构和转动部件大修_题库.xlsx


+ 1 - 1
ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/220kV隔离开关-GW4A型传动机构和转动部件大修_题库.xlsx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e06c0d69dc4b5c844970f5069e892ad8
+guid: 3ed33746ab65c054e908d0bdfd8c5913
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 22 - 10
ChivaTechFramework/ProjectSettings/EditorBuildSettings.asset

@@ -32,9 +32,6 @@ EditorBuildSettings:
   - enabled: 0
     path: "Assets/Scenes/\u4E91\u5357/\u81EA\u7531\u6A21\u5F0F\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u98CE\u6247\u7535\u673A\u66F4\u6362).unity"
     guid: 616d391e618a577468222c890205710f
-  - enabled: 0
-    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u64CD\u52A8\u673A\u6784\u89E3\u4F53\u68C0\u4FEE.unity"
-    guid: 8fd8b362c86fa9a44b6bbc678225f568
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357/\u4E3B\u53D8\u672C\u4F53\u6CB9\u6DFB\u52A0\u53CA\u8BD5\u9A8C\u68C0\u4FEE.unity"
     guid: ae41c2d3f3d387f4287ee0c8f42b4531
@@ -47,24 +44,36 @@ EditorBuildSettings:
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u74F7\u8D28\u7EDD\u7F18\u68C0\u4FEE.unity"
     guid: 327e09e152466fa499492c969c3c2395
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: c628b263750c9924da8656debc0c06af
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u706D\u5F27\u3001\u5BFC\u7535\u548C\u7EDD\u7F18\u90E8\u5206\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: 5657f005aa973504dbb026332caafadc
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u64CD\u52A8\u673A\u6784\u89E3\u4F53\u68C0\u4FEE.unity"
+    guid: 8fd8b362c86fa9a44b6bbc678225f568
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u65AD\u8DEF\u5668-LW35\u578B\u89E3\u4F53\u5927\u4FEE.unity"
     guid: 7a7584f0e9c365348ace86d37483e9b9
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/500kV\u9694\u79BB\u5F00\u5173-GW12\u578B\u8F74\u627F\u5EA7\u68C0\u4FEE.unity"
     guid: 876f378f059107a4082bd806b3200e66
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: 230b3e331b8cf7543b6988b80e726c83
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u4F20\u52A8\u673A\u6784\u548C\u8F6C\u52A8\u90E8\u4EF6\u5927\u4FEE.unity"
     guid: e938a4ad95b511747baaff51cd05dbc5
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u8F74\u627F\u5EA7\u5927\u4FEE.unity"
+    guid: 296eeba5d42edff41a1a54271cbac86b
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u63A5\u5730\u5200\u95F8\u53CA\u5173\u8054\u90E8\u4EF6\u5927\u4FEE.unity"
     guid: 825ec3e9e9ee3f84d84ce4904794f287
   - enabled: 1
-    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/\u5F00\u5173\u67DC\u5C0F\u8F66\u9694\u79BB\u89E6\u6307\u68C0\u4FEE(\u65AD\u8DEF\u5668\u624B\u8F66\u52A8\u9759\u89E6\u5934\u66F4\u6362).unity"
-    guid: e7852bf69efe5c84289f5cf168ded72e
-  - enabled: 1
-    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/\u65AD\u8DEF\u5668\u64CD\u52A8\u673A\u6784\u89E3\u4F53\u68C0\u4FEE(\u50A8\u80FD\u7535\u673A\u53CA\u51CF\u901F\u5668\u66F4\u6362).unity"
-    guid: 9330ca715009ba34d9ef266ba922ad2b
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u6CD5\u5170\u90E8\u4EF6\u66F4\u6362.unity"
+    guid: 76147a3688923994cba742500eed4c51
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u89E3\u4F53\u5927\u4FEE.unity"
     guid: 9263387a8745ebb499a01812f7fdbc77
@@ -72,6 +81,9 @@ EditorBuildSettings:
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u5BFC\u7535\u90E8\u5206\u5F02\u5E38\u68C0\u4FEE.unity"
     guid: a791221d330ced24fb9983d049c37939
   - enabled: 1
-    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u6CD5\u5170\u90E8\u4EF6\u66F4\u6362.unity"
-    guid: 76147a3688923994cba742500eed4c51
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/\u5F00\u5173\u67DC\u5C0F\u8F66\u9694\u79BB\u89E6\u6307\u68C0\u4FEE(\u65AD\u8DEF\u5668\u624B\u8F66\u52A8\u9759\u89E6\u5934\u66F4\u6362).unity"
+    guid: e7852bf69efe5c84289f5cf168ded72e
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/\u65AD\u8DEF\u5668\u64CD\u52A8\u673A\u6784\u89E3\u4F53\u68C0\u4FEE(\u50A8\u80FD\u7535\u673A\u53CA\u51CF\u901F\u5668\u66F4\u6362).unity"
+    guid: 9330ca715009ba34d9ef266ba922ad2b
   m_configObjects: {}