修改垃圾触发逻辑
This commit is contained in:
parent
55c6275293
commit
3ca2d5ecb8
File diff suppressed because one or more lines are too long
|
@ -1985,7 +1985,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
|
||||
|
|
|
@ -51,6 +51,7 @@ public class Device_MeasuringCabinet : MonoBehaviour
|
|||
{
|
||||
AddActions();
|
||||
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
|
||||
sundries.gameObject.SetActive(false);
|
||||
}
|
||||
/// <summary>
|
||||
/// Ìí¼Ó¸÷ÖÖ²Ù×÷»Øµ÷
|
||||
|
|
|
@ -6,12 +6,12 @@ public class Device_Sundries : Device_Base
|
|||
{
|
||||
protected override void OnMDown()
|
||||
{
|
||||
base.OnMDown();
|
||||
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
|
||||
if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)) == 0)
|
||||
{
|
||||
base.OnMDown();
|
||||
Debug.Log("清理柜子杂物");
|
||||
gameObject.SetActive(false);
|
||||
triggerAction.Invoke(triggerName, false);
|
||||
//triggerAction.Invoke(triggerName, false);
|
||||
base.CallScoreAction();
|
||||
}
|
||||
|
||||
|
|
|
@ -90,6 +90,7 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
|
|||
|
||||
public void OnCheckSubProcess(bool ifdestroy = true)
|
||||
{
|
||||
if (tMDTips != null)
|
||||
tMDTips.gameObject.SetActive(false);
|
||||
if (ifdestroy)
|
||||
Destroy(currentTool);
|
||||
|
|
Loading…
Reference in New Issue