Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop

liuzujun
2 parents f82a5775 1e74806a
Showing 2 changed files with 4 additions and 2 deletions Show diff stats
src/actions/RoleAction.lua
src/models/Store.lua
@@ -1771,6 +1771,8 @@ function _M.itemConvertSpecialRpc(agent, data)
 		local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
 		if tmpreward then
 			table.rewardMerge(reward, tmpreward)
+		else
+			return 6
 		end
 	end
@@ -378,7 +378,7 @@ function Store:buySMonthCard(id)
         --续刊
         local card = csvdb["shop_cardCsv"][id] or {}
         if card["buyLimit"] and card["buyLimit"] ~= "" then
-            if self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) == false then
+            if not self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) then
                 skynet.error("不满足购买条件")
                 return false
             end
@@ -399,7 +399,7 @@ function Store:buySMonthCard(id)
         --增刊
         local card = csvdb["shop_cardCsv"][id] or {}
         if card["buyLimit"] and card["buyLimit"] ~= "" then
-            if self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) == false then
+            if not self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) then
                 skynet.error("不满足增刊条件")
                 return false
             end