|
@@ -3,6 +3,7 @@ using UnityEngine;
|
|
|
using UI.LuckyBox;
|
|
|
using System.Collections.Generic;
|
|
|
using FairyGUI;
|
|
|
+using System.Linq;
|
|
|
|
|
|
namespace GFGGame
|
|
|
{
|
|
@@ -42,13 +43,14 @@ namespace GFGGame
|
|
|
protected override void OnShown()
|
|
|
{
|
|
|
base.OnShown();
|
|
|
- _rewardList = new List<ItemData>(((this.viewData as object[])[0] as List<ItemData>));
|
|
|
+ _rewardList = new List<ItemData>();
|
|
|
|
|
|
+ List<ItemData> rewards = new List<ItemData>(((this.viewData as object[])[0] as List<ItemData>));
|
|
|
+ _rewardList.AddRange(rewards);
|
|
|
|
|
|
int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
|
|
|
List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
|
|
|
- itemDatas.AddRange(_rewardList);
|
|
|
- _rewardList = itemDatas;
|
|
|
+ _rewardList.AddRange(itemDatas);
|
|
|
|
|
|
_type = (int)(this.viewData as object[])[1];
|
|
|
_ui.m_btnPass.visible = _type == (int)FirstGetCardViewType.JUMP ? true : false;
|