商人卖完走人

zhouhaihai
1 parent b992f1ca
Showing 1 changed file with 7 additions and 1 deletions Show diff stats
src/adv/Adv.lua
@@ -798,7 +798,8 @@ local function clickTrader(self, room, block, params)
 	if not block.event.shop or not block.event.shop[buyId] then return end
 	if (block.event.status or ""):getv(buyId, 0) == 1 then return end -- 买过了
  
-	if traderData.purchasetime <= #((block.event.status or ""):toArray()) then return end
+	local buyCount = #((block.event.status or ""):toArray())
+	if traderData.purchasetime <= buyCount then return end
  
 	local goodsData = csvdb["event_trader_goodsCsv"][block.event.shop[buyId][1]]
 	if not goodsData then return end
@@ -815,9 +816,14 @@ local function clickTrader(self, room, block, params)
 		self.owner:updateProperty({field = "advShop", value = advShop})
 	end
 	block.event.status = block.event.status:setv(buyId, 1)
+	buyCount = buyCount + 1
 	self:checkTask(Adv.TaskType.Shop, 1, block.event.id)
 	self:checkAchievement(Adv.AchievType.Shop, 1, block.event.id)
 	self:backReward(reward)
+
+	if traderData.purchasetime <= buyCount or #block.event.shop <= buyCount then
+		block:clear()
+	end
 	return true
 end