修改流程操作
This commit is contained in:
parent
addab0d363
commit
d695dcd275
Binary file not shown.
|
@ -254,7 +254,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
triggerID: 0
|
||||
triggerName:
|
||||
triggerName: "\u9A8C\u7535\u7B14"
|
||||
_highlight: {fileID: 0}
|
||||
toolType: 3
|
||||
screem: {fileID: 2465643204263011842}
|
||||
|
|
|
@ -69,7 +69,7 @@ public class Tool_TestPen : Tool_Base
|
|||
/// <param name="device_base">被验电设备</param>
|
||||
public void Test(Device_Base device_base)
|
||||
{
|
||||
if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName + device_base.triggerName, true)) == 0)
|
||||
if ((triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true)) == 0)
|
||||
{
|
||||
if (device_base.deviceType == DeviceType.计量柜_插座)
|
||||
{
|
||||
|
@ -80,7 +80,6 @@ public class Tool_TestPen : Tool_Base
|
|||
transform.eulerAngles = tmp.testPosAndRot.eulerAngles;
|
||||
Debug.Log("计量柜_插座 已验电");
|
||||
isFlicker = tmp.hasElectricity;
|
||||
|
||||
}
|
||||
else if (device_base.deviceType == DeviceType.计量柜_柜门)
|
||||
{
|
||||
|
|
|
@ -184,6 +184,8 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count > 0)
|
||||
{
|
||||
string currentSubProcessStepTriggerID = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0];
|
||||
Debug.Log($"<color=green>triggersId=={triggerID}</color>");
|
||||
Debug.Log($"<color=green>currentSubProcessStepTriggerID=={currentSubProcessStepTriggerID}</color>");
|
||||
if (triggerID == currentSubProcessStepTriggerID)
|
||||
{
|
||||
if (isRemove)
|
||||
|
@ -195,7 +197,17 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
}
|
||||
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count != 0)
|
||||
{
|
||||
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0]);
|
||||
string triggerNameTemp = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0];
|
||||
string splitResult = "";
|
||||
if (triggerNameTemp.Contains("+"))
|
||||
{
|
||||
splitResult = triggerNameTemp.Split('+')[1];
|
||||
}
|
||||
else
|
||||
{
|
||||
splitResult = triggerNameTemp;
|
||||
}
|
||||
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, splitResult);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue