【+】220kV隔离开关场景修改

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

@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/220kV隔离开关-GW4A型传动机构和转动部件大修.unity.meta
-guid: e938a4ad95b511747baaff51cd05dbc5
-========
-guid: eb32d8902044ebf4ab71628ed97a8216
->>>>>>>> feature/jinxin:ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV断路器-LW35型解体大修.xlsx.meta
+guid: fabeee10041ff7c458636c32510a8233
 DefaultImporter:
   externalObjects: {}
   userData: 

ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/~$110kV隔离开关-GW22型接地刀闸及关联部件大修.xlsx.meta

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

ChivaTechFramework/ProjectSettings/EditorBuildSettings.asset

@@ -63,7 +63,7 @@ EditorBuildSettings:
     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"
+    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\u4FEE2.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"