From badeee4e6412eb7169af5baa3b0aded853f3c993 Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Thu, 27 Feb 2020 17:44:07 +0800
Subject: [PATCH] 优化gm 冒险清除

---
 src/actions/GmAction.lua | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/actions/GmAction.lua b/src/actions/GmAction.lua
index b633579..4f00074 100644
--- a/src/actions/GmAction.lua
+++ b/src/actions/GmAction.lua
@@ -204,7 +204,23 @@ end
 
 table.insert(helpDes, {"冒险清除"	, "advc"})
 function _M.advc(role, pms)
-	role:getAdvData():forceOver()
+	local advTeam = role:getProperty("advTeam")
+	advTeam.player = nil
+
+	local reward = role:getProperty("advItems"):toNumMap()
+	for itemId, count in pairs(reward) do
+		reward[itemId] = math.ceil(count * globalCsv.adv_fail_reward_ratio / 100) -- 奖励相当于失败
+	end
+	role:award(reward)
+
+	role:updateProperties({
+		advInfo = {}, 
+		advTeam = advTeam,
+		advItems = "",
+		advAFGet = {},
+		advAFWear = {},
+	}, notNotify)
+	role.advData = nil
 	return "成功"
 end
 
--
libgit2 0.21.2