diff --git a/Assets/Scripts/Project/Manager/ReconnectMgr.cs b/Assets/Scripts/Project/Manager/ReconnectMgr.cs index 6b3ebae..c175a63 100644 --- a/Assets/Scripts/Project/Manager/ReconnectMgr.cs +++ b/Assets/Scripts/Project/Manager/ReconnectMgr.cs @@ -51,7 +51,6 @@ public class ReconnectMgr : SingletonMono { //记录步骤相关各项信息 UserExamStat.schemeID = ProcessManager.Instance.schemeID; - //记录得分情况 ScoreBase scoreBase = FindFirstObjectByType(); UserExamStat.systemID = scoreBase.systemId; @@ -70,10 +69,6 @@ public class ReconnectMgr : SingletonMono //保存场景内独有信息 UserExamStat.currentSceneOtherInfo = scoreBase.SaveSceneBufferList(); } - /*UserExamStat.processId = ProcessManager.Instance.processId; - UserExamStat.subProcessId = ProcessManager.Instance.subProcessId; - UserExamStat.subProcessStepId = ProcessManager.Instance.subProcessStepId;*/ - //记录装备材料信息 UserExamStat.allToolAndMaterial.Clear(); UserExamStat.currentSceneTools.Clear(); @@ -83,15 +78,14 @@ public class ReconnectMgr : SingletonMono foreach (var itemInfo in item.Value) { UserExamStat.allToolAndMaterial.Add(((ItemInfo)itemInfo).toolName); - ReconnectItemInfo rec = new ReconnectItemInfo(); - rec.toolId = itemInfo.toolId; - rec.toolName = itemInfo.toolName; - rec.triggerID = itemInfo.triggerID; + ReconnectItemInfo rec = new ReconnectItemInfo();//获取场景内(工具间)所有可以装备材料的物品 + rec.toolId = itemInfo.toolId; + rec.toolName = itemInfo.toolName; + rec.triggerID = itemInfo.triggerID; //rec.toolOrDeviceOrMaterial = item.itemInfo.toolOrDeviceOrMaterial; - rec.selfPosInToolRoom = itemInfo.selfPosInToolRoom; + rec.selfPosInToolRoom = itemInfo.selfPosInToolRoom; UserExamStat.currentSceneTools.Add(rec); } - } //记录已穿戴设备 @@ -105,21 +99,6 @@ public class ReconnectMgr : SingletonMono //获取当前所加载场景的名字 UserExamStat.sceneName = UnityEngine.SceneManagement.SceneManager.GetActiveScene().name; - //获取场景内(工具间)所有可以装备材料的物品 - //UserExamStat.currentSceneTools.Clear(); - //BaseToolOrDevice[] allThings = FindObjectsOfType(); - //foreach (BaseToolOrDevice item in allThings) - //{ - // //Debug.Log(item.itemInfo.toolName); - // ReconnectItemInfo rec = new ReconnectItemInfo(); - // rec.toolId = item.itemInfo.toolId; - // rec.toolName = item.itemInfo.toolName; - // rec.triggerID = item.itemInfo.triggerID; - // //rec.toolOrDeviceOrMaterial = item.itemInfo.toolOrDeviceOrMaterial; - // rec.selfPosInToolRoom = item.itemInfo.selfPosInToolRoom; - // UserExamStat.currentSceneTools.Add(rec); - //} - //获取场景内(现场)所有可以出发的装置 UserExamStat.currentSceneTriggers.Clear(); PermanentTriggerBase[] allPermanentTriggers = FindObjectsOfType(); @@ -184,27 +163,10 @@ public class ReconnectMgr : SingletonMono } else GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType); - //恢复场景中各项装备 - //BaseToolOrDevice[] allThings = FindObjectsOfType(); - //foreach (BaseToolOrDevice item in allThings) - //{ - // item.gameObject.SetActive(false);//先全部隐藏 - // foreach (ReconnectItemInfo rec in UserExamStat.currentSceneTools) - // { - // if (item.itemInfo.toolName.Equals(rec.toolName) && item.itemInfo.toolId == rec.toolId) - // { - // if (item.itemInfo.selfPosInToolRoom.Equals(rec.selfPosInToolRoom)) - // { - // item.gameObject.SetActive(true); - // break; - // } - // } - // } - //} //恢复背包中的装备 - TooRoomMannger tooRoomMannger = FindAnyObjectByType(); - List itemInPack = ToolAndmaterialMgr.Instance.CreateItemInfoByName(UserExamStat.allToolAndMaterial); + TooRoomMannger tooRoomMannger = FindAnyObjectByType(); + List itemInPack = ToolAndmaterialMgr.Instance.CreateItemInfoByName(UserExamStat.allToolAndMaterial); foreach (ItemInfo item in itemInPack) { for (int j = 0; j < UserExamStat.currentSceneTools.Count; j++) diff --git a/Assets/StreamingAssets/realtimeStat.json b/Assets/StreamingAssets/realtimeStat.json index bdcb7f3..4014236 100644 --- a/Assets/StreamingAssets/realtimeStat.json +++ b/Assets/StreamingAssets/realtimeStat.json @@ -31,13 +31,13 @@ "index": 5, "subProcessId": 5, "currentScore": 0.0, - "isDone": true + "isDone": false }, { "index": 6, "subProcessId": 6, - "currentScore": 1.99999928, - "isDone": true + "currentScore": 0.0, + "isDone": false }, { "index": 7, @@ -112,139 +112,18 @@ "isDone": false } ], - "allToolAndMaterial": [ - "鍓ョ嚎閽", - "鍓ョ嚎閽", - "楠岀數绗", - "缁濈紭铻轰笣鍒" - ], + "allToolAndMaterial": [], "allWear": [], - "sceneName": "05_LiveScene", - "currentSceneTools": [ - { - "toolId": 5002, - "triggerID": 5002, - "toolName": "鍓ョ嚎閽", - "selfPosInToolRoom": { - "x": -3.1648, - "y": 0.217400074, - "z": -0.189 - } - }, - { - "toolId": 5002, - "triggerID": 5002, - "toolName": "鍓ョ嚎閽", - "selfPosInToolRoom": { - "x": -3.1648, - "y": 0.217400074, - "z": -0.731 - } - }, - { - "toolId": 5004, - "triggerID": 5004, - "toolName": "楠岀數绗", - "selfPosInToolRoom": { - "x": -3.21036649, - "y": 1.1167, - "z": -0.173 - } - }, - { - "toolId": 5003, - "triggerID": 5003, - "toolName": "缁濈紭铻轰笣鍒", - "selfPosInToolRoom": { - "x": -3.223, - "y": 1.124, - "z": -1.649 - } - } - ], + "sceneName": "04_ToolMaterialScene", + "currentSceneTools": [], "currentSceneTriggers": [ { "triggerID": 0, - "triggerName": "绌哄紑1", + "triggerName": "", "selfPosInScene": { - "x": 0.0278625488, - "y": 0.08226776, - "z": -0.008735657 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "True" - }, - { - "triggerID": 5023, - "triggerName": "鐢佃兘琛ㄥ皝鍗2", - "selfPosInScene": { - "x": 0.0612678528, - "y": 0.0201263428, - "z": -0.109647989 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 180.0 - }, - "triggerInfo": "False" - }, - { - "triggerID": 5023, - "triggerName": "鐢佃兘琛ㄥ皝鍗1", - "selfPosInScene": { - "x": -0.06092453, - "y": 0.0201263428, - "z": -0.109647989 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 180.0 - }, - "triggerInfo": "False" - }, - { - "triggerID": 5024, - "triggerName": "鐢佃兘琛ㄧ洊瀛", - "selfPosInScene": { - "x": -0.000122070313, - "y": -0.0111236572, - "z": -0.09854126 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 180.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "鐢佃兘琛ㄩ摥鐗", - "selfPosInScene": { - "x": -0.069568634, - "y": 0.02281189, - "z": -0.0215929747 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 180.0 - }, - "triggerInfo": "False" - }, - { - "triggerID": 0, - "triggerName": "鐢佃兘琛ㄦ媶瑁呰灪涓2", - "selfPosInScene": { - "x": -0.06737137, - "y": 0.051071167, - "z": -0.109404683 + "x": -3.22629857, + "y": 1.129, + "z": -1.12697673 }, "selfRotInScene": { "x": 0.0, @@ -253,418 +132,28 @@ }, "triggerInfo": "" }, - { - "triggerID": 0, - "triggerName": "鐢佃兘琛ㄦ媶瑁呰灪涓1", - "selfPosInScene": { - "x": 0.06592941, - "y": 0.051071167, - "z": -0.109404683 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 5025, - "triggerName": "鐢佃兘琛ㄧ洊瀛愬浐瀹氳灪涓2", - "selfPosInScene": { - "x": -0.06129074, - "y": -0.0140533447, - "z": -0.101232052 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 5025, - "triggerName": "鐢佃兘琛ㄧ洊瀛愬浐瀹氳灪涓1", - "selfPosInScene": { - "x": 0.0612869263, - "y": -0.0140533447, - "z": -0.101232052 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "闆禵鍦癬铻轰笣up", - "selfPosInScene": { - "x": -0.0295066833, - "y": 0.0256958, - "z": -0.09305191 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "闆禵out_铻轰笣up", - "selfPosInScene": { - "x": -0.0381965637, - "y": 0.0222015381, - "z": -0.09305191 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "B_out_绾", - "selfPosInScene": { - "x": 20.0205078, - "y": 142.292862, - "z": 21.0742188 - }, - "selfRotInScene": { - "x": 8.14222E-13, - "y": 2.035555E-13, - "z": 4.85314136E-20 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "C_out_绾", - "selfPosInScene": { - "x": 17.5166016, - "y": 142.292862, - "z": 21.0742188 - }, - "selfRotInScene": { - "x": 8.14222E-13, - "y": 2.035555E-13, - "z": 4.85314136E-20 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "C_in_绾", - "selfPosInScene": { - "x": 13.3569336, - "y": 131.0804, - "z": 22.4726563 - }, - "selfRotInScene": { - "x": 8.14222E-13, - "y": 2.035555E-13, - "z": 4.85314136E-20 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "B_in_绾", - "selfPosInScene": { - "x": 15.9238281, - "y": 131.0804, - "z": 22.4726563 - }, - "selfRotInScene": { - "x": 8.14222E-13, - "y": 2.035555E-13, - "z": 4.85314136E-20 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "A_in_绾", - "selfPosInScene": { - "x": 18.47998, - "y": 131.0804, - "z": 22.4726563 - }, - "selfRotInScene": { - "x": 8.14222E-13, - "y": 2.035555E-13, - "z": 4.85314136E-20 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "闆禵out_绾", - "selfPosInScene": { - "x": 16.4960938, - "y": 142.292862, - "z": 21.0742188 - }, - "selfRotInScene": { - "x": 8.14222E-13, - "y": 2.035555E-13, - "z": 4.85314136E-20 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "B_out_铻轰笣up", - "selfPosInScene": { - "x": 0.006591797, - "y": 0.0256958, - "z": -0.09305191 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "C_out_铻轰笣up", - "selfPosInScene": { - "x": -0.0201148987, - "y": 0.0256958, - "z": -0.09305191 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 5021, - "triggerName": "鎻掑骇", - "selfPosInScene": { - "x": -1.56, - "y": 2.29342651, - "z": -0.203244925 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 180.0 - }, - "triggerInfo": "True" - }, - { - "triggerID": 0, - "triggerName": "B_in_铻轰笣down", - "selfPosInScene": { - "x": 0.0237312317, - "y": 0.0256958, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "A_in_铻轰笣up", - "selfPosInScene": { - "x": 0.0501709, - "y": 0.0256958, - "z": -0.09305191 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 5018, - "triggerName": "NPC瀹㈡埛", - "selfPosInScene": { - "x": -170.37, - "y": 1.26, - "z": -57.03 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "A_out_绾", - "selfPosInScene": { - "x": 22.70166, - "y": 142.292862, - "z": 21.0742188 - }, - "selfRotInScene": { - "x": 8.14222E-13, - "y": 2.035555E-13, - "z": 4.85314136E-20 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "妫鏌ユ帴绾", - "selfPosInScene": { - "x": 0.14606, - "y": -0.15198, - "z": 0.40884 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "False" - }, - { - "triggerID": 0, - "triggerName": "C_in_铻轰笣up", - "selfPosInScene": { - "x": -0.002609253, - "y": 0.0256958, - "z": -0.09305191 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "B_out_铻轰笣down", - "selfPosInScene": { - "x": 0.006591797, - "y": 0.0256958, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "闆禵鍦癬铻轰笣down", - "selfPosInScene": { - "x": -0.0295066833, - "y": 0.0256958, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 5020, - "triggerName": "NPC璐熻矗浜", - "selfPosInScene": { - "x": -170.376083, - "y": 1.26, - "z": -53.5962639 - }, - "selfRotInScene": { - "x": 0.0, - "y": 125.039986, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "C_out_铻轰笣down", - "selfPosInScene": { - "x": -0.0201148987, - "y": 0.0256958, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "闆禵鍦癬绾", - "selfPosInScene": { - "x": -5.22167969, - "y": 140.3523, - "z": 18.2167969 - }, - "selfRotInScene": { - "x": 8.14222E-13, - "y": 2.035555E-13, - "z": 4.85314136E-20 - }, - "triggerInfo": "" - }, - { - "triggerID": 5022, - "triggerName": "鏌滈棬", - "selfPosInScene": { - "x": 0.491622925, - "y": -0.5744629, - "z": 0.47206974 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "{\"isOpen\":false,\"hasElectricity\":false}" - }, { "triggerID": 0, "triggerName": "", "selfPosInScene": { - "x": 0.146900177, - "y": -0.179336548, - "z": 0.5191498 + "x": 0.305, + "y": 1.556, + "z": -3.328 }, "selfRotInScene": { - "x": 0.0, + "x": 270.0, "y": 0.0, - "z": 180.0 + "z": 0.0 }, "triggerInfo": "" }, { "triggerID": 0, - "triggerName": "in寮鍏砡铻轰笣2", + "triggerName": "", "selfPosInScene": { - "x": 0.0108642578, - "y": -0.07393646, - "z": 0.03310418 + "x": -3.1648, + "y": 0.217400074, + "z": -0.731 }, "selfRotInScene": { "x": 0.0, @@ -675,11 +164,41 @@ }, { "triggerID": 0, - "triggerName": "in寮鍏砡铻轰笣3", + "triggerName": "楠岀數绗", "selfPosInScene": { - "x": 0.0108642578, - "y": -0.09108353, - "z": 0.0330979824 + "x": -3.212, + "y": 1.128, + "z": -0.672 + }, + "selfRotInScene": { + "x": 6.83245332E-07, + "y": 5.008956E-06, + "z": 5.008956E-06 + }, + "triggerInfo": "" + }, + { + "triggerID": 0, + "triggerName": "", + "selfPosInScene": { + "x": 0.305, + "y": 1.556, + "z": -3.808 + }, + "selfRotInScene": { + "x": 270.0, + "y": 0.0, + "z": 0.0 + }, + "triggerInfo": "" + }, + { + "triggerID": 0, + "triggerName": "", + "selfPosInScene": { + "x": -3.223, + "y": 1.124, + "z": -1.649 }, "selfRotInScene": { "x": 0.0, @@ -690,11 +209,11 @@ }, { "triggerID": 0, - "triggerName": "闆禵out_铻轰笣down", + "triggerName": "楠岀數绗", "selfPosInScene": { - "x": -0.0381965637, - "y": 0.0222015381, - "z": -0.101950169 + "x": -3.21036649, + "y": 1.1167, + "z": -0.173 }, "selfRotInScene": { "x": 0.0, @@ -705,11 +224,11 @@ }, { "triggerID": 0, - "triggerName": "B_in_铻轰笣up", + "triggerName": "", "selfPosInScene": { - "x": 0.0237312317, - "y": 0.0256958, - "z": -0.09305191 + "x": -3.1648, + "y": 0.217400074, + "z": -0.189 }, "selfRotInScene": { "x": 0.0, @@ -719,88 +238,13 @@ "triggerInfo": "" }, { - "triggerID": 5021, - "triggerName": "绌哄紑2", + "triggerID": 5012, + "triggerName": "闀滃瓙", "selfPosInScene": { - "x": 0.0278625488, - "y": -0.06511688, - "z": -0.008735657 - }, - "selfRotInScene": { "x": 0.0, "y": 0.0, "z": 0.0 }, - "triggerInfo": "True" - }, - { - "triggerID": 0, - "triggerName": "C_in_铻轰笣down", - "selfPosInScene": { - "x": -0.002609253, - "y": 0.0256958, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "in寮鍏砡铻轰笣1", - "selfPosInScene": { - "x": 0.0108642578, - "y": -0.05678177, - "z": 0.0330979824 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "A_out_铻轰笣down", - "selfPosInScene": { - "x": 0.03305435, - "y": 0.0256958, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "A_in_铻轰笣down", - "selfPosInScene": { - "x": 0.0501709, - "y": 0.0256958, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "triggerInfo": "" - }, - { - "triggerID": 0, - "triggerName": "A_out_铻轰笣up", - "selfPosInScene": { - "x": 0.03305435, - "y": 0.0256958, - "z": -0.09305191 - }, "selfRotInScene": { "x": 0.0, "y": 0.0,