From 009110306d064dd52f1eb9059880472cf84890bd Mon Sep 17 00:00:00 2001 From: liuyu <272912176@qq.com> Date: Wed, 4 Sep 2024 15:26:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E6=98=BE=E7=A4=BABU?= =?UTF-8?q?G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Project/Manager/ReconnectMgr.cs | 11 +- Assets/StreamingAssets/realtimeStat.json | 619 +++++++++++++++++- 2 files changed, 608 insertions(+), 22 deletions(-) diff --git a/Assets/Scripts/Project/Manager/ReconnectMgr.cs b/Assets/Scripts/Project/Manager/ReconnectMgr.cs index 156327b..668eb98 100644 --- a/Assets/Scripts/Project/Manager/ReconnectMgr.cs +++ b/Assets/Scripts/Project/Manager/ReconnectMgr.cs @@ -157,7 +157,16 @@ public class ReconnectMgr : SingletonMono //先恢复场景 ScenesManager.Instance.LoadSceneAsyn(UserExamStat.sceneName, () => { //右侧工具栏切换 - GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType); + if (!GameManager.UIMgr.GetPanel())//office场景下,右侧工具栏可能会隐藏 + { + GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => + { + panel.Init(); + GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType); + }); + } + else + GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType); //恢复场景中各项装备 BaseToolOrDevice[] allThings = FindObjectsOfType(); foreach (BaseToolOrDevice item in allThings) diff --git a/Assets/StreamingAssets/realtimeStat.json b/Assets/StreamingAssets/realtimeStat.json index e784624..9c49da7 100644 --- a/Assets/StreamingAssets/realtimeStat.json +++ b/Assets/StreamingAssets/realtimeStat.json @@ -24,44 +24,44 @@ { "index": 4, "subProcessId": 4, - "currentScore": 0.0, - "isDone": false + "currentScore": 5.0, + "isDone": true }, { "index": 5, "subProcessId": 5, - "currentScore": 0.0, - "isDone": false + "currentScore": 5.0, + "isDone": true }, { "index": 6, "subProcessId": 6, - "currentScore": 0.0, - "isDone": false + "currentScore": 10.0, + "isDone": true }, { "index": 7, "subProcessId": 7, - "currentScore": 0.0, - "isDone": false + "currentScore": 5.0, + "isDone": true }, { "index": 8, "subProcessId": 8, "currentScore": 0.0, - "isDone": false + "isDone": true }, { "index": 9, "subProcessId": 9, - "currentScore": 0.0, - "isDone": false + "currentScore": 3.0, + "isDone": true }, { "index": 10, "subProcessId": 10, - "currentScore": 0.0, - "isDone": false + "currentScore": 4.0, + "isDone": true }, { "index": 11, @@ -112,18 +112,595 @@ "isDone": false } ], - "allToolAndMaterial": [], - "allWear": [], - "sceneName": "03_OfficeScene", + "allToolAndMaterial": [ + "鍥界綉瀹夊叏甯", + "宸ヤ綔鏈", + "缁濈紭鎵嬪", + "缁濈紭闈", + "缁濈紭鑳跺甫", + "鐩掕灏佸嵃", + "宸ヤ綔璇", + "涓夌浉鍥涚嚎鐢佃兘琛", + "缁濈紭铻轰笣鍒", + "楠岀數绗", + "鍓ョ嚎閽" + ], + "allWear": [ + "鍥界綉瀹夊叏甯", + "宸ヤ綔鏈", + "缁濈紭鎵嬪", + "缁濈紭闈" + ], + "sceneName": "05_LiveScene", "currentSceneTools": [], "currentSceneTriggers": [ { - "triggerID": 5005, - "triggerName": "鎵嬫満", + "triggerID": 0, + "triggerName": "绌哄紑1", "selfPosInScene": { - "x": 0.0244421959, - "y": 0.885706842, - "z": -1.00569367 + "x": 0.0278625488, + "y": 0.08226776, + "z": -0.008735657 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 5024, + "triggerName": "鐢佃兘琛ㄧ洊瀛", + "selfPosInScene": { + "x": 0.000122070313, + "y": -0.1388763, + "z": -0.2485413 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "鐢佃兘琛ㄩ摥鐗", + "selfPosInScene": { + "x": 0.069568634, + "y": -0.02281189, + "z": -0.0215929747 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "鐢佃兘琛ㄦ媶瑁呰灪涓2", + "selfPosInScene": { + "x": -0.06737137, + "y": 0.051071167, + "z": -0.109404683 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "鐢佃兘琛ㄦ媶瑁呰灪涓1", + "selfPosInScene": { + "x": 0.06592941, + "y": 0.051071167, + "z": -0.109404683 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 5025, + "triggerName": "鐢佃兘琛ㄧ洊瀛愬浐瀹氳灪涓2", + "selfPosInScene": { + "x": -0.06129074, + "y": -0.184051514, + "z": -0.251232147 + }, + "selfRotInScene": { + "x": 0.0, + "y": 77.57858, + "z": 0.0 + } + }, + { + "triggerID": 5025, + "triggerName": "鐢佃兘琛ㄧ洊瀛愬浐瀹氳灪涓1", + "selfPosInScene": { + "x": 0.0612869263, + "y": -0.184051514, + "z": -0.251232147 + }, + "selfRotInScene": { + "x": 0.0, + "y": 93.803894, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "闆禵鍦癬铻轰笣up", + "selfPosInScene": { + "x": -0.0295066833, + "y": 0.0256958, + "z": -0.09305191 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "triggerID": 5018, + "triggerName": "NPC瀹㈡埛", + "selfPosInScene": { + "x": -170.37, + "y": 1.26, + "z": -57.03 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "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 + } + }, + { + "triggerID": 0, + "triggerName": "妫鏌ユ帴绾", + "selfPosInScene": { + "x": 0.14606, + "y": -0.15198, + "z": 0.40884 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "triggerID": 0, + "triggerName": "闆禵鍦癬铻轰笣down", + "selfPosInScene": { + "x": -0.0295066833, + "y": 0.0256958, + "z": -0.101950169 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 5020, + "triggerName": "NPC璐熻矗浜", + "selfPosInScene": { + "x": -170.376083, + "y": 1.26, + "z": -53.5962639 + }, + "selfRotInScene": { + "x": 0.0, + "y": 89.6994858, + "z": 0.0 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "triggerID": 5022, + "triggerName": "鏌滈棬", + "selfPosInScene": { + "x": 0.491622925, + "y": -0.5744629, + "z": 0.47206974 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 180.0 + } + }, + { + "triggerID": 5021, + "triggerName": "鎻掑骇", + "selfPosInScene": { + "x": 9.813477, + "y": 2.96411133, + "z": -2.70623541 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 180.0 + } + }, + { + "triggerID": 0, + "triggerName": "", + "selfPosInScene": { + "x": 0.146900177, + "y": -0.179336548, + "z": 0.5191498 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "in寮鍏砡铻轰笣2", + "selfPosInScene": { + "x": 0.0108642578, + "y": -0.07393646, + "z": 0.03310418 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "in寮鍏砡铻轰笣3", + "selfPosInScene": { + "x": 0.0108642578, + "y": -0.09108353, + "z": 0.0330979824 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "闆禵out_铻轰笣down", + "selfPosInScene": { + "x": -0.0381965637, + "y": 0.0222015381, + "z": -0.101950169 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "B_in_铻轰笣up", + "selfPosInScene": { + "x": 0.0237312317, + "y": 0.0256958, + "z": -0.09305191 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 5021, + "triggerName": "绌哄紑2", + "selfPosInScene": { + "x": 0.0278625488, + "y": -0.06511688, + "z": -0.008735657 + }, + "selfRotInScene": { + "x": 0.0, + "y": 45.0000038, + "z": 0.0 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "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 + } + }, + { + "triggerID": 0, + "triggerName": "A_out_铻轰笣up", + "selfPosInScene": { + "x": 0.03305435, + "y": 0.0256958, + "z": -0.09305191 }, "selfRotInScene": { "x": 0.0,