Merge pull request #6191 from planetarium/bugfix/world-boss-reward

fix world boss reward
planetarium · Oct 23, 2024 · 2086b32 · 2086b32
2 parents b9a3eda + 6e2224a
commit 2086b32
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/nekoyume/Assets/UIResources/Content/WorldBoss/Prefab/Tabs_Reward.prefab b/nekoyume/Assets/UIResources/Content/WorldBoss/Prefab/Tabs_Reward.prefab
@@ -6618,7 +6618,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1097120982747635510
 RectTransform:
   m_ObjectHideFlags: 0

diff --git a/nekoyume/Assets/_Scripts/UI/Module/WorldBoss/WorldBossBattleRewardItem.cs b/nekoyume/Assets/_Scripts/UI/Module/WorldBoss/WorldBossBattleRewardItem.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Nekoyume.Helper;
 using Nekoyume.TableData;
@@ -45,12 +46,24 @@ public void Reset()
 
         public void Set(WorldBossBattleRewardSheet.Row row)
         {
-            SetRewardItem((row.RuneMin, row.RuneMax), row.Crystal, new[] { (600402, row.Circle) });
+            var materials = new List<(int itemId, int quantity)>();
+            if (row.Circle > 0)
+            {
+                materials.Add((600402, row.Circle));
+            }
+
+            SetRewardItem((row.RuneMin, row.RuneMax), row.Crystal, materials);
         }
 
         public void Set(WorldBossKillRewardSheet.Row row)
         {
-            SetRewardItem((row.RuneMin, row.RuneMax), row.Crystal, new[] { (600402, row.Circle) });
+            var materials = new List<(int itemId, int quantity)>();
+            if (row.Circle > 0)
+            {
+                materials.Add((600402, row.Circle));
+            }
+
+            SetRewardItem((row.RuneMin, row.RuneMax), row.Crystal, materials);
         }
 
         public void Set(WorldBossRankingRewardSheet.Row row, int myRank, int userCount)
@@ -93,13 +106,13 @@ public void Set(WorldBossRankingRewardSheet.Row row, int myRank, int userCount)
             }
 
             var runeSum = row.Runes.Sum(x => x.RuneQty);
-            SetRewardItem((runeSum, runeSum), row.Crystal, row.Materials.ToArray());
+            SetRewardItem((runeSum, runeSum), row.Crystal, row.Materials);
         }
 
         private void SetRewardItem(
             (int min, int max) rune,
             int crystal,
-            (int itemId, int quantity)[] materials)
+            List<(int itemId, int quantity)> materials)
         {
             runeItem.container.gameObject.SetActive(rune.max > 0);
             runeItem.text.text = rune.min == rune.max
@@ -112,7 +125,7 @@ private void SetRewardItem(
             for (var i = 0; i < materialItems.Length; i++)
             {
                 var material = materialItems[i];
-                if (i < materials.Length)
+                if (i < materials.Count)
                 {
                     var (itemId, quantity) = materials[i];
                     material.container.gameObject.SetActive(true);