添加 人物移动判断

Assets/Scenes/03_OfficeScene.unity

@@ -300,6 +300,17 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 2399593117452945565, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
   m_PrefabInstance: {fileID: 267617284}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &267617286 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2399593117452945567, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
+  m_PrefabInstance: {fileID: 267617284}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267617285}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d90ba6530d9bfda47abb4610956b2f44, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &772251462
 GameObject:
   m_ObjectHideFlags: 0
@@ -841,6 +852,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mobileController: {fileID: 919132148358585193}
+  firstPersonController: {fileID: 267617286}
 --- !u!1 &2077977345
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Project/Manager/DataManager.cs

@@ -224,7 +224,7 @@ public class DataManager : BaseManager<DataManager>
             int index = i;
             foreach (var item in toolAndMaterialDic.Values)
             {
-                if (item.id == int.Parse(tmdTemp[index]))
+                if (item.objName == tmdTemp[index])
                 {
                     D_ToolAndMaterialData d_ToolAndMaterialData = new D_ToolAndMaterialData();
                     d_ToolAndMaterialData.id = item.id;

Assets/Scripts/Project/Manager/LiveSceneManager.cs

@@ -23,11 +23,14 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
         tMDTips.gameObject.SetActive(false);
         GameManager.EventMgr.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
         firstPersonController.zoomAction += OnZoom;
-
+        GameManager.EventMgr.AddEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
         //»ùÀàÈ«²¿³õʼ»¯
         device_Control.transform.GetComponentsInChildren<PermanentTriggerBase>(true).ToList().ForEach(a => a.Awake());
     }
-
+    public void SwitchFirstPersonControllerMove(bool isMove)
+    {
+        firstPersonController.playerCanMove = isMove;
+    }
     private void OnZoom(float value)
     {
         tMDTips.localScale = new Vector3(value, value, value);
@@ -106,17 +109,19 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
         if (ifdestroy)
             Destroy(currentTool);
         currentTool = null;
-        GameManager.EventMgr.EventTrigger<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools,  null);
+        GameManager.EventMgr.EventTrigger<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, null);
     }
 
     private void OnDestroy()
     {
         firstPersonController.zoomAction -= OnZoom;
         GameManager.EventMgr.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
+        GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
     }
     private void OnDisable()
     {
         firstPersonController.zoomAction -= OnZoom;
         GameManager.EventMgr.RemoveEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
+        GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
     }
 }

Assets/Scripts/Project/Manager/OfficeManager.cs

@@ -19,9 +19,13 @@ public class OfficeManager : SingletonMono<OfficeManager>
     /// ÊÖ»ú
     /// </summary>
     public MobileController mobileController;
+    private FirstPersonController firstPersonController;
     void Start()
     {
+        firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>();
+        firstPersonController.gameObject.SetActive(false);
         GameManager.EventMgr.AddEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
+        GameManager.EventMgr.AddEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
         GameManager.EventMgr.AddEventListener(Enum_EventType.InitializationUI, InitializationUI);
         if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
         {
@@ -29,6 +33,11 @@ public class OfficeManager : SingletonMono<OfficeManager>
         }
     }
 
+    public void SwitchFirstPersonControllerMove(bool isMove)
+    {
+        firstPersonController.playerCanMove = isMove;
+    }
+
     private void SwitchSubProcess(int subProcess)
     {
         if (!GameManager.UIMgr.GetPanel<UI_TopTipPanel>())
@@ -78,6 +87,7 @@ public class OfficeManager : SingletonMono<OfficeManager>
             GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
         });
         }
+        firstPersonController.gameObject.SetActive(true);
     }
 
 
@@ -85,6 +95,7 @@ public class OfficeManager : SingletonMono<OfficeManager>
     {
         GameManager.EventMgr.RemoveEventListener(Enum_EventType.OfficeTimeLineOver, OfficeTimeLineOver);
         GameManager.EventMgr.RemoveEventListener(Enum_EventType.InitializationUI, InitializationUI);
+        GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
         //GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
     }
 

Assets/Scripts/Project/Manager/TooRoomMannger.cs

@@ -14,12 +14,12 @@ public class TooRoomMannger : SingletonMono<TooRoomMannger>
     public Transform shoesSlot;
     private List<Material> _cancel; //帤援渴第窐ヶ
     private List<Material> _wear; //援渴第窐ヶ
-
+    private FirstPersonController firstPersonController;
     void Start()
     {
         allTMDs = toolParent.GetComponentsInChildren<BaseToolOrDevice>(true).ToList();
-
+        firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>();
-
+        GameManager.EventMgr.AddEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
         _cancel = new List<Material>();
         _wear = new List<Material>();
         _cancel = Resources.LoadAll<Material>("Materials/CharacterEquip/Cancel").ToList();
@@ -31,7 +31,10 @@ public class TooRoomMannger : SingletonMono<TooRoomMannger>
         }
         RemoveRepeat();
     }
-
+    public void SwitchFirstPersonControllerMove(bool isMove)
+    {
+        firstPersonController.playerCanMove = isMove;
+    }
     /// <summary>
     /// /痄壺笭葩恀枙
     /// </summary>
@@ -89,6 +92,16 @@ public class TooRoomMannger : SingletonMono<TooRoomMannger>
         }
     }
 
+    private void OnDestroy()
+    {
+        GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
+    }
+
+    private void OnDisable()
+    {
+        GameManager.EventMgr.RemoveEventListener<bool>(Enum_EventType.PlayerCanMove, SwitchFirstPersonControllerMove);
+    }
+
 }
 
 /// <summary>

Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs

@@ -13,8 +13,8 @@ public class UI_CheckMyselfPanel : BasePanel
     public override void ShowMe()
     {
         base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
         var currentBagDataForTool = GameManager.PacksackBagMgr.GetItemsByE_TMDType(E_ToolOrDeviceOrMaterials.Tool);
-
         foreach (var item in currentBagDataForTool.Keys)
         {
             if (validToolNames.Contains(item))
@@ -36,6 +36,7 @@ public class UI_CheckMyselfPanel : BasePanel
     public override void HideMe()
     {
         base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
         if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
         {
             GameManager.EventMgr.RemoveEventListener(Enum_EventType.WearState, OnWearState);

Assets/Scripts/Project/UI/UI_Panel/UI_CheckTaskPanel.cs

@@ -6,6 +6,17 @@ using UnityEngine.UI;
 
 public class UI_CheckTaskPanel : BasePanel
 {
+
+    public override void ShowMe()
+    {
+        base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
+    }
+    public override void HideMe()
+    {
+        base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
+    }
     public void Init()
     {
         switch (ProcessManager.Instance.mode)

Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs

@@ -23,10 +23,15 @@ public class UI_CustomSessionPanel : BasePanel
         //UItext = GetControl<TextMeshProUGUI>("ClientText_DialogBox");
         StartTypewriterEffect(clientTalk);
     }
-
+    public override void ShowMe()
+    {
+        base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
+    }
     public override void HideMe()
     {
         base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
     }
     //}
     /// <summary>

Assets/Scripts/Project/UI/UI_Panel/UI_DisassemblyAssemblyNoticePanel.cs

@@ -14,7 +14,16 @@ public class UI_DisassemblyAssemblyNoticePanel : BasePanel
             GetControl<Button>("Button_Close").gameObject.SetActive(false);
         }
     }
-
+    public override void ShowMe()
+    {
+        base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
+    }
+    public override void HideMe()
+    {
+        base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
+    }
     protected override void OnClick(string btnName)
     {
         base.OnClick(btnName);

Assets/Scripts/Project/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.cs

@@ -26,9 +26,15 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
     public override void ShowMe()
     {
         base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
         if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GetControl<Button>("Button_Close").gameObject.SetActive(false);
     }
+    public override void HideMe()
+    {
+        base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
+    }
 
     /// <summary>
     /// 点击按钮

Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs

@@ -15,6 +15,7 @@ public class UI_LowTensionWorkTicketPanel : BasePanel
     public override void ShowMe()
     {
         base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
         if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
         {
             GetControl<Button>("closeBtn").gameObject.SetActive(false);
@@ -22,6 +23,11 @@ public class UI_LowTensionWorkTicketPanel : BasePanel
 
         }
     }
+    public override void HideMe()
+    {
+        base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
+    }
 
 
     protected override void OnClick(string btnName)

Assets/Scripts/Project/UI/UI_Panel/UI_MaskPanel.cs

@@ -25,6 +25,7 @@ public class UI_MaskPanel : BasePanel
     /// </summary>
     public override void ShowMe()
     {
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
         GameManager.EventMgr.AddEventListener(Enum_EventType.HideMask, HideMask);
     }
     /// <summary>
@@ -32,6 +33,7 @@ public class UI_MaskPanel : BasePanel
     /// </summary>
     public override void HideMe()
     {
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
         GameManager.EventMgr.RemoveEventListener(Enum_EventType.HideMask, HideMask);
     }
     private void HideMask()

Assets/Scripts/Project/UI/UI_Panel/UI_MessagePanel.cs

@@ -30,7 +30,17 @@ public class UI_MessagePanel : BasePanel
         this.sureAction += sureAction;
         this.cancelAction += cancelAction;
     }
+    public override void ShowMe()
+    {
+        base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
+    }
 
+    public override void HideMe()
+    {
+        base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
+    }
     /// <summary>
     /// 选择提示模式
     /// </summary>

Assets/Scripts/Project/UI/UI_Panel/UI_PlayerSessionPanel.cs

@@ -22,7 +22,17 @@ public class UI_PlayerSessionPanel : BasePanel
         //UItext = GetControl<TextMeshProUGUI>("PlayerText_DialogBox");
         StartTypewriterEffect(clientTalk);
     }
+    public override void ShowMe()
+    {
+        base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
+    }
 
+    public override void HideMe()
+    {
+        base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
+    }
     //}
     /// <summary>
     /// 按钮点击

Assets/Scripts/Project/UI/UI_Panel/UI_PracticeCompletedPanel.cs

@@ -24,7 +24,17 @@ public class UI_PracticeCompletedPanel : BasePanel
         GetControl<TextMeshProUGUI>("UsedTimesRes").text = (DateTime.Now - GameManager.RunModelMgr.startTime).ToString(@"hh\:mm\:ss");
         Debug.Log("开始时间：" + GameManager.RunModelMgr.startTime.ToString() + "           结束时间：" + DateTime.Now.ToString());
     }
+    public override void ShowMe()
+    {
+        base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
+    }
 
+    public override void HideMe()
+    {
+        base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
+    }
     protected override void OnClick(string btnName)
     {
         switch (btnName)

Assets/Scripts/Project/UI/UI_Panel/UI_ReceiveTaskPanel.cs

@@ -18,6 +18,17 @@ public class UI_ReceiveTaskPanel : BasePanel
         rPanel.DOScale(new Vector3(1, 1, 1), 1f);
         this.triggerName = triggerName;
     }
+    public override void ShowMe()
+    {
+        base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
+    }
+
+    public override void HideMe()
+    {
+        base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
+    }
     protected override void OnClick(string btnName)
     {
         switch (btnName)

Assets/Scripts/Project/UI/UI_Panel/UI_SelectWorkTicketPanel.cs

@@ -21,10 +21,16 @@ public class UI_SelectWorkTicketPanel : BasePanel
     public override void ShowMe()
     {
         base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
         if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GetControl<Button>("Button_Close").gameObject.SetActive(false);
     }
 
+    public override void HideMe()
+    {
+        base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
+    }
     protected override void OnClick(string btnName)
     {
         switch (btnName)

Assets/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs

@@ -2,6 +2,17 @@ using UnityEngine;
 
 public class UI_TipsForPracticePanel : BasePanel
 {
+    public override void ShowMe()
+    {
+        base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
+    }
+
+    public override void HideMe()
+    {
+        base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
+    }
     protected override void OnClick(string btnName)
     {
         switch (btnName)

Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs

@@ -15,6 +15,8 @@ public class UI_ToolAndMaterialPanel : BasePanel
 
     public override void ShowMe()
     {
+        base.ShowMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, false);
         if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GetControl<Button>("closeBtn").gameObject.SetActive(false);
         CreatItem(E_ToolOrDeviceOrMaterials.Tool); //默认打开显示工器具
@@ -23,6 +25,12 @@ public class UI_ToolAndMaterialPanel : BasePanel
 
 
 
+    public override void HideMe()
+    {
+        base.HideMe();
+        GameManager.EventMgr.EventTrigger<bool>(Enum_EventType.PlayerCanMove, true);
+    }
+
     private void CreatItem(E_ToolOrDeviceOrMaterials tmdTpye)
     {
         if (_content.transform.childCount > 0)

Assets/Scripts/ProjectBase/EventCenter/Enum_EventType.cs

@@ -65,5 +65,9 @@ public enum Enum_EventType
     /// <summary>
     /// 提交
     /// </summary>
-    Submit
+    Submit,
+    /// <summary>
+    /// 玩家移动
+    /// </summary>
+    PlayerCanMove
 }

Assets/Scripts/Wwz/OfficeScene/OfficeTimelineControl.cs

@@ -9,7 +9,7 @@ public class OfficeTimelineControl : MonoBehaviour
 
     //过场动画所用的玩家模型
     private GameObject playerModel;
-    public GameObject playerController;
+    //public GameObject playerController;
     public GameObject aniCamera;
 
     // Start is called before the first frame update
@@ -18,11 +18,11 @@ public class OfficeTimelineControl : MonoBehaviour
         mPlayableDirector = GetComponent<PlayableDirector>();
         if (!GameManager.RunModelMgr.isOnceOfficeAni)
         {
-            playerController.SetActive(false);
+            //playerController.SetActive(false);
             mPlayableDirector.Stop();
             //mPlayableDirector.stopped += OnPlayableDirectorStopped;
             playerModel = transform.GetChild(0).gameObject;
-            StartTimeline(); //TODO 这里先掉一下,后续应该流程控制的时候触发调用
+            StartTimeline(); 
             GameManager.RunModelMgr.isOnceOfficeAni = true;
         }
         else
@@ -54,7 +54,7 @@ public class OfficeTimelineControl : MonoBehaviour
     {
         Destroy(playerModel);
         Destroy(aniCamera);
-        playerController.SetActive(true);
+        //playerController.SetActive(true);
         GameManager.EventMgr.EventTrigger(Enum_EventType.InitializationUI);
     }
 

Assets/StreamingAssets/Setting/科目/10002_1002_计量装置轮换.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TB_System id="10002" systemName="计量装置轮换及现场校验仿真" loadName="计量装置轮换及现场校验仿真" titleName="计量装置轮换及现场校验仿真">
 
-  <Subject id="1002" deviceTypeId="20002" schemeName="直接接入式电能计量装置" deviceMap="单相表" schemeDes="" ToolOrMaterilOrDevice="5002,5003,5004,5008,5009,5010,5011,5014,5015,5016,5017">
+  <Subject id="1002" deviceTypeId="20002" schemeName="直接接入式电能计量装置" deviceMap="单相表" schemeDes="" ToolOrMaterilOrDevice="剥线钳,绝缘螺丝刀,验电笔,国网安全帽,工作服,绝缘手套,绝缘靴,工作证,盒装封印,绝缘胶带,三相四线电能表">
 
       <Process id="" processName="任务接受" processDes="">
 
@@ -25,12 +25,12 @@
 
           <Step id="" subProcessName="正确着装" isPrecondition="FALSE" precondition="" tipTitle="" tips="请前往工具间，选取工作服、绝缘鞋、安全帽、手套，到梳妆镜面前进行换装">
               <operation id="" subProcessStepName="前往工具间" isPrecondition="" precondition="Office" triggerID="工具间按钮" tipTitle="前往工具间" score=""></operation>
-              <operation id="" subProcessStepName="选择着装" isPrecondition="" precondition="ToolRoom" triggerID="国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请点击正确的着装" score=""></operation>
+              <operation id="" subProcessStepName="选择着装" isPrecondition="" precondition="ToolRoom" triggerID="国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请按照提示点击正确的着装" score=""></operation>
-              <operation id="" subProcessStepName="正确着装" isPrecondition="" precondition="ToolRoom" triggerID="镜子,国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请走到镜子面前，点击镜子" score=""></operation>
+              <operation id="" subProcessStepName="正确着装" isPrecondition="" precondition="ToolRoom" triggerID="镜子,国网安全帽,工作服,绝缘手套,绝缘靴" tipTitle="请点击镜子,按顺序点击着装" score=""></operation>
           </Step>
 
-          <Step id="" subProcessName="选取工器具" isPrecondition="FALSE" precondition="" tipTitle="" tips="请前往工具间，选取电能表、绝缘螺丝刀、剥线钳、绝缘胶带、验电笔、封印、相序表、工作证">
+          <Step id="" subProcessName="选取工器具" isPrecondition="FALSE" precondition="" tipTitle="" tips="请前往工具间，按照顺序选取电能表、绝缘螺丝刀、剥线钳、绝缘胶带、验电笔、封印、相序表、工作证">
-              <operation id="" subProcessStepName="选取工器具" isPrecondition="" precondition="ToolRoom" triggerID="剥线钳,绝缘螺丝刀,验电笔,工作证,盒装封印,绝缘胶带,三相四线电能表" tipTitle="请点击正确工器具" score=""></operation>
+              <operation id="" subProcessStepName="选取工器具" isPrecondition="" precondition="ToolRoom" triggerID="剥线钳,绝缘螺丝刀,验电笔,工作证,盒装封印,绝缘胶带,三相四线电能表" tipTitle="请按顺序点击正确工器具" score=""></operation>
           </Step>
       </Process>
 

Assets/StreamingAssets/realtimeStat.json

@@ -24,8 +24,8 @@
     {
       "index": 4,
       "subProcessId": 4,
-      "currentScore": 5.0,
+      "currentScore": 0.0,
-      "isDone": true
+      "isDone": false
     },
     {
       "index": 5,
@@ -112,18 +112,325 @@
       "isDone": false
     }
   ],
-  "allToolAndMaterial": [],
+  "allToolAndMaterial": [
+    "国网安全帽",
+    "工作服",
+    "绝缘手套"
+  ],
   "allWear": [],
-  "sceneName": "03_OfficeScene",
+  "sceneName": "04_ToolMaterialScene",
-  "currentSceneTools": [],
+  "currentSceneTools": [
+    {
+      "toolId": 5003,
+      "triggerID": 5003,
+      "toolName": "绝缘螺丝刀",
+      "selfPosInToolRoom": {
+        "x": -3.22629857,
+        "y": 1.129,
+        "z": -1.12697673
+      }
+    },
+    {
+      "toolId": 5015,
+      "triggerID": 5015,
+      "toolName": "盒装封印",
+      "selfPosInToolRoom": {
+        "x": 0.305,
+        "y": 1.556,
+        "z": -3.328
+      }
+    },
+    {
+      "toolId": 5010,
+      "triggerID": 5010,
+      "toolName": "绝缘手套",
+      "selfPosInToolRoom": {
+        "x": 0.265,
+        "y": 0.6700001,
+        "z": -1.387
+      }
+    },
+    {
+      "toolId": 5017,
+      "triggerID": 5017,
+      "toolName": "三相四线电能表",
+      "selfPosInToolRoom": {
+        "x": -3.2316,
+        "y": 1.1067,
+        "z": -2.258
+      }
+    },
+    {
+      "toolId": 5002,
+      "triggerID": 5002,
+      "toolName": "剥线钳",
+      "selfPosInToolRoom": {
+        "x": -3.1648,
+        "y": 0.217400074,
+        "z": -0.731
+      }
+    },
+    {
+      "toolId": 5004,
+      "triggerID": 5004,
+      "toolName": "验电笔",
+      "selfPosInToolRoom": {
+        "x": -3.212,
+        "y": 1.128,
+        "z": -0.672
+      }
+    },
+    {
+      "toolId": 5009,
+      "triggerID": 5009,
+      "toolName": "工作服",
+      "selfPosInToolRoom": {
+        "x": 0.311,
+        "y": 1.1358,
+        "z": -1.381
+      }
+    },
+    {
+      "toolId": 5015,
+      "triggerID": 5015,
+      "toolName": "盒装封印",
+      "selfPosInToolRoom": {
+        "x": 0.305,
+        "y": 1.556,
+        "z": -3.808
+      }
+    },
+    {
+      "toolId": 5003,
+      "triggerID": 5003,
+      "toolName": "绝缘螺丝刀",
+      "selfPosInToolRoom": {
+        "x": -3.223,
+        "y": 1.124,
+        "z": -1.649
+      }
+    },
+    {
+      "toolId": 5004,
+      "triggerID": 5004,
+      "toolName": "验电笔",
+      "selfPosInToolRoom": {
+        "x": -3.21036649,
+        "y": 1.1167,
+        "z": -0.173
+      }
+    },
+    {
+      "toolId": 5017,
+      "triggerID": 5017,
+      "toolName": "三相四线电能表",
+      "selfPosInToolRoom": {
+        "x": -3.2316,
+        "y": 1.1067,
+        "z": -2.7405
+      }
+    },
+    {
+      "toolId": 5002,
+      "triggerID": 5002,
+      "toolName": "剥线钳",
+      "selfPosInToolRoom": {
+        "x": -3.1648,
+        "y": 0.217400074,
+        "z": -0.189
+      }
+    },
+    {
+      "toolId": 5014,
+      "triggerID": 5014,
+      "toolName": "工作证",
+      "selfPosInToolRoom": {
+        "x": 0.238,
+        "y": 1.134,
+        "z": -3.807
+      }
+    },
+    {
+      "toolId": 5011,
+      "triggerID": 5011,
+      "toolName": "绝缘靴",
+      "selfPosInToolRoom": {
+        "x": 0.315,
+        "y": 0.207000017,
+        "z": -1.377
+      }
+    },
+    {
+      "toolId": 5014,
+      "triggerID": 5014,
+      "toolName": "工作证",
+      "selfPosInToolRoom": {
+        "x": 0.238,
+        "y": 1.134,
+        "z": -3.353
+      }
+    },
+    {
+      "toolId": 5008,
+      "triggerID": 5008,
+      "toolName": "国网安全帽",
+      "selfPosInToolRoom": {
+        "x": 0.263,
+        "y": 1.60900009,
+        "z": -1.817
+      }
+    },
+    {
+      "toolId": 5016,
+      "triggerID": 5016,
+      "toolName": "绝缘胶带",
+      "selfPosInToolRoom": {
+        "x": 0.281,
+        "y": 1.55870008,
+        "z": -4.595
+      }
+    },
+    {
+      "toolId": 5016,
+      "triggerID": 5016,
+      "toolName": "绝缘胶带",
+      "selfPosInToolRoom": {
+        "x": 0.281,
+        "y": 1.55870008,
+        "z": -4.202
+      }
+    },
+    {
+      "toolId": 5011,
+      "triggerID": 5011,
+      "toolName": "绝缘靴",
+      "selfPosInToolRoom": {
+        "x": 0.315,
+        "y": 0.207000017,
+        "z": -1.852
+      }
+    }
+  ],
   "currentSceneTriggers": [
     {
-      "triggerID": 5005,
+      "triggerID": 0,
-      "triggerName": "手机",
+      "triggerName": "",
       "selfPosInScene": {
-        "x": 0.0244421959,
+        "x": -3.22629857,
-        "y": 0.885706842,
+        "y": 1.129,
-        "z": -1.00569367
+        "z": -1.12697673
+      },
+      "selfRotInScene": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+      }
+    },
+    {
+      "triggerID": 0,
+      "triggerName": "",
+      "selfPosInScene": {
+        "x": 0.305,
+        "y": 1.556,
+        "z": -3.328
+      },
+      "selfRotInScene": {
+        "x": 270.0,
+        "y": 0.0,
+        "z": 0.0
+      }
+    },
+    {
+      "triggerID": 0,
+      "triggerName": "",
+      "selfPosInScene": {
+        "x": -3.1648,
+        "y": 0.217400074,
+        "z": -0.731
+      },
+      "selfRotInScene": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+      }
+    },
+    {
+      "triggerID": 0,
+      "triggerName": "验电笔",
+      "selfPosInScene": {
+        "x": -3.212,
+        "y": 1.128,
+        "z": -0.672
+      },
+      "selfRotInScene": {
+        "x": 6.83245332E-07,
+        "y": 5.008956E-06,
+        "z": 5.008956E-06
+      }
+    },
+    {
+      "triggerID": 0,
+      "triggerName": "",
+      "selfPosInScene": {
+        "x": 0.305,
+        "y": 1.556,
+        "z": -3.808
+      },
+      "selfRotInScene": {
+        "x": 270.0,
+        "y": 0.0,
+        "z": 0.0
+      }
+    },
+    {
+      "triggerID": 0,
+      "triggerName": "",
+      "selfPosInScene": {
+        "x": -3.223,
+        "y": 1.124,
+        "z": -1.649
+      },
+      "selfRotInScene": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+      }
+    },
+    {
+      "triggerID": 0,
+      "triggerName": "验电笔",
+      "selfPosInScene": {
+        "x": -3.21036649,
+        "y": 1.1167,
+        "z": -0.173
+      },
+      "selfRotInScene": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+      }
+    },
+    {
+      "triggerID": 0,
+      "triggerName": "",
+      "selfPosInScene": {
+        "x": -3.1648,
+        "y": 0.217400074,
+        "z": -0.189
+      },
+      "selfRotInScene": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+      }
+    },
+    {
+      "triggerID": 5012,
+      "triggerName": "镜子",
+      "selfPosInScene": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
       },
       "selfRotInScene": {
         "x": 0.0,