WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工具栏显示BUG

This commit is contained in:
liuyu 2024-09-04 15:26:39 +08:00
parent eadf603199
commit 009110306d
2 changed files with 608 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Scripts/Project/Manager/ReconnectMgr.cs
View File

@ -157,7 +157,16 @@ public class ReconnectMgr : SingletonMono<ReconnectMgr>
//先恢复场景 //先恢复场景
ScenesManager.Instance.LoadSceneAsyn(UserExamStat.sceneName, () => { ScenesManager.Instance.LoadSceneAsyn(UserExamStat.sceneName, () => {
//右侧工具栏切换 //右侧工具栏切换
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType); if (!GameManager.UIMgr.GetPanel<UI_MenuBar>())//office场景下,右侧工具栏可能会隐藏
{
GameManager.UIMgr.ShowPanel<UI_MenuBar>(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<BaseToolOrDevice>(); BaseToolOrDevice[] allThings = FindObjectsOfType<BaseToolOrDevice>();
foreach (BaseToolOrDevice item in allThings) foreach (BaseToolOrDevice item in allThings)

619
Assets/StreamingAssets/realtimeStat.json
View File

@ -24,44 +24,44 @@
{ {
"index": 4, "index": 4,
"subProcessId": 4, "subProcessId": 4,
"currentScore": 0.0, "currentScore": 5.0,
"isDone": false "isDone": true
}, },
{ {
"index": 5, "index": 5,
"subProcessId": 5, "subProcessId": 5,
"currentScore": 0.0, "currentScore": 5.0,
"isDone": false "isDone": true
}, },
{ {
"index": 6, "index": 6,
"subProcessId": 6, "subProcessId": 6,
"currentScore": 0.0, "currentScore": 10.0,
"isDone": false "isDone": true
}, },
{ {
"index": 7, "index": 7,
"subProcessId": 7, "subProcessId": 7,
"currentScore": 0.0, "currentScore": 5.0,
"isDone": false "isDone": true
}, },
{ {
"index": 8, "index": 8,
"subProcessId": 8, "subProcessId": 8,
"currentScore": 0.0, "currentScore": 0.0,
"isDone": false "isDone": true
}, },
{ {
"index": 9, "index": 9,
"subProcessId": 9, "subProcessId": 9,
"currentScore": 0.0, "currentScore": 3.0,
"isDone": false "isDone": true
}, },
{ {
"index": 10, "index": 10,
"subProcessId": 10, "subProcessId": 10,
"currentScore": 0.0, "currentScore": 4.0,
"isDone": false "isDone": true
}, },
{ {
"index": 11, "index": 11,
@ -112,18 +112,595 @@
"isDone": false "isDone": false
} }
], ],
"allToolAndMaterial": [], "allToolAndMaterial": [
"allWear": [], "国网安全帽",
"sceneName": "03_OfficeScene", "工作服",
"绝缘手套",
"绝缘靴",
"绝缘胶带",
"盒装封印",
"工作证",
"三相四线电能表",
"绝缘螺丝刀",
"验电笔",
"剥线钳"
],
"allWear": [
"国网安全帽",
"工作服",
"绝缘手套",
"绝缘靴"
],
"sceneName": "05_LiveScene",
"currentSceneTools": [], "currentSceneTools": [],
"currentSceneTriggers": [ "currentSceneTriggers": [
{ {
"triggerID": 5005, "triggerID": 0,
"triggerName": "手机", "triggerName": "空开1",
"selfPosInScene": { "selfPosInScene": {
"x": 0.0244421959, "x": 0.0278625488,
"y": 0.885706842, "y": 0.08226776,
"z": -1.00569367 "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": { "selfRotInScene": {
"x": 0.0, "x": 0.0,