【+】暂存

ModeDisplay/Assets/GameAssets/09.Audios/500kV变压器运行原理.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ModeDisplay/Assets/Scenes/内部结构拆解动画.meta
-guid: 2f68e3135b7a64b4c85c1606473167ab
+guid: 754cd978de64cb749bbb871c12b6a4e5
 ========
 guid: 162ca9154397ae548a97379865c47d7c
 >>>>>>>> feature/cjy:ModeDisplay/Assets/GameAssets/09.Audios/500kV变压器运行原理.meta

ModeDisplay/Assets/Scenes/云南.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ModeDisplay/Assets/Scenes/云南.meta
-guid: 520cc34d804c7b644bb7419b0040430f
-========
-guid: 4e30deeb7b974d9429a14fe1e3692425
->>>>>>>> feature/cjy:ModeDisplay/Assets/Scripts/OperatingPrinciple.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ModeDisplay/Assets/Scripts/OperatingPrinciple.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ModeDisplay/Assets/Scenes/云南.meta
-guid: 520cc34d804c7b644bb7419b0040430f
+guid: 2cda3ac94c0409c4fa2e72b31498d8b4
 ========
 guid: 4e30deeb7b974d9429a14fe1e3692425
 >>>>>>>> feature/cjy:ModeDisplay/Assets/Scripts/OperatingPrinciple.meta