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:58:01 +08:00
commit fed54ad85b
7 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Resources/UI/Prefab/Match/CountDownPanel.prefab
View File

@ -156,7 +156,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Riding Time
m_Text: 'Get Ready:'
--- !u!114 &3886708269221531246
MonoBehaviour:
m_ObjectHideFlags: 0
@ -248,7 +248,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Get Ready
m_Text: Competition Time
--- !u!114 &5952686733100152547
MonoBehaviour:
m_ObjectHideFlags: 0

2
Assets/Resources/UI/Prefab/Ride/CancelPanel.prefab
View File

@ -5325,7 +5325,7 @@ GameObject:
- component: {fileID: 8046915994613852834}
- component: {fileID: 5739020646471174006}
m_Layer: 5
m_Name: CancelButton
m_Name: CloseButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

2
Assets/Resources/UI/Prefab/Ride/Mobile/CancelPanel.prefab
View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 2981122519614947927}
- component: {fileID: 2993340167898118021}
m_Layer: 5
m_Name: CancelButton
m_Name: CloseButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

1
Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs
View File

@ -149,6 +149,7 @@ namespace Assets.Scenes.Ride.Scripts
mainController.SetQuit();
playerController.Upload();
quitPanel.SetActive(false);
transform.Find("modalPanel").gameObject.SetActive(false);
}
ShowResultList();//保存显示当前排名
}

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

@ -125,6 +125,7 @@ namespace Assets.Scenes.Ride.Scripts
GameObject QuitButton;
GameObject CancelButton;
GameObject modalPanel;
GameObject CancelCloseQuitButton;
private void InitGameObject()
{
#region 控件获取与事件绑定
@ -177,25 +178,23 @@ namespace Assets.Scenes.Ride.Scripts
selectPanel = uipanel.transform.Find("SelectPanel").gameObject;
selectPlayer = uipanel.transform.Find("SelectPlayer").gameObject;
reviewPanel = uipanel.transform.Find("ReviewPanel").gameObject;
#if UNITY_IOS || UNITY_ANDROID
modalPanel = transform.Find("ModalPanel").gameObject;
#if UNITY_IOS || UNITY_ANDROID
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.transform);
cancelPanel = Instantiate<GameObject>(cancelPanelPrefab, modalPanel.transform);
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 = Instantiate<GameObject>(quitPanelPrefab, modalPanel.transform);
cancelPanel = Instantiate<GameObject>(cancelPanelPrefab, modalPanel.transform);
#endif
quitPanel.SetActive(false);
cancelPanel.SetActive(false);
#endif
QuitButton = cancelPanel.transform.Find("QuitButton").gameObject;
CancelButton = cancelPanel.transform.Find("CancelButton").gameObject;
CancelCloseQuitButton = cancelPanel.transform.Find("CloseButton").gameObject;
pauseButton = uipanel.transform.Find("ToolBarPanel/StartOrPauseButton").GetComponent<Button>();
settingButton = uipanel.transform.Find("ToolBarPanel/SettingButton").GetComponent<Button>();
@ -211,6 +210,7 @@ namespace Assets.Scenes.Ride.Scripts
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>();
@ -264,7 +264,8 @@ namespace Assets.Scenes.Ride.Scripts
UIManager.AddEvent(QuitButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, StopShortRide);
UIManager.AddEvent(CancelButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, CancelStopShortRide);
UIManager.AddEvent(CancelCloseQuitButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, CancelStopShortRide);
#endregion
}
protected virtual void Update()

8
Assets/Scripts/Scenes/Ride/Scripts/RouteController.cs
View File

@ -208,8 +208,8 @@ namespace Assets.Scenes.Ride.Scripts
lineRender.positionCount = dat.Count;
lineRender.SetPositions(feat.Points[0].ToArray());
lineRender.loop = false;
lineRender.numCapVertices = 10;
lineRender.numCornerVertices = 30;
//lineRender.numCapVertices = 10;
//lineRender.numCornerVertices = 30;
}
@ -236,8 +236,8 @@ namespace Assets.Scenes.Ride.Scripts
lineRender.positionCount = feat.Count;
lineRender.SetPositions(feat.ToArray());
lineRender.loop = false;
lineRender.numCapVertices = 10;
lineRender.numCornerVertices = 10;
//lineRender.numCapVertices = 10;
//lineRender.numCornerVertices = 10;
//
lineRender.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.Off;
lineRender.allowOcclusionWhenDynamic = false;

6
Assets/Scripts/UI/Control/PfUIButton.cs
View File

@ -157,7 +157,7 @@ namespace Assets.Scripts.UI.Control
se.SetDelay(1);
se.AppendCallback(() =>
{
DOTween.CompleteAll(true);
DOTween.Complete(tooltips);
tooltips.SetActive(true);
tooltips.GetComponent<CanvasGroup>().alpha = 0f;
tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
@ -201,7 +201,7 @@ namespace Assets.Scripts.UI.Control
if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip)
{
#endif
DOTween.CompleteAll(true);
DOTween.Complete(tooltips);
group.DOFade(0, 1f).onComplete += () => {
tooltips.SetActive(false);
};
@ -234,7 +234,7 @@ namespace Assets.Scripts.UI.Control
UIManager.AddEvent(this.gameObject, EventTriggerType.PointerDown, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
{
if (!this.isActiveAndEnabled) return;
DOTween.CompleteAll(true);
DOTween.Complete(tooltips);
tooltips.SetActive(false);
//else
//{