浏览代码

爬塔补充提交

zhangyuqian 11 月之前
父节点
当前提交
dc0d011846

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_TurnTableUI.cs

@@ -24,6 +24,7 @@ namespace UI.TurnTable
         public GLoader m_pointer1;
         public GLoader m_pointer0;
         public GLoader m_rewardIcon;
+        public GGraph m_specialEffect;
         public UI_Component1 m_reward;
         public GLoader m_numberBg;
         public GTextField m_numberText;
@@ -104,6 +105,7 @@ namespace UI.TurnTable
             m_pointer1 = (GLoader)comp.GetChild("pointer1");
             m_pointer0 = (GLoader)comp.GetChild("pointer0");
             m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_specialEffect = (GGraph)comp.GetChild("specialEffect");
             m_reward = (UI_Component1)UI_Component1.Create(comp.GetChild("reward"));
             m_numberBg = (GLoader)comp.GetChild("numberBg");
             m_numberText = (GTextField)comp.GetChild("numberText");
@@ -150,6 +152,7 @@ namespace UI.TurnTable
             m_pointer1 = null;
             m_pointer0 = null;
             m_rewardIcon = null;
+            m_specialEffect = null;
             m_reward.Dispose();
             m_reward = null;
             m_numberBg = null;

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_rewardItem.cs

@@ -11,6 +11,7 @@ namespace UI.TurnTable
         public GLoader m_iconBg;
         public GLoader m_icon;
         public GTextField m_numText;
+        public GGraph m_effect;
         public const string URL = "ui://zioq0m8xqncf19";
         public const string PACKAGE_NAME = "TurnTable";
         public const string RES_NAME = "rewardItem";
@@ -62,6 +63,7 @@ namespace UI.TurnTable
             m_iconBg = (GLoader)comp.GetChild("iconBg");
             m_icon = (GLoader)comp.GetChild("icon");
             m_numText = (GTextField)comp.GetChild("numText");
+            m_effect = (GGraph)comp.GetChild("effect");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +71,7 @@ namespace UI.TurnTable
             m_iconBg = null;
             m_icon = null;
             m_numText = null;
+            m_effect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 24 - 0
GameClient/Assets/Game/HotUpdate/Views/TurnTable/TurnTableView.cs

@@ -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)

二进制
GameClient/Assets/ResIn/UI/TurnTable/TurnTable_fui.bytes