战令活动过期清购买记录，升级月卡只能同等级续费

liuzujun
1 parent 2e283f60
Showing 2 changed files with 13 additions and 2 deletions Show diff stats
src/models/Activity.lua
src/models/Store.lua
@@ -1082,6 +1082,15 @@ activityFunc[Activity.ActivityType.BattleCommand] = {
 		actData["week"] = 0
 		self:updateActData(actType, actData, true)
 	end,
+	["close"] = function (self, actType, notify, actId)
+		local rechargeRecord = self.owner.storeData:getProperty("payR")
+		for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
+			if cfg.shop == 2 and cfg.type == CardType.ActBattleCommandCard then
+				rechargeRecord[id] = nil
+			end
+		end
+		self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
+	end,
 }
@@ -219,7 +219,8 @@ function Store:onBuyCard(type, duration, id, actid)
         else
             local cfg = csvdb["shop_cardCsv"][id]
             if not cfg then return end 
-            if cfg.level - self:getCurMonthCardLvl() ~= 1 then
+            local dif = cfg.level - self:getCurMonthCardLvl(false)
+            if dif > 1 and dif < 0 then
                 return
             end
             self:updateProperty({field = "monthCardId", value = id})
@@ -240,7 +241,8 @@ function Store:onBuyCard(type, duration, id, actid)
         else
             local cfg = csvdb["shop_cardCsv"][id]
             if not cfg then return end 
-            if cfg.level - self:getCurMonthCardLvl() ~= 1 then
+            local dif = cfg.level - self:getCurMonthCardLvl(true)
+            if dif > 1 and dif < 0 then
                 return
             end
             self:updateProperty({field = "smonthCardId", value = id})