[+]暂存

35kVPSADS_Platform/Assets/Detailed_Pyro_FX.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:35kVPSADS_Platform/Assets/StreamingAssets/Audio/EquipmentCognition/1048.meta
-guid: fbef2bd1983d2104badeb953d241646a
+guid: 5de66a46c033a844e88bb69d4256f6b4
 ========
 guid: 36ec7a89c1069044fa36c312466d4523
 >>>>>>>> feature/jinxin:35kVPSADS_Platform/Assets/Detailed_Pyro_FX.meta

35kVPSADS_Platform/Assets/JMO Assets.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:35kVPSADS_Platform/Assets/GameAssets/工作原理Model/09.10kV开关柜-KYN28型.meta
-guid: e3dc0bf725b05fc4aa85221d24e3ae28
+guid: 9ebf30be8a3ed2c478b8cf97fe311470
 ========
 guid: ce2212ff2734a40498e8f16ce89c18db
 >>>>>>>> feature/jinxin:35kVPSADS_Platform/Assets/JMO Assets.meta

35kVPSADS_Platform/Assets/MagicEffectsLightningVol01.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:35kVPSADS_Platform/Assets/GameAssets/工作原理Model/09.10kV开关柜-KYN28型/Materials.meta
-guid: 660017ec7e5505f459e64fa3fa86da54
+guid: 510aed7be2772364fb62cb5006099c14
 ========
 guid: 6aaa3fc95a0ab0e40bf4a832c8e074ee
 >>>>>>>> feature/jinxin:35kVPSADS_Platform/Assets/MagicEffectsLightningVol01.meta

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

@@ -47,9 +47,8 @@ public class OpenEquipmentPane : MonoBehaviour
     void Start()
     {
         ResKit.Init();
+        
         UIKit.OpenPanel<EquipmentPanel>();
-        UIKit.GetPanel<EquipmentPanel>().isLoadingPhaseTwo = isLoadingPhaseTwo;
-        UIKit.GetPanel<EquipmentPanel>().isLoadingPhaseThree = isLoadingPhaseThree;
     }
     void Update()
     {

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

@@ -104,6 +104,8 @@ namespace QFramework
 		{
 			mData = uiData as EquipmentPanelData ?? new EquipmentPanelData();
 
+			isLoadingPhaseTwo = OpenEquipmentPane.Instance.isLoadingPhaseTwo;
+			isLoadingPhaseThree = OpenEquipmentPane.Instance.isLoadingPhaseThree;
 
 			wanderDatas = ExcelHelper.ReadInfoFromExcel<WanderEquipmentData>(wanderPath, 1);
 			cognitionDatas = ExcelHelper.ReadInfoFromExcel<CognitionEquipmentData>(cognitionPath, 2);
@@ -133,7 +135,15 @@ namespace QFramework
 			});
 
 			OperateLogBtn.onClick.AddListener(() => {
-				EquipmentPaneGameLaunch.LoadScene("±äµçMain", null);
+
+				if (!isLoadingPhaseTwo)
+                {
+					EquipmentPaneGameLaunch.LoadScene("±äµçMain", null);
+					return;
+				}
+
+				if(!isLoadingPhaseThree)
+					EquipmentPaneGameLaunch.LoadScene("ÅäµçMain", null);				
 			});
 
 			CloseBtn.onClick.AddListener(()=> 
@@ -159,12 +169,10 @@ namespace QFramework
 				PartBaseItem tmpItem = tmpObj.GetComponent<PartBaseItem>();
 				List<WanderEquipmentData> tmpList = group.ToList();
 
-				if (!isLoadingPhaseTwo)
-					if (tmpList[0].equipmentPhase.Equals("¶þÆÚ"))
+				if (!isLoadingPhaseTwo && tmpList[0].equipmentPhase.Equals("¶þÆÚ"))
 						continue;
 
-				if (!isLoadingPhaseThree)
-					if (tmpList[0].equipmentPhase.Equals("ÈýÆÚ"))
+				if (!isLoadingPhaseThree && tmpList[0].equipmentPhase.Equals("ÈýÆÚ"))
 						continue;
 				
 				tmpItem.ClickBtn.onClick.AddListener(() => 
@@ -200,7 +208,7 @@ 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, -45), new Vector3(265, 5, 13.6f));
+					camera.JumpCorrespondingPosition(data.getPositionV3(), data.getRotationV3(), new Vector3(243, 0.5f, -76), new Vector3(265, 10, 13.6f));
 					break;
 				case "µçÀÂËíµÀ":
 					camera.JumpCorrespondingPosition(data.getPositionV3(), data.getRotationV3(), new Vector3(29.9f, 3.1f, -65.9f), new Vector3(27.9f, 1.5f, 35f));

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

@@ -23,34 +23,34 @@ namespace QFramework
 			LearnBtn.onClick.AddListener(delegate
 			{
 				GlobalData.m_CurrentOperationMode = OperationMode.Learn;
-				EquipmentPaneGameLaunch.LoadScene("±äµçվѲÊÓ", null);
-
-/*				GlobalData.m_CurrentOperationMode= OperationMode.Learn;
 				SenceManager.Instance.LoadingScene();
-				//SceneManager.LoadSceneAsync("±äµçվѲÊÓ");
-				UIKit.CloseAllPanel();*/
+
+				/*				GlobalData.m_CurrentOperationMode= OperationMode.Learn;
+
+								//SceneManager.LoadSceneAsync("±äµçվѲÊÓ");
+								UIKit.CloseAllPanel();*/
 			});
 
 			PracticeBtn.onClick.AddListener(delegate
 			{
 				GlobalData.m_CurrentOperationMode = OperationMode.Practice;
-				EquipmentPaneGameLaunch.LoadScene("±äµçվѲÊÓ", null);
-
-/*				GlobalData.m_CurrentOperationMode = OperationMode.Practice;
 				SenceManager.Instance.LoadingScene();
-				//SceneManager.LoadSceneAsync("±äµçվѲÊÓ");
-				UIKit.CloseAllPanel();*/
+
+				/*				GlobalData.m_CurrentOperationMode = OperationMode.Practice;
+								SenceManager.Instance.LoadingScene();
+								//SceneManager.LoadSceneAsync("±äµçվѲÊÓ");
+								UIKit.CloseAllPanel();*/
 			});
 
 			ExamBtn.onClick.AddListener(delegate
 			{
 				GlobalData.m_CurrentOperationMode = OperationMode.Exam;
-				EquipmentPaneGameLaunch.LoadScene("±äµçվѲÊÓ", null);
-
-/*				GlobalData.m_CurrentOperationMode = OperationMode.Exam;
 				SenceManager.Instance.LoadingScene();
-				//SceneManager.LoadSceneAsync("±äµçվѲÊÓ");
-				UIKit.CloseAllPanel();*/
+
+				/*				GlobalData.m_CurrentOperationMode = OperationMode.Exam;
+								SenceManager.Instance.LoadingScene();
+								//SceneManager.LoadSceneAsync("±äµçվѲÊÓ");
+								UIKit.CloseAllPanel();*/
 			});
 			BackBtn.onClick.AddListener(() =>
 			{

35kVPSADS_Platform/Assets/Phase I Resources/XunShiFramework/UIFramework/Scripts/UI/ExamResultFrom.cs

@@ -82,8 +82,9 @@ namespace QFramework
         /// </summary>
         private void OnExitBtnClick()
         {
-            EquipmentPaneGameLaunch.LoadScene("±äµçMain", "ѧϰ");
-/*            SenceManager.Instance.LoadingScene();
+            SenceManager.Instance.LoadingScene();
+           // EquipmentPaneGameLaunch.LoadScene("±äµçMain", "ѧϰ");
+/*            
             //SceneManager.LoadSceneAsync("Main");
 			UIKit.CloseAllPanel();*/
 

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

@@ -34289,6 +34289,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 121837875}
+  - component: {fileID: 121837876}
   m_Layer: 0
   m_Name: "\u7194\u7BA1"
   m_TagString: Untagged
@@ -34311,6 +34312,68 @@ Transform:
   m_Father: {fileID: 5783557896807816833}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &121837876
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 121837874}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: beeab9a214aefc840b3042454f94ce6b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mode: 0
+  forceRender: 0
+  color: {r: 1, g: 1, b: 1, a: 1}
+  _overlay: 0
+  _occluder: 0
+  _tween: 0
+  _tweenGradient:
+    serializedVersion: 2
+    key0: {r: 0, g: 1, b: 1, a: 0}
+    key1: {r: 0, g: 1, b: 1, a: 1}
+    key2: {r: 0, g: 0, b: 0, a: 0}
+    key3: {r: 0, g: 0, b: 0, a: 0}
+    key4: {r: 0, g: 0, b: 0, a: 0}
+    key5: {r: 0, g: 0, b: 0, a: 0}
+    key6: {r: 0, g: 0, b: 0, a: 0}
+    key7: {r: 0, g: 0, b: 0, a: 0}
+    ctime0: 0
+    ctime1: 65535
+    ctime2: 0
+    ctime3: 0
+    ctime4: 0
+    ctime5: 0
+    ctime6: 0
+    ctime7: 0
+    atime0: 0
+    atime1: 65535
+    atime2: 0
+    atime3: 0
+    atime4: 0
+    atime5: 0
+    atime6: 0
+    atime7: 0
+    m_Mode: 0
+    m_NumColorKeys: 2
+    m_NumAlphaKeys: 2
+  _tweenDuration: 1
+  _tweenReverse: 0
+  _tweenLoop: 2
+  _tweenEasing: 0
+  _tweenDelay: 0
+  _tweenRepeatCount: -1
+  _tweenUseUnscaledTime: 0
+  _constant: 0
+  _constantColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  _constantFadeInTime: 0.1
+  _constantFadeOutTime: 0.25
+  _constantEasing: 0
+  _constantUseUnscaledTime: 0
+  _filterMode: 0
+  _filterList: []
 --- !u!1 &122054014
 GameObject:
   m_ObjectHideFlags: 0
@@ -77556,8 +77619,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 292966303}
-  m_LocalRotation: {x: -0.06945775, y: 0.37412894, z: -0.028111285, w: -0.92434466}
-  m_LocalPosition: {x: 263.23767, y: 4.5557346, z: -77.14592}
+  m_LocalRotation: {x: 0.029898826, y: -0.42225587, z: 0.013951333, w: 0.9058761}
+  m_LocalPosition: {x: 263.98282, y: 6.8946943, z: -23.0211}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -117301,6 +117364,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 456437635}
+  - component: {fileID: 456437636}
   m_Layer: 0
   m_Name: "\u7EDD\u7F18\u652F\u5EA7"
   m_TagString: Untagged
@@ -117325,6 +117389,68 @@ Transform:
   m_Father: {fileID: 5783557896807816833}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &456437636
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 456437634}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: beeab9a214aefc840b3042454f94ce6b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mode: 0
+  forceRender: 0
+  color: {r: 1, g: 1, b: 1, a: 1}
+  _overlay: 0
+  _occluder: 0
+  _tween: 0
+  _tweenGradient:
+    serializedVersion: 2
+    key0: {r: 0, g: 1, b: 1, a: 0}
+    key1: {r: 0, g: 1, b: 1, a: 1}
+    key2: {r: 0, g: 0, b: 0, a: 0}
+    key3: {r: 0, g: 0, b: 0, a: 0}
+    key4: {r: 0, g: 0, b: 0, a: 0}
+    key5: {r: 0, g: 0, b: 0, a: 0}
+    key6: {r: 0, g: 0, b: 0, a: 0}
+    key7: {r: 0, g: 0, b: 0, a: 0}
+    ctime0: 0
+    ctime1: 65535
+    ctime2: 0
+    ctime3: 0
+    ctime4: 0
+    ctime5: 0
+    ctime6: 0
+    ctime7: 0
+    atime0: 0
+    atime1: 65535
+    atime2: 0
+    atime3: 0
+    atime4: 0
+    atime5: 0
+    atime6: 0
+    atime7: 0
+    m_Mode: 0
+    m_NumColorKeys: 2
+    m_NumAlphaKeys: 2
+  _tweenDuration: 1
+  _tweenReverse: 0
+  _tweenLoop: 2
+  _tweenEasing: 0
+  _tweenDelay: 0
+  _tweenRepeatCount: -1
+  _tweenUseUnscaledTime: 0
+  _constant: 0
+  _constantColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  _constantFadeInTime: 0.1
+  _constantFadeOutTime: 0.25
+  _constantEasing: 0
+  _constantUseUnscaledTime: 0
+  _filterMode: 0
+  _filterList: []
 --- !u!1 &456509079
 GameObject:
   m_ObjectHideFlags: 0
@@ -150732,7 +150858,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   tmpMaterial: {fileID: 2100000, guid: 3eefb4ef8e63a734bb9d280def8369e6, type: 2}
   isLoadingPhaseTwo: 0
-  isLoadingPhaseThree: 0
+  isLoadingPhaseThree: 1
   PhaseThreeObj:
   - {fileID: 120687520}
   - {fileID: 741841529}
@@ -193871,7 +193997,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &768643965
 Transform:
   m_ObjectHideFlags: 0
@@ -290385,6 +290511,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1165263531}
+  - component: {fileID: 1165263532}
   m_Layer: 0
   m_Name: "\u64CD\u4F5C\u73AF"
   m_TagString: Untagged
@@ -290409,6 +290536,68 @@ Transform:
   m_Father: {fileID: 5783557896807816833}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1165263532
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1165263530}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: beeab9a214aefc840b3042454f94ce6b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mode: 0
+  forceRender: 0
+  color: {r: 1, g: 1, b: 1, a: 1}
+  _overlay: 0
+  _occluder: 0
+  _tween: 0
+  _tweenGradient:
+    serializedVersion: 2
+    key0: {r: 0, g: 1, b: 1, a: 0}
+    key1: {r: 0, g: 1, b: 1, a: 1}
+    key2: {r: 0, g: 0, b: 0, a: 0}
+    key3: {r: 0, g: 0, b: 0, a: 0}
+    key4: {r: 0, g: 0, b: 0, a: 0}
+    key5: {r: 0, g: 0, b: 0, a: 0}
+    key6: {r: 0, g: 0, b: 0, a: 0}
+    key7: {r: 0, g: 0, b: 0, a: 0}
+    ctime0: 0
+    ctime1: 65535
+    ctime2: 0
+    ctime3: 0
+    ctime4: 0
+    ctime5: 0
+    ctime6: 0
+    ctime7: 0
+    atime0: 0
+    atime1: 65535
+    atime2: 0
+    atime3: 0
+    atime4: 0
+    atime5: 0
+    atime6: 0
+    atime7: 0
+    m_Mode: 0
+    m_NumColorKeys: 2
+    m_NumAlphaKeys: 2
+  _tweenDuration: 1
+  _tweenReverse: 0
+  _tweenLoop: 2
+  _tweenEasing: 0
+  _tweenDelay: 0
+  _tweenRepeatCount: -1
+  _tweenUseUnscaledTime: 0
+  _constant: 0
+  _constantColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  _constantFadeInTime: 0.1
+  _constantFadeOutTime: 0.25
+  _constantEasing: 0
+  _constantUseUnscaledTime: 0
+  _filterMode: 0
+  _filterList: []
 --- !u!1 &1165296480
 GameObject:
   m_ObjectHideFlags: 0

35kVPSADS_Platform/Assets/Scenes/工作原理/10kV柱上开关原理认知.unity.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:35kVPSADS_Platform/Assets/StreamingAssets/Pictures/1038.meta
-guid: 9097354a58fb5bf4191a509d482bf00a
+guid: b19168d71ca615548a67525f50b73206
 folderAsset: yes
 ========
 guid: a7c3f8606dad3cb4db878f63d12ce34e

35kVPSADS_Platform/Assets/Phase I Resources/GameAssets/05.UI/12.精细化版巡视/12.5新加学练考UI/切图/练习.meta → 35kVPSADS_Platform/Assets/StreamingAssets/AssetBundles.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cc20aa6b4da30a447a0a272b849e6105
+guid: 4e66abcb6b46deb488423f4d834abf96
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 3b5ef671f76ccc5408a5d765250701b6
-folderAsset: yes
+guid: 062ba44e48f7ae740b128fbc48e49c20
 DefaultImporter:
   externalObjects: {}
   userData: