提交阳春花蔓UI 新入口

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

@@ -13,7 +13,9 @@ namespace UI.ActivityThemeLuckyBox
         public GButton m_btnChapter;
         public GButton m_btnTask;
         public GButton m_btnShop;
+        public GTextField m_timeDesc;
         public GTextField m_txtTime;
+        public GButton m_btnLuckyBox_old;
         public GButton m_btnLuckyBox;
         public const string URL = "ui://ubfk2kobmbf1k";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
@@ -68,7 +70,9 @@ namespace UI.ActivityThemeLuckyBox
             m_btnChapter = (GButton)comp.GetChild("btnChapter");
             m_btnTask = (GButton)comp.GetChild("btnTask");
             m_btnShop = (GButton)comp.GetChild("btnShop");
+            m_timeDesc = (GTextField)comp.GetChild("timeDesc");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnLuckyBox_old = (GButton)comp.GetChild("btnLuckyBox_old");
             m_btnLuckyBox = (GButton)comp.GetChild("btnLuckyBox");
         }
         public void Dispose(bool disposeTarget = false)
@@ -79,7 +83,9 @@ namespace UI.ActivityThemeLuckyBox
             m_btnChapter = null;
             m_btnTask = null;
             m_btnShop = null;
+            m_timeDesc = null;
             m_txtTime = null;
+            m_btnLuckyBox_old = null;
             m_btnLuckyBox = null;
             if(disposeTarget && target != null)
             {

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

@@ -32,6 +32,7 @@ namespace GFGGame
             _ui.m_btnTask.onClick.Add(OnBtnTaskClick);
             _ui.m_btnChapter.onClick.Add(OnBtnChapterClick);
             _ui.m_btnLuckyBox.onClick.Add(OnBtnLuckyBoxClick);
+            _ui.m_btnShop.onClick.Add(OnBtnShopClick);
         }
 
         protected override void AddEventListener()
@@ -55,7 +56,8 @@ namespace GFGGame
             _ui.m_c1.selectedPage = _activityId.ToString();
             
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hb_" + _activityCfg.res);
+            //_ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hb_" + _activityCfg.res);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hb_ychm"); 
             UpdateRedDot();
             Timers.inst.Add(1, 0, UpdateTime);
         }
@@ -89,6 +91,13 @@ namespace GFGGame
             if (endTime < curTime) return;
             ViewManager.Show<LuckyBoxActivityView>(_activityId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData }, true);
         }
+
+        private void OnBtnShopClick()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY }
+ , new object[] { typeof(ActivityThemeLuckyBoxView).FullName, viewData });
+        }
+
         private void UpdateTime(object param = null)
         {
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
@@ -103,7 +112,7 @@ namespace GFGGame
         }
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnLuckyBox, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox) || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -90, 70);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnLuckyBox, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox) || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -36, 39);
             RedDotController.Instance.SetComRedDot(_ui.m_btnTask, RedDotDataManager.Instance.GetActLuckyBoxTaskdRed());
         }
     }