|
@@ -33,7 +33,9 @@ namespace GFGGame
|
|
|
private EffectUI _effectUI2;
|
|
|
private EffectUI _effectUI3;
|
|
|
private EffectUI _effectUI4;
|
|
|
+ private EffectUI _effectUISpecial;
|
|
|
private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
|
|
|
+ private Dictionary<string, EffectUI> _effectTableUIDic = new Dictionary<string, EffectUI>();
|
|
|
|
|
|
public override void Dispose()
|
|
|
{
|
|
@@ -45,11 +47,18 @@ namespace GFGGame
|
|
|
_effectUI3 = null;
|
|
|
EffectUIPool.Recycle(_effectUI4);
|
|
|
_effectUI4 = null;
|
|
|
+ EffectUIPool.Recycle(_effectUISpecial);
|
|
|
+ _effectUISpecial = null;
|
|
|
foreach (var v in _effectUIDic)
|
|
|
{
|
|
|
EffectUIPool.Recycle(v.Value);
|
|
|
}
|
|
|
_effectUIDic.Clear();
|
|
|
+ foreach (var v in _effectTableUIDic)
|
|
|
+ {
|
|
|
+ EffectUIPool.Recycle(v.Value);
|
|
|
+ }
|
|
|
+ _effectTableUIDic.Clear();
|
|
|
if (_valueBarController != null)
|
|
|
{
|
|
|
_valueBarController.Dispose();
|
|
@@ -91,6 +100,7 @@ namespace GFGGame
|
|
|
_effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_titleEffect, "ui_Activity", "HHYY_Text_TX/HHYY_Text_TX");
|
|
|
_effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_btnEffectOne, "ui_Activity", "HHYY_Button/HHYY_Button");
|
|
|
_effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_btnEffectThree, "ui_Activity", "HHYY_Button/HHYY_Button");
|
|
|
+ _effectUISpecial = EffectUIPool.CreateEffectUI(_ui.m_specialEffect, "ui_Activity", "HHYY_Select_Special/HHYY_Select_Special");
|
|
|
}
|
|
|
protected override void OnShown()
|
|
|
{
|
|
@@ -208,9 +218,14 @@ namespace GFGGame
|
|
|
GComponent comProBonus = _ui.target.GetChild("item" + i).asCom;
|
|
|
UI_rewardItem rewardItem = UI_rewardItem.Proxy(comProBonus);
|
|
|
ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(rewardItemList[i].item);
|
|
|
+ if (!_effectTableUIDic.ContainsKey("item" + i))
|
|
|
+ {
|
|
|
+ _effectTableUIDic.Add("item" + i, EffectUIPool.CreateEffectUI(rewardItem.m_effect, "ui_Activity", "HHYY_Select/HHYY_Select"));
|
|
|
+ }
|
|
|
rewardItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
|
|
|
rewardItem.m_numText.text = string.Format("x{0}", rewardItemList[i].maxNum);
|
|
|
rewardItem.m_c1.selectedIndex = 0;
|
|
|
+ rewardItem.m_effect.visible = false;
|
|
|
if (rewardItem.target.data == null)
|
|
|
{
|
|
|
rewardItem.target.onClick.Add(OnClickTableRewardItem);
|
|
@@ -222,6 +237,14 @@ namespace GFGGame
|
|
|
//更新下面次数的物品
|
|
|
private void UpdateReward()
|
|
|
{
|
|
|
+ if(ActivityDataManager.Instance.TurnSpecialRewardList.Count > 0)
|
|
|
+ {
|
|
|
+ _ui.m_specialEffect.visible = true;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ _ui.m_specialEffect.visible = false;
|
|
|
+ }
|
|
|
_ui.m_numberText.text = ActivityDataManager.Instance.TurnTableTimes.ToString();
|
|
|
_ui.m_reward.m_bar.max = rewardList.Count;
|
|
|
_ui.m_reward.m_bar.value = GetRewardIndex();
|
|
@@ -404,6 +427,7 @@ namespace GFGGame
|
|
|
GComponent comProBonus = _ui.target.GetChild("item" + i).asCom;
|
|
|
UI_rewardItem rewardItem = UI_rewardItem.Proxy(comProBonus);
|
|
|
rewardItem.m_c1.selectedIndex = 1;
|
|
|
+ rewardItem.m_effect.visible = true;
|
|
|
UI_rewardItem.ProxyEnd();
|
|
|
}
|
|
|
private void GetOffSetValue(int index)
|