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

# Conflicts:
#	ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型.meta
#	ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具.meta
#	ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具/尖嘴钳&链条钳&摇把&二次插头/尖嘴钳&链条钳&摇把_Tex.meta
#	ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型/工器具/推车.meta
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/10kV真空断路器-VS1型固封式极柱整体更换/41_note.mp3.meta
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/220kV隔离开关-GW4A型接地刀闸及关联部件大修/17_note.mp3.meta
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/500kV断路器-LW13型液压油更换/21.mp3.meta
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/500kV断路器-LW13型液压油更换/7.mp3.meta
#	ChivaTechFramework/Assets/StreamingAssets/Config/Audios/500kV断路器-LW13型液压油更换/尖嘴钳&链条钳&摇把&二次插头.meta

ChivaTechFramework/Assets/GameAssets/StreamingAssets/AssetBundles.meta

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

ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型解体大修.unity

@@ -109657,7 +109657,8 @@ MonoBehaviour:
   m_CurrentAniData: {fileID: 663551917}
   aniName: "1\u73B0\u573A\u52D8\u5BDF\r"
   currentStepID: 1
-  selection: []
+  selection:
+  - {fileID: 1537903726}
 --- !u!1 &470866599
 GameObject:
   m_ObjectHideFlags: 0
@@ -359022,7 +359023,7 @@ MonoBehaviour:
       Entry: 6
       Data: 
   awakeStepID: 1
-  awakePlay: 0
+  awakePlay: 1
   autoEnterNextProcess: 1
   currentStepID: 1
   processes:

ChivaTechFramework/Assets/StreamingAssets/Config/Audios/500kV断路器-LW13型液压油更换/21.mp3.meta

@@ -1,5 +1,10 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/500kV断路器-LW13型液压油更换/21.mp3.meta
 guid: 7e56c4227ede9a6438270fe045905bf1
+========
+guid: 4ba16aaa92dcd1e428b93d9689de9c4b
+folderAsset: yes
+>>>>>>>> feature/JNHJ:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/500kV断路器-LW13型液压油更换/尖嘴钳&链条钳&摇把&二次插头.meta
 DefaultImporter:
   externalObjects: {}
   userData: 

ChivaTechFramework/Assets/StreamingAssets/Config/Audios/500kV断路器-LW13型液压油更换/7.mp3.meta

@@ -1,5 +1,10 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/Audios/500kV断路器-LW13型液压油更换/7.mp3.meta
 guid: 4a1485e15476a3c42a1f50867e746ea7
+========
+guid: 1b422230774f0bc45a7bd56949127085
+folderAsset: yes
+>>>>>>>> feature/JNHJ:ChivaTechFramework/Assets/GameAssets/03.Models/10.10kV开关柜-KYN28型.meta
 DefaultImporter:
   externalObjects: {}
   userData: