转盘补充提交

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

@@ -418,6 +418,8 @@ namespace GFGGame
         /***************************转盘活动*******************************/
         public int TurnTableActivityType = 102; 
         public int TurnTableTimes = 300;
+        public int TipsDropId = 0;
+        public int StartDropId = 40000002;
         //奖励状态
         public Dictionary<int, int> TurnRewardStateDic = new Dictionary<int, int>();
         //抽奖结果

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

@@ -8,6 +8,7 @@ namespace UI.TurnTable
     {
         public GComponent target;
         public GLoader m_bg;
+        public GGraph m_bgEffect;
         public GLoader m_iconBg;
         public UI_rewardItem m_item0;
         public UI_rewardItem m_item1;
@@ -27,9 +28,12 @@ namespace UI.TurnTable
         public GLoader m_numberBg;
         public GTextField m_numberText;
         public GButton m_btnStartOne;
+        public GGraph m_btnEffectOne;
         public GButton m_btnStartThree;
+        public GGraph m_btnEffectThree;
         public GTextField m_timeText;
         public GButton m_ruleBtn;
+        public GGraph m_titleEffect;
         public GButton m_shopBtn;
         public GButton m_giftBtn;
         public GTextField m_giftTimeText;
@@ -84,6 +88,7 @@ namespace UI.TurnTable
         private void Init(GComponent comp)
         {
             m_bg = (GLoader)comp.GetChild("bg");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             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"));
@@ -103,9 +108,12 @@ namespace UI.TurnTable
             m_numberBg = (GLoader)comp.GetChild("numberBg");
             m_numberText = (GTextField)comp.GetChild("numberText");
             m_btnStartOne = (GButton)comp.GetChild("btnStartOne");
+            m_btnEffectOne = (GGraph)comp.GetChild("btnEffectOne");
             m_btnStartThree = (GButton)comp.GetChild("btnStartThree");
+            m_btnEffectThree = (GGraph)comp.GetChild("btnEffectThree");
             m_timeText = (GTextField)comp.GetChild("timeText");
             m_ruleBtn = (GButton)comp.GetChild("ruleBtn");
+            m_titleEffect = (GGraph)comp.GetChild("titleEffect");
             m_shopBtn = (GButton)comp.GetChild("shopBtn");
             m_giftBtn = (GButton)comp.GetChild("giftBtn");
             m_giftTimeText = (GTextField)comp.GetChild("giftTimeText");
@@ -116,6 +124,7 @@ namespace UI.TurnTable
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
+            m_bgEffect = null;
             m_iconBg = null;
             m_item0.Dispose();
             m_item0 = null;
@@ -146,9 +155,12 @@ namespace UI.TurnTable
             m_numberBg = null;
             m_numberText = null;
             m_btnStartOne = null;
+            m_btnEffectOne = null;
             m_btnStartThree = null;
+            m_btnEffectThree = null;
             m_timeText = null;
             m_ruleBtn = null;
+            m_titleEffect = null;
             m_shopBtn = null;
             m_giftBtn = null;
             m_giftTimeText = null;

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

@@ -10,6 +10,7 @@ namespace UI.TurnTable
         public Controller m_c1;
         public GLoader m_icon;
         public GTextField m_numText;
+        public GGraph m_effect;
         public const string URL = "ui://zioq0m8xqncf1a";
         public const string PACKAGE_NAME = "TurnTable";
         public const string RES_NAME = "reward";
@@ -60,12 +61,14 @@ namespace UI.TurnTable
             m_c1 = comp.GetController("c1");
             m_icon = (GLoader)comp.GetChild("icon");
             m_numText = (GTextField)comp.GetChild("numText");
+            m_effect = (GGraph)comp.GetChild("effect");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_icon = null;
             m_numText = null;
+            m_effect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -444,7 +444,9 @@ namespace GFGGame
                 {
                     ActivityDataManager.Instance.TurnRewardStateDic.Clear();
                     ActivityDataManager.Instance.TurnTableTimes = response.SpecialTotalNum;
-                    for(int i = 0;i<response.RewardIds.Count;i++)
+                    ActivityDataManager.Instance.StartDropId = response.ExtraIdDropId;
+                    ActivityDataManager.Instance.TipsDropId = response.ExtraIdDropId;
+                    for (int i = 0;i<response.RewardIds.Count;i++)
                     {
                         ActivityDataManager.Instance.TurnRewardStateDic.Add(response.RewardIds[i],response.RewardStatus[i]);
                     }
@@ -465,6 +467,7 @@ namespace GFGGame
                     ActivityDataManager.Instance.TurnRewardStateDic.Clear();
                     ActivityDataManager.Instance.threeTurnResult.Clear();
                     ActivityDataManager.Instance.TurnTableTimes = response.SpecialTotalNum;
+                    ActivityDataManager.Instance.TipsDropId = response.ExtraIdDropId;
                     for (int i = 0; i < response.RewardIds.Count; i++)
                     {
                         ActivityDataManager.Instance.TurnRewardStateDic.Add(response.RewardIds[i], response.RewardStatus[i]);

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionRewardView.cs

@@ -142,6 +142,11 @@ namespace GFGGame
             //_effects.Clear();
             //EventAgent.DispatchEvent(ConstMessage.REWARDVIEW_CLOTHER);
             GetSuitItemController.TryShow(0);
+            if(ActivityDataManager.Instance.StartDropId != ActivityDataManager.Instance.TipsDropId)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("特殊奖励已改变！");
+                ActivityDataManager.Instance.StartDropId = ActivityDataManager.Instance.TipsDropId;
+            }
         }
         private void RenderListRewardItem(int index, GObject obj)
         {

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeThemeView.cs

@@ -97,6 +97,7 @@ namespace GFGGame
                 UI_ComDodgeFightStar.ProxyEnd();
             }
             item.m_useIcon.visible = false;
+            item.m_fieldwork.visible = false;
             if(cardData.id == MainDataManager.Instance.CardBgID)
             {
                 selectIndex = index;

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

@@ -47,8 +47,8 @@ namespace GFGGame
         {
             base.OnShown();
             //这里根据表来，看放哪
-            int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityDataManager.Instance.TurnTableActivityType);
-            int dropId = TurntableLuckyBoxCfgArray.Instance.GetCfgByActivityId(activityID).ExtraIdDropId;
+            //int activityID = ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityDataManager.Instance.TurnTableActivityType);
+            int dropId = ActivityDataManager.Instance.TipsDropId;//TurntableLuckyBoxCfgArray.Instance.GetCfgByActivityId(activityID).ExtraIdDropId;
             rewardList = DropOutCfgArray.Instance.GetCfgsByid(dropId);
             _ui.m_list.numItems = rewardList.Count;
         }

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

@@ -33,6 +33,7 @@ namespace GFGGame
         private EffectUI _effectUI2;
         private EffectUI _effectUI3;
         private EffectUI _effectUI4;
+        private Dictionary<string, EffectUI> _effectUIDic = new Dictionary<string, EffectUI>();
 
         public override void Dispose()
         {
@@ -44,6 +45,11 @@ namespace GFGGame
             _effectUI3 = null;
             EffectUIPool.Recycle(_effectUI4);
             _effectUI4 = null;
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+            _effectUIDic.Clear();
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -81,6 +87,10 @@ namespace GFGGame
         }
         private void AddEffect()
         {
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "HHYY_BG_TX/HHYY_BG_TX");
+            _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");
         }
         protected override void OnShown()
         {
@@ -156,7 +166,6 @@ namespace GFGGame
         }
         private void UpdateView()
         {
-            _ui.m_reward.target.scrollPane.SetPercX(GetRewardIndex(), false);
             ActivityOpenCfg activiyCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
             if (activiyCfg != null)
             {
@@ -216,10 +225,17 @@ namespace GFGGame
             _ui.m_numberText.text = ActivityDataManager.Instance.TurnTableTimes.ToString();
             _ui.m_reward.m_bar.max = rewardList.Count;
             _ui.m_reward.m_bar.value = GetRewardIndex();
+            float value =(float) GetRewardIndex() / (float)rewardList.Count;
+            _ui.m_reward.target.scrollPane.SetPercX(value, false);
             for (int i = 0; i < rewardList.Count; i++)
             {
                 GComponent comProBonus = _ui.m_reward.target.GetChild("itemj" + i).asCom;
                 UI_reward rewardItem = UI_reward.Proxy(comProBonus);
+                if(!_effectUIDic.ContainsKey("itemj" + i))
+                {
+                    _effectUIDic.Add("itemj" + i, EffectUIPool.CreateEffectUI(rewardItem.m_effect, "ui_Activity", "HHYY_Line_Full/HHYY_Line_Full"));
+                }  
+                rewardItem.m_effect.SetScale(1, 1);
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(rewardList[i].BonusArr[0][0]);
                 rewardItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
                 rewardItem.m_numText.text = rewardList[i].Num.ToString();
@@ -227,16 +243,19 @@ namespace GFGGame
                 {
                     if (i>(GetRewardIndex()-1) || ActivityDataManager.Instance.TurnRewardStateDic[rewardList[i].Id] == 2)
                     {
+                        rewardItem.m_effect.visible = false;
                         rewardItem.m_c1.selectedIndex = 0;
                         RedDotController.Instance.SetComRedDot(rewardItem.target, false, "");
                     }
                     else
                     {
+                        rewardItem.m_effect.visible = true;
                         rewardItem.m_c1.selectedIndex = 1;
                         RedDotController.Instance.SetComRedDot(rewardItem.target, true, "");
                     }
                     if(ActivityDataManager.Instance.TurnRewardStateDic[rewardList[i].Id] == 2)
                     {
+                        rewardItem.m_effect.visible = false;
                         rewardItem.m_c1.selectedIndex = 2;
                         RedDotController.Instance.SetComRedDot(rewardItem.target, false, "");
                     }