浏览代码

礼包过期未下架、限购文本、售罄道具可继续购买、

zhaoyang 3 年之前
父节点
当前提交
741b3987da

+ 8 - 3
GameClient/Assets/Game/HotUpdate/Data/RechargeDataManager.cs

@@ -120,6 +120,7 @@ namespace GFGGame
             if (StoryLvGiftCfg != null) giftBagCfgs.Add(StoryLvGiftCfg);
             GiftBagCfg RoleLvGiftCfg = GetRoleLvGiftCfg();
             if (RoleLvGiftCfg != null) giftBagCfgs.Add(RoleLvGiftCfg);
+            giftBagCfgs = RemoveNotOpenCfg(giftBagCfgs);
             SortGiftBagCfgs(giftBagCfgs);
             return giftBagCfgs;
         }
@@ -164,10 +165,8 @@ namespace GFGGame
             });
             return giftBagCfgs;
         }
-        private List<GiftBagCfg> GetNoneGiftCfg()
+        private List<GiftBagCfg> RemoveNotOpenCfg(List<GiftBagCfg> giftBagCfgs)
         {
-            List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>(GiftBagCfgArray.Instance.GetCfgs(LockType.NONE));
-
             for (int i = giftBagCfgs.Count - 1; i >= 0; i--)
             {
                 if (giftBagCfgs[i].startTime != "" && !TimeUtil.IsBeforeCurTime(giftBagCfgs[i].startTime) || giftBagCfgs[i].endTime != "" && !TimeUtil.IsLaterCurTime(giftBagCfgs[i].endTime))
@@ -177,6 +176,12 @@ namespace GFGGame
             }
             return giftBagCfgs;
         }
+        private List<GiftBagCfg> GetNoneGiftCfg()
+        {
+            List<GiftBagCfg> giftBagCfgs = new List<GiftBagCfg>(GiftBagCfgArray.Instance.GetCfgs(LockType.NONE));
+            
+            return giftBagCfgs;
+        }
         private GiftBagCfg GetStoryLvGiftCfg()
         {
             List<GiftBagCfg> giftBagCfgs = GiftBagCfgArray.Instance.GetCfgs(LockType.STORY_LV);

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/GiftBagBuyView.cs

@@ -55,8 +55,8 @@ namespace GFGGame
             {
                 _ui.m_txtLock.text = string.Format("角色达到{0}级解锁", cfg.lv);
             }
-            int buyNum = RechargeDataManager.Instance.GetGiftBuyNumById(cfg.id);
-            _ui.m_txtLimit.text = string.Format("{0}限购({1}/{2})", RechargeDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
+            int buyNum = RechargeDataManager.Instance.GetGiftBuyNumById(cfg.id);         
+            _ui.m_txtLimit.text = string.Format("{0}({1}/{2})", RechargeDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
             if (cfg.refreshType == RefreshType.NONE) _ui.m_txtLimit.text = "永久限购";
             _ui.m_txtEndTime.text = RechargeDataManager.Instance.GetEndTime(cfg.id);
             _ui.m_grpEndTime.visible = cfg.endTime != "";

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs

@@ -225,6 +225,7 @@ namespace GFGGame
             {
                 item.target.onClick.Add(() =>
                 {
+                    bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
                     if (isSellOut)
                     {
                         PromptController.Instance.ShowFloatTextPrompt("已售罄");