Browse Source

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

# Conflicts:
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/500kV断路器-LW13型液压油更换/21.mp3.meta
1905626492 2 months ago
parent
commit
004154389f
20 changed files with 372 additions and 269 deletions
  1. 128 174
      ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型导电部分异常检修.unity
  2. 242 93
      ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型法兰部件更换.unity
  3. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/10_note.mp3
  4. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/12_note.mp3
  5. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/16_note.mp3
  6. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/1_note.mp3
  7. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/25.mp3
  8. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/26.mp3
  9. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/34_note.mp3
  10. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/39.mp3
  11. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/5_note.mp3
  12. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/62.mp3
  13. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/6_note.mp3
  14. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/78.mp3
  15. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/7_note.mp3
  16. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/81.mp3
  17. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/82.mp3
  18. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/Audios/110kV隔离开关-GW22型法兰部件更换/88_note.mp3
  19. BIN
      ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/110kV隔离开关-GW22型导电部分异常检修.xlsx
  20. 2 2
      ChivaTechFramework/ProjectSettings/ProjectSettings.asset

File diff suppressed because it is too large
+ 128 - 174
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型导电部分异常检修.unity


File diff suppressed because it is too large
+ 242 - 93
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV隔离开关-GW22型法兰部件更换.unity


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


BIN
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

Some files were not shown because too many files changed in this diff