浏览代码

Merge branch 'feature/BASE' into develop_合作分支

# Conflicts:
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/500kV断路器-LW13型液压油更换/21.mp3.meta
1905626492 2 月之前
父节点
当前提交
004154389f
共有 20 个文件被更改,包括 372 次插入269 次删除
  1. 128 174
      ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型导电部分异常检修.unity
  2. 242 93
      ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型法兰部件更换.unity
  3. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/10_note.mp3
  4. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/12_note.mp3
  5. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/16_note.mp3
  6. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/1_note.mp3
  7. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/25.mp3
  8. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/26.mp3
  9. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/34_note.mp3
  10. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/39.mp3
  11. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/5_note.mp3
  12. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/62.mp3
  13. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/6_note.mp3
  14. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/78.mp3
  15. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/7_note.mp3
  16. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/81.mp3
  17. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/82.mp3
  18. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/88_note.mp3
  19. 二进制
      ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV隔离开关-GW22型导电部分异常检修.xlsx
  20. 2 2
      ChivaTechFramework/ProjectSettings/ProjectSettings.asset

文件差异内容过多而无法显示
+ 128 - 174
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型导电部分异常检修.unity


文件差异内容过多而无法显示
+ 242 - 93
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型法兰部件更换.unity


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/10_note.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/12_note.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/16_note.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/1_note.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/25.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/26.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/34_note.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/39.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/5_note.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/62.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/6_note.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/78.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/7_note.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/81.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/82.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/88_note.mp3


二进制
ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV隔离开关-GW22型导电部分异常检修.xlsx


+ 2 - 2
ChivaTechFramework/ProjectSettings/ProjectSettings.asset

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

部分文件因为文件数量过多而无法显示