lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

登录bug&影子选手bug修复

Browse Source
This commit is contained in:
lishuo committed 2021-05-08 14:27:56 +08:00
1 parent 92676d7cf8
commit 696fd256a8
9 files changed
+2200 -2173
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scenes/Ride/Scripts/SelectPlayerFactory.cs
+19 -9
View File
@@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEditor.Events;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
@@ -143,6 +144,9 @@ namespace Assets.Scenes.Ride.Scripts
cyclingController.selectParamModel.RankingsId.Add(seletedPlayerScript.GetRankingId());
}
}
//查询选中人员的骑行记录
var rankingList = mapApi.GetRecordFileFromServer(cyclingController.selectParamModel.RankingsId);
cyclingController.SetCyclingModel(CyclingModel.Review);
if (!reviewPanel.activeSelf)
{
@@ -150,7 +154,9 @@ namespace Assets.Scenes.Ride.Scripts
}
else
{
reviewPanel.GetComponent<ReviewFactory>().Refresh();
var reviewFactory = reviewPanel.GetComponent<ReviewFactory>();
reviewFactory.Refresh();
reviewFactory.SetReview(rankingList);
}
reviewPanel.transform.Find("ReviewArea").gameObject.SetActive(true);
reviewPanel.transform.Find("SingleArea").gameObject.SetActive(false);
@@ -205,8 +211,10 @@ namespace Assets.Scenes.Ride.Scripts
noRecord.SetActive(false);
}
var parent = transform.Find("Panel/PlayerList/Scroll View/Viewport/Content");
int index = 0;
foreach (var item in list)
{
index++;
GameObject newObj = (GameObject)Instantiate(prefab, parent);
var selectPlayerItemScript = newObj.GetComponent<SelectPlayerItemScript>();
selectPlayerItemScript.SetRankingId(item.Id.ToString());
@@ -215,23 +223,24 @@ namespace Assets.Scenes.Ride.Scripts
selectPlayerItemScript.SetWeightKg(item.WeightKg.ToString());
selectPlayerItemScript.SetHeadImage(item.WxHeadImg);
selectPlayerItemScripts.Add(selectPlayerItemScript);
UIManager.AddEvent(selectPlayerItemScript.GetButton().gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, OnSelectClick);
//UIManager.AddEventWithoutCursor(selectPlayerItemScript.GetButton().gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, OnSelectClick);
selectPlayerItemScript.GetButton().onClick.AddListener(delegate () { this.OnSelectClick(selectPlayerItemScript); });
}
}
private void OnSelectClick(BaseEventData baseEventData)
private void OnSelectClick(SelectPlayerItemScript selectPlayerItemScript)
{
var selectPlayerItemScript = baseEventData.selectedObject.GetComponent<SelectPlayerItemScript>();
foreach (var item in gameObjects)
var seletedScriptList = FindObjectsOfType<SeletedPlayerScript>();
var exisitList = seletedScriptList.Where(c => c.GetRankingId().Equals(selectPlayerItemScript.GetRankingId()));
if(exisitList.Count() == 0)
{
var seletedPlayerScript = item.GetComponent<SeletedPlayerScript>();
if (!seletedPlayerScript.isUsed && !selectPlayerItemScript.isSelected)
var seletedPlayerScript = seletedScriptList.Where(c=>!c.isUsed).OrderBy(c=>c.transform.GetSiblingIndex()).FirstOrDefault();
if (seletedPlayerScript != null)
{
seletedPlayerScript.SetHead(selectPlayerItemScript.GetImageTexture(), true);
seletedPlayerScript.SetName(selectPlayerItemScript.GetName());
seletedPlayerScript.SetRankingId(selectPlayerItemScript.GetRankingId());
UIManager.AddEvent(seletedPlayerScript.GetButton().gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, OnCloseClick);
selectPlayerItemScript.isSelected = true;
break;
}
}
}
@@ -256,7 +265,8 @@ namespace Assets.Scenes.Ride.Scripts
Refresh();
}
}
if (scrollrect.verticalNormalizedPosition >= 1)
if (scrollrect.verticalNormalizedPosition >= (pageIndex == 0 ? 1.2 : 1))
{
if (pageIndex >0)
{