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 2022-01-13 18:50:55 +08:00
commit 5489fa2a24
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,6 +124,7 @@ namespace Assets.Scenes.Ride.Scripts
GameObject QuitButton; GameObject QuitButton;
GameObject CancelButton; GameObject CancelButton;
GameObject modalPanel;
private void InitGameObject() private void InitGameObject()
{ {
#region 控件获取与事件绑定 #region 控件获取与事件绑定
@ -177,11 +178,11 @@ namespace Assets.Scenes.Ride.Scripts
selectPlayer = uipanel.transform.Find("SelectPlayer").gameObject; selectPlayer = uipanel.transform.Find("SelectPlayer").gameObject;
reviewPanel = uipanel.transform.Find("ReviewPanel").gameObject; reviewPanel = uipanel.transform.Find("ReviewPanel").gameObject;
#if UNITY_IOS || UNITY_ANDROID #if UNITY_IOS || UNITY_ANDROID
var modalPanel = transform.Find("ModalPanel"); modalPanel = transform.Find("ModalPanel").gameObject;
var cancelPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/CancelPanel"); var cancelPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/CancelPanel");
var quitPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/QuitPanel"); var quitPanelPrefab = Resources.Load<GameObject>("UI/Prefab/Ride/Mobile/QuitPanel");
quitPanel = Instantiate<GameObject>(quitPanelPrefab, modalPanel); quitPanel = Instantiate<GameObject>(quitPanelPrefab, modalPanel.transform);
cancelPanel = Instantiate<GameObject>(cancelPanelPrefab, modalPanel); cancelPanel = Instantiate<GameObject>(cancelPanelPrefab, modalPanel.transform);
quitPanel.SetActive(false); quitPanel.SetActive(false);
cancelPanel.SetActive(false); cancelPanel.SetActive(false);
#else #else
@ -512,6 +513,7 @@ namespace Assets.Scenes.Ride.Scripts
mainController.SetQuit(); mainController.SetQuit();
playerController?.Upload(); playerController?.Upload();
quitPanel.SetActive(false); quitPanel.SetActive(false);
modalPanel.SetActive(false);
} }
else else
{ {
@ -521,6 +523,7 @@ namespace Assets.Scenes.Ride.Scripts
//不保存退出 //不保存退出
public virtual void CancelQuit(BaseEventData baseEventData) public virtual void CancelQuit(BaseEventData baseEventData)
{ {
modalPanel.SetActive(false);
quitPanel.SetActive(false); quitPanel.SetActive(false);
mainController.ClearTempFile(); mainController.ClearTempFile();
SceneManager.LoadScene("MainScene"); SceneManager.LoadScene("MainScene");
@ -529,6 +532,7 @@ namespace Assets.Scenes.Ride.Scripts
public void CloseQuit(BaseEventData baseEventData) public void CloseQuit(BaseEventData baseEventData)
{ {
quitPanel.SetActive(false); quitPanel.SetActive(false);
modalPanel.SetActive(false);
} }
//切换视角 //切换视角
public void ChangeView(BaseEventData baseEventData) public void ChangeView(BaseEventData baseEventData)
@ -545,17 +549,20 @@ namespace Assets.Scenes.Ride.Scripts
protected virtual void CancelStopShortRide(BaseEventData baseEventData) protected virtual void CancelStopShortRide(BaseEventData baseEventData)
{ {
cancelPanel.SetActive(false); cancelPanel.SetActive(false);
modalPanel.SetActive(false);
} }
//结束游戏 //结束游戏
protected virtual void StopRide(BaseEventData baseEventData) protected virtual void StopRide(BaseEventData baseEventData)
{ {
if (playerController?.TotalTicks > 0 && playerController ?.TotalDistance > 0.1f) if (playerController?.TotalTicks > 0 && playerController ?.TotalDistance > 0.1f)
{ {
modalPanel.SetActive(true);
quitPanel.SetActive(true); quitPanel.SetActive(true);
quitPanel.transform.SetAsLastSibling(); quitPanel.transform.SetAsLastSibling();
} }
else else
{ {
modalPanel.SetActive(true);
cancelPanel.SetActive(true); cancelPanel.SetActive(true);
cancelPanel.transform.SetAsLastSibling(); cancelPanel.transform.SetAsLastSibling();
} }