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

测试
2 parents cc30a8b3 1d073c8b
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
src/adv/Adv.lua
src/models/RolePlugin.lua
@@ -1713,7 +1713,7 @@ local function clickTrader(self, room, block, params)
 	local goodsData = csvdb["event_trader_goodsCsv"][block.event.shop[buyId][1]]
 	if not goodsData then return false, 5 end
-	local costCount = math.ceil(goodsData.price * (1 - (block.event.shop[buyId][2] or 100) / 100))
+	local costCount = math.ceil(goodsData.price * (1 - (block.event.shop[buyId][2] or 0) / 100))
 	if not self:cost({[goodsData.currency] = costCount}, {log = {desc = "clickTrader", int1 = block.event.id}}) then return false, 6 end --不够
 	self:backCost({[goodsData.currency] = costCount})
 	self:award({[goodsData.item] = goodsData.num}, {log = {desc = "clickTrader", int1 = block.event.id}}, {})
@@ -2377,7 +2377,7 @@ function RolePlugin.bind(Role)
 			return 1
 		end
-		if not self.storeData:checkRechargeRecord(rechargeData.limit, id) then
+		if not self.storeData:checkRechargeRecord(rechargeData.limit, id) and rechargeData.shop ~= 2 then
 			return 2
 		end