修改流程
This commit is contained in:
parent
71757aab24
commit
383af005d8
Binary file not shown.
|
@ -14,6 +14,7 @@ public class Device_Base : PermanentTriggerBase
|
||||||
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
|
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
|
||||||
{
|
{
|
||||||
base.OnStart();
|
base.OnStart();
|
||||||
|
Debug.Log("Device_Base PermanentTriggerBase");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,10 +48,10 @@ public class Device_CabinetDoor : Device_Base
|
||||||
}
|
}
|
||||||
protected override void OnMDown()
|
protected override void OnMDown()
|
||||||
{
|
{
|
||||||
|
if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "Ñéµç±Ê") return;
|
||||||
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
|
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
|
||||||
{
|
{
|
||||||
base.OnMDown();
|
base.OnMDown();
|
||||||
if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "Ñéµç±Ê") return;
|
|
||||||
if (isOpen)
|
if (isOpen)
|
||||||
{
|
{
|
||||||
Close();
|
Close();
|
||||||
|
|
|
@ -31,7 +31,7 @@ public class Tool_TestPen : Tool_Base
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//ケ<EFBFBD>ナ
|
//ÂÝË¿
|
||||||
Tool_Base tb = hit.transform.GetComponent<Tool_Base>();
|
Tool_Base tb = hit.transform.GetComponent<Tool_Base>();
|
||||||
if (tb != null)
|
if (tb != null)
|
||||||
{
|
{
|
||||||
|
@ -66,6 +66,7 @@ public class Tool_TestPen : Tool_Base
|
||||||
{
|
{
|
||||||
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_base.triggerName, true) == 0)
|
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_base.triggerName, true) == 0)
|
||||||
{
|
{
|
||||||
|
Debug.Log("Test(Device_Base device_base)");
|
||||||
if (device_base.deviceType == DeviceType.计量柜_插座)
|
if (device_base.deviceType == DeviceType.计量柜_插座)
|
||||||
{
|
{
|
||||||
var tmp = ((Device_Socket)device_base);
|
var tmp = ((Device_Socket)device_base);
|
||||||
|
@ -74,10 +75,12 @@ public class Tool_TestPen : Tool_Base
|
||||||
transform.eulerAngles = tmp.testPosAndRot.eulerAngles;
|
transform.eulerAngles = tmp.testPosAndRot.eulerAngles;
|
||||||
Debug.Log("计量柜_插座 已验电");
|
Debug.Log("计量柜_插座 已验电");
|
||||||
isFlicker = tmp.hasElectricity;
|
isFlicker = tmp.hasElectricity;
|
||||||
|
|
||||||
}
|
}
|
||||||
else if (device_base.deviceType == DeviceType.计量柜_柜门)
|
else if (device_base.deviceType == DeviceType.计量柜_柜门)
|
||||||
{
|
{
|
||||||
var tmp = ((Device_CabinetDoor)device_base);
|
var tmp = ((Device_CabinetDoor)device_base);
|
||||||
|
|
||||||
//位置移动
|
//位置移动
|
||||||
transform.position = tmp.testPosAndRot.position;
|
transform.position = tmp.testPosAndRot.position;
|
||||||
transform.localEulerAngles = tmp.testPosAndRot.localEulerAngles;
|
transform.localEulerAngles = tmp.testPosAndRot.localEulerAngles;
|
||||||
|
@ -109,4 +112,4 @@ public class Tool_TestPen : Tool_Base
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -166,10 +166,7 @@ public class ProcessManager : BaseManager<ProcessManager>
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Debug.Log("按照流程走");
|
Debug.Log("按照流程走");
|
||||||
GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.Mid, (panel) =>
|
StepErrorTips();
|
||||||
{
|
|
||||||
panel.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
|
|
||||||
});
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -204,10 +201,7 @@ public class ProcessManager : BaseManager<ProcessManager>
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
|
StepErrorTips();
|
||||||
{
|
|
||||||
p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
|
|
||||||
});
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -218,12 +212,24 @@ public class ProcessManager : BaseManager<ProcessManager>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
StepErrorTips();
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void StepErrorTips()
|
||||||
|
{
|
||||||
|
if (GameManager.UIMgr.GetPanel<UI_MiddleTipPanel>())
|
||||||
|
{
|
||||||
|
GameManager.UIMgr.GetPanel<UI_MiddleTipPanel>().Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
|
GameManager.UIMgr.ShowPanel<UI_MiddleTipPanel>(E_UI_Layer.System, (p) =>
|
||||||
{
|
{
|
||||||
p.Init($"错误,请前往{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.SceneName()}");
|
p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}");
|
||||||
});
|
});
|
||||||
return -1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,11 +23,13 @@ public class UI_MiddleTipPanel : BasePanel
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private void Hide()
|
private void Hide()
|
||||||
{
|
{
|
||||||
|
StopCoroutine(HideAsync());
|
||||||
StartCoroutine(HideAsync());
|
StartCoroutine(HideAsync());
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerator HideAsync()
|
private IEnumerator HideAsync()
|
||||||
{
|
{
|
||||||
yield return new WaitForSeconds(disappear);
|
yield return new WaitForSeconds(disappear);
|
||||||
UIManager.Instance.HidePanel<UI_MiddleTipPanel>();
|
GameManager.UIMgr.HidePanel<UI_MiddleTipPanel>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue