[+]打包设置

ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ChivaTechFramework/Assets/GameAssets/03.Models/02.220kV变压器-SFPSZ10-180000型/200kv_内部.fbm.meta
-guid: 08cfcddbb28ed7d4e93a6c112a54ba4b
-========
-guid: 0671f280834e2f9438099d509419c9a2
->>>>>>>> feature/bj:ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/220kV断路器-LW25型灭弧、导电和绝缘部分解体大修_old.unity.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV断路器-LW35型手动电动分合闸检查/15.mp3.meta
-guid: b1b32158e2f33ff4fba6cff0de38c77d
+guid: 029650d07c943334691070bd51a01ceb
 ========
 guid: acfc83426b2ff98429292558df42c298
 >>>>>>>> feature/cjy:ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/220kV断路器-LW25型灭弧、导电和绝缘部分解体大修_old.unity.meta

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

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV断路器-LW35型手动电动分合闸检查/15.mp3.meta
-guid: b1b32158e2f33ff4fba6cff0de38c77d
+guid: 70643d5aba4db5a438ed62424164e004
 ========
 guid: acfc83426b2ff98429292558df42c298
 >>>>>>>> feature/cjy:ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/220kV断路器-LW25型灭弧、导电和绝缘部分解体大修_old.unity.meta

ChivaTechFramework/ProjectSettings/EditorBuildSettings.asset

@@ -77,18 +77,18 @@ EditorBuildSettings:
   - 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\u74F7\u8D28\u7EDD\u7F18\u68C0\u4FEE_old.unity"
-    guid: e0c3c4eeb26a1014db957749ade5ffd7
-  - 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_old.unity"
-    guid: acfc83426b2ff98429292558df42c298
   - 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: d37c386efce20a24a94626defb42fede
   - enabled: 1
     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u624B\u52A8\u7535\u52A8\u5206\u5408\u95F8\u68C0\u67E5.unity"
     guid: d8f0d2cef755d5c49b24ac25a4532c1c
+  - 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: c72ef91ecdd60c14aba26734f7cc17b3
+  - 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: 2f277fd29d6547b4d9907c31cf658029
   - 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