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

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

@@ -1,3 +1,4 @@
+using ET;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -72,10 +73,73 @@ namespace GFGGame
             });
         }
 
-
         public NoticeInfo GetNoticeInfoById(int noticeId)
         {
             return _noticeInfoDic[noticeId];
         }
+
+        public List<AdCfg> UpdateShowActivity()
+        {
+            AdCfg[] activitydata = AdCfgArray.Instance.dataArray;
+            List<AdCfg> showActivity = new List<AdCfg>();
+            for (int i = 0; i < activitydata.Length; i++)
+            {
+                AdCfg adCfg = activitydata[i];
+                if (adCfg.activityId > 0)
+                {
+                    if (ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;
+                    ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
+                    if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime) continue;
+                }
+                if (adCfg.NoticeTips != null && adCfg.NoticeTips != "")
+                {
+                    if (adCfg.activityId != 0)
+                    {
+                        ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
+                        if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime)
+                        {
+
+                        }
+                        else
+                        {
+                            showActivity.Add(adCfg);
+                            continue;
+                        }
+                    }
+                    if (adCfg.startTime != "" && adCfg.startTime != null)
+                    {
+                        long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);
+                        long endTime = TimeUtil.DateTimeToTimestamp(adCfg.endTime);
+                        if (TimeHelper.ServerNow() < startTime || TimeHelper.ServerNow() > endTime)
+                        {
+                            continue;
+                        }
+                        else
+                        {
+                            showActivity.Add(adCfg);
+                        }
+                    }
+                }
+            }
+
+            return showActivity;
+        }
+
+        public bool GetRedDotState(string jumpId, int activityID)
+        {
+            switch (jumpId)
+            {
+                case "DailySignView":
+                    return RedDotDataManager.Instance.GetActivityDay7Red();
+                case "LuckyBoxView":
+                    return RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy) || RedDotDataManager.Instance.GetLuckyBoxFreeTimes();
+                case "NewLimitChargeView":
+                    return RedDotDataManager.Instance.GetLimiteChargeRewardRed(activityID);
+                case "OpenServerActivityView":
+                    return RedDotDataManager.Instance.GetOpenServerRed();
+            }
+
+            return false;
+        }
     }
 }

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

@@ -20,6 +20,15 @@ namespace GFGGame
             {
                 if (noticeInfos[i].readStatus == false) return true;
             }
+
+            List<AdCfg> showActivity = NoticeDataManager.Instance.UpdateShowActivity();
+            for (int i = 0; i < showActivity.Count; i++)
+            {
+                if (NoticeDataManager.Instance.GetRedDotState(showActivity[i].jumpId, showActivity[i].activityId))
+                {
+                    return true;
+                }
+            }
             return false;
         }
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardUpUI.cs

@@ -8,7 +8,6 @@ namespace UI.Card
     {
         public GComponent target;
         public Controller m_c1;
-        public GGraph m_bgTouch;
         public GGraph m_holderBgCom;
         public GGraph m_holderTitle;
         public GTextField m_txtLast;
@@ -65,7 +64,6 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_bgTouch = (GGraph)comp.GetChild("bgTouch");
             m_holderBgCom = (GGraph)comp.GetChild("holderBgCom");
             m_holderTitle = (GGraph)comp.GetChild("holderTitle");
             m_txtLast = (GTextField)comp.GetChild("txtLast");
@@ -78,7 +76,6 @@ namespace UI.Card
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_bgTouch = null;
             m_holderBgCom = null;
             m_holderTitle = null;
             m_txtLast = null;

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

@@ -7,6 +7,7 @@ namespace UI.LuckyBox
     public partial class UI_LuckyBoxWishUI
     {
         public GComponent target;
+        public Controller m_showType;
         public GButton m_btnWish1;
         public GButton m_btnWish2;
         public GButton m_btnRule;
@@ -61,6 +62,7 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
+            m_showType = comp.GetController("showType");
             m_btnWish1 = (GButton)comp.GetChild("btnWish1");
             m_btnWish2 = (GButton)comp.GetChild("btnWish2");
             m_btnRule = (GButton)comp.GetChild("btnRule");
@@ -71,6 +73,7 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_showType = null;
             m_btnWish1 = null;
             m_btnWish2 = null;
             m_btnRule = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthList.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_StoreMonthList
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://p9mtgheobdp4te8";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "StoreMonthList";
+        private static UI_StoreMonthList _proxy;
+
+        public static UI_StoreMonthList Create(GObject gObject = null)
+        {
+            var ui = new UI_StoreMonthList();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_StoreMonthList Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_StoreMonthList();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthList.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b2a3150d4e5099444b354db0902b64a9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthUI.cs

@@ -22,7 +22,7 @@ namespace UI.Store
         public GTextField m_txtTime;
         public GButton m_btnGet;
         public GTextField m_txtGiftBag;
-        public GList m_list;
+        public UI_StoreMonthList m_storeMonthList;
         public GButton m_btnBlackReward;
         public GGraph m_holderfEff;
         public const string URL = "ui://p9mtgheoqik1tc0";
@@ -87,7 +87,7 @@ namespace UI.Store
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_txtGiftBag = (GTextField)comp.GetChild("txtGiftBag");
-            m_list = (GList)comp.GetChild("list");
+            m_storeMonthList = (UI_StoreMonthList)UI_StoreMonthList.Create(comp.GetChild("storeMonthList"));
             m_btnBlackReward = (GButton)comp.GetChild("btnBlackReward");
             m_holderfEff = (GGraph)comp.GetChild("holderfEff");
         }
@@ -109,7 +109,8 @@ namespace UI.Store
             m_txtTime = null;
             m_btnGet = null;
             m_txtGiftBag = null;
-            m_list = null;
+            m_storeMonthList.Dispose();
+            m_storeMonthList = null;
             m_btnBlackReward = null;
             m_holderfEff = null;
             if(disposeTarget && target != null)

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

@@ -43,6 +43,7 @@ namespace GFGGame
             _ui.m_t4.Play();
             if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity) == 0)
             {
+                ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
                 _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
             }
             UpdateInfo();
@@ -140,7 +141,7 @@ namespace GFGGame
         }
         private void OnClickTips()
         {
-            if(GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity) == 0)
+            if(ActivityDataManager.Instance.todayActivityTips == 0)
             {
                 _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
                 ActivityDataManager.Instance.todayActivityTips = 1;

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

@@ -53,6 +53,7 @@ namespace GFGGame
         {
             if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity) == 0)
             {
+                ActivityDataManager.Instance.todayMonthlyCardTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity);
                 _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
             }
             _ui.m_rewardList.numItems = rewards;
@@ -85,7 +86,7 @@ namespace GFGGame
 
         private void OnClickTips()
         {
-            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity) == 0)
+            if (ActivityDataManager.Instance.todayMonthlyCardTips == 0)
             {
                 _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
                 ActivityDataManager.Instance.todayMonthlyCardTips = 1;

GameClient/Assets/Game/HotUpdate/Views/Card/CardUpView.cs

@@ -37,13 +37,15 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            packageName = UI_CardUpUI.PACKAGE_NAME;
             _ui = UI_CardUpUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
+            this.isfullScreen = true;
 
             //MakeFullScreen(_ui);
-            _ui.m_bgTouch.onClick.Add(OnBackClick);
+            _ui.target.onClick.Add(OnBackClick);
             _ui.m_listProperty.itemRenderer = RenderListPropertyItem;
             _ui.m_listLastProperty.itemRenderer = RenderListLastPropertyItem;
             _ui.m_listCardProperty.itemRenderer = RenderListCardPropertyItem;

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

@@ -52,6 +52,10 @@ namespace GFGGame
         {
             base.OnShown();
             _actLimitTsy = (int)this.viewData;
+            if (_actLimitTsy == ConstLimitTimeActivityType.ActLimitStlyc)
+                _ui.m_showType.selectedIndex = 1;
+            else
+                _ui.m_showType.selectedIndex = 0;
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);

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

@@ -895,6 +895,7 @@ namespace GFGGame
 
             if (redPointUpdateFrame == 12)
                 RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red(), "", -10, 17);
+
             RedDotController.Instance.SetComRedDot(_ui.m_btnWanShiLi.target, RedDotDataManager.Instance.GetActivityWanShiLiRed(), "", -24, -9);
 
             if (redPointUpdateFrame == 13)

GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameCheckView.cs

@@ -74,18 +74,18 @@ namespace GFGGame
                 _ui.m_needNum1.text = gameDate[0].comsumeStartArr[0][1].ToString();
                 _ui.m_needNum2.text = gameDate[1].comsumeStartArr[0][1].ToString();
                 _ui.m_needNum3.text = gameDate[2].comsumeStartArr[0][1].ToString();
-                _ui.m_needIcon1.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[0].comsumeStartArr[0][0]).res);
-                _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[1].comsumeStartArr[0][0]).res);
-                _ui.m_needIcon3.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[2].comsumeStartArr[0][0]).res);
+                _ui.m_needIcon1.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(gameDate[0].comsumeStartArr[0][0]).res,"png");
+                _ui.m_needIcon2.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(gameDate[1].comsumeStartArr[0][0]).res,"png");
+                _ui.m_needIcon3.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(gameDate[2].comsumeStartArr[0][0]).res,"png");
             }
             else if(gameDate[0].comsumePassArr.Length > 0)
             {
                 _ui.m_needNum1.text = gameDate[0].comsumePassArr[0][1].ToString();
                 _ui.m_needNum2.text = gameDate[1].comsumePassArr[0][1].ToString();
                 _ui.m_needNum3.text = gameDate[2].comsumePassArr[0][1].ToString();
-                _ui.m_needIcon1.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[0].comsumePassArr[0][0]).res);
-                _ui.m_needIcon2.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[1].comsumePassArr[0][0]).res);
-                _ui.m_needIcon3.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(gameDate[2].comsumePassArr[0][0]).res);
+                _ui.m_needIcon1.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(gameDate[0].comsumePassArr[0][0]).res,"png");
+                _ui.m_needIcon2.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(gameDate[1].comsumePassArr[0][0]).res,"png");
+                _ui.m_needIcon3.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(gameDate[2].comsumePassArr[0][0]).res,"png");
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs

@@ -13,6 +13,7 @@ namespace GFGGame
         private EffectUI _effectUI2;
         private AdCfg[] activitydata;
         private List<AdCfg> showActivity = new List<AdCfg>();
+
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -37,6 +38,7 @@ namespace GFGGame
             this.viewCom.Center();
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            isReturnView = true;
         }
 
         protected override void OnInit()
@@ -60,11 +62,18 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_c1.selectedIndex = 1;
-            _ui.m_listActivity.visible = true;
-            _ui.m_listNotice.visible = true;
-            _ui.m_buttonCom.visible = true;
+
+            if (backRefresh)
+            {
+                _ui.m_c1.selectedIndex = 1;
+                _ui.m_listActivity.visible = true;
+                _ui.m_listNotice.visible = true;
+                _ui.m_buttonCom.visible = true;
+            }
+
             OnCtrlChange();
+            UpdateInfo();
+            UpdateTitleRedDot();
         }
 
         protected override void OnHide()
@@ -102,20 +111,16 @@ namespace GFGGame
             }
         }
 
+        /// <summary>
+        /// 活动公告 0
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="obj"></param>
         private void ListActivityItemRender(int index, GObject obj)
         {
             UI_ListActivityItem item = UI_ListActivityItem.Proxy(obj);
-            item.m_loaShow.url = ResPathUtil.GetActivityPath(showActivity[index].NoticeTips,"png");
+            item.m_loaShow.url = ResPathUtil.GetActivityPath(showActivity[index].NoticeTips, "png");
             item.m_txtName.text = "";
-            switch (showActivity[index].jumpId)
-            {
-                //后续添加其他活动
-                case "LuckyBoxView":
-                    item.m_imgTips.visible = RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy) || RedDotDataManager.Instance.GetLuckyBoxFreeTimes();
-                    break;
-                default:
-                    break;
-            }
             long endTime = 0;
             long curTime = TimeHelper.ServerNow();
             if (showActivity.Count > 0)
@@ -133,9 +138,11 @@ namespace GFGGame
             item.m_txtTime.text = string.Format("剩余时间：{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
             item.target.onClick.Add(OnListActivityClick);
             item.target.data = showActivity[index];
+            item.m_imgTips.visible = NoticeDataManager.Instance.GetRedDotState(showActivity[index].jumpId, showActivity[index].activityId);
             UI_ListActivityItem.ProxyEnd();
         }
 
+
         private void OnListActivityClick(EventContext context)
         {
             AdCfg adCfg = (AdCfg)(context.sender as GObject).data;
@@ -156,16 +163,21 @@ namespace GFGGame
 
             if (jumpIndex != 0)
             {
-                this.Hide();
-                ViewManager.Show($"GFGGame.{adCfg.jumpId}", jumpIndex);
+                //Hide();
+                ViewManager.Show($"GFGGame.{adCfg.jumpId}", jumpIndex, false, false);
             }
             else
             {
-                this.Hide();
-                ViewManager.Show($"GFGGame.{adCfg.jumpId}", param);
+                //Hide();
+                ViewManager.Show($"GFGGame.{adCfg.jumpId}", param, false, false);
             }
         }
 
+        /// <summary>
+        /// 系统公告 1
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="obj"></param>
         private void ListNoticeItemRender(int index, GObject obj)
         {
             NoticeInfo noticeInfo = NoticeDataManager.Instance.NoticeInfos[index];
@@ -179,8 +191,10 @@ namespace GFGGame
                 item.m_btnGo.onClick.Add(OnListNoticeBtnGoClick);
             }
             item.m_btnGo.data = noticeInfo;
+
             UI_ListNoticeItem.ProxyEnd();
         }
+
         private async void OnListNoticeBtnGoClick(EventContext context)
         {
             _ui.m_listActivity.visible = false;
@@ -203,48 +217,33 @@ namespace GFGGame
 
         private void UpdateInfo()
         {
-            if(activitydata == null)
-            {
-                activitydata = AdCfgArray.Instance.dataArray;
-            }
-            showActivity.Clear();
-            for (int i = 0; i < activitydata.Length; i++)
+            showActivity = NoticeDataManager.Instance.UpdateShowActivity();
+        }
+
+
+
+        private void UpdateTitleRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnActivity, false);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnNotice, false);
+
+            // 活动公告
+            for (int i = 0; i < showActivity.Count; i++)
             {
-                AdCfg adCfg = activitydata[i];
-                if (adCfg.activityId > 0)
+                if (NoticeDataManager.Instance.GetRedDotState(showActivity[i].jumpId, showActivity[i].activityId))
                 {
-                    if (ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;
-                    ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
-                    if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime) continue;
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnActivity, true, "", -25);
+                    break;
                 }
-                if (adCfg.NoticeTips != null && adCfg.NoticeTips != "")
+            }
+
+            // 系统公告
+            for (int i = 0; i < NoticeDataManager.Instance.NoticeInfos.Count; i++)
+            {
+                if (!NoticeDataManager.Instance.NoticeInfos[i].readStatus)
                 {
-                    if (adCfg.activityId != 0)
-                    {
-                        ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
-                        if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime)
-                        {
-
-                        }
-                        else
-                        {
-                            showActivity.Add(adCfg);
-                            continue;
-                        }
-                    }
-                    if (adCfg.startTime != "" && adCfg.startTime != null)
-                    {
-                        long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);
-                        long endTime = TimeUtil.DateTimeToTimestamp(adCfg.endTime);
-                        if (TimeHelper.ServerNow() < startTime || TimeHelper.ServerNow() > endTime)
-                        {
-                            continue;
-                        }
-                        else
-                        {
-                            showActivity.Add(adCfg);
-                        }
-                    }
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnNotice, true, "", -25);
+                    break;
                 }
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
             this.bringToFontOnClick = false;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
-            _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_storeMonthList.m_list.itemRenderer = ListItemRenderer;
             _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnBuy.target.onClick.Add(OnBtnBuyCardClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
@@ -90,7 +90,7 @@ namespace GFGGame
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_MONTH_CARD, menu2);
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
-            _ui.m_list.numItems = _shopCfgs.Count;
+            _ui.m_storeMonthList.m_list.numItems = _shopCfgs.Count;
 
             MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege1);
 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 5afc63cb314217048ad3d8537286d179
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 837c6021dd937c242b1bc7898f0581e9
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: