[+]场景添加

ChivaTechFramework/Assets/GameAssets/03.Models/08.110kV隔离开关-GW22型/隔离开关_110kV_GW22_126.FBX.meta

@@ -33,7 +33,7 @@ ModelImporter:
       type: UnityEngine:Material
       assembly: UnityEngine.CoreModule
       name: "\u9694\u79BB\u5F00\u5173_110kV_GW22_126_\u4E0B\u90E8"
-    second: {fileID: 2100000, guid: 40dfd21494c4189448ac756c8e441afc, type: 2}
+    second: {fileID: 2100000, guid: d1fc17c2a67cee24cad574acca7d8818, type: 2}
   - first:
       type: UnityEngine:Material
       assembly: UnityEngine.CoreModule

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

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
-guid: 27d1e2695d245a14a9fcff4758e63252
+<<<<<<<< HEAD:ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型接地刀闸及关联部件大修.unity.meta
+guid: 3887660294457434d89bad5129ba556a
+========
+guid: 9b4ede6e8ca01a147871f7483948bb64
+>>>>>>>> feature/BASE:ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/220kV断路器-LW25型手动电动分合闸检查.unity.meta
 DefaultImporter:
   externalObjects: {}
   userData: 

ChivaTechFramework/Assets/StreamingAssets/AssetBundles.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5cf01303e08ebaf48833fb6ddc30ab03
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV断路器-LW35型手动电动分合闸检查.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV断路器-LW35型手动电动分合闸检查.meta
-guid: 3dde14eb4f5e6da4ba77146a5d9e969c
+guid: a7ad875e7d4a4934aae6604eec619c85
 ========
 guid: 8b4ce2ab80a9cb4408d1cd3dcf2415bd
 >>>>>>>> feature/LQD_YunNan:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修.meta

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

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV断路器-LW35型手动电动分合闸检查.meta
-guid: 3dde14eb4f5e6da4ba77146a5d9e969c
+guid: fb9fdcb9853542447b84cf67371424f2
 ========
 guid: 8b4ce2ab80a9cb4408d1cd3dcf2415bd
 >>>>>>>> feature/LQD_YunNan:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型传动机构和转动部件大修.meta

ChivaTechFramework/Assets/StreamingAssets/Config/工具配置/工具配置图片/“禁止合闸 有人工作”标识牌.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/工具配置/工具配置图片/“禁止合闸 有人工作”标识牌.png.meta
-guid: 9766195099c70054492ed90e3b76edce
+guid: 12a438adc5a55ce4387fb322da650d79
 ========
 guid: 67f860653af242f4fb3cb31c4ffda72b
 >>>>>>>> feature/LQD_YunNan:ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV断路器-LW35型手动电动分合闸检查.xlsx.meta

ChivaTechFramework/Assets/StreamingAssets/Config/工具配置/工具配置图片/凡士林.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/工具配置/工具配置图片/凡士林.png.meta
-guid: f94b2fcdc72dad74cbad69d1b0f7d8f3
+guid: 1e64ceb60f66e564292f82bcd82744dc
 ========
 guid: a53383a66995a4a4c88522f3e3c4dbc3
 >>>>>>>> feature/LQD_YunNan:ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV隔离开关-GW22型传动机构和转动部件大修.xlsx.meta

ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV断路器-LW35型手动电动分合闸检查.xlsx.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/工具配置/工具配置图片/“禁止合闸 有人工作”标识牌.png.meta
-guid: 9766195099c70054492ed90e3b76edce
+guid: e7b1c28104adb3d4fb2f1eaa416f7643
 ========
 guid: 67f860653af242f4fb3cb31c4ffda72b
 >>>>>>>> feature/LQD_YunNan:ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV断路器-LW35型手动电动分合闸检查.xlsx.meta

ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV隔离开关-GW22型传动机构和转动部件大修.xlsx.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/工具配置/工具配置图片/凡士林.png.meta
-guid: f94b2fcdc72dad74cbad69d1b0f7d8f3
+guid: e8312d541cb547d41ac53b5a35b9335c
 ========
 guid: a53383a66995a4a4c88522f3e3c4dbc3
 >>>>>>>> feature/LQD_YunNan:ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV隔离开关-GW22型传动机构和转动部件大修.xlsx.meta

ChivaTechFramework/ProjectSettings/EditorBuildSettings.asset

@@ -47,10 +47,13 @@ EditorBuildSettings:
   - 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
+  - enabled: 0
     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: 0
     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/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u63A5\u5730\u5200\u95F8\u53CA\u5173\u8054\u90E8\u4EF6\u5927\u4FEE.unity"
+    guid: a543a81da812d5f4abb7640b2f65feac
   m_configObjects: {}

ChivaTechFramework/ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: Chiva
-  productName: "220kV\u65AD\u8DEF\u5668-LW25\u578B\u89E3\u4F53\u5927\u4FEE"
+  productName: "110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u63A5\u5730\u5200\u95F8\u53CA\u5173\u8054\u90E8\u4EF6\u5927\u4FEE"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}