From ae3f9d21018b7b111480e96864898ca55bb20cdf Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Fri, 23 Jul 2021 15:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E7=BB=86=E8=8A=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/RaceButtonGroupScript.cs | 10 +- Assets/RaceHomeScript.cs | 31 +- Assets/RaceItemScript.cs | 74 ++- Assets/RaceListScript.cs | 12 +- Assets/RaceScript.cs | 8 + Assets/Resources/Images/Race/back up.png | Bin 0 -> 9396 bytes Assets/Resources/Images/Race/back up.png.meta | 116 ++++ .../UI/Prefab/Panel/RaceHomePanel.prefab | 86 +++ .../UI/Prefab/Panel/RaceListPanel.prefab | 600 +++++++++++++----- .../ButtonGroup/BtnContainer-Double-H.prefab | 6 +- .../ButtonGroup/BtnContainer-Double-V.prefab | 6 +- .../ButtonGroup/BtnContainer-Enter.prefab | 2 +- .../Resources/UI/Prefab/Race/ItemBig.prefab | 4 +- .../Resources/UI/Prefab/Race/ItemSmall.prefab | 35 +- Assets/Scripts/Apis/MapCompetitionApi.cs | 13 +- Assets/Scripts/Apis/Models/MapCompetition.cs | 4 + 16 files changed, 812 insertions(+), 195 deletions(-) create mode 100644 Assets/Resources/Images/Race/back up.png create mode 100644 Assets/Resources/Images/Race/back up.png.meta diff --git a/Assets/RaceButtonGroupScript.cs b/Assets/RaceButtonGroupScript.cs index 6005a6a6..c298076f 100644 --- a/Assets/RaceButtonGroupScript.cs +++ b/Assets/RaceButtonGroupScript.cs @@ -7,6 +7,7 @@ public class RaceButtonGroupScript : MonoBehaviour { private Transform BtnEnter, BtnCancel, BtnWatch; public MapCompetition map { get; set; } + public Transform parent { get; set; } // Start is called before the first frame update void Start() { @@ -28,11 +29,18 @@ public class RaceButtonGroupScript : MonoBehaviour } void GoEnter() { + if (!map.HasJoin) + { + parent.GetComponent().Join(); + } Debug.Log(map); } void GoCancel() { - Debug.Log("Cancel"); + if (map.HasJoin) + { + parent.GetComponent().CancelJoin(); + } } void GoWatch() { diff --git a/Assets/RaceHomeScript.cs b/Assets/RaceHomeScript.cs index 7667cbd7..c3bed05c 100644 --- a/Assets/RaceHomeScript.cs +++ b/Assets/RaceHomeScript.cs @@ -12,7 +12,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,avatar; private float contentSize; private int count; private Button L, R; @@ -55,12 +55,22 @@ public class RaceHomeScript : RaceScript { UIManager.ShowRaceListPanel(); }); - var r = await ConfigHelper.mapCompetitionApi.GetCompetitionListV2("", 0, 6); - DisplayMaps(r.data); + avatar = transform.Find("Avatar"); + if (avatar != null) + { + Utils.DisplayImage(avatar.GetComponent(), App.CurrentUser.WxHeadImg, true); + UIManager.AddEvent(avatar.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + UIManager.ShowUserInfoPanel(); + }); + } + var r = await ConfigHelper.mapCompetitionApi.GetCompetitionListV2("", 0, 5); + var activityList = await ConfigHelper.mapCompetitionApi.GetCompetitionListV2("", 0, 3, activity: 1); + DisplayMaps(r.data,activityList.data); Initial(); } - private void DisplayMaps(List list) + private void DisplayMaps(List list, List activityList) { int i = 0; GameObject bigGame = Resources.Load("UI/Prefab/Race/ItemBig"), @@ -83,9 +93,15 @@ public class RaceHomeScript : RaceScript } for (i = 0; i < 3; i++) { + var activity = activityList[i]; var banner = Instantiate(bannerItem); var dot = Instantiate(dotItem); - Utils.DisplayImage(banner.GetComponent(), list[i].CoverImage, true); + Utils.DisplayImage(banner.GetComponent(), activity.BannerPreview, true); + + UIManager.AddEvent(banner.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + OnBannerClick(activity); + }); banner.transform.SetParent(scroll.content); dot.GetComponent().color = i == 0 ? Utils.HexToColorHtml("#f93086") : Utils.HexToColorHtml("#ffffff"); @@ -96,7 +112,10 @@ public class RaceHomeScript : RaceScript } rightContainer.Find("Container-2/BtnGoList").SetAsLastSibling(); } - + void OnBannerClick(MapCompetition map) + { + Debug.Log("banner點擊"); + } private async Task Login() { var result = await ConfigHelper.userApi.Login("13115011550", "laozhong", ""); diff --git a/Assets/RaceItemScript.cs b/Assets/RaceItemScript.cs index 6562034b..12441f06 100644 --- a/Assets/RaceItemScript.cs +++ b/Assets/RaceItemScript.cs @@ -42,6 +42,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH transform.Find("InfoContainer/DataContainer/Slope/Text").GetComponent().text = $"{mapCompetition.AverageGrade.ToString("#0.00")}%"; transform.Find("InfoContainer/DataContainer/StartTime/Text").GetComponent().text = mapCompetition.StartTime.ToString(); + transform.Find("CountContainer/Text").GetComponent().text = mapCompetition.ApplyCount.ToString(); SetStatus(mapCompetition); SetButtonGroup(mapCompetition); this.parent = parent; @@ -50,12 +51,13 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH private void SetButtonGroup(MapCompetition mapCompetition) { - if (mapCompetition.Status == 1 || mapCompetition.Status == 3) + if (mapCompetition.Status == 1 || mapCompetition.Status == 3 || (mapCompetition.Status == 2 && !mapCompetition.HasJoin)) { var game = Resources.Load("UI/Prefab/Race/ButtonGroup/BtnContainer-Enter"); var igame = Instantiate(game); igame.name = "BtnContainer"; igame.GetComponent().map = mapCompetition; + igame.GetComponent().parent = transform; igame.transform.SetParent(transform); igame.transform.localScale = Vector3.one; var loc = Vector3.zero; @@ -68,6 +70,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH var igame = Instantiate(game); igame.name = "BtnContainer"; igame.GetComponent().map = mapCompetition; + igame.GetComponent().parent = transform; igame.transform.SetParent(transform); igame.transform.localScale = Vector3.one; var loc = Vector3.zero; @@ -82,6 +85,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH var igame = Instantiate(game); igame.name = "BtnContainer"; igame.GetComponent().map = mapCompetition; + igame.GetComponent().parent = transform; igame.transform.SetParent(transform); igame.transform.localScale = Vector3.one; var loc = Vector3.zero; @@ -94,6 +98,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH var igame = Instantiate(game); igame.name = "BtnContainer"; igame.GetComponent().map = mapCompetition; + igame.GetComponent().parent = transform; igame.transform.SetParent(transform); igame.transform.localScale = Vector3.one; var loc = Vector3.zero; @@ -114,13 +119,17 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH { status.gameObject.SetActive(false); } - else + else { status.GetComponent().color = Utils.HexToColorHtml(statusColorDict[mapCompetition.Status]); - status.Find("Text").GetComponent().text = mapCompetition.StatusVlaue; - //status.gameObject.AddComponent(); - //status.GetComponent().r.w = 20; - //status.GetComponent().r.y = 20; + if (mapCompetition.Status == 2 && mapCompetition.HasJoin) + { + status.Find("Text").GetComponent().text = "Applied"; + } + else + { + status.Find("Text").GetComponent().text = mapCompetition.StatusVlaue; + } } } @@ -136,10 +145,13 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH transform.Find("InfoContainer").GetComponent().DOFade(1, 0.5f); if (myType == ItemType.small) { + transform.Find("InfoContainer/DataContainer").GetComponent().DOFade(1, 0.5f); + transform.Find("InfoContainer/AltitudeCurve").DOScaleY(1f, 0.5f); transform.Find("InfoContainer").DOLocalMoveY(-225, 0.3f); } else { + transform.Find("InfoContainer/Line").GetComponent().DOFade(1,0.5f); transform.Find("InfoContainer").DOLocalMoveY(-246, 0.3f); } if (this.parent != null) @@ -160,10 +172,14 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH transform.Find("InfoContainer").GetComponent().DOFade(0, 0.5f); if (myType == ItemType.small) { - transform.Find("InfoContainer").DOLocalMoveY(-139, 0.3f); + transform.Find("InfoContainer/DataContainer").GetComponent().DOFade(0, 0.5f); + transform.Find("InfoContainer/AltitudeCurve").DOScaleY(1.7f, 0.5f); + transform.Find("InfoContainer").DOLocalMoveY(-124 + 50, 0.3f); + //transform.Find("InfoContainer").DOLocalMoveY(-139, 0.3f); } else { + transform.Find("InfoContainer/Line").GetComponent().DOFade(0, 0.5f); transform.Find("InfoContainer").DOLocalMoveY(-155, 0.3f); } if (this.parent != null) @@ -178,4 +194,48 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto); } + /* + //先报名 + if (_canJoin) + { + MapCompetitionApi s = new MapCompetitionApi(); + var rrr = s.ApplyMapCompetition(cyclingController.competitionId); + if (rrr.Result.result) + { + var competition = s.GetById(cyclingController.competitionId).data; + _canStart = competition.CanStart; + } + rideNowText.text = "RideNow"; + } + else + { + base.StartRide(baseEvent); + } + */ + async public void Join() + { + var res = await ConfigHelper.mapCompetitionApi.ApplyMapCompetition(mapCompetition.Id); + if (res.result) + { + mapCompetition.HasJoin = true; + transform.Find("CountContainer/Text").GetComponent().text = (++mapCompetition.ApplyCount).ToString(); + SetStatus(mapCompetition); + transform.Find("BtnContainer").gameObject.Destroy(); + SetButtonGroup(mapCompetition); + Utils.showToast(null, "Successful application!", type: 1); + } + } + async public void CancelJoin() + { + var res = await ConfigHelper.mapCompetitionApi.CancelMapCompetition(mapCompetition.Id); + if (res.result) + { + mapCompetition.HasJoin = false; + transform.Find("CountContainer/Text").GetComponent().text = (--mapCompetition.ApplyCount).ToString(); + SetStatus(mapCompetition); + transform.Find("BtnContainer").gameObject.Destroy(); + SetButtonGroup(mapCompetition); + Utils.showToast(null, "Successful cancellation application!", type: 1); + } + } } diff --git a/Assets/RaceListScript.cs b/Assets/RaceListScript.cs index 5342fe6e..bd19c2fa 100644 --- a/Assets/RaceListScript.cs +++ b/Assets/RaceListScript.cs @@ -13,7 +13,7 @@ public class RaceListScript : RaceScript { // Start is called before the first frame update private GameObject scroll; - private Transform content,statusOptionContainer, reserveContainer,dirContainer, searchInput,btnReturn; + private Transform content,statusOptionContainer, reserveContainer,dirContainer, searchInput,btnReturn,avatar; private bool startMouse = false,isEnd = false; private int pageIndex = 0, pageSize = 24; private string raceName = ""; @@ -111,6 +111,15 @@ public class RaceListScript : RaceScript UIManager.ShowRaceHomePanel(true); }); } + avatar = transform.Find("Avatar"); + if (avatar != null) + { + Utils.DisplayImage(avatar.GetComponent(), App.CurrentUser.WxHeadImg, true); + UIManager.AddEvent(avatar.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + UIManager.ShowUserInfoPanel(); + }); + } Refresh(); } @@ -125,6 +134,7 @@ public class RaceListScript : RaceScript { if (Input.GetAxis("Mouse ScrollWheel") != 0) { + Debug.Log(scroll.GetComponent().verticalNormalizedPosition); if (scroll.GetComponent().verticalNormalizedPosition <= 0 || scroll.GetComponent().verticalNormalizedPosition >= (pageIndex == 0 ? 1.2 : 1)) { diff --git a/Assets/RaceScript.cs b/Assets/RaceScript.cs index 6b6b67c3..888bdcbd 100644 --- a/Assets/RaceScript.cs +++ b/Assets/RaceScript.cs @@ -25,6 +25,14 @@ public class RaceScript : PFUIPanel { currentItem = t; HandleTime(); + if (t != null) + { + StartTime(); + } + else + { + StopTime(); + } } /*参考代码 var second = Math.Ceiling((Now - mapCompetition.StartTime.ToLocalTime()).TotalSeconds); diff --git a/Assets/Resources/Images/Race/back up.png b/Assets/Resources/Images/Race/back up.png new file mode 100644 index 0000000000000000000000000000000000000000..f4c361c2252043e3d1c17023be962ba8bbf28dbb GIT binary patch literal 9396 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.SerializeObject(list.data)) }; } - public async Task>> GetCompetitionListV2(string name, int pageIndex, int pageSize, string status = "", int order = 1, bool self = false) + public async Task>> GetCompetitionListV2(string name, int pageIndex, int pageSize, string status = "", int order = 1, bool self = false, int activity = 0) { - var list = await GetAsync>($"/MapCompetition/v2/GetList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&status={ status }&order={order}&self={self}"); + var list = await GetAsync>($"/MapCompetition/v2/GetList?pageIndex={ pageIndex }&pageSize={ pageSize }&name={ name }&status={ status }&order={order}&self={self}&activity={activity}"); return new JsonResult> { result = list.result, @@ -91,5 +91,14 @@ namespace Assets.Scripts.Apis }; return await PostAsync($"/MapCompetition/ApplyMapCompetition", param); } + //取消报名比赛 + public async Task CancelMapCompetition(int id) + { + var param = new + { + id = id, + }; + return await PostAsync($"/MapCompetition/CancelMapCompetition", param); + } } } diff --git a/Assets/Scripts/Apis/Models/MapCompetition.cs b/Assets/Scripts/Apis/Models/MapCompetition.cs index 4b3fc30d..a1ed9edb 100644 --- a/Assets/Scripts/Apis/Models/MapCompetition.cs +++ b/Assets/Scripts/Apis/Models/MapCompetition.cs @@ -63,6 +63,10 @@ namespace Assets.Scripts.Apis.Models public double MaxElevation { get; set; } public string AltitudeGraph { get; set; } public string RouteCover { get; set; } + public string SponsorCoverage { get; set; } + public string BannerPreview { get; set; } + public bool HasJoin { get; set; } + public int ApplyCount { get; set; } } public class CompetitionPlayer {