招财进宝活动修改

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityZCJB.cs

@@ -13,6 +13,7 @@ namespace UI.ActivityMain
         public GTextField m_activityTime;
         public GLoader m_backBtn;
         public GLoader m_viewBtn;
+        public GLoader m_shopBtn;
         public GGraph m_bgEffect;
         public GGraph m_btnEffect;
         public const string URL = "ui://4ht5s77uqbf4l";
@@ -68,6 +69,7 @@ namespace UI.ActivityMain
             m_activityTime = (GTextField)comp.GetChild("activityTime");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_viewBtn = (GLoader)comp.GetChild("viewBtn");
+            m_shopBtn = (GLoader)comp.GetChild("shopBtn");
             m_bgEffect = (GGraph)comp.GetChild("bgEffect");
             m_btnEffect = (GGraph)comp.GetChild("btnEffect");
         }
@@ -79,6 +81,7 @@ namespace UI.ActivityMain
             m_activityTime = null;
             m_backBtn = null;
             m_viewBtn = null;
+            m_shopBtn = null;
             m_bgEffect = null;
             m_btnEffect = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBRewardView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             base.OnShown();
             UpdateList();
             _ui.m_List.numItems = ActivityDressCfgArray.Instance.dataArray.Length;
-            _ui.m_List.ScrollToView(ActivityDataManager.Instance.ActivityZCJBList.Count, false, true);
+            _ui.m_List.ScrollToView(Mathf.Max(0, ActivityDataManager.Instance.ActivityZCJBList.Count - 1), false, true);
         }
         protected override void OnHide()
         {

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityZCJBView.cs

@@ -35,10 +35,11 @@ namespace GFGGame
             _ui.m_rewardBTn.onClick.Add(OnClickShowReward);
             _ui.m_backBtn.onClick.Add(this.Hide);
             _ui.m_btnChange.onClick.Add(this.Hide);
+            _ui.m_shopBtn.onClick.Add(OnClickShopBtn);
 
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "zcjb_All");
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnEffect, "ui_Activity", "zcjb_icon");
-        }
+        }                
         protected override void OnShown()
         {
             base.OnShown();
@@ -73,6 +74,10 @@ namespace GFGGame
         {
             ViewManager.Show<ActivityZCJBRewardView>();
         }
+        private void OnClickShopBtn()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
+        }
         private async void ReqInfo()
         {
             bool result = await ActivitySProxy.ReqActivityZCJBInfo();