Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

Assets/Scenes/01_InitScene.unity

@@ -365,6 +365,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 987826881}
+  - {fileID: 1536160730}
   m_Father: {fileID: 552229449}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -901,7 +902,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b60c6991d2888da47850978d1051aa7f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  initSceneType: 1
+  initSceneType: 2
   systemId: 0
   schemeId: 0
   subProcessId: 0
@@ -1562,6 +1563,51 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   initStatePara: "\u9690\u85CF"
+--- !u!1 &1536160729
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1536160730}
+  - component: {fileID: 1536160731}
+  m_Layer: 0
+  m_Name: aaaa
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1536160730
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1536160729}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 254869080}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1536160731
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1536160729}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 40734e2dbb26ba24eaced19c3fbc57ae, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  initStatePara: 0
 --- !u!1 &1606844579
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/MyTools.meta

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

Assets/Scripts/Project/CXX/StepState.cs

@@ -32,20 +32,46 @@ public class StepState : MonoBehaviour
         systemId= int.Parse(transform.parent.parent.name);
     }
 
-    /// <summary>
-    /// ×¢²á³¡¾°Ìøת»Øµ÷
-    /// </summary>
-    /// <param name="callback"></param>
-    public void AddResetChangeScene(Action<E_SceneType> callback)
-    {
-        this.callback = callback;
-    }
+    ///// <summary>
+    ///// 注册场景跳转回调
+    ///// </summary>
+    ///// <param name="callback"></param>
+    //public void AddResetChangeScene(Action<E_SceneType> callback)
+    //{
+    //    this.callback = callback;
+    //}
 
     public void InvokeChangeScene()
     {
-        if (callback != null)
+        //if (callback != null)
+        //{
+        //    callback(initSceneType);
+        //};
+
+        string sname = "";
+        switch (initSceneType)
         {
-            callback(initSceneType);
-        };
+            case E_SceneType.None:
+                return;
+            case E_SceneType.Office:
+                sname = "03_OfficeScene";
+                break;
+            case E_SceneType.ToolRoom:
+                sname = "04_ToolMaterialScene";
+                break;
+            case E_SceneType.Site:
+                sname = "05_LiveScene";
+                break;
+            default:
+                return;
+        }
+
+        if (GameManager.RunModelMgr.SceneType != initSceneType)
+        {
+            GameManager.ScenesMgr.LoadSceneAsyn(sname, () =>
+            {
+                Debug.Log("步骤场景：" + initSceneType.ToString());
+            });
+        }
     }
 }

Assets/Scripts/Project/CXX/StepStateControl.cs

@@ -28,6 +28,21 @@ public class StepStateControl : MonoBehaviour
         m_Steps.ForEach(a=> { a.Init(); });
     }
 
+    ///// <summary>
+    ///// 注册科目回调（主要切换场景）
+    ///// </summary>
+    ///// <param name="systemId"></param>
+    ///// <param name="schemeId"></param>
+    ///// <param name="subProcessId"></param>
+    //public void AddStepState(int systemId, int schemeId, int subProcessId, Action<E_SceneType> callback)
+    //{
+    //    StepState ss = m_Steps.Find(a => a.systemId == systemId && a.schemeId == schemeId && a.subProcessId== subProcessId);
+    //    if(ss!=null)
+    //    {
+    //        ss.AddResetChangeScene(callback);
+    //    }
+    //}
+
     /// <summary>
     /// 注册当前科目里步骤里某个需要初始化的状态脚本
     /// </summary>

Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs

@@ -66,7 +66,6 @@ public class D_SubProcessStep : I_Enter, I_Exit
     {
         //GetTriggerID();
         UnityEngine.Debug.Log("进入当前子流程步骤:" + id + "_" + subProcessStepName);
-        StepStateControl.instance.InvokeInitStepState(GameManager.Instance.systemId, schemeId, subProcessId);
     }
     /// <summary>
     /// 退出

Assets/Scripts/Project/Enum/Enums.cs

@@ -167,4 +167,22 @@ public enum E_SceneType
     /// 现场
     /// </summary>
     Site,
+}
+
+/// <summary>
+/// 所有工具
+/// </summary>
+public enum ToolType
+{
+    万用表,
+    剥线钳,
+    绝缘螺丝刀,
+    验电笔,
+    国网安全帽,
+    工作服,
+    绝缘手套,
+    绝缘靴,
+    工作证,
+    盒装封印,
+    绝缘胶带
 }

Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs

@@ -49,6 +49,8 @@ public class UI_SubProcessItem : BaseItem
         {
             case "subProcessBtn":
                 GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID);
+                //ÖØÖÃÎïÌå
+                StepStateControl.instance.InvokeInitStepState(GameManager.Instance.systemId, GameManager.ProcessMgr.d_Scheme.id, subProcessID);
                 GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID);
                 break;
         }