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

骑行退出面板层级调整至modalpanel

Browse Source
This commit is contained in:
lishuo 2022-01-13 16:48:37 +08:00
parent 697818bae4
commit e70a84db98
9 changed files with 12599 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7270
Assets/Resources/UI/Prefab/Ride/CancelPanel.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/UI/Prefab/Ride/CancelPanel.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 37e4f36b8a6fd7146ba73172fcd4857b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1745
Assets/Resources/UI/Prefab/Ride/Mobile/CancelPanel.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/UI/Prefab/Ride/Mobile/CancelPanel.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 66d819e0c0965c249947232ed0ba0a16
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1745
Assets/Resources/UI/Prefab/Ride/Mobile/QuitPanel.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/UI/Prefab/Ride/Mobile/QuitPanel.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 36a58368eea54024ca74471e348cea81
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1787
Assets/Resources/UI/Prefab/Ride/QuitPanel.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/UI/Prefab/Ride/QuitPanel.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fb7ad2121bc5b394195ba6a54428085f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

33
Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
View File

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