Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -22,8 +22,11 @@ namespace GFGGame
 
         public List<ActivityLoginCfg> RewardCfgs { get => _rewardCfgs; set => _rewardCfgs = value; }
 
-        private bool isOpen;
-        public bool IsOpen { get => isOpen; set => isOpen = value; }
+        private bool _isOpen;
+        public bool IsOpen { get => _isOpen; set => _isOpen = value; }
+
+        private bool _needRefresh;
+        public bool NeedRefresh { get => _needRefresh; set => _needRefresh = value; }
 
         public bool CheckIconShow()
         {
@@ -88,7 +91,7 @@ namespace GFGGame
 
         public bool HaveCanGetReward()
         {
-            if (!isOpen)
+            if (!_isOpen)
             {
                 return false;
             }
@@ -109,7 +112,8 @@ namespace GFGGame
 
         public void Clear()
         {
-            isOpen = false;
+            _isOpen = false;
+            _needRefresh = true;
             //info = null;
             //_isBuy = false;
             //_indexDay = 1;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs

@@ -7,6 +7,7 @@ namespace UI.ActivityThemeLuckyBox
     public partial class UI_ActivityThemeLuckyBoxUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaBg;
         public GButton m_btnBack;
         public GButton m_btnChapter;
@@ -61,6 +62,7 @@ namespace UI.ActivityThemeLuckyBox
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChapter = (GButton)comp.GetChild("btnChapter");
@@ -71,6 +73,7 @@ namespace UI.ActivityThemeLuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaBg = null;
             m_btnBack = null;
             m_btnChapter = null;

GameClient/Assets/Game/HotUpdate/Views/ActivityAfuGift/ActivityAfuGiftView.cs

@@ -53,7 +53,11 @@ namespace GFGGame
         {
             base.OnShown();
 
-            InitUI();
+            if (ActivityAfuGiftDataManager.Instance.NeedRefresh)
+            {
+                InitUI();
+                ActivityAfuGiftDataManager.Instance.NeedRefresh = false;
+            }
             UpdateState();
             ProgressAutoLocate();
             UpdateTime(null);

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

@@ -1,10 +1,7 @@
 
-using System.Collections.Generic;
 using ET;
 using FairyGUI;
 using UI.ActivityThemeLuckyBox;
-using UI.CommonGame;
-using UnityEngine;
 
 namespace GFGGame
 {
@@ -12,11 +9,9 @@ namespace GFGGame
     {
         private UI_ActivityThemeLuckyBoxUI _ui;
         private ActivityOpenCfg _activityCfg;
-        private LuckyBoxCfg _luckyBoxCfg;
         private int _activityId;
         public override void Dispose()
         {
-
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -31,23 +26,20 @@ namespace GFGGame
             packageName = UI_ActivityThemeLuckyBoxUI.PACKAGE_NAME;
             _ui = UI_ActivityThemeLuckyBoxUI.Create();
             this.viewCom = _ui.target;
-            // this.modal = true;
-            // this.viewCom.Center();
             isfullScreen = true;
 
-            // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnTask.onClick.Add(OnBtnTaskClick);
             _ui.m_btnChapter.onClick.Add(OnBtnChapterClick);
             _ui.m_btnLuckyBox.onClick.Add(OnBtnLuckyBoxClick);
-
-
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -55,10 +47,14 @@ namespace GFGGame
             if (showTask)
             {
                 OnBtnTaskClick();
+           
             }
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+
+            // ½çÃæ¸ù¾ÝID¸Ä±ä
+            _ui.m_c1.selectedPage = _activityId.ToString();
+            
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
-            _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hb_" + _activityCfg.res);
             UpdateRedDot();
             Timers.inst.Add(1, 0, UpdateTime);

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

@@ -51,9 +51,9 @@ namespace GFGGame
             _luckyBoxCtrl = new LuckyBoxController(_ui.m_comBox.m_comModel.target);
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnReward.onClick.Add(OnClikcBtnReward);
-            _ui.m_btnShop.onClick.Add(OnClikcBtnShop);
-            _ui.m_btnGiftBag.onClick.Add(OnClikcBtnGiftBag);
+            _ui.m_btnReward.onClick.Add(OnClickBtnReward);
+            _ui.m_btnShop.onClick.Add(OnClickBtnShop);
+            _ui.m_btnGiftBag.onClick.Add(OnClickBtnGiftBag);
 
         }
         protected override void AddEventListener()
@@ -245,17 +245,18 @@ namespace GFGGame
             });
         }
 
-        private void OnClikcBtnReward()
+        private void OnClickBtnReward()
         {
             ViewManager.Show<ActivityThemeLuckyBoxBonusView>(ConstLimitTimeActivityType.ActLimitLuckyBox);
         }
-        private void OnClikcBtnShop()
+        private void OnClickBtnShop()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY }
+            , new object[] { typeof(LuckyBoxActivityView).FullName, viewData});
         }
 
         //限时礼包按钮点击执行方法
-        private void OnClikcBtnGiftBag()
+        private void OnClickBtnGiftBag()
         {
             var activityInfoByTypeList =
                 ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);