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

熊润斐
2 parents f4a07e64 e3b29f2f
Showing 5 changed files with 16 additions and 9 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/csvdata
src/models/Activity.lua
src/models/RoleTask.lua
@@ -1237,10 +1237,10 @@ function _M.battleCommandRpc(agent, data)
 		local awd = ""
 		if pay then
 			actData["payR"] = record
-			awd = bpCfg["rewardNormal"]
+			awd = bpCfg["rewardHigh"]
 		else
 			actData["freeR"] = record
-			awd = bpCfg["rewardHigh"]
+			awd = bpCfg["rewardNormal"]
 		end
 		for k, v in pairs(awd:toNumMap()) do
 			award[k] = (award[k] or 0) + v
@@ -1279,6 +1279,7 @@ function _M.buyBattleCommandLvlRpc(agent, data)
 		local cfg = bpCfg[i]
 		if cfg["type"] > curLvl and cfg["type"] <= nextLvl then
 			cost = cost + cfg["cost"]
+		elseif cfg["type"] > nextLvl then
 			break
 		end
 	end
@@ -291,6 +291,8 @@ function _M.startHangRpc(agent, data)
  
 	if not role:checkAdvCount(adv_idle_energy) then return 7 end -- 是否有体力
  
+	role:checkTaskEnter("AdvCostPower", {count = adv_idle_energy})
+
 	if not checkFormat(role, format, role:getAdvData():isRunning()) then return 8 end --编队是否正确
  
 	local player = {}
-Subproject commit 887956fe254c1ca6e855ec71179e203f9eeb8986
+Subproject commit 5c618b16315e74aaa111b3e84dbc4da3f7b3d699
@@ -1044,12 +1044,16 @@ activityFunc[Activity.ActivityType.BattleCommand] = {
 		if not actCfg then return end
 		if actCfg.condition1 == "" then return end
 		local arr = actCfg.condition2:toArray(true, "=")
-		local itemId, limit = arr[1], arr[2]
-		if itemId == id and count > 0 then
-			if (actData["week"] or 0) >= limit then
-				return
+		local itemIdWeek, itemIdNormal, limit = arr[1], arr[2], arr[3]
+		if (itemIdWeek == id or itemIdNormal == id) and count > 0 then
+			if itemIdWeek == id then
+				if (actData["week"] or 0) >= limit then
+					return
+				end
+				local old = actData["week"] or 0
+				actData["week"] = math.min(old + count, limit)
+				count = actData["week"] - old
 			end
-			actData["week"] = (actData["week"] or 0) + count
 			local total = actData["sum"] + count
 			local curLvl = actData["lvl"] or 0
 			if actCfg.condition == 1 then		-- 代表sum需要转换为等级
@@ -285,7 +285,7 @@ local CalendaTaskListener = {
 		[TaskType.OpenBox]= {{20, 3, f("count"), f("quality")}},
 		[TaskType.RadioTaskStart] = {{21, 1}, {22, 3, f("heroCnt")}},
 		[TaskType.BonusQuick] = {{23, 1, f("count")}},
-		[TaskType.AdvHangHeroCnt] = {{24, 3, f("HeroCnt")}},
+		[TaskType.AdvHangHeroCnt] = {{24, 3, f("count")}},
 		[TaskType.AdvKillBoss] = {{25, 1}},
 		[TaskType.AdvMineKill] = {{26, 1}},
 		[TaskType.PvpBattle] = {{27, 1}},