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

Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
陈向学 2024-08-27 19:00:13 +08:00
parent 9a07fdc8f7 57338dc352
commit fd12821146
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/Scripts/Project/Manager/ProcessManager.cs
View File

@ -205,6 +205,7 @@ public class ProcessManager : BaseManager<ProcessManager>
{ {
splitResult = triggerNameTemp; splitResult = triggerNameTemp;
} }
subProcessStepTriggerID = splitResult;
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, splitResult); GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, splitResult);
} }
return 0; return 0;

11
Assets/Scripts/Project/Objects/Other/ImageTips.cs
View File

@ -17,22 +17,27 @@ public class ImageTips : MonoBehaviour
gameObject.SetActive(true); gameObject.SetActive(true);
selfRect = GetComponent<RectTransform>(); selfRect = GetComponent<RectTransform>();
image = GetComponent<Image>(); image = GetComponent<Image>();
image.enabled = true;
selfRect.SetParent(target); selfRect.SetParent(target);
selfRect.anchorMin = Vector2.zero; selfRect.anchorMin = Vector2.zero;
selfRect.anchorMax = new Vector2(1, 1); selfRect.anchorMax = new Vector2(1, 1);
selfRect.offsetMax = Vector2.zero; selfRect.offsetMax = Vector2.zero;
selfRect.offsetMin = Vector2.zero; selfRect.offsetMin = Vector2.zero;
//selfRect.sizeDelta = target.sizeDelta + sizeOffset; //selfRect.sizeDelta = target.sizeDelta + sizeOffset;
if (gameObject.activeSelf) if (gameObject.activeSelf && gameObject.activeInHierarchy)
StartCoroutine(FlashRoutine()); StartCoroutine(FlashRoutine());
} }
public void HideTips() public void HideTips()
{ {
transform.parent = null; transform.parent = null;
StopCoroutine(FlashRoutine()); if (gameObject.activeSelf && gameObject.activeInHierarchy)
gameObject.SetActive(false); {
StopCoroutine(FlashRoutine());
gameObject.SetActive(false);
}
} }
private IEnumerator FlashRoutine() private IEnumerator FlashRoutine()
{ {
while (true) while (true)

11
Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
View File

@ -83,11 +83,8 @@ public class PermanentTriggerBase : MonoBehaviour
{ {
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
private void OnDisable() //private void OnDisable()
{ //{
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); // GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} //}
} }

1
Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs
View File

@ -64,6 +64,7 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
currentTool.GetComponent<Collider>().enabled = false; currentTool.GetComponent<Collider>().enabled = false;
currentTool.name = currentItem.toolName; currentTool.name = currentItem.toolName;
LiveSceneManager.Instance.SetSpawnToolInfo(currentTool); LiveSceneManager.Instance.SetSpawnToolInfo(currentTool);
GameManager.UIMgr.imageTips.HideTips();
} }
break; break;
} }

2
Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs
View File

@ -27,7 +27,7 @@ public class UI_CheckMyselfPanel : BasePanel
{ {
GetControl<Button>("closeBtn").interactable = false; GetControl<Button>("closeBtn").interactable = false;
GameManager.EventMgr.AddEventListener(Enum_EventType.WearState, OnWearState); GameManager.EventMgr.AddEventListener(Enum_EventType.WearState, OnWearState);
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0]); GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.subProcessStepTriggerID);
} }
} }

2
Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs
View File

@ -41,7 +41,7 @@ public class UI_ToolAndMaterialPanel : BasePanel
uiTMDitem.Init(bagDatas[item]); uiTMDitem.Init(bagDatas[item]);
} }
} }
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID,GameManager.ProcessMgr.subProcessStepTriggerID);
} }