From 06da72770c641fabf980816ed466a2280dac2be7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 05 八月 2025 19:25:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/KnapSack/Logic/CommonGetItemCell.cs | 36 ++++++++++++++----------------------
1 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/Main/System/KnapSack/Logic/CommonGetItemCell.cs b/Main/System/KnapSack/Logic/CommonGetItemCell.cs
index e067abe..d16ba2b 100644
--- a/Main/System/KnapSack/Logic/CommonGetItemCell.cs
+++ b/Main/System/KnapSack/Logic/CommonGetItemCell.cs
@@ -1,32 +1,24 @@
锘縰sing System.Collections.Generic;
-using System.Linq;
using UnityEngine;
using UnityEngine.UI;
- public class CommonGetItemCell : CellView
+public class CommonGetItemCell : CellView
+{
+ [SerializeField] List<CommonGetItem> commonGetItems = new List<CommonGetItem>();
+ public void Display(int index, List<Item> showItems)
{
- [SerializeField] List<CommonGetItem> commonGetItems = new List<CommonGetItem>();
- [SerializeField] HorizontalLayoutGroup horizontalLayout;
- public void Display(int rowIndex)
+ for (int i = 0; i < commonGetItems.Count; i++)
{
- var dict = ItemLogicUtility.Instance.totalShowItems;
- var list = dict.Keys.ToList();
- int rowCount = (int)Mathf.Ceil((float)list.Count / 5);
- horizontalLayout.childAlignment= rowCount > 1?TextAnchor.MiddleLeft: TextAnchor.MiddleCenter;
-
- for (int i = 0; i < commonGetItems.Count; i++)
+ if (index + i < showItems.Count)
{
- int index = rowIndex * 5 + i;
- if (index < list.Count)
- {
- int itemId = list[index];
- commonGetItems[i].Display(itemId);
- commonGetItems[i].SetActive(true);
- }
- else
- {
- commonGetItems[i].SetActive(false);
- }
+ int itemId = showItems[index + i].id;
+ commonGetItems[i].Display(itemId);
+ commonGetItems[i].SetActive(true);
+ }
+ else
+ {
+ commonGetItems[i].SetActive(false);
}
}
}
+}
--
Gitblit v1.8.0