From 0168c551302706b306e0c71a87ac1a9140b4f51d Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 29 Oct 2020 14:28:53 +0800
Subject: [PATCH] 1.木属性小怪一次要出两个 2.buff加上 3.宝箱图片显示不对 4.钻石道具5个为一组,占一个item 6.合成特效改为对应的上阵的特效,原合成特效给技能用 7.把王冠昨天改的新手引导合了

---
 Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs
index e7e7729..e32c86b 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs
@@ -3,6 +3,7 @@
 using UnityEngine;
 using TowerDefense.Level;
 using UnityEngine.UI;
+using Protobuf;
 
 /**
  * 无尽模式结算界面列表脚本
@@ -30,20 +31,31 @@
 
             for (int i = 0; i < list.Count; ++i)
             {
-                for (int j = 0; j < list[i].Reward.count; ++j)
+                if (list[i].Reward.type == CURRENCY.Gold)
                 {
-                    GameObject item = Instantiate(ItemPrefab);
-                    EndlessPropIcon propIcon = item.GetComponent<EndlessPropIcon>();
-                    string resId = list[i].Reward.id == 0 ? resId = $"{(int)list[i].Reward.type}" : $"{list[i].Reward.type}_{list[i].Reward.id}";
-
-                    Sprite iconSp = Resources.Load<Sprite>($"{iconPath}{resId}");
-                    Sprite bgSp = Resources.Load<Sprite>($"{bgPath}{resId}");
-
-                    propIcon.SetIcon(iconSp);
-                    propIcon.SetBg(bgSp);
-                    item.transform.SetParent(Grid.transform, false);
+                    AddItem($"{(int)list[i].Reward.type}");
+                }
+                else
+                {
+                    for (int j = 0; j < list[i].Reward.count; ++j)
+                    {
+                        AddItem($"{(int)list[i].Reward.type}_{list[i].Reward.id}");
+                    }
                 }
             }
         }
+
+        private void AddItem(string resId)
+        {
+            GameObject item = Instantiate(ItemPrefab);
+            EndlessPropIcon propIcon = item.GetComponent<EndlessPropIcon>();
+
+            Sprite iconSp = Resources.Load<Sprite>($"{iconPath}{resId}");
+            Sprite bgSp = Resources.Load<Sprite>($"{bgPath}{resId}");
+
+            propIcon.SetIcon(iconSp);
+            propIcon.SetBg(bgSp);
+            item.transform.SetParent(Grid.transform, false);
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1