暂时关闭活动入口

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -77,7 +77,7 @@ namespace GFGEditor
                     var value = "";
                     foreach (var e in a.Value)
                     {
-                         value = value + e.Key + "*" + e.Value+ ";";
+                        value = value + e.Key + "*" + e.Value + ";";
                     }
                     var values = new string[] { string.Join(";", value) };
                     SQLiteHelper.Instance.UpdateValues(nameof(SuitCfgArray), names, values, nameof(a.Key.id), a.Key.id.ToString());
@@ -95,9 +95,9 @@ namespace GFGEditor
 
         private static void UpdateGlobalCfg(GlobalCfg globalCfg)
         {
-            var names = new string[] 
+            var names = new string[]
             { nameof(globalCfg.suitPartTotalCount), nameof(globalCfg.ClothingPartsCount), nameof(globalCfg.CardCount) };
-            var values = new string[] 
+            var values = new string[]
             { globalCfg.suitPartTotalCount.ToString(), globalCfg.ClothingPartsCount.ToString(), globalCfg.CardCount.ToString() };
             SQLiteHelper.Instance.UpdateValues(nameof(GlobalCfgArray), names, values, nameof(globalCfg.id), globalCfg.id.ToString());
         }
@@ -161,7 +161,7 @@ namespace GFGEditor
                 return;
             }
 
-                if (itemCfg.itemType == ConstItemType.DRESS_UP)
+            if (itemCfg.itemType == ConstItemType.DRESS_UP)
             {
                 // 服装
                 bool isDressUp = Array.IndexOf(DressUpMenuItemDataManager.dressUpGuideSubType, itemCfg.subType) >= 0;
@@ -199,7 +199,7 @@ namespace GFGEditor
             }
         }
 
-        private static void HandleItemAndSuitTags(ItemCfg itemCfg, Dictionary<SuitCfg, Dictionary<string,string>> suitTagsDic)
+        private static void HandleItemAndSuitTags(ItemCfg itemCfg, Dictionary<SuitCfg, Dictionary<string, string>> suitTagsDic)
         {
             if (itemCfg.suitId <= 0)
             {
@@ -220,7 +220,7 @@ namespace GFGEditor
                         tags = new Dictionary<string, string>();
                         suitTagsDic[suitCfg] = tags;
                     }
-                
+
                     if (!tags.ContainsKey(itemCfg.tagsArr[i][0]))
                         tags[itemCfg.tagsArr[i][0]] = itemCfg.tagsArr[i][1];
                     else

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

@@ -19,7 +19,6 @@ namespace GFGGame
         //已经高级领奖levelId
         private List<int> _superRewards = new List<int>();
         private List<ActivityLoginCfg> _rewardCfgs;
-
         public List<ActivityLoginCfg> RewardCfgs { get => _rewardCfgs; set => _rewardCfgs = value; }
 
         private bool _isOpen;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox.cs

@@ -7,10 +7,11 @@ namespace UI.LuckyBox
     public partial class UI_ComBox
     {
         public GComponent target;
+        public Controller m_c1;
         public UI_ComModel m_comModel;
         public UI_Button3 m_btnPreview;
         public GTextField m_txtOwned;
-        public GImage m_imgActLuckyBox;
+        public GLoader m_imgActLuckyBox;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
         public UI_Button1 m_btnBuyOne;
@@ -64,10 +65,11 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
-            m_imgActLuckyBox = (GImage)comp.GetChild("imgActLuckyBox");
+            m_imgActLuckyBox = (GLoader)comp.GetChild("imgActLuckyBox");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
             m_btnBuyOne = (UI_Button1)UI_Button1.Create(comp.GetChild("btnBuyOne"));
@@ -77,6 +79,7 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_comModel.Dispose();
             m_comModel = null;
             m_btnPreview.Dispose();

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -53,7 +53,7 @@ namespace GFGGame
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
 
             // ½çÃæ¸ù¾ÝID¸Ä±ä
-            _ui.m_c1.selectedPage = _activityId.ToString();
+            _ui.m_c1.SetSelectedPage(_activityId.ToString());
             
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res); 

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

@@ -78,6 +78,7 @@ namespace GFGGame
             Timers.inst.Add(1, 0, UpdateTime);
             UpdateListItemData();
             UpdateRedDot();
+            _ui.m_comBox.m_c1.SetSelectedPage(_activityId.ToString());
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);

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

@@ -768,7 +768,8 @@ namespace GFGGame
             ShowExitAlert();
 
             int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
-            _ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
+            //_ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
+            _ui.m_btnActivityLuckyBox.target.visible = false;
             if (actLuckyBoxId > 0)
             {
                 if (actLuckyBoxId != ActivityDataManager.Instance.lastActLuckyBoxId)