1

ChivaTechFramework/Assets/ArtScene_SubstationModel

@@ -1 +1 @@
-Subproject commit c465c88e0fed14033eab5058e3b3320f9ed36f38
+Subproject commit ed67e2b879bf9b3081f5c11cc69e006c7028b76d

ChivaTechFramework/Assets/GameAssets/03.Models/01.500kV变压器-ODFPS-250000型-周边修改.meta

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

ChivaTechFramework/Assets/GameAssets/03.Models/广州番禺.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ChivaTechFramework/Assets/GameAssets/03.Models/广州番禺.meta
-guid: 9d0c8c328269a264ab62acebc05e8d7e
-========
-guid: 5a0438e3992bdd740b8240aa48d5f9c8
->>>>>>>> feature/YunNan_合作分支:ChivaTechFramework/Assets/Scenes/云南/220kV主变-本体油添加及试验.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ChivaTechFramework/Assets/Scenes/云南/220kV主变-本体油添加及试验.meta

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

ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/ToolLibrary.unitypackage.meta

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

ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/tooldisplayform.unitypackage.meta

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