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

Compare commits

base: WangWeiZhi:57338dc352dfbd950f238abc39c68cb412d857d2
Branches Tags
WangWeiZhi:main
WangWeiZhi:HQB_workspace
..
compare: WangWeiZhi:29f88c7bb1ff248f72529ed304a57a016bfb3e4b
Branches Tags
WangWeiZhi:HQB_workspace
WangWeiZhi:main

No commits in common. "57338dc352dfbd950f238abc39c68cb412d857d2" and "29f88c7bb1ff248f72529ed304a57a016bfb3e4b" have entirely different histories.
57338dc352 ... 29f88c7bb1

6 changed files with 12 additions and 16 deletions
Show Stats Expand all files Collapse all files

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

@ -205,7 +205,6 @@ 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;

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

@ -17,27 +17,22 @@ 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 && gameObject.activeInHierarchy) if (gameObject.activeSelf)
StartCoroutine(FlashRoutine()); StartCoroutine(FlashRoutine());
} }
public void HideTips() public void HideTips()
{ {
transform.parent = null; transform.parent = null;
if (gameObject.activeSelf && gameObject.activeInHierarchy)
{
StopCoroutine(FlashRoutine()); StopCoroutine(FlashRoutine());
gameObject.SetActive(false); gameObject.SetActive(false);
} }
}
private IEnumerator FlashRoutine() private IEnumerator FlashRoutine()
{ {
while (true) while (true)

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

@ -83,8 +83,11 @@ 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,7 +64,6 @@ 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.subProcessStepTriggerID); GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0]);
} }
} }

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);
} }