From d7d30d2e665aa451f8bd3ea3c8b15391b765ccc3 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Wed, 02 Dec 2020 17:47:42 +0800
Subject: [PATCH] 修改新手引导 修改结算页面使用无限滚动 替换了json
---
Assets/Scripts/UI/FinalPanel/FinalPanel.cs | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/Assets/Scripts/UI/FinalPanel/FinalPanel.cs b/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
index cba824a..f68378d 100644
--- a/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
+++ b/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
@@ -12,10 +12,10 @@
public class FinalPanel : MonoBehaviour, IEnhancedScrollerDelegate
{
- //private EnhancedScroller scroller;
+ private EnhancedScroller scroller;
- //private SmallList<FinalPanelItemData> _data;
- private List<FinalPanelItemData> _data;
+ private SmallList<FinalPanelItemData> _data;
+ //private List<FinalPanelItemData> _data;
public EnhancedScrollerCellView cellViewPrefab;
[SerializeField]
private Sprite rank_di_0, rank_di_1, rank_di_2, rank_di_03;
@@ -65,8 +65,8 @@
public void SetData(string waveInfo, int myScore)
{
hScore = PlayerPrefs.GetInt("GemBattleHScore");
- scrollerCanvasGroup = transform.Find("Scroll View").GetComponent<CanvasGroup>();
- //scrollerCanvasGroup = transform.Find("Scroller").GetComponent<CanvasGroup>();
+ //scrollerCanvasGroup = transform.Find("Scroll View").GetComponent<CanvasGroup>();
+ scrollerCanvasGroup = transform.Find("Scroller").GetComponent<CanvasGroup>();
if (myScore > hScore)
{
PlayerPrefs.SetInt("GemBattleHScore", myScore);
@@ -147,7 +147,9 @@
protected void StartLoadLargeData()
{
scoreText.gameObject.SetActive(true);
- StartCoroutine(PlayerItemDoTween());
+ scrollerCanvasGroup.alpha = 1;
+
+ //StartCoroutine(PlayerItemDoTween());
}
/// <summary>
@@ -218,21 +220,22 @@
/// <param name="hScore">自身分数</param>
private void LoadLargeData(int hScore)
{
- //scroller = transform.Find("Scroller").GetComponent<EnhancedScroller>();
- Transform content = transform.Find("Scroll View/Viewport/Content");
+ scroller = transform.Find("Scroller").GetComponent<EnhancedScroller>();
+ scroller.Delegate = this;
+ _data = new SmallList<FinalPanelItemData>();
- //scroller.Delegate = this;
- _data = new List<FinalPanelItemData>();
+ //Transform content = transform.Find("Scroll View/Viewport/Content");
+ //_data = new List<FinalPanelItemData>();
FinalPanelItemData data;
int score = 101;
- GameObject go;
- FinalPanelItem tmpData;
- allItemLis = new List<FinalPanelItem>();
+ //GameObject go;
+ //FinalPanelItem tmpData;
+ //allItemLis = new List<FinalPanelItem>();
for (var i = 0; i < 100; i++)
{
- go = Instantiate(cellViewPrefab.gameObject, content);
- tmpData = go.GetComponent<FinalPanelItem>();
- allItemLis.Add(tmpData);
+ //go = Instantiate(cellViewPrefab.gameObject, content);
+ //tmpData = go.GetComponent<FinalPanelItem>();
+ //allItemLis.Add(tmpData);
data = new FinalPanelItemData();
data.score = score - i;
data.index = i + 1;
@@ -254,16 +257,16 @@
_data[2].spriteBackGround = rank_di_2;
// tell the scroller to reload now that we have the data
- //scroller.ReloadData();
- for (int i = 0; i < allItemLis.Count; i++)
- {
- allItemLis[i].SetData(_data[i]);
- }
+ scroller.ReloadData();
+ // for (int i = 0; i < allItemLis.Count; i++)
+ // {
+ // allItemLis[i].SetData(_data[i]);
+ // }
- for (int i = 0; i < 8; i++)
- {
- allItemLis[i].SetPos();
- }
+ // for (int i = 0; i < 8; i++)
+ // {
+ // allItemLis[i].SetPos();
+ // }
}
@@ -303,7 +306,6 @@
public EnhancedScrollerCellView GetCellView(EnhancedScroller scroller, int dataIndex, int cellIndex)
{
FinalPanelItem cellView = scroller.GetCellView(cellViewPrefab) as FinalPanelItem;
-
cellView.SetData(_data[dataIndex]);
return cellView;
}
--
Gitblit v1.9.1