Merge branch 'tr/bugfix-qa' into tr/publish/qa-out

熊润斐
2 parents 49df67a2 a5a2c706
Showing 2 changed files with 27 additions and 7 deletions Show diff stats
src/actions/GmAction.lua
src/adv/Adv.lua
@@ -558,6 +558,26 @@ function _M.actbattle(role, pms)
 	return "成功"
 end
  
+table.insert(helpDes, {"清空背包", "clearbag"})
+function _M.clearbag(role, pms)
+	-- 装备
+	role:updateProperty({field="equips", value = {}})
+	-- 道具
+	local items = role:getProperty("items"):toNumMap()
+	for k, v in pairs(items) do
+		role:addItem({itemId = k, count = -v, log = {desc = "gm"}})
+	end
+
+	-- 铭文
+	local uids = {}
+	for uid, _ in pairs(role.runeBag) do
+		table.insert(uids, uid)
+	end
+	role:delRunes(uids, {log = {desc = "gm"}})
+
+	return "成功"
+end
+
 function _M.helpRpc(agent, data)
 	SendPacket(actionCodes.Gm_helpRpc, MsgPack.pack({help = helpDes}))
 	return true
@@ -812,14 +812,12 @@ function Adv:over(success, rewardRatio, overType)
 	local potionBag = self.owner:getProperty("potionBag")
 	for itemId, count in pairs(self.owner:getProperty("advItems"):toNumMap()) do
 		local itemCsv = csvdb["itemCsv"][itemId]
-		if not itemCsv then
+		if advPotionCsv[itemId] then
+			potionBag[itemId] = (potionBag[itemId] or 0) + count
+		elseif not itemCsv then
 			print("ERROR: no itemId in ItemCsv : ", itemId)
 		elseif itemCsv.type ~= ItemType.AdvItem then
-			if advPotionCsv[itemId] then
-				potionBag[itemId] = (potionBag[itemId] or 0) + count
-			else
-				reward[itemId] = math.ceil(count * rewardRatio / 100)
-			end
+			reward[itemId] = math.ceil(count * rewardRatio / 100)
 		end
 	end
 	reward = self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}})
@@ -1125,10 +1123,12 @@ function Adv:supplyPotion()
 	local potionCsv = csvdb["adv_potionCsv"]
 	local potionBag = self.owner:getProperty("potionBag")
 	local advItems = self.owner:getProperty("advItems")
+	local dishTree = self.owner.dinerData:getProperty("dishTree")
 	for potionId, set in pairs(potionCsv) do
 		local count = potionBag[potionId] or 0
 		if count > 0 then
-			local num = math.min(set[1].limit,count)
+			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
 		end