lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp

Browse Source
This commit is contained in:
Caiyanpeng committed 2022-01-13 16:53:05 +08:00
2 parents e82592722f e70a84db98
commit 0a1ba5fbde
9 files changed
+12599 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
+24 -9
View File
@@ -176,10 +176,25 @@ namespace Assets.Scenes.Ride.Scripts
selectPanel = uipanel.transform.Find("SelectPanel").gameObject;
selectPlayer = uipanel.transform.Find("SelectPlayer").gameObject;
reviewPanel = uipanel.transform.Find("ReviewPanel").gameObject;
quitPanel = uipanel.transform.Find("QuitPanel").gameObject;
cancelPanel = uipanel.transform.Find("CancelPanel").gameObject;
QuitButton = uipanel.transform.Find("CancelPanel/QuitButton").gameObject;
CancelButton = uipanel.transform.Find("CancelPanel/CancelButton").gameObject;
#if UNITY_IOS || UNITY_ANDROID
var modalPanel = transform.Find("ModalPanel");
var cancelPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/CancelPanel");
var quitPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/QuitPanel");
quitPanel = Instantiate<GameObject>(quitPanelPrefab, modalPanel);
cancelPanel = Instantiate<GameObject>(cancelPanelPrefab, modalPanel);
quitPanel.SetActive(false);
cancelPanel.SetActive(false);
#else
var modalPanel = transform.Find("ModalPanel");
var cancelPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/CancelPanel");
var quitPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/QuitPanel");
quitPanel = Instantiate<GameObject>(quitPanelPrefab, modalPanel);
cancelPanel = Instantiate<GameObject>(cancelPanelPrefab, modalPanel);
quitPanel.SetActive(false);
cancelPanel.SetActive(false);
#endif
QuitButton = cancelPanel.transform.Find("QuitButton").gameObject;
CancelButton = cancelPanel.transform.Find("CancelButton").gameObject;
pauseButton = uipanel.transform.Find("ToolBarPanel/StartOrPauseButton").GetComponent<Button>();
settingButton = uipanel.transform.Find("ToolBarPanel/SettingButton").GetComponent<Button>();
@@ -192,10 +207,10 @@ namespace Assets.Scenes.Ride.Scripts
singleArea = uipanel.transform.Find("ReviewPanel/SingleArea").gameObject;
addButton = uipanel.transform.Find("ReviewPanel/SingleArea/AddButton").GetComponent<Button>();
saveButton = uipanel.transform.Find("QuitPanel/SaveButton").GetComponent<Button>();
cancelQuitButton = uipanel.transform.Find("QuitPanel/CancelButton").GetComponent<Button>();
closeQuitButton = uipanel.transform.Find("QuitPanel/CloseButton").GetComponent<Button>();
abandonButton = uipanel.transform.Find("QuitPanel/AbandonButton").GetComponent<Button>();
saveButton = quitPanel.transform.Find("SaveButton").GetComponent<Button>();
cancelQuitButton = quitPanel.transform.Find("CancelButton").GetComponent<Button>();
closeQuitButton = quitPanel.transform.Find("CloseButton").GetComponent<Button>();
abandonButton = quitPanel.transform.Find("AbandonButton").GetComponent<Button>();
viewButton = uipanel.transform.Find("ViewButton").GetComponent<Button>();
#if UNITY_IOS || UNITY_ANDROID
@@ -249,7 +264,7 @@ namespace Assets.Scenes.Ride.Scripts
UIManager.AddEvent(QuitButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, StopShortRide);
UIManager.AddEvent(CancelButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, CancelStopShortRide);
#endregion
#endregion
}
protected virtual void Update()
{