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

熊润斐
2 parents 5add8320 b3ca5d1f
Showing 3 changed files with 53 additions and 26 deletions Show diff stats
src/actions/GmAction.lua
src/adv/Adv.lua
src/models/Activity.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}})
@@ -1129,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({
@@ -834,25 +834,27 @@ activityFunc[Activity.ActivityType.Crisis] = {
 		for id, actSet in pairs(actCsv) do
 			if actSet.type == atype then
 				local status = actData.task[id] or 0
-				status = status + count
-				if status >= actSet.condition1 then
-					local reward
-					if actSet.loop == 1 then
-						local rcount = math.floor(status / actSet.condition1)
-						reward = actSet.reward:toNumMap()
-						for itemId, itemC in pairs(reward) do
-							reward[itemId] = itemC * rcount
+				if status ~= -1 then
+					status = status + count
+					if status >= actSet.condition1 then
+						local reward
+						if actSet.loop == 1 then
+							local rcount = math.floor(status / actSet.condition1)
+							reward = actSet.reward:toNumMap()
+							for itemId, itemC in pairs(reward) do
+								reward[itemId] = itemC * rcount
+							end
+							status = status % actSet.condition1
+						else
+							reward = actSet.reward
+							status = -1
 						end
-						status = status % actSet.condition1
-					else
-						reward = actSet.reward
-						status = -1
-					end
-					self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
+						self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
+					end
+					actData.task[id] = status
+					change = true
 				end
-				actData.task[id] = status
-				change = true
 			end
 		end
 		if change then