修复阳春BUG

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -205,7 +205,6 @@ namespace GFGGame
             {
                 ActivityOpenCfg OpenCfg = ActivityOpenCfgArray.Instance.GetCfg(openCfg.id);
                 item.m_loaIcon.url = ResPathUtil.GetActivityPath("gg_banner_lc_zfy", "png");
-                ;
                 item.m_loaTitle.visible = false;
                 //item.target.visible = false;
                 UI_Button1.ProxyEnd();

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxWishView.cs

@@ -11,6 +11,7 @@ namespace GFGGame
     {
         private UI_LuckyBoxWishUI _ui;
         private int _actLimitTsy = 0;
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -18,6 +19,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -43,11 +45,12 @@ namespace GFGGame
             _ui.m_btnShow2.data = 1;
             _ui.m_btnShow2.onClick.Add(OnClickBtnShow);
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
-
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -56,16 +59,16 @@ namespace GFGGame
             {
                 _ui.m_showType.selectedIndex = 1;
             }
-            else if(_actLimitTsy == 1)
+            else if (_actLimitTsy == 1)
             {
-                _ui.m_showType.selectedIndex = 3;
+                _ui.m_showType.selectedIndex = 0;
             }
             else
             {
                 _ui.m_showType.selectedIndex = 0;
             }
-            
-            _ui.m_showType.selectedIndex = 1;
+
+            // _ui.m_showType.selectedIndex = 1;
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
@@ -82,13 +85,11 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-
         }
 
         private void OnClickBtnWish(EventContext context)
@@ -98,7 +99,8 @@ namespace GFGGame
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
             var suitId = activityOpenCfg.params2Arr[index];
             var suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
-            AlertUI.Show(string.Format("是否将【{0}】设为许愿套装（许愿后将不可修改，请研究员谨慎选择）", suitCfg.name)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(index); });
+            AlertUI.Show(string.Format("是否将【{0}】设为许愿套装（许愿后将不可修改，请研究员谨慎选择）", suitCfg.name)).SetLeftButton(true)
+                .SetRightButton(true, "确定", (object data) => { onSuccess(index); });
         }
 
         private void OnClickBtnShow(EventContext context)
@@ -117,6 +119,7 @@ namespace GFGGame
                     break;
                 }
             }
+
             ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, new List<int>() { suitId }, false });
         }
 
@@ -127,7 +130,6 @@ namespace GFGGame
             bool result = await LuckyBoxSProxy.ReqAddWishingPoolInfo(activityOpenCfg.params2Arr[index], activityId);
             if (result)
             {
-             
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -888,7 +888,7 @@ namespace GFGGame
 
             List<int> actListChargeIds =
                 ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType
-                    .ActLimitOpenServerCharge);
+                    .ActLimitChargeId);
             int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;
             if (ActivityDataManager.Instance.lastActLimitChargeId != actLimitChargeId)
             {