From 56d95fa59a9f6dc12d0fc0723ea449e5b317f994 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Sat, 26 Dec 2020 14:05:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/UI/Main/MainStartUI.cs | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/Assets/Scripts/UI/Main/MainStartUI.cs b/Assets/Scripts/UI/Main/MainStartUI.cs
index 524b114..354fdb1 100644
--- a/Assets/Scripts/UI/Main/MainStartUI.cs
+++ b/Assets/Scripts/UI/Main/MainStartUI.cs
@@ -1,22 +1,16 @@
using UnityEngine;
using UnityEngine.UI;
-using DG.Tweening;
+using KTGMGemClient;
public class MainStartUI : MonoBehaviour
{
- private Image errorImage;
private Button pvpPanel;
- private Color normal = new Color(1, 1, 1, 1);
- private Color dis = new Color(1, 1, 1, 0);
// Start is called before the first frame update
void Start()
{
transform.Find("GoToBattleBtn").GetComponent<Button>().onClick.AddListener(OnClickGoToBattleBtn);
transform.Find("ShowPVPBtn").GetComponent<Button>().onClick.AddListener(OnClickShowPVPBtn);
- transform.Find("ErrorBtn1").GetComponent<Button>().onClick.AddListener(OnClickErrorBtn);
- transform.Find("ErrorBtn2").GetComponent<Button>().onClick.AddListener(OnClickErrorBtn);
- errorImage = transform.Find("ErrorImage").GetComponent<Image>();
- errorImage.color = dis;
+
pvpPanel = transform.Find("PVPPanel").GetComponent<Button>();
pvpPanel.onClick.AddListener(OnClickPVPPanelBtn);
pvpPanel.gameObject.SetActive(false);
@@ -24,22 +18,15 @@
private void OnClickGoToBattleBtn()
{
- gameObject.SetActive(false);
//跳转场景
- transform.parent.GetComponent<Loading>().StartLoadingScene();
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.ChangeScene);
+ gameObject.SetActive(false);
+
+ //transform.parent.GetComponent<Loading>().StartLoadingScene();
}
private void OnClickShowPVPBtn()
{
pvpPanel.gameObject.SetActive(true);
- }
-
- private void OnClickErrorBtn()
- {
- errorImage.DOKill();
- errorImage.DOColor(normal, 1.0f).OnComplete(() =>
- {
- errorImage.DOColor(dis, 1.0f);
- });
}
private void OnClickPVPPanelBtn()
--
Gitblit v1.9.1