This commit is contained in:
liuyu 2024-09-06 08:18:31 +08:00
parent 824bc36529
commit 27c356ba28
2 changed files with 32 additions and 35 deletions

View File

@ -204,9 +204,12 @@ public class ReconnectMgr : SingletonMono<ReconnectMgr>
if (item.triggerName == ret.triggerName) if (item.triggerName == ret.triggerName)
{ {
item.gameObject.SetActive(true); item.gameObject.SetActive(true);
item.transform.localPosition = ret.selfPosInScene; if (item.gameObject.GetComponent<Tool_SelectComponent>() == null)
item.transform.localEulerAngles = ret.selfRotInScene; {
item.LoadCurrentTriggerStat(ret.triggerInfo); item.transform.localPosition = ret.selfPosInScene;
item.transform.localEulerAngles = ret.selfRotInScene;
item.LoadCurrentTriggerStat(ret.triggerInfo);
}
break; break;
} }
} }

View File

@ -112,10 +112,34 @@
"isDone": false "isDone": false
} }
], ],
"allToolAndMaterial": [], "allToolAndMaterial": [
"剥线钳",
"验电笔"
],
"allWear": [], "allWear": [],
"sceneName": "04_ToolMaterialScene", "sceneName": "04_ToolMaterialScene",
"currentSceneTools": [], "currentSceneTools": [
{
"toolId": 5002,
"triggerID": 5002,
"toolName": "剥线钳",
"selfPosInToolRoom": {
"x": -3.1648,
"y": 0.217400074,
"z": -0.189
}
},
{
"toolId": 5004,
"triggerID": 5004,
"toolName": "验电笔",
"selfPosInToolRoom": {
"x": -3.21036649,
"y": 1.1167,
"z": -0.173
}
}
],
"currentSceneTriggers": [ "currentSceneTriggers": [
{ {
"triggerID": 0, "triggerID": 0,
@ -207,36 +231,6 @@
}, },
"triggerInfo": "" "triggerInfo": ""
}, },
{
"triggerID": 0,
"triggerName": "验电笔",
"selfPosInScene": {
"x": -3.21036649,
"y": 1.1167,
"z": -0.173
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"triggerInfo": ""
},
{
"triggerID": 0,
"triggerName": "",
"selfPosInScene": {
"x": -3.1648,
"y": 0.217400074,
"z": -0.189
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"triggerInfo": ""
},
{ {
"triggerID": 5012, "triggerID": 5012,
"triggerName": "镜子", "triggerName": "镜子",