Merge branch 'cn/develop' into cn/publish/preview

jiyue
2 parents 547dd794 2c3a1b31
Showing 1 changed file with 18 additions and 13 deletions Show diff stats
src/actions/PvpAction.lua
@@ -325,7 +325,7 @@ function _M.startBattleRpc(agent, data)
 	if not result and not matchInfo then return 4 end
-	if not result then
+	if not revenge then
 		-- 次数扣一波
 		local pvpFree = role.dailyData:getProperty("pvpFree")
 		if pvpFree >= globalCsv.pvp_battle_free_count then
@@ -335,7 +335,9 @@ function _M.startBattleRpc(agent, data)
 		else
 			role.dailyData:updateProperty({field = "pvpFree", delta = 1})
 		end
+	end
+	if not result then
 		key = tostring(math.random())
 		_pvpStartBattleCacheC = {idx = idx, key = key, revenge = revenge, pvpTC = pvpTC}
@@ -574,8 +576,9 @@ function _M.startBattleHRpc(agent, data)
 	if not result and not enemyTeamRecord then return 4 end
-	if not result then
+	if not revenge then
 		-- 次数扣一波
+        print("xxxxx")
 		local pvpFreeH = role.dailyData:getProperty("pvpFreeH")
 		if pvpFreeH >= globalCsv.pvp_battle_free_count_high then
 			local cost = {[ItemId.PvpKey] = globalCsv.pvp_battle_high_cost}
@@ -584,7 +587,9 @@ function _M.startBattleHRpc(agent, data)
 		else
 			role.dailyData:updateProperty({field = "pvpFreeH", delta = 1})
 		end
+	end
+	if not result then
 		-- 只发送指定的那个敌人
 		if enemyTeamRecord.robot then
@@ -643,17 +648,6 @@ function _M.endBattleHRpc(agent, data)
 		match = _pvpRecordInfoCacheH[msg.idx]
 		_revengeRecord[match.id] = now + RevengeWaitTime  -- 1分钟内不能再打
-        if isWin then
-            -- 次数扣一波
-            local pvpFreeH = role.dailyData:getProperty("pvpFreeH")
-            if pvpFreeH >= globalCsv.pvp_battle_free_count_high then
-                local cost = {[ItemId.PvpKey] = globalCsv.pvp_battle_high_cost}
-                if not role:checkItemEnough(cost) then return 5 end
-                role:costItems(cost, {log = {desc = "startPvp", int1 = 2}})
-            else
-                role.dailyData:updateProperty({field = "pvpFreeH", delta = 1})
-            end
-        end
 	else
 		local pvpMH = role:getProperty("pvpMH")
 		match = pvpMH[msg.idx]
@@ -728,6 +722,17 @@ function _M.endBattleHRpc(agent, data)
 		}))
 		return true
 	end
+	if revenge and isWin then
+		-- 次数扣一波
+		local pvpFreeH = role.dailyData:getProperty("pvpFreeH")
+		if pvpFreeH >= globalCsv.pvp_battle_free_count_high then
+			local cost = {[ItemId.PvpKey] = globalCsv.pvp_battle_high_cost}
+			if not role:checkItemEnough(cost) then return 5 end
+			role:costItems(cost, {log = {desc = "startPvp", int1 = 2}})
+		else
+			role.dailyData:updateProperty({field = "pvpFreeH", delta = 1})
+		end
+	end
 	-- 战斗结束了发奖 
 	local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpgroupBonus, true)