3 달 전 · 7391956823
--- a/ChivaTechFramework/Assets/ArtScene_SubstationModel
+++ b/ChivaTechFramework/Assets/ArtScene_SubstationModel
@@ -1 +1 @@
 
				-Subproject commit c465c88e0fed14033eab5058e3b3320f9ed36f38
			
 
				+Subproject commit ed67e2b879bf9b3081f5c11cc69e006c7028b76d
			
--- a/ChivaTechFramework/Assets/Scenes/云南/220kV主变-主变解体大修（吊罩检修)400-489.unity
+++ b/ChivaTechFramework/Assets/Scenes/云南/220kV主变-主变解体大修（吊罩检修)400-489.unity
--- a/ChivaTechFramework/Assets/Scenes/云南/500kV变压器本体油枕指针式油位计更换及调试备份.unity
+++ b/ChivaTechFramework/Assets/Scenes/云南/500kV变压器本体油枕指针式油位计更换及调试备份.unity
--- a/ChivaTechFramework/Assets/Scenes/云南/500kV变压器本体油枕指针式油位计更换及调试备份.unity.meta
+++ b/ChivaTechFramework/Assets/Scenes/云南/500kV变压器本体油枕指针式油位计更换及调试备份.unity.meta
--- a/ChivaTechFramework/Assets/StreamingAssets/Config/Audios/主变解体大修(人孔盖进入免吊罩检修).meta
+++ b/ChivaTechFramework/Assets/StreamingAssets/Config/Audios/主变解体大修(人孔盖进入免吊罩检修).meta
@@ -1,6 +1,6 @@
 
				 fileFormatVersion: 2
			
 
				 <<<<<<<< HEAD:ChivaTechFramework/Assets/GameAssets/03.Models/01.500kV变压器-ODFPS-250000型-周边修改.meta
			
 
				-guid: dcdd87e8b9875a54b908a528440678ac
			
 
				+guid: 29f9385970cd2f8419225ac4b94dacef
			
 
				 ========
			
 
				 guid: 7b2019f1a485c4947bd5f40846ba3cfa
			
 
				 >>>>>>>> feature/cjy:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/主变解体大修(人孔盖进入免吊罩检修).meta
			
--- a/ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/tooldisplayform.unitypackage.meta
+++ b/ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/tooldisplayform.unitypackage.meta
@@ -0,0 +1,7 @@
 
				+fileFormatVersion: 2
			
 
				+guid: 6c050ad87a4890d4fa2a918840a60fa4
			
 
				+DefaultImporter:
			
 
				+  externalObjects: {}
			
 
				+  userData: 
			
 
				+  assetBundleName: 
			
 
				+  assetBundleVariant: