Merge branch 'feature/JNHJ' into develop

35kVPSADS_Platform/Assets/03.Models/220kV主变检修.meta

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

35kVPSADS_Platform/Assets/03.Models/220kV变压器.meta

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

35kVPSADS_Platform/Assets/03.Models/35kV_主变压器.fbm.meta

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

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

@@ -1,12 +0,0 @@
-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: 
-  assetBundleName: 
-  assetBundleVariant: 

35kVPSADS_Platform/Assets/03.Models/吊车.meta

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

35kVPSADS_Platform/Assets/03.Models/工作原理导入.meta

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

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

@@ -10599,7 +10599,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "35kV\u667A\u80FD\u53D8\u7535\u7AD9\u4EFF\u771F\u5B9E\u8BAD\u7CFB\u7EDF"
+  m_Text: "\u4F4E\u538B\u7EBF\u8DEF\u8FD0\u68C0\u4EFF\u771F\u5B9E\u8BAD\u5E73\u53F0"
 --- !u!114 &5618583166894184782
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -151,7 +151,7 @@ namespace QFramework
 		/// <summary> ÏÔÒþ×ÓÎïÌå </summary>
 		public void ChangeExpandChildItem()
 		{
-			UIKit.GetPanel<EquipmentPanel>().selectEquipmentName = equipmentDatas[0].equipmentName;
+			//UIKit.GetPanel<EquipmentPanel>().selectEquipmentName = equipmentDatas[0].equipmentName;
 			if (partBaseItems == null || partBaseItems.Count == 0) return;
 
 			foreach (var item in partBaseItems)

35kVPSADS_Platform/Assets/Scenes/场景漫游及设备认知.unity

@@ -151109,8 +151109,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   tmpMaterial: {fileID: 2100000, guid: 3eefb4ef8e63a734bb9d280def8369e6, type: 2}
-  isLoadingPhaseTwo: 1
-  isLoadingPhaseThree: 0
+  isLoadingPhaseTwo: 0
+  isLoadingPhaseThree: 1
   PhaseThreeObj:
   - {fileID: 120687520}
   - {fileID: 741841529}