|
@@ -10,19 +10,14 @@ namespace GFGGame
|
|
{
|
|
{
|
|
private UI_LuckBoxBonusShowUI _ui;
|
|
private UI_LuckBoxBonusShowUI _ui;
|
|
private List<ItemData> _rewardList = new List<ItemData>();
|
|
private List<ItemData> _rewardList = new List<ItemData>();
|
|
- // private List<GameObject> _gameobjects = new List<GameObject>();
|
|
|
|
- //private Dictionary<int, Dictionary<int, EffectUI>> _effList = new Dictionary<int, Dictionary<int, EffectUI>>();
|
|
|
|
private List<EffectUI> _effList = new List<EffectUI>();
|
|
private List<EffectUI> _effList = new List<EffectUI>();
|
|
|
|
|
|
private EffectUI _effectUI1;
|
|
private EffectUI _effectUI1;
|
|
private EffectUI _effectUI2;
|
|
private EffectUI _effectUI2;
|
|
private EffectUI _effectUI3;
|
|
private EffectUI _effectUI3;
|
|
- private EffectUI _effectUI4;
|
|
|
|
|
|
|
|
- private int _effectIndex = 0;
|
|
|
|
public override void Dispose()
|
|
public override void Dispose()
|
|
{
|
|
{
|
|
- base.Dispose();
|
|
|
|
EffectUIPool.Recycle(_effectUI1);
|
|
EffectUIPool.Recycle(_effectUI1);
|
|
_effectUI1 = null;
|
|
_effectUI1 = null;
|
|
EffectUIPool.Recycle(_effectUI2);
|
|
EffectUIPool.Recycle(_effectUI2);
|
|
@@ -30,17 +25,12 @@ namespace GFGGame
|
|
EffectUIPool.Recycle(_effectUI3);
|
|
EffectUIPool.Recycle(_effectUI3);
|
|
_effectUI3 = null;
|
|
_effectUI3 = null;
|
|
|
|
|
|
- // for (int i = 0; i < _gameobjects.Count; i++)
|
|
|
|
- // {
|
|
|
|
- // SceneController.DestroyObjectFromView(_gameobjects[i], _wrappers[i]);
|
|
|
|
-
|
|
|
|
- // }
|
|
|
|
-
|
|
|
|
if (_ui != null)
|
|
if (_ui != null)
|
|
{
|
|
{
|
|
_ui.Dispose();
|
|
_ui.Dispose();
|
|
_ui = null;
|
|
_ui = null;
|
|
}
|
|
}
|
|
|
|
+ base.Dispose();
|
|
}
|
|
}
|
|
|
|
|
|
protected override void OnInit()
|
|
protected override void OnInit()
|
|
@@ -66,7 +56,6 @@ namespace GFGGame
|
|
{
|
|
{
|
|
base.OnShown();
|
|
base.OnShown();
|
|
_rewardList.AddRange(this.viewData as List<ItemData>);
|
|
_rewardList.AddRange(this.viewData as List<ItemData>);
|
|
- _effectIndex = 0;
|
|
|
|
if (_rewardList.Count == 1)
|
|
if (_rewardList.Count == 1)
|
|
{
|
|
{
|
|
_ui.m_c1.selectedIndex = 0;
|
|
_ui.m_c1.selectedIndex = 0;
|
|
@@ -90,12 +79,9 @@ namespace GFGGame
|
|
_effList[key] = null;
|
|
_effList[key] = null;
|
|
}
|
|
}
|
|
_effList.Clear();
|
|
_effList.Clear();
|
|
-
|
|
|
|
- EffectUIPool.Recycle(_effectUI4);
|
|
|
|
- _effectUI4 = null;
|
|
|
|
|
|
+ _rewardList.Clear();
|
|
|
|
|
|
base.OnHide();
|
|
base.OnHide();
|
|
- _rewardList.Clear();
|
|
|
|
GetSuitItemController.TryShow(0);
|
|
GetSuitItemController.TryShow(0);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -110,19 +96,16 @@ namespace GFGGame
|
|
item.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
|
|
item.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
|
|
RarityIconController.UpdateRarityIcon(item.m_comIcon.m_rarity, itemData.id, false);
|
|
RarityIconController.UpdateRarityIcon(item.m_comIcon.m_rarity, itemData.id, false);
|
|
|
|
|
|
- string resPath = itemCfg.rarity == ConstDressRarity.Rarity_TIANYI ? "CK_all_01" : "CK_all_02";
|
|
|
|
-
|
|
|
|
- if (countType == 10 && itemCfg.rarity > 2 )//&& (!_effList.ContainsKey(itemCfg.rarity) || !_effList[itemCfg.rarity].ContainsKey(index)))
|
|
|
|
- {
|
|
|
|
- GGraph holder = itemCfg.rarity == 3 ? item.m_comIcon.m_holder : item.m_comIcon.m_holder1;
|
|
|
|
- EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
|
|
|
|
- _effList.Add(_effectUI);
|
|
|
|
- }
|
|
|
|
- if (countType == 1 && itemCfg.rarity > 2 && _effectUI4 == null)
|
|
|
|
- {
|
|
|
|
- GGraph holder = itemCfg.rarity == 3 ? item.m_comIcon.m_holder : item.m_comIcon.m_holder1;
|
|
|
|
- _effectUI4 = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
|
|
|
|
|
|
+ if (itemCfg.rarity > 2) {
|
|
|
|
+ string resPath = itemCfg.rarity == ConstDressRarity.Rarity_TIANYI ? "CK_all_01" : "CK_all_02";
|
|
|
|
+ if (item != null && item.m_comIcon.m_holder != null && item.m_comIcon.m_holder1 != null)
|
|
|
|
+ {
|
|
|
|
+ GGraph holder = itemCfg.rarity == 3 ? item.m_comIcon.m_holder : item.m_comIcon.m_holder1;
|
|
|
|
+ EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
|
|
|
|
+ _effList.Add(_effectUI);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
int count = 0;
|
|
int count = 0;
|
|
bool isFirst = false;
|
|
bool isFirst = false;
|
|
for (int i = 0; i < _rewardList.Count; i++)
|
|
for (int i = 0; i < _rewardList.Count; i++)
|
|
@@ -137,6 +120,7 @@ namespace GFGGame
|
|
item.target.onClick.Add(ShowItemTips);
|
|
item.target.onClick.Add(ShowItemTips);
|
|
}
|
|
}
|
|
item.target.data = itemCfg.id;
|
|
item.target.data = itemCfg.id;
|
|
|
|
+
|
|
UI_LuckyBoxBonusShowItem.ProxyEnd();
|
|
UI_LuckyBoxBonusShowItem.ProxyEnd();
|
|
}
|
|
}
|
|
|
|
|