[+]

ModeDisplay/Assets/GameAssets/01.Animation.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ModeDisplay/Assets/GameAssets/01.Animation.meta
-guid: cfbd5b91ae13fd2498bd192513957395
-folderAsset: yes
-========
-guid: 68b79c277cc16994fbfe477d3d8d9dc0
->>>>>>>> feature/cjy:ModeDisplay/Assets/StreamingAssets/SubTitles/原理/断路器_220kV_LW25_储能.srt.meta
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ModeDisplay/Assets/StreamingAssets/AssetBundles.meta

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

ModeDisplay/Assets/StreamingAssets/Config/Audios/原理.meta

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

ModeDisplay/Assets/StreamingAssets/SubTitles/内部结构.meta

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

ModeDisplay/Assets/StreamingAssets/SubTitles/原理/断路器_220kV_LW25_储能.srt.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ModeDisplay/Assets/GameAssets/01.Animation.meta
-guid: cfbd5b91ae13fd2498bd192513957395
+guid: ae07d2154b3cdbe4c8e3cc41b12d5846
 folderAsset: yes
 ========
 guid: 68b79c277cc16994fbfe477d3d8d9dc0