Merge branch 'tr/bugfix' into tr/publish/preview

熊润斐
2 parents a09c8240 de111972
Showing 1 changed file with 11 additions and 4 deletions Show diff stats
src/adv/Adv.lua
@@ -1127,10 +1127,17 @@ function Adv:supplyPotion()
 	for potionId, set in pairs(potionCsv) do
 		local count = potionBag[potionId] or 0
 		if count > 0 then
-			local level = dishTree:getv(potionId,1)
-			local num = math.min(set[level].limit,count)
-			advItems = advItems:setv(potionId,num)
-			potionBag[potionId] = num ~= count and (count - num) or nil
+			local max = set[dishTree:getv(potionId,1)].limit
+			local old = advItems:getv(potionId,0)
+			local need = max - old
+
+			if need < count then
+				advItems = advItems:setv(potionId,max)
+				potionBag[potionId] = count - need
+			else
+				advItems = advItems:setv(potionId,old + count)
+				potionBag[potionId] = nil
+			end
 		end
 	end
 	self.owner:updateProperties({