[+]打包

ChivaTechFramework/Assets/GameAssets/StreamingAssets/AssetBundles.meta → ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e9fb17934c34f1f498103dfa1fabda81
+guid: 0a6fce1d0f4a7b4479f90977182be1cf
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具.meta
-guid: b2cc5c5a0efe25942a5707343be0ef0b
-folderAsset: yes
-========
-guid: 007e5cd10a250524296c3ed35d49685f
->>>>>>>> feature/cjy:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/220kV隔离开关-GW4A型接地刀闸及关联部件大修/17_note.mp3.meta
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ChivaTechFramework/Assets/GameAssets/StreamingAssets.meta

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

ChivaTechFramework/Assets/Scenes/云南/主变冷却散热系统大修(油流继电器).unity

@@ -567401,7 +567401,7 @@ Camera:
     y: 0
     width: 1
     height: 1
-  near clip plane: 0.3
+  near clip plane: 0.01
   far clip plane: 1000
   field of view: 60
   orthographic: 0
@@ -869487,8 +869487,7 @@ MonoBehaviour:
   m_CurrentAniData: {fileID: 2114496548}
   aniName: "\u786E\u8BA4\u68C0\u4FEE\u65B9\u6848\r"
   currentStepID: 1
-  selection:
-  - {fileID: 965415792}
+  selection: []
 --- !u!1 &1475596766
 GameObject:
   m_ObjectHideFlags: 0

ChivaTechFramework/ProjectSettings/ProjectSettings.asset

@@ -17,7 +17,7 @@ PlayerSettings:
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
-  m_ShowUnitySplashScreen: 1
+  m_ShowUnitySplashScreen: 0
   m_ShowUnitySplashLogo: 1
   m_SplashScreenOverlayOpacity: 1
   m_SplashScreenAnimation: 1