2809621200 9 месяцев назад
Родитель
Сommit
70df8dde2b

Разница между файлами не показана из-за своего большого размера
+ 907 - 11
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型操动机构解体检修.unity


+ 2 - 2
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型液压油更换.unity

@@ -105662,7 +105662,7 @@ MonoBehaviour:
   aniName: "1\u73B0\u573A\u52D8\u5BDF\r"
   currentStepID: 1
   selection:
-  - {fileID: 1594912471}
+  - {fileID: 2880873530387862005}
 --- !u!1 &470866599
 GameObject:
   m_ObjectHideFlags: 0
@@ -561989,7 +561989,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: e84273e06425dac439d301b5bf2ebf5a, type: 2}
+  - {fileID: 2100000, guid: 4cba22fd20ea4c9489d91268b03ebf0b, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

Разница между файлами не показана из-за своего большого размера
+ 137 - 361
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型灭弧、导电和绝缘部分解体大修.unity


Разница между файлами не показана из-за своего большого размера
+ 675 - 155
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型解体大修.unity


+ 0 - 0
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV隔离开关-GW12型解体大修(本体、传动及机构大修).unity → ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV隔离开关-GW12型解体大修.unity


+ 0 - 0
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV隔离开关-GW12型解体大修(本体、传动及机构大修).unity.meta → ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV隔离开关-GW12型解体大修.unity.meta


+ 60 - 21
ChivaTechFramework/Assets/Scripts/Tool/ProcessEvent_CameraQuickMove.cs

@@ -2,6 +2,7 @@
 using Sirenix.OdinInspector;
 using System.Collections;
 using System.Collections.Generic;
+using System.Xml.Linq;
 using UnityEngine;
 using UnityEngine.PlayerLoop;
 
@@ -9,16 +10,20 @@ using UnityEngine.PlayerLoop;
 public class ProcessEvent_CameraQuickMove : MonoBehaviour
 {
     public Transform moveTarget;
-    public bool quickMove;
+
+    public ProcessElement lastElement;
+    public ProcessElement nextElement;
+
     private ProcessElement processElement;
-    private PreprocessBase preprocessBase;
-    private bool isBool = true;
-    public int maxProcess;
-    public int minProcess;
+
+
+    public bool isLastBool = false;
+    public bool isDownBool = false;
 
     private int currentProcess;
 
 
+
     // Start is called before the first frame update
     void Awake()
     {
@@ -32,40 +37,74 @@ public class ProcessEvent_CameraQuickMove : MonoBehaviour
             processElement.preprocess.Preprocess_EnterEvent += ProcessEnter;
         }
 
-
-
-    }
-
-    void Update()
-    {
-/*        if(isBool && processElement.active)
+        if (lastElement.preprocess == null)
+        {
+            lastElement.processElementEnterHandler += lastProcessEnter;
+        }
+        else
         {
+            lastElement.preprocess.Preprocess_EnterEvent += lastProcessEnter;
+        }
 
-            isBool = false;
-        }*/
+        if (nextElement.preprocess == null)
+        {
+            nextElement.processElementEnterHandler += nextProcessEnter;
+        }
+        else
+        {
+            nextElement.preprocess.Preprocess_EnterEvent += nextProcessEnter;
+        }
     }
 
     public void ProcessEnter(ProcessElement process)
     {
-        if (quickMove)
+
+        if (currentProcess > processElement.stepID && isLastBool)
         {
             Camera.main.GetComponent<RoamCameraController>().SetCameraState(moveTarget.position, moveTarget.localEulerAngles);
         }
-        else
-        {            
-                CameraLerpMoveController.Instance.SetCameraMoveTarget(moveTarget);
+
+        if (currentProcess < processElement.stepID && isDownBool)
+        {
+            Camera.main.GetComponent<RoamCameraController>().SetCameraState(moveTarget.position, moveTarget.localEulerAngles);
         }
+
+
     }
 
     public void ProcessEnter(PreprocessBase process)
     {
-        if (quickMove)
+
+        if (currentProcess > processElement.stepID   && isLastBool)
         {
             Camera.main.GetComponent<RoamCameraController>().SetCameraState(moveTarget.position, moveTarget.localEulerAngles);
         }
-        else
+
+        if (currentProcess < processElement.stepID  && isDownBool)
         {
-            CameraLerpMoveController.Instance.SetCameraMoveTarget(moveTarget);
+            Camera.main.GetComponent<RoamCameraController>().SetCameraState(moveTarget.position, moveTarget.localEulerAngles);
         }
+
+    }
+
+    public void lastProcessEnter(ProcessElement process)
+    {
+        currentProcess = lastElement.stepID;
+    }
+
+    public void lastProcessEnter(PreprocessBase process)
+    {
+        currentProcess = lastElement.stepID;
     }
+
+    public void nextProcessEnter(ProcessElement process)
+    {
+        currentProcess = nextElement.stepID;
+    }
+
+    public void nextProcessEnter(PreprocessBase process)
+    {
+        currentProcess = nextElement.stepID;
+    }
+
 }

Некоторые файлы не были показаны из-за большого количества измененных файлов