瀏覽代碼

Merge branch 'develop' into feature/合并测试

# Conflicts:
#	ChivaTechFramework/Assets/ChivaFramework
2809621200 6 月之前
父節點
當前提交
260524bf8f

文件差異過大導致無法顯示
+ 689 - 131
ChivaTechFramework/Assets/Scenes/云南/主变冷却散热系统大修(潜油泵更换).unity


二進制
ChivaTechFramework/Assets/StreamingAssets/Config/工具配置/工具信息表.xlsx


二進制
ChivaTechFramework/Assets/StreamingAssets/Config/工具配置/工具配置图片/塑料布.png


+ 7 - 0
ChivaTechFramework/Assets/StreamingAssets/Config/工具配置/工具配置图片/塑料布.png.meta

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

二進制
ChivaTechFramework/Assets/StreamingAssets/Config/工具配置/工具配置图片/无尘袋.png


+ 7 - 0
ChivaTechFramework/Assets/StreamingAssets/Config/工具配置/工具配置图片/无尘袋.png.meta

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

部分文件因文件數量過多而無法顯示