转盘补充提交

GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -421,6 +421,7 @@ namespace GFGGame
         public int TurnTableTimes = 300;
         public int TipsDropId = 0;
         public int StartDropId = 40000002;
+        public List<int> GiftBagIdList = new List<int>() { };
         //奖励状态
         public Dictionary<int, int> TurnRewardStateDic = new Dictionary<int, int>();
         //抽奖结果

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TurnTable/UI_TurnTableUI.cs

@@ -9,6 +9,7 @@ namespace UI.TurnTable
         public GComponent target;
         public GLoader m_bg;
         public GGraph m_bgEffect;
+        public GGraph m_bgEffec1;
         public GLoader m_iconBg;
         public UI_rewardItem m_item0;
         public UI_rewardItem m_item1;
@@ -40,6 +41,8 @@ namespace UI.TurnTable
         public GTextField m_giftTimeText;
         public GGroup m_gift;
         public GComponent m_valueBar;
+        public GGraph m_bgEffec2;
+        public GGraph m_bgEffec3;
         public GButton m_btnBack;
         public const string URL = "ui://zioq0m8xtvgdg";
         public const string PACKAGE_NAME = "TurnTable";
@@ -90,6 +93,7 @@ namespace UI.TurnTable
         {
             m_bg = (GLoader)comp.GetChild("bg");
             m_bgEffect = (GGraph)comp.GetChild("bgEffect");
+            m_bgEffec1 = (GGraph)comp.GetChild("bgEffec1");
             m_iconBg = (GLoader)comp.GetChild("iconBg");
             m_item0 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item0"));
             m_item1 = (UI_rewardItem)UI_rewardItem.Create(comp.GetChild("item1"));
@@ -121,12 +125,15 @@ namespace UI.TurnTable
             m_giftTimeText = (GTextField)comp.GetChild("giftTimeText");
             m_gift = (GGroup)comp.GetChild("gift");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_bgEffec2 = (GGraph)comp.GetChild("bgEffec2");
+            m_bgEffec3 = (GGraph)comp.GetChild("bgEffec3");
             m_btnBack = (GButton)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
             m_bgEffect = null;
+            m_bgEffec1 = null;
             m_iconBg = null;
             m_item0.Dispose();
             m_item0 = null;
@@ -169,6 +176,8 @@ namespace UI.TurnTable
             m_giftTimeText = null;
             m_gift = null;
             m_valueBar = null;
+            m_bgEffec2 = null;
+            m_bgEffec3 = null;
             m_btnBack = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -446,6 +446,7 @@ namespace GFGGame
                     ActivityDataManager.Instance.TurnTableTimes = response.SpecialTotalNum;
                     ActivityDataManager.Instance.StartDropId = response.ExtraIdDropId;
                     ActivityDataManager.Instance.TipsDropId = response.ExtraIdDropId;
+                    ActivityDataManager.Instance.GiftBagIdList = response.WishingBags;
                     for (int i = 0;i<response.RewardIds.Count;i++)
                     {
                         ActivityDataManager.Instance.TurnRewardStateDic.Add(response.RewardIds[i],response.RewardStatus[i]);
@@ -468,6 +469,7 @@ namespace GFGGame
                     ActivityDataManager.Instance.threeTurnResult.Clear();
                     ActivityDataManager.Instance.TurnTableTimes = response.SpecialTotalNum;
                     ActivityDataManager.Instance.TipsDropId = response.ExtraIdDropId;
+                    ActivityDataManager.Instance.GiftBagIdList = response.WishingBags;
                     for (int i = 0; i < response.RewardIds.Count; i++)
                     {
                         ActivityDataManager.Instance.TurnRewardStateDic.Add(response.RewardIds[i], response.RewardStatus[i]);

GameClient/Assets/Game/HotUpdate/Views/TurnTable/TurnSpecialTipsView.cs

@@ -68,6 +68,75 @@ namespace GFGGame
             }
             (obj.data as ItemView).SetData(reward);
             (obj.data as ItemView).ChangeTxtCountStyle();
+            if(isGetBag(reward.id))
+            {
+                (obj.data as ItemView).ImgHasVisible = true;
+            }
+            else
+            {
+                (obj.data as ItemView).ImgHasVisible = false;
+            }
+        }
+        private bool isGetGift(int id)
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(id);
+            if (itemCfg == null)
+            {
+                return false;
+            }
+            int targetCount = itemCfg.itemsArr.Length;
+            int count = 0;
+            for (int i = 0; i < itemCfg.itemsArr.Length; i++)
+            {
+                ItemData itemDate;
+                if (BagDataManager.Instance.GetBagData().TryGetValue(itemCfg.itemsArr[i][0], out itemDate))
+                {
+                    if (itemDate.num >= itemCfg.itemsArr[i][1])
+                    {
+                        count++;
+                    }
+                }
+                else
+                {
+                    ItemCfg itemcfg = ItemCfgArray.Instance.GetCfg(itemCfg.itemsArr[i][0]);
+                    if(itemcfg.itemType == ConstItemType.CARD)
+                    {
+                        CardData data = CardDataManager.GetCardDataById(itemcfg.id);
+                        if(data !=null)
+                        {
+                            count++;
+                        }
+                    }
+                    else if(itemcfg.itemType == ConstItemType.ITEM && itemcfg.subType == 1)
+                    {
+
+                    }
+                    else 
+                    {
+                        if (ItemDataManager.GetItemNum(itemCfg.itemsArr[i][0]) >= itemCfg.itemsArr[i][1])
+                        {
+                            count++;
+                        }
+                    }
+                }
+            }
+            if(count >= targetCount)
+            {
+                return true;
+            }
+            return false;
         }
+        private bool isGetBag(int id)
+        {
+           foreach(var item in ActivityDataManager.Instance.GiftBagIdList)
+            {
+                if(item == id)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
     }
 }

GameClient/Assets/Game/HotUpdate/Views/TurnTable/TurnTableView.cs

@@ -34,6 +34,9 @@ namespace GFGGame
         private EffectUI _effectUI2;
         private EffectUI _effectUI3;
         private EffectUI _effectUI4;
+        private EffectUI _effectUI5;
+        private EffectUI _effectUI6;
+        private EffectUI _effectUI7;
         private EffectUI _effectUISpecial;
         private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
         private Dictionary<string, EffectUI> _effectTableUIDic = new Dictionary<string, EffectUI>();
@@ -48,6 +51,12 @@ namespace GFGGame
             _effectUI3 = null;
             EffectUIPool.Recycle(_effectUI4);
             _effectUI4 = null;
+            EffectUIPool.Recycle(_effectUI5);
+            _effectUI4 = null;
+            EffectUIPool.Recycle(_effectUI6);
+            _effectUI4 = null;
+            EffectUIPool.Recycle(_effectUI7);
+            _effectUI4 = null;
             EffectUIPool.Recycle(_effectUISpecial);
             _effectUISpecial = null;
             foreach (var v in _effectUIDic)
@@ -101,6 +110,9 @@ 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");
+            _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_bgEffec1, "ui_Activity", "HHYY_BG_TX/HHYY_BG_TX");
+            _effectUI6 = EffectUIPool.CreateEffectUI(_ui.m_bgEffec2, "ui_Activity", "HHYY_BG_TX/HHYY_BG_TX");
+            _effectUI7 = EffectUIPool.CreateEffectUI(_ui.m_bgEffec3, "ui_Activity", "HHYY_BG_TX/HHYY_BG_TX");
             _effectUISpecial = EffectUIPool.CreateEffectUI(_ui.m_specialEffect, "ui_Activity", "HHYY_Select_Special/HHYY_Select_Special");
         }
         protected override void OnShown()