Merge branch 'feature/jnhj' into develop

# Conflicts:
#	CableProducts_2025/Assets/GameAssets/01_Animations.meta
#	CableProducts_2025/Assets/GameAssets/02_Audios.meta
#	CableProducts_2025/Assets/GameAssets/03.Models/热缩电缆模型/热缩终端头/Materials/22___Default.mat.meta
#	CableProducts_2025/Assets/Scenes/PC_LSZJT_bf.unity.meta
#	CableProducts_2025/Assets/StreamingAssets/Config/Audios/10kV冷缩中间头制作/13_note.mp3.meta
#	CableProducts_2025/Assets/StreamingAssets/Config/Audios/10kV冷缩中间头制作_bf.meta
#	CableProducts_2025/Assets/StreamingAssets/Config/Audios/10kV热缩终端头_old/1.mp3.meta
#	CableProducts_2025/Assets/StreamingAssets/Config/Audios/10kV热缩终端头_old/10.mp3.meta
#	CableProducts_2025/Assets/StreamingAssets/Config/流程配置/10kV冷缩中间头制作_bf.xlsx.meta
#	CableProducts_2025/Assets/StreamingAssets/Config/流程配置/10kV冷缩中间头制作_题库.xlsx.meta
#	CableProducts_2025/Assets/StreamingAssets/Config/流程配置/10kV热缩终端头_old.xlsx.meta
#	CableProducts_2025/Assets/StreamingAssets/Config/流程配置/10kV热缩终端头_old_题库.xlsx.meta

CableProducts_2025/Assets/Scenes/PC_LSZJT_bf.unity.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:CableProducts_2025/Assets/StreamingAssets/Config/流程配置/10kV热缩终端头_old.xlsx.meta
-guid: aa31a287226afd04cb8eaa740679a4c2
+guid: 263a4e433ffdb54479f4823dab9b4b97
 ========
 guid: 5d5584e47b8fa5e429c438adb6b4153f
 >>>>>>>> feature/jnhj:CableProducts_2025/Assets/Scenes/PC_LSZJT_bf.unity.meta

CableProducts_2025/Assets/StreamingAssets/Config/Audios/10kV冷缩中间头制作/13_note.mp3.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:CableProducts_2025/Assets/StreamingAssets/Config/Audios/10kV热缩终端头_old/10.mp3.meta
-guid: b8439969de9a5f348b19251171d19b7e
+guid: 3a6f107ddbeb92146a0cfc5dc09362dc
 ========
 guid: 59d61cfd73ba27f47872c25111b47cf2
 >>>>>>>> feature/jnhj:CableProducts_2025/Assets/StreamingAssets/Config/Audios/10kV冷缩中间头制作/13_note.mp3.meta

CableProducts_2025/Assets/StreamingAssets/Config/Audios/10kV冷缩中间头制作_bf.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:CableProducts_2025/Assets/GameAssets/03.Models/热缩电缆模型/热缩终端头/Materials/22___Default.mat.meta
-guid: 7922b1663fc439647a76e205347f256d
+guid: e722a92fbbcf06242ba6e6a78bd125ae
 NativeFormatImporter:
 ========
 guid: 5f43e4a654b52034dbfac35f2fc2799e

CableProducts_2025/Assets/StreamingAssets/Config/流程配置/10kV冷缩中间头制作_bf.xlsx.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:CableProducts_2025/Assets/StreamingAssets/Config/流程配置/10kV热缩终端头_old_题库.xlsx.meta
-guid: 73d5a35daaa5b5d4faeaf8c133688435
+guid: beea53bf0f280234b982298454c919a0
 ========
 guid: f8e2ce46fdcfbf14ab82ed681bb53c84
 >>>>>>>> feature/jnhj:CableProducts_2025/Assets/StreamingAssets/Config/流程配置/10kV冷缩中间头制作_bf.xlsx.meta

CableProducts_2025/Assets/StreamingAssets/Config/流程配置/10kV冷缩中间头制作_题库.xlsx.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:CableProducts_2025/Assets/StreamingAssets/Config/Audios/10kV热缩终端头_old/1.mp3.meta
-guid: c53bed9580fc6324bb27b4aa65d5e4f6
+guid: 3e9d112c2f55859419281acac79ad972
 ========
 guid: dc2fead4ded3ae744b2852d8182adc87
 >>>>>>>> feature/jnhj:CableProducts_2025/Assets/StreamingAssets/Config/流程配置/10kV冷缩中间头制作_题库.xlsx.meta

CableProducts_2025/ProjectSettings/EditorBuildSettings.asset

@@ -11,10 +11,16 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/Loading/AsyncLoad.unity
     guid: 1dd9e366d4f9e8b418bc56a692130e37
-  - enabled: 0
+  - enabled: 1
     path: "Assets/Scenes/PC_\u51B7\u7F29\u8098\u578B\u5934.unity"
     guid: 9f6c2aa07a950d2428620d3c41283450
   - enabled: 1
     path: "Assets/Scenes/PC_\u7535\u7F06\u7194\u63A5\u5934\u5236\u4F5C.unity"
     guid: 8b08d6ad188c6da49a00d84770ca2c2c
+  - enabled: 1
+    path: "Assets/Scenes/PC_\u70ED\u7F29\u7EC8\u7AEF\u5934.unity"
+    guid: 6be43b15c6a1ea5489bb1b14f729b884
+  - enabled: 1
+    path: Assets/Scenes/PC_LSZJT.unity
+    guid: cf65123ccde3e6f43900af31a27ec906
   m_configObjects: {}

CableProducts_2025/ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: Chiva
-  productName: "10kV\u7535\u7F06\u7194\u63A5\u5934\u5236\u4F5C"
+  productName: CableProducts
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}