SHA1
--- a/ChivaTechFramework/Assets/Scenes/云南/220kV隔离开关-导电部分异常检修.unity
+++ b/ChivaTechFramework/Assets/Scenes/云南/220kV隔离开关-导电部分异常检修.unity
--- a/ChivaTechFramework/Assets/Scenes/云南/220kV隔离开关-导电部分异常检修(导电部分解体大修).unity.meta
+++ b/ChivaTechFramework/Assets/Scenes/云南/220kV隔离开关-导电部分异常检修(导电部分解体大修).unity.meta
--- a/ChivaTechFramework/Assets/Scenes/云南/主变本体油添加及试验检修.unity
+++ b/ChivaTechFramework/Assets/Scenes/云南/主变本体油添加及试验检修.unity
--- a/ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/10kV断路器操动机构解体检修（储能电机及减速器更换）.unity
+++ b/ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/10kV断路器操动机构解体检修（储能电机及减速器更换）.unity
--- a/ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/10kV断路器操动机构解体检修（储能电机及减速器更换）.unity.meta
+++ b/ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/10kV断路器操动机构解体检修（储能电机及减速器更换）.unity.meta
--- a/ChivaTechFramework/ProjectSettings/EditorBuildSettings.asset
+++ b/ChivaTechFramework/ProjectSettings/EditorBuildSettings.asset
@@ -68,7 +68,4 @@ EditorBuildSettings:
 
				   - enabled: 0
			
 
				     path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u63A5\u5730\u5200\u95F8\u53CA\u5173\u8054\u90E8\u4EF6\u5927\u4FEE.unity"
			
 
				     guid: 825ec3e9e9ee3f84d84ce4904794f287
			
 
				-  - enabled: 1
			
 
				-    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u4F20\u52A8\u673A\u6784\u548C\u8F6C\u52A8\u90E8\u4EF6\u5927\u4FEE.unity"
			
 
				-    guid: 003a65e086f6caa4ea18826bb9591bf1
			
 
				   m_configObjects: {}
			
--- a/ChivaTechFramework/ProjectSettings/ProjectSettings.asset
+++ b/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
Auteur	SHA1 Message	Date
FYX	71ba975668 Merge branch 'feature/新制作' into develop_合作分支	il y a 1 mois
FYX	08c5214939 [+]部分场景名称修改	il y a 1 mois