1

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

@@ -31,7 +31,7 @@ namespace GFGGame
         public List<float> angleList = new List<float>() {0,39,74,109 ,145,180,215,250,288,325};
         public int wishType = 0;
         private EffectUI _effectUI1;
-        private EffectUI _effectUI2;
+       // private EffectUI _effectUI2;
         private EffectUI _effectUI3;
         private EffectUI _effectUI4;
         private EffectUI _effectUI5;
@@ -45,8 +45,8 @@ namespace GFGGame
         {
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
-            EffectUIPool.Recycle(_effectUI2);
-            _effectUI2 = null;
+            // EffectUIPool.Recycle(_effectUI2);
+            // _effectUI2 = null;
             EffectUIPool.Recycle(_effectUI3);
             _effectUI3 = null;
             EffectUIPool.Recycle(_effectUI4);
@@ -97,6 +97,7 @@ namespace GFGGame
             _ui.m_rewardIcon.onClick.Add(OnClickBtnReward);
             _ui.m_shopBtn.onClick.Add(OnClickBtnShop);
             _ui.m_giftBtn.onClick.Add(OnClickBtnGift);
+            _ui.m_ruleBtn.onClick.Add(RuleController.ShowRuleView);
             endValue = 1080;
             duratio = 2.0f;
             WaitTime = 2700;
@@ -105,7 +106,7 @@ 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");
+            //_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");
@@ -135,6 +136,7 @@ namespace GFGGame
             UpdateRewardItem();
             UpdateReward();
             UpdateTime(null);
+            _ui.m_ruleBtn.data = 300029;
             Timers.inst.Add(1, 0, UpdateTime);
         }
         protected override void OnHide()
@@ -190,7 +192,7 @@ namespace GFGGame
             ActivityOpenCfg activiyCfg = ActivityOpenCfgArray.Instance.GetCfg(activityID);
             if (activiyCfg != null)
             {
-                _ui.m_timeText.text = GetTImeText(activiyCfg.endTime);
+                _ui.m_timeText.text = "活动结束时间：" + GetTImeText(activiyCfg.endTime);
             }
             //还要判断是否已购买,和时间
             var activityInfoByTypeList = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
@@ -308,8 +310,10 @@ namespace GFGGame
                 }
                 if(rewardItem.target.data == null)
                 {
-                    rewardItem.target.onClick.Add(OnClickRewardItem);
+                    
                 }
+                rewardItem.target.onClick.Add(OnClickRewardItem);
+
                 List<int> dateList = new List<int>() { itemCfg.id, rewardList[i].Id };
                 rewardItem.target.data = dateList;
                 UI_rewardItem.ProxyEnd();
@@ -327,7 +331,7 @@ namespace GFGGame
             if (ActivityDataManager.Instance.TurnRewardStateDic.ContainsKey(idList[1]))
             {
                 //if (ActivityDataManager.Instance.TurnRewardStateDic[idList[1]] != 1)
-                if(idList[1] > GetRewardIndex() || ActivityDataManager.Instance.TurnRewardStateDic[idList[1]] == 2)
+                if (ActivityDataManager.Instance.TurnRewardStateDic[idList[1]] != 1)
                 {
                     GoodsItemTipsController.ShowItemTips(idList[0]);
                 }