35kVPSADS_Platform/Assets/03.Models/GongJu_Tex.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:35kVPSADS_Platform/Assets/03.Models/GongJu_Tex.meta
 guid: 4fd2a43a40e67a84587ec61bd39a924d
+========
+guid: 77b51809948777242999577e269997f9
+>>>>>>>> feature/JNHJ:35kVPSADS_Platform/Assets/Scripts/UI.meta
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

35kVPSADS_Platform/Assets/03.Models/Materials.meta

@@ -1,6 +1,10 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:35kVPSADS_Platform/Assets/03.Models/Materials.meta
 guid: 53520f88d3de4504084cb6cb50b80719
 folderAsset: yes
+========
+guid: 56670b9a9ac7a6e48b36d0b662e61740
+>>>>>>>> feature/JNHJ:35kVPSADS_Platform/Assets/StreamingAssets/Config/EquipmentCognition 1.xlsx.meta
 DefaultImporter:
   externalObjects: {}
   userData: 

35kVPSADS_Platform/Assets/03.Models/变压器更改.fbm.meta

@@ -1,6 +1,10 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:35kVPSADS_Platform/Assets/03.Models/变压器更改.fbm.meta
 guid: a93fa5ee91e15944b96221db076d5b94
 folderAsset: yes
+========
+guid: 9ec57c7c29278c54faa3aa356b49ceca
+>>>>>>>> feature/JNHJ:35kVPSADS_Platform/Assets/StreamingAssets/Config/~$EquipmentCognition 1.xlsx.meta
 DefaultImporter:
   externalObjects: {}
   userData: 

35kVPSADS_Platform/Assets/GameAssets/06.UIPrefabs/TitlePanel.prefab.meta

@@ -3,5 +3,5 @@ guid: f776f9906cbfb674b844047109d32081
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: principlepanel_prefab
+  assetBundleName: titlepanel_prefab
   assetBundleVariant: 

35kVPSADS_Platform/Assets/GameAssets/Script/GZYL/UI/PrincipleGameLanuch.cs

@@ -108,7 +108,6 @@ public class PrincipleGameLanuch : MonoBehaviour
     {
         if (m_PlayableDirector != null)
         {
-            Debug.Log("dadadada");
             // 停止播放
             m_PlayableDirector.Pause();
             // 重置时间到0

35kVPSADS_Platform/Assets/GameAssets/Shader/GZYL/15.LineRenderer/Small_new.mat

@@ -57,8 +57,8 @@ Material:
         m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 76b293ce6c463144aa5d643127dd77f4, type: 3}
-        m_Scale: {x: 0.33333334, y: 0.125}
-        m_Offset: {x: 0, y: 0.5}
+        m_Scale: {x: 0.5, y: 0.125}
+        m_Offset: {x: 0.5, y: 0.375}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

35kVPSADS_Platform/Assets/Phase I Resources/GameAssets/06.UIPrefabs/ReturnMainSceneBtn.prefab

@@ -1124,6 +1124,142 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2799113881956265063
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4392067410492490137}
+  - component: {fileID: 4782057389435844323}
+  - component: {fileID: 6492950826691411955}
+  - component: {fileID: 1823612152369137075}
+  - component: {fileID: 3517878150844405956}
+  m_Layer: 5
+  m_Name: ReturnBtn (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4392067410492490137
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2799113881956265063}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5254285582105787976}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 1776.0228, y: 1056.15}
+  m_SizeDelta: {x: 19, y: 18}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &4782057389435844323
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2799113881956265063}
+  m_CullTransparentMesh: 0
+--- !u!114 &6492950826691411955
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2799113881956265063}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 00e4744e5d1f46649ab364b2393414b4, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1823612152369137075
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2799113881956265063}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6492950826691411955}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &3517878150844405956
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2799113881956265063}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d51f3a7c41ab0346b49ae50d456bece, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  MarkType: 0
+  CustomComponentName: Icon
+  ComponentGeneratePath: 
+  CustomComment: 
+  mComponentName: UnityEngine.UI.Button
 --- !u!1 &2804245935556031831
 GameObject:
   m_ObjectHideFlags: 0
@@ -1830,6 +1966,8 @@ RectTransform:
   - {fileID: 8735831445366452964}
   - {fileID: 4914510550008063983}
   - {fileID: 8300760444585387656}
+  - {fileID: 4392067410492490137}
+  - {fileID: 3685678498467983817}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1956,6 +2094,80 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1 &5133331890161890977
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3685678498467983817}
+  - component: {fileID: 3817817512910833996}
+  - component: {fileID: 6970475695143394193}
+  m_Layer: 5
+  m_Name: "\u56FE\u6807\u5206\u5272\u7EBF"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3685678498467983817
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5133331890161890977}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5254285582105787976}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 1811.5228, y: 1056.15}
+  m_SizeDelta: {x: 1, y: 22}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3817817512910833996
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5133331890161890977}
+  m_CullTransparentMesh: 0
+--- !u!114 &6970475695143394193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5133331890161890977}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 4b7a202a02c2bba4db0c12869113dc31, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5346929551916922188
 GameObject:
   m_ObjectHideFlags: 0

35kVPSADS_Platform/Assets/Phase I Resources/Scripts/EquipmentPaneGameLaunch.cs

@@ -52,8 +52,6 @@ public class EquipmentPaneGameLaunch : MonoBehaviour
     public static void LoadScene(string tmpCourseName,string tmpMode)
     {
 
-        Debug.LogError($"LaunchLoadScene , tmpCourseName = {tmpCourseName}");
-
         UIKit.CloseAllPanel();
         UIKit.OpenPanel<TransitionPicture>(UILevel.PopUI);
 

35kVPSADS_Platform/Assets/Phase I Resources/Scripts/OpenEquipmentPane.cs

@@ -4,34 +4,35 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using ReadOnlyAttribute = Sirenix.OdinInspector.ReadOnlyAttribute;
 
-public class OpenEquipmentPane : MonoBehaviour
+public class OpenEquipmentPane : MonoSingleton<OpenEquipmentPane>
 {
-    //[HideInInspector]
-    public static OpenEquipmentPane Instance;
 
     [LabelText("半透材质")]
     public Material tmpMaterial;
 
     [LabelText("是否加载二期内容")]
-    public bool isLoadingPhaseTwo = false;
+    public bool isLoadingPhaseTwo;
 
     [LabelText("是否加载三期内容")]
-    public bool isLoadingPhaseThree = false;
+    public bool isLoadingPhaseThree;
 
     [LabelText("三期需要显示的物体")]
     public List<GameObject> PhaseThreeObj;
 
-    [HideInInspector]
+    [ReadOnly]
     [SerializeReference]
     public Dictionary<string, HighlightOperation> highLights;
     private void Awake()
     {
-        Instance = this;
 
+    }
+    void Start()
+    {
         highLights = new Dictionary<string, HighlightOperation>();
 
-        HighlightOperation[] highlights = GetComponentsInChildren<HighlightOperation>(true); 
+        HighlightOperation[] highlights = GetComponentsInChildren<HighlightOperation>(true);
 
         foreach (HighlightOperation tmpTr in highlights)
         {
@@ -43,11 +44,8 @@ public class OpenEquipmentPane : MonoBehaviour
         {
             item.SetActive(isLoadingPhaseThree);
         }
-    }
-    void Start()
-    {
+
         ResKit.Init();
-        
         UIKit.OpenPanel<EquipmentPanel>();
     }
     void Update()

35kVPSADS_Platform/Assets/Phase I Resources/Scripts/Tools/Meshselect.cs

@@ -68,17 +68,6 @@ public class Meshselect : MonoBehaviour
         {
             DestroyImmediate(item);
         }
-
-
-        tmpObj = new GameObject();
-        tmpObj.name = "未匹配";
-        tmpObj.transform.SetParent(modelB.transform);
-
-        meshs = modelA.GetComponentsInChildren<MeshFilter>(true);
-        for (int i = 0; i < meshs.Length; i++)
-        {
-            meshs[i].transform.SetParent(tmpObj.transform);
-        }
     }
     [Button("查找空网格物体")]
     public void FindVoideMesh()

35kVPSADS_Platform/Assets/Phase I Resources/Scripts/UI/EquipmentPanel.Designer.cs

@@ -5,7 +5,7 @@ using QFramework;
 
 namespace QFramework
 {
-	// Generate Id:f015d18c-9347-4b2a-b80f-458b013ee610
+	// Generate Id:fc529e0e-760f-4da5-b0d1-cb97ef369a9e
 	public partial class EquipmentPanel
 	{
 		public const string Name = "EquipmentPanel";
@@ -64,6 +64,16 @@ namespace QFramework
 		public UnityEngine.UI.Button PreviousBtn;
 		[SerializeField]
 		public UnityEngine.UI.Button NextBtn;
+		[SerializeField]
+		public UnityEngine.UI.Image ConfirmPanel;
+		[SerializeField]
+		public UnityEngine.UI.Text QuestionType;
+		[SerializeField]
+		public UnityEngine.UI.Text ConfirmTopic;
+		[SerializeField]
+		public UnityEngine.UI.Button ConfirmBtn;
+		[SerializeField]
+		public UnityEngine.UI.Button CancelBtn;
 		
 		private EquipmentPanelData mPrivateData = null;
 		
@@ -96,6 +106,11 @@ namespace QFramework
 			CognitionImage = null;
 			PreviousBtn = null;
 			NextBtn = null;
+			ConfirmPanel = null;
+			QuestionType = null;
+			ConfirmTopic = null;
+			ConfirmBtn = null;
+			CancelBtn = null;
 			
 			mData = null;
 		}

35kVPSADS_Platform/Assets/Phase I Resources/Scripts/UI/EquipmentPanel.cs

@@ -46,9 +46,9 @@ namespace QFramework
 						return "1031";
 					case "10kV箱式变压器":
 						return "1032";
-					case "10Kv柱上开关":
+					case "10kV柱上开关":
 						return "1033";
-					case "10Kv柱上变压器":
+					case "10kV柱上变压器":
 						return "1034";
 					case "接地变消弧线圈成套装置":
 						return "1035";
@@ -64,9 +64,9 @@ namespace QFramework
 						return "1040";
 					case "10kV箱式变压器(类型2)":
 						return "1041";
-					case "10Kv柱上变压器(类型2)":
+					case "10kV柱上变压器(类型2)":
 						return "1042";
-					case "10Kv柱上开关(类型2)":
+					case "10kV柱上开关(类型2)":
 						return "1043";
 					case "电线杆":
 						return "1044";
@@ -95,6 +95,8 @@ namespace QFramework
 		string wanderPath = Application.streamingAssetsPath +"/Config/场景数据.xlsx";
 		string cognitionPath = Application.streamingAssetsPath + "/Config/EquipmentCognition.xlsx";
 
+		public WanderEquipmentData tmpData;
+
 		protected override void ProcessMsg(int eventId, QMsg msg)
 		{
 			throw new System.NotImplementedException();
@@ -136,14 +138,12 @@ namespace QFramework
 
 			OperateLogBtn.onClick.AddListener(() => {
 
-				if (!isLoadingPhaseTwo)
-                {
-					EquipmentPaneGameLaunch.LoadScene("变电Main", null);
-					return;
-				}
+				ConfirmPanel.gameObject.SetActive(true);
+
+				SelectModeBtnBox.JumpMode = "返回";
+				ConfirmTopic.text = "是否确认返回首页";
+;
 
-				if(!isLoadingPhaseThree)
-					EquipmentPaneGameLaunch.LoadScene("配电Main", null);				
 			});
 
 			CloseBtn.onClick.AddListener(()=> 
@@ -162,7 +162,7 @@ namespace QFramework
         /// <summary> 漫游初始化 </summary>
         public void WanderItemInit()
         {
-			
+
 			foreach (var group in WanderGroupedData)
 			{
 				GameObject tmpObj = Instantiate(PartBaseItem.gameObject, Content);
@@ -174,27 +174,28 @@ namespace QFramework
 
 				if (!isLoadingPhaseThree && tmpList[0].equipmentPhase.Equals("三期"))
 						continue;
-				
+
 				tmpItem.ClickBtn.onClick.AddListener(() => 
 				{ 
 					selectEquipmentName = group.Key;
 
-					CamearJumpMove(tmpList[0]);
-
 					if (tmpItem.isShowChild)
-						tmpItem.ChangeExpandChildItem();
+						CamearJumpMove(tmpList[0]);
+
+					tmpItem.ChangeExpandChildItem();
+						
 				});
 				tmpItem.gameObject.SetActive(true);
-				tmpItem.ExpandBtn.onClick.AddListener(() => { tmpItem.ChangeExpandChildItem(); });
+				tmpItem.ExpandBtn.onClick.AddListener(() => { tmpItem.ChangeExpandChildItem(); CamearJumpMove(tmpList[0]); });
 				tmpItem.UnExpandBtn.onClick.AddListener(() => { tmpItem.ChangeExpandChildItem(); });
 				tmpItem.ItemInit(group.Key, tmpList);
 
-				tmpItem.ExpandBtn.onClick.AddListener(()=> { CamearJumpMove(tmpList[0]); });
-
 				tmpObj.SetActive(true);
 			}
 		}
 
+
+
 		private void CamearJumpMove(WanderEquipmentData data)
         {
 			NMGJD.InitAndInspect.CameraController camera = Camera.main.GetComponent<NMGJD.InitAndInspect.CameraController>();
@@ -208,10 +209,10 @@ namespace QFramework
 					camera.JumpCorrespondingPosition(data.getPositionV3(), data.getRotationV3(), new Vector3(243, 0.5f, -76), new Vector3(260, 5, -41));
 					break;
 				case "室外三期":
-					camera.JumpCorrespondingPosition(data.getPositionV3(), data.getRotationV3(), new Vector3(243, 0.5f, -76), new Vector3(265, 10, 13.6f));
+					camera.JumpCorrespondingPosition(data.getPositionV3(), data.getRotationV3(), new Vector3(243, 0.5f, -76), new Vector3(268.5f, 10, -12.24f));
 					break;
 				case "电缆隧道":
-					camera.JumpCorrespondingPosition(data.getPositionV3(), data.getRotationV3(), new Vector3(29.9f, 3.1f, -65.9f), new Vector3(27.9f, 1.5f, 35f));
+					camera.JumpCorrespondingPosition(data.getPositionV3(), data.getRotationV3(), new Vector3(27.9f, 1.5f, -65.9f), new Vector3(29.9f, 3.1f, 35f));
 					break;
 			}
 		}
@@ -225,6 +226,7 @@ namespace QFramework
         /// <summary> 设备认知初始化 </summary>
         public void CognitionItemInit()
         {
+			CamearJumpMove(tmpData);
 			CognitionGroupedData.TryGetValue(selectEquipmentCode, out List<CognitionEquipmentData> selectCognitionDatas);
 			int tmpIndex = 01;
 			foreach (CognitionEquipmentData data in selectCognitionDatas)
@@ -352,7 +354,6 @@ namespace QFramework
 		public string sceneName;
 		public string equipmentName;
 		public string isExistencePracticeMode;
-		public string isExistenceInternalStructure;
 		public string isExistenceOperatingPrinciple;
 		public string position;
 		public string rotation;
@@ -396,16 +397,14 @@ namespace QFramework
 		public List<bool> isShowModeBtn()
         {
 			List<bool> tmpList = new List<bool>();
-			bool tmpBool = isExistencePracticeMode.Equals("1");
-			for (int i = 0; i < 3; i++)
-				tmpList.Add(tmpBool);
-			tmpList.Add(isExistenceInternalStructure.Equals("1") || isExistenceOperatingPrinciple.Equals("1"));
+			tmpList.Add(isExistencePracticeMode.Equals("1"));
+			tmpList.Add( isExistenceOperatingPrinciple.Equals("1"));
 			return tmpList;
 		}
 
 		public bool isHaveScene()
 		{
-			return isExistencePracticeMode.Equals("0") && isExistenceInternalStructure.Equals("0") && isExistenceOperatingPrinciple.Equals("0");
+			return isExistencePracticeMode.Equals("0") && isExistenceOperatingPrinciple.Equals("0");
 
 		}
 	}

35kVPSADS_Platform/Assets/Phase I Resources/Scripts/UI/EquipmentPanel/PartBaseItem.cs

@@ -15,7 +15,6 @@ namespace QFramework
 
 		private void Awake()
 		{
-
 		}
 
 
@@ -33,6 +32,8 @@ namespace QFramework
 		public List<PartBaseItem> partBaseItems;
 		public bool isShowChild = true;
 
+		public PartBaseItem JianXiuItem;
+
 		/// <summary> �구츰냔만섬놓迦뺏 </summary>
 		/// <param name="equipmentName"></param>
 		/// <param name="equipmentDatas"></param>
@@ -43,7 +44,6 @@ namespace QFramework
 			Message.text = equipmentName;
 
 			partBaseItems = new List<PartBaseItem>();
-
 			ChildItemInit();
 		}
 
@@ -61,13 +61,16 @@ namespace QFramework
 			tmpEndItem.UnExpandBtn.gameObject.SetActive(false);
 			tmpEndItem.ClickBtn.onClick.AddListener(() =>
 			{
+				UIKit.GetPanel<EquipmentPanel>().tmpData = equipmentDatas[0];
+
 				ChileOnclickInit(tmpEndItem, panelObj);
 				panelObj.SelectModeBtnBox.ShowEquipmentSceneBtn(null);
 			});
 			partBaseItems.Add(tmpEndItem);
 
 			PartBaseItem tmpParent = Instantiate(panelObj.PartBaseItem.gameObject, panelObj.Content).GetComponent<PartBaseItem>();
-			tmpParent.Message.text = "쇱錦淃커";
+			JianXiuItem = tmpParent;
+			tmpParent.Message.text = "쇱錦력廬茄祁";
 			tmpParent.ExpandBtn.gameObject.SetActive(true);
 			tmpParent.UnExpandBtn.gameObject.SetActive(false);
 			partBaseItems.Add(tmpParent);
@@ -88,7 +91,7 @@ namespace QFramework
 				PartBaseItem tmpItem = tmpObj.GetComponent<PartBaseItem>();
 				tmpItem.Message.text = tmpData.courseName;
 
-				if (tmpData.isShowModeBtn()[1])
+				if (tmpData.isShowModeBtn()[0])
                 {
 					tmpParent.partBaseItems.Add(tmpItem);
 					tmpItem.position.anchoredPosition = new Vector3(170, 0, 0);
@@ -116,22 +119,17 @@ namespace QFramework
                 {
 					item.transform.SetAsLastSibling();
 				}
-
-
 			}
 
 			if (tmpParent.partBaseItems.Count == 0)
             {
-				partBaseItems.RemoveAt(partBaseItems.Count-1);
+				partBaseItems.RemoveAt(1);
 				Destroy(tmpParent);
 			}
 
-
-
-
 		}
 
-		/// <summary> 야竟係커데샌慤숭警속  </summary>
+		/// <summary> �零朞櫓瓊刻  </summary>
 		/// <param name="tmpItem"></param>
 		/// <param name="tmpData"></param>
 		public void ChileOnclickInit(PartBaseItem tmpItem, EquipmentPanel panelObj)
@@ -151,7 +149,20 @@ namespace QFramework
 			if (partBaseItems == null || partBaseItems.Count == 0) return;
 
 			foreach (var item in partBaseItems)
+            {
 				item.gameObject.SetActive(isShowChild);
+			}
+
+			if (JianXiuItem != null && !isShowChild) 
+			{
+				JianXiuItem.ExpandBtn.gameObject.SetActive(true);
+				JianXiuItem.UnExpandBtn.gameObject.SetActive(false);
+				foreach (var item in JianXiuItem.partBaseItems)
+				{
+					item.gameObject.SetActive(isShowChild);
+				}
+			}
+
 
 			ExpandBtn.gameObject.SetActive(!isShowChild);
 			UnExpandBtn.gameObject.SetActive(isShowChild);

35kVPSADS_Platform/Assets/Phase I Resources/Scripts/UI/EquipmentPanel/SelectModeBtnBox.cs

@@ -15,88 +15,135 @@ namespace QFramework
 	public partial class SelectModeBtnBox : UIElement
 	{
 		public List<Button> buttons;
+		private WanderEquipmentData equipmentData;
+		private EquipmentPanel TmpEquipmentPanel;
+		public string JumpMode = "";
 
-		WanderEquipmentData equipmentData;
 
-		private bool isLoad = false;
-		private void Awake()
-		{
+        private void Start()
+        {
+			TmpEquipmentPanel = UIKit.GetPanel<EquipmentPanel>();
 			BtnBoxOnclickInit();
 		}
 
-		public void ShowEquipmentSceneBtn(WanderEquipmentData Data)
+        public void ShowEquipmentSceneBtn(WanderEquipmentData Data)
 		{
-			isLoad = false;
 			equipmentData = Data;
+
 			if (equipmentData == null) 
 			{
 				StudyModeBtn.gameObject.SetActive(false);
 				PracticeModeBtn.gameObject.SetActive(false);
 				ExamModeBtn.gameObject.SetActive(false);
 				InternalStructureBtn.gameObject.SetActive(false);
-				OperatingPrincipleBtn.gameObject.SetActive(true);
+
+				TmpEquipmentPanel.ConfirmPanel.gameObject.SetActive(true);
+				Time.timeScale = 0;
+
+				TmpEquipmentPanel.ConfirmTopic.text = "是否确认进行设备认知";
+
+				JumpMode = "认知";
 				return;
 			};
-			StudyModeBtn.gameObject.SetActive(equipmentData.isShowModeBtn()[0]);
-			PracticeModeBtn.gameObject.SetActive(equipmentData.isShowModeBtn()[1]);
-			ExamModeBtn.gameObject.SetActive(equipmentData.isShowModeBtn()[2]);
-			InternalStructureBtn.gameObject.SetActive(equipmentData.isShowModeBtn()[3]);
-			OperatingPrincipleBtn.gameObject.SetActive(false);
+
+            if (equipmentData.isShowModeBtn()[0])
+            {
+				StudyModeBtn.gameObject.SetActive(true);
+				PracticeModeBtn.gameObject.SetActive(true);
+				ExamModeBtn.gameObject.SetActive(true);
+				InternalStructureBtn.gameObject.SetActive(true);
+				return;
+			}
+
+            if (equipmentData.isShowModeBtn()[1])
+            {
+				StudyModeBtn.gameObject.SetActive(false);
+				PracticeModeBtn.gameObject.SetActive(false);
+				ExamModeBtn.gameObject.SetActive(false);
+				InternalStructureBtn.gameObject.SetActive(false);
+
+				TmpEquipmentPanel.ConfirmPanel.gameObject.SetActive(true);
+				Time.timeScale = 0;
+
+				TmpEquipmentPanel.ConfirmTopic.text = "是否确认进行至工作原理";
+
+				JumpMode = "原理";
+			}
 		}
 
+		//下列按钮单击事件
 		private void BtnBoxOnclickInit()
         {
+			
 			StudyModeBtn.onClick.AddListener(() => 
 			{
-				if (isLoad) return;
-				loadAsyncLoadScene("学习");
+				EquipmentPaneGameLaunch.LoadScene(equipmentData.sceneName, "学习");
 			});
 
 			PracticeModeBtn.onClick.AddListener(() =>
 			{
-				if (isLoad) return;
-				loadAsyncLoadScene("练习");
+				EquipmentPaneGameLaunch.LoadScene(equipmentData.sceneName, "练习");
 			});
 			ExamModeBtn.onClick.AddListener(() =>
 			{
-				if (isLoad) return;
-				loadAsyncLoadScene("考核");
+				EquipmentPaneGameLaunch.LoadScene(equipmentData.sceneName, "考核");
 			});
 			InternalStructureBtn.onClick.AddListener(() =>
 			{
-				if (isLoad) return;
-				loadAsyncLoadScene("原理");
+				EquipmentPaneGameLaunch.LoadScene("GuideScene", "引导");
 			});
-			OperatingPrincipleBtn.onClick.AddListener(() =>
+
+			UIKit.GetPanel<EquipmentPanel>().CancelBtn.onClick.AddListener(()=> 
 			{
-				EquipmentPanel TmpEquipmentPanel = UIKit.GetPanel<EquipmentPanel>();
-				TmpEquipmentPanel.Title_TopLayer.text = TmpEquipmentPanel.selectEquipmentName;
-
-				TmpEquipmentPanel.WanderIcon.gameObject.SetActive(false);
-				TmpEquipmentPanel.CognitionIcon.gameObject.SetActive(true);
-				TmpEquipmentPanel.CognitionTextBg.gameObject.SetActive(false);
-				TmpEquipmentPanel.CognitionImageBg.gameObject.SetActive(false);
-				TmpEquipmentPanel.CognitionPanel.gameObject.SetActive(true);
-				OperatingPrincipleBtn.gameObject.SetActive(false);
-
-				TmpEquipmentPanel.Content.DestroyChildren();
-				OpenEquipmentPane.Instance.highLights.TryGetValue(TmpEquipmentPanel.selectEquipmentName,out TmpEquipmentPanel.Highlight);
-				TmpEquipmentPanel.Highlight.StarShowHight();
-				TmpEquipmentPanel.CognitionItemInit();
-
-				TmpEquipmentPanel.Highlight.ClearAllHighlight();
+				TmpEquipmentPanel.ConfirmPanel.gameObject.SetActive(false);
+				Time.timeScale = 1;
 			});
+			UIKit.GetPanel<EquipmentPanel>().ConfirmBtn.onClick.AddListener(()=> 
+			{
+				ChangeTmpEquipmentPanelOnclick();
+			});
+
 		}
 
-		private void loadAsyncLoadScene(string mode)
+		private void ChangeTmpEquipmentPanelOnclick()
         {
-			isLoad = true;
-
-			EquipmentPaneGameLaunch.LoadScene(equipmentData.sceneName,mode);
-			
-			//SceneManager.LoadSceneAsync("AsyncLoad");
-			//UIKit.ShowPanel<ReturnMainSceneBtn>();
 
+			TmpEquipmentPanel.ConfirmPanel.gameObject.SetActive(false);
+			Time.timeScale = 1;
+
+            switch (JumpMode)
+            {
+				case "原理":
+					EquipmentPaneGameLaunch.LoadScene(equipmentData.sceneName, "原理");
+					break;
+				case "认知":
+					UIKit.GetPanel<EquipmentPanel>().WanderIcon.gameObject.SetActive(false);
+					UIKit.GetPanel<EquipmentPanel>().CognitionIcon.gameObject.SetActive(true);
+					UIKit.GetPanel<EquipmentPanel>().CognitionTextBg.gameObject.SetActive(false);
+					UIKit.GetPanel<EquipmentPanel>().CognitionImageBg.gameObject.SetActive(false);
+					UIKit.GetPanel<EquipmentPanel>().CognitionPanel.gameObject.SetActive(true);
+
+					UIKit.GetPanel<EquipmentPanel>().Content.DestroyChildren();
+
+					UIKit.GetPanel<EquipmentPanel>().Title_TopLayer.text = UIKit.GetPanel<EquipmentPanel>().selectEquipmentName;
+					OpenEquipmentPane.Instance.highLights.TryGetValue(UIKit.GetPanel<EquipmentPanel>().selectEquipmentName, out UIKit.GetPanel<EquipmentPanel>().Highlight);
+					if (UIKit.GetPanel<EquipmentPanel>().Highlight == null)
+						Debug.LogError("TmpEquipmentPanel.Highlight 为空");
+
+					UIKit.GetPanel<EquipmentPanel>().Highlight.StarShowHight();//修改材质
+					UIKit.GetPanel<EquipmentPanel>().CognitionItemInit();
+					break;
+				case "返回":
+					if (UIKit.GetPanel<EquipmentPanel>().isLoadingPhaseTwo)
+					{
+						EquipmentPaneGameLaunch.LoadScene("变电Main", null);
+						return;
+					}
+
+					if (UIKit.GetPanel<EquipmentPanel>().isLoadingPhaseThree)
+						EquipmentPaneGameLaunch.LoadScene("配电Main", null);
+					break;
+			}
 		}
 
 		protected override void OnBeforeDestroy()

35kVPSADS_Platform/Assets/Phase I Resources/Scripts/UI/ModelChoicePlane.cs

@@ -44,7 +44,6 @@ namespace QFramework
 		}
 		public void OpenCognize()
         {
-
 			EquipmentPaneGameLaunch.LoadScene("³¡¾°ÂþÓμ°É豸ÈÏÖª",null);
 		}
 		public void OpenTour()

35kVPSADS_Platform/Assets/Phase I Resources/Scripts/UI/PhaseIIModelChoicePlane.cs

@@ -43,7 +43,7 @@ namespace QFramework
 		}
 		public void OpenCognize()
 		{
-
+			EquipmentPaneGameLaunch.LoadScene("³¡¾°ÂþÓμ°É豸ÈÏÖª", null);
 		}
 		public void OpenCable()
 		{

35kVPSADS_Platform/Assets/GameAssets/Script/GZYL/UI/QFramework/TitlePanel.Designer.cs → 35kVPSADS_Platform/Assets/Scripts/UI/TitlePanel.Designer.cs

@@ -5,7 +5,7 @@ using QFramework;
 
 namespace QFramework
 {
-	// Generate Id:6f301254-4f3c-484b-b2b8-88a0f884eb09
+	// Generate Id:ea6b6a06-7c1a-418e-a598-355fecc324b5
 	public partial class TitlePanel
 	{
 		public const string Name = "TitlePanel";
@@ -27,6 +27,8 @@ namespace QFramework
 		[SerializeField]
 		public UnityEngine.UI.Text OperationTitle;
 		[SerializeField]
+		public UnityEngine.UI.Button ReturnBtn;
+		[SerializeField]
 		public UnityEngine.UI.Button CloseBtn;
 		[SerializeField]
 		public UnityEngine.UI.Image HeadPortraitBg;
@@ -36,6 +38,16 @@ namespace QFramework
 		public UnityEngine.UI.Text UserName;
 		[SerializeField]
 		public UnityEngine.UI.Text ScheduleText;
+		[SerializeField]
+		public UnityEngine.UI.Image ConfirmPanel;
+		[SerializeField]
+		public UnityEngine.UI.Text QuestionType;
+		[SerializeField]
+		public UnityEngine.UI.Text ConfirmTopic;
+		[SerializeField]
+		public UnityEngine.UI.Button ConfirmBtn;
+		[SerializeField]
+		public UnityEngine.UI.Button CancelBtn;
 		
 		private TitlePanelData mPrivateData = null;
 		
@@ -49,11 +61,17 @@ namespace QFramework
 			TitleClampMask = null;
 			OperationTitle_Shadow = null;
 			OperationTitle = null;
+			ReturnBtn = null;
 			CloseBtn = null;
 			HeadPortraitBg = null;
 			HeadPortraitText = null;
 			UserName = null;
 			ScheduleText = null;
+			ConfirmPanel = null;
+			QuestionType = null;
+			ConfirmTopic = null;
+			ConfirmBtn = null;
+			CancelBtn = null;
 			
 			mData = null;
 		}
@@ -65,7 +83,7 @@ namespace QFramework
 				return mData;
 			}
 		}
-
+		
 		TitlePanelData mData
 		{
 			get

35kVPSADS_Platform/Assets/GameAssets/Script/GZYL/UI/QFramework/TitlePanel.Designer.cs.meta → 35kVPSADS_Platform/Assets/Scripts/UI/TitlePanel.Designer.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5f10a41432ffbd149becfcf65158dfce
+guid: f2b0457c4c89ad14b99109d107ac8c1f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

35kVPSADS_Platform/Assets/GameAssets/Script/GZYL/UI/QFramework/TitlePanel.cs → 35kVPSADS_Platform/Assets/Scripts/UI/TitlePanel.cs

@@ -14,7 +14,7 @@ namespace QFramework
 		{
 			throw new System.NotImplementedException();
 		}
-		
+
 		protected override void OnInit(IUIData uiData = null)
 		{
 			mData = uiData as TitlePanelData ?? new TitlePanelData();
@@ -22,10 +22,33 @@ namespace QFramework
 
 			OperationTitle_Shadow.text = OperationTitle.text = mData.TitleName;
 
-			CloseBtn.onClick.AddListener(() => Application.Quit());
+			CloseBtn.onClick.AddListener(() =>
+			{
+				ConfirmPanel.gameObject.SetActive(true);
+				ConfirmBtn.onClick.RemoveAllListeners();
+				QuestionType.text = "退出系统";
+				ConfirmTopic.text = "是否确认退出系统";
+				ConfirmBtn.onClick.AddListener(() =>
+				{
+					Application.Quit();
+				});
+
+			});
+			ReturnBtn.onClick.AddListener(() =>
+			{
+				ConfirmPanel.gameObject.SetActive(true);
+				ConfirmBtn.onClick.RemoveAllListeners();
+				QuestionType.text = "场景返回";
+				ConfirmTopic.text = "是否确认返回认知界面";
+				ConfirmBtn.onClick.AddListener(() =>
+				{
+					EquipmentPaneGameLaunch.LoadScene("场景漫游及设备认知", null);
+				});
+			});
+			CancelBtn.onClick.AddListener(() => { ConfirmPanel.gameObject.SetActive(false); });
 
 		}
-		
+
 		protected override void OnOpen(IUIData uiData = null)
 		{
 		}

35kVPSADS_Platform/Assets/GameAssets/Script/GZYL/UI/QFramework/TitlePanel.cs.meta → 35kVPSADS_Platform/Assets/Scripts/UI/TitlePanel.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bea01fc19ddeb8c448bc48c5e7ea44c8
+guid: b9da68ec0dcb3444d814dbf13692c9f0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

35kVPSADS_Platform/Assets/StreamingAssets/Config/EquipmentCognition 1.xlsx.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:35kVPSADS_Platform/Assets/03.Models/Materials.meta
+guid: 53520f88d3de4504084cb6cb50b80719
+folderAsset: yes
+========
+guid: 56670b9a9ac7a6e48b36d0b662e61740
+>>>>>>>> feature/JNHJ:35kVPSADS_Platform/Assets/StreamingAssets/Config/EquipmentCognition 1.xlsx.meta
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

35kVPSADS_Platform/Assets/StreamingAssets/Config/场景数据 1.xlsx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 062ba44e48f7ae740b128fbc48e49c20
+guid: 7bea5cdeaa3f94d4aaaab2a513041b3b
 DefaultImporter:
   externalObjects: {}
   userData: 

35kVPSADS_Platform/ProjectSettings/EditorBuildSettings.asset

@@ -8,12 +8,21 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/ChivaFramework/Author/Author.unity
     guid: 5c5c8597de35c6f4483e852f5d465ef3
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE1\u89C6/\u914D\u7535Main.unity"
+    guid: 6b5a6d345f08ec7428afdb9899b97c82
   - enabled: 1
     path: "Assets/Scenes/\u5DE1\u89C6/\u53D8\u7535Main.unity"
     guid: 5e3f71c27c99f5a48907edd04246f910
   - enabled: 1
-    path: Assets/Scenes/Main   2.unity
-    guid: 748ed4e97730e4440bf9930cebeff2cf
+    path: Assets/Scenes/AsyncLoad.unity
+    guid: 1dd9e366d4f9e8b418bc56a692130e37
+  - enabled: 1
+    path: Assets/Scenes/GuideScene.unity
+    guid: e9678ff49279f004eb393cd90ba9e117
+  - enabled: 1
+    path: "Assets/Scenes/\u573A\u666F\u6F2B\u6E38\u53CA\u8BBE\u5907\u8BA4\u77E5.unity"
+    guid: 4aeebebda270c4144a3be8559a64d406
   - enabled: 1
     path: "Assets/Scenes/\u5DE1\u89C6/Select.unity"
     guid: ca275eda8bdc7b140ab30e0460c88904
@@ -21,20 +30,11 @@ EditorBuildSettings:
     path: "Assets/Scenes/\u5DE1\u89C6/\u53D8\u7535\u7AD9\u5DE1\u89C6.unity"
     guid: acda3910fa1523c47bcd0dc604fa94a2
   - enabled: 1
-    path: Assets/Scenes/AsyncLoad.unity
-    guid: 1dd9e366d4f9e8b418bc56a692130e37
-  - enabled: 1
-    path: Assets/Scenes/GuideScene.unity
-    guid: e9678ff49279f004eb393cd90ba9e117
-  - enabled: 1
-    path: "Assets/Scenes/\u5DE1\u89C6/\u914D\u7535Main.unity"
-    guid: 6b5a6d345f08ec7428afdb9899b97c82
+    path: "Assets/Scenes/\u5DE1\u89C6/\u67B6\u7A7A\u7EBF\u8DEF\u5DE1\u89C6.unity"
+    guid: 433cd2009c407774ca164c3614dd4ec6
   - enabled: 1
     path: "Assets/Scenes/\u5DE1\u89C6/\u7535\u7F06\u7EBF\u8DEF\u5DE1\u89C6.unity"
     guid: 4307342411063f1429594c4feb306c5a
-  - enabled: 1
-    path: "Assets/Scenes/\u573A\u666F\u6F2B\u6E38\u53CA\u8BBE\u5907\u8BA4\u77E5.unity"
-    guid: 4aeebebda270c4144a3be8559a64d406
   - enabled: 1
     path: "Assets/Scenes/35kV\u53D8\u538B\u5668\u5957\u7BA1\u6E17\u6F0F\u6CB9\u68C0\u67E5\u5904\u7406.unity"
     guid: 4c3f8637d1d5dd94cba4a07222fe4e19
@@ -59,16 +59,67 @@ EditorBuildSettings:
   - enabled: 1
     path: "Assets/Scenes/35kV\u9694\u79BB\u5F00\u5173\u66F4\u6362\u652F\u6491\u74F7\u7BA1.unity"
     guid: d6d825e17ad6bbf4c958424c0cfa2aa3
+  - enabled: 1
+    path: "Assets/Scenes/10kV\u53D8\u538B\u5668\u66F4\u6362.unity"
+    guid: a37434d252b6b2e4b87de79b8d1f3aa5
+  - enabled: 1
+    path: "Assets/Scenes/10kV\u67F1\u4E0A\u5F00\u5173\u68C0\u4FEE.unity"
+    guid: e109f6c4cf3533544bb88d93b6809346
+  - enabled: 1
+    path: "Assets/Scenes/10kV\u7BB1\u5F0F\u53D8\u538B\u5668\u51B7\u5374\u88C5\u7F6E\u68C0\u4FEE.unity"
+    guid: 9a4b349f0d920f8468ade71a6fb11c12
+  - enabled: 1
+    path: "Assets/Scenes/10kV\u7BB1\u5F0F\u53D8\u538B\u5668\u65AD\u8DEF\u5668\u66F4\u6362\u68C0\u4FEE.unity"
+    guid: 5c36df63699868d4893b3048d45959e5
+  - enabled: 1
+    path: "Assets/Scenes/10kV\u8DCC\u843D\u5F00\u5173\u68C0\u4FEE.unity"
+    guid: f6ff37db503e0b544af60d9e46c1a802
   - enabled: 1
     path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/\u4E8C\u671F/35kV\u53D8\u538B\u5668\u5DE5\u4F5C\u539F\u7406.unity"
     guid: 22226a57b4b940d4ba0d64418969d6fa
   - enabled: 1
     path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/\u4E8C\u671F/35kV\u65AD\u8DEF\u5668\u5DE5\u4F5C\u539F\u7406.unity"
     guid: c4ae72aa3d59a8b40b178d19941d9c21
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/\u4E8C\u671F/35kV\u9694\u79BB\u5F00\u5173\u5DE5\u4F5C\u539F\u7406.unity"
+    guid: 8764aaad8dc9a7b4d884b19a4572f1e1
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/10kV\u67F1\u4E0A\u5F00\u5173\u539F\u7406\u8BA4\u77E5.unity"
+    guid: b19168d71ca615548a67525f50b73206
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/10kV\u7535\u7F06\u5206\u63A5\u7BB1\u5DE5\u4F5C\u539F\u7406.unity"
+    guid: 75c0f18279e3929468724df893eef25e
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/10kV\u8DCC\u843D\u5F00\u5173\u5DE5\u4F5C\u539F\u7406.unity"
+    guid: b29bcef01887b234f9e95c16befa9615
   - enabled: 1
     path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/\u4E09\u671F/10kV\u73AF\u7F51\u67DC\u5DE5\u4F5C\u539F\u7406.unity"
     guid: f035fe337414da24db6131b6bb2178e5
   - enabled: 1
-    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/\u4E8C\u671F/35kV\u9694\u79BB\u5F00\u5173\u5DE5\u4F5C\u539F\u7406.unity"
-    guid: 8764aaad8dc9a7b4d884b19a4572f1e1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/\u4E09\u671F/10kV\u5F00\u5173\u67DC-\u673A\u68B0\u8054\u52A8\u7279\u6027.unity"
+    guid: bc58b07a8cccca3408ea2484a41577f8
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/\u4E09\u671F/10kV\u67F1\u4E0A\u53D8\u538B\u5668\u5DE5\u4F5C\u539F\u7406.unity"
+    guid: b56e3b3664875cd4aa151a5c592c37ee
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/\u4E09\u671F/10kV\u7BB1\u5F0F\u53D8\u538B\u5668\u5DE5\u4F5C\u539F\u7406.unity"
+    guid: 3564243cf30125245a3f4e7203f35acc
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/\u4E09\u671F/10kV\u7BB1\u5F0F\u53D8\u538B\u5668\u5DE5\u4F5C\u539F\u7406(\u7C7B\u578B2).unity"
+    guid: 4c573e274c5a848479cd211e0e1273f8
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/\u4E09\u671F/10kV\u73AF\u7F51\u67DC\u5DE5\u4F5C\u539F\u7406(\u7C7B\u578B2).unity"
+    guid: c9b1f73bdb9e5c64581b8dfcf35dd2ee
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/\u4E09\u671F/10kV\u67F1\u4E0A\u53D8\u538B\u5668\u5DE5\u4F5C\u539F\u7406(\u7C7B\u578B2).unity"
+    guid: bbbbb66549e8060408ed26d1bce3bf66
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/10kV\u67F1\u4E0A\u5F00\u5173\u5DE5\u4F5C\u539F\u7406\uFF08\u7C7B\u578B2\uFF09.unity"
+    guid: edc998fc4a45983439fb5ffaafb5dfaf
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/10kV\u7535\u7F06\u5206\u63A5\u7BB1\u5DE5\u4F5C\u539F\u7406(\u7C7B\u578B2).unity"
+    guid: ee57713d82517524f886e9f062be7343
+  - enabled: 1
+    path: "Assets/Scenes/\u5DE5\u4F5C\u539F\u7406/10kV\u8DCC\u843D\u5F00\u5173\u5DE5\u4F5C\u539F\u7406(\u7C7B\u578B2).unity"
+    guid: 36c329de95a9f7f4f830ddc0f24d9fcc
   m_configObjects: {}