From 7a1042d184ef9a6b3d0863242bcd466e65bb1392 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Mon, 9 Aug 2021 16:32:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/Race/back down.png | Bin 0 -> 7648 bytes .../Resources/Images/Race/back down.png.meta | 116 + .../UI/Prefab/Panel/EditUserPanel.prefab | 50 + .../UI/Prefab/Panel/RaceHomePanel.prefab | 208 ++ .../UI/Prefab/Panel/RaceListPanel.prefab | 101 +- .../Resources/UI/Prefab/Race/ItemSmall.prefab | 44 + Assets/Scenes/Login.unity | 2610 ++++++++--------- .../UI/Prefab/Panel/MapListController.cs | 1 + .../UI/Prefab/Panel/UserInfoController.cs | 4 + .../Scripts/UI/Prefab/Race/RaceHomeScript.cs | 10 +- .../Scripts/UI/Prefab/Race/RaceItemScript.cs | 17 +- .../Scripts/UI/Prefab/Race/RaceListScript.cs | 33 + .../Scripts/UI/Prefab/Race/RaceMaskScript.cs | 7 + Assets/Scripts/UIManager.cs | 2 +- 14 files changed, 1889 insertions(+), 1314 deletions(-) create mode 100644 Assets/Resources/Images/Race/back down.png create mode 100644 Assets/Resources/Images/Race/back down.png.meta diff --git a/Assets/Resources/Images/Race/back down.png b/Assets/Resources/Images/Race/back down.png new file mode 100644 index 0000000000000000000000000000000000000000..312abc1712fbb58307753aa53176af97b24809ca GIT binary patch literal 7648 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.texture = App.DefaultRotateTexture; } + ResetPanel(); var cg = this.GetComponent(); cg.alpha = 0; cg.DOFade(1f, .3f); diff --git a/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs b/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs index aa439ef6..b504b3fe 100644 --- a/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs @@ -43,6 +43,10 @@ public class UserInfoController : PFUIPanel { UIManager.ShowEditUserPanel(); }); + UIManager.AddEvent(infoPanel.Find("Avatar").gameObject, EventTriggerType.PointerClick, (b) => + { + UIManager.ShowEditUserPanel(); + }); //editBtn.onClick.AddListener(() => //{ // UIManager.ShowEditUserPanel(); diff --git a/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs index a6f0b5f9..59acffba 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs @@ -13,7 +13,7 @@ public class RaceHomeScript : RaceScript { // Start is called before the first frame update private ScrollRect scroll; - private Transform content,rightContainer,leftContainer,btnGoList; + private Transform content,rightContainer,leftContainer,btnGoList,btnGoListTop; private float contentSize; private int count; private Button L, R; @@ -79,6 +79,14 @@ public class RaceHomeScript : RaceScript UIManager.ShowRaceListPanel(); }); } + btnGoListTop = transform.Find("BtnGoListTop"); + if (btnGoListTop != null) + { + UIManager.AddEvent(btnGoListTop.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + UIManager.ShowRaceListPanel(); + }); + } } bool isEnter = false; diff --git a/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs index 37d0872c..5100ff0c 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs @@ -6,6 +6,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; +using UnityEngine.SceneManagement; using UnityEngine.UI; public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, IPointerUpHandler @@ -27,6 +28,12 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH } public void Initial(MapCompetition mapCompetition,Transform parent) { + transform.GetComponent