From 1a20d90b0780eac9775c948e7d68ea06bb569d4e Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Mon, 8 Feb 2021 17:14:45 +0800
Subject: [PATCH] 添加活动关卡gm指令, 活动代理拾荒数据清理

---
 src/actions/GmAction.lua | 36 ++++++++++++++++++++++++++++++++++++
 src/models/Activity.lua  |  3 +--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/actions/GmAction.lua b/src/actions/GmAction.lua
index 03d4d9e..f0995c6 100644
--- a/src/actions/GmAction.lua
+++ b/src/actions/GmAction.lua
@@ -588,6 +588,42 @@ function _M.notice(role, pms)
 	return "成功"
 end
 
+table.insert(helpDes, {"活动关卡", "actbp", "id", "actid"})
+function _M.actbp(role, pms)
+	local id = tonum(pms.pm1, 0)
+	local actid = tonum(pms.pm2, 0)
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then return end
+	local actData = role.activity:getActData("ChallengeLevel") or {}
+
+	local actCfg = csvdb["activity_battleCsv"][actid]
+	if not actCfg then return end
+	for k, v in pairs(actCfg) do
+		if k <= id then
+			local bpInfo = actData[i] or {}
+			bpInfo["star"] = 1
+			actData[k] = bpInfo
+		end
+	end
+	role.activity:updateActData("ChallengeLevel", actData)
+
+	return "成功"
+end
+
+table.insert(helpDes, {"活动拾荒", "actadv", "id", "actid"})
+function _M.actadv(role, pms)
+	local id = tonum(pms.pm1, 0)
+	local actid = tonum(pms.pm2, 0)
+	if not role.activity:isOpenById(actid, "AdvLevel") then return end
+	local actData = role.activity:getActData("AdvLevel") or {}
+	local advInfo = actData[id]
+	advInfo["pass"] = 1
+	actData[id] = advInfo
+
+	role.activity:updateActData("AdvLevel", actData)
+
+	return "成功"
+end
+
 function _M.helpRpc(agent, data)
 	SendPacket(actionCodes.Gm_helpRpc, MsgPack.pack({help = helpDes}))
 	return true
diff --git a/src/models/Activity.lua b/src/models/Activity.lua
index dfa8e6d..5a675e2 100644
--- a/src/models/Activity.lua
+++ b/src/models/Activity.lua
@@ -1146,7 +1146,6 @@ local function closeActAdvHang(role, chapterId)
 		end
 		reward, change = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
 	end
-	
 	role:changeUpdates({{type = "advHang", field = chapterId, value = nil}})
 
 	role:mylog("adv_action", {desc = "endHang", int1 = chapterId, short1 = 2})
@@ -1163,7 +1162,7 @@ activityFunc[Activity.ActivityType.AdvLevel] = {
 	["close"] = function(self, actType, notify, actid)
 		local actCfg = csvdb["activity_adv_chapterCsv"][actid]
 		if not actCfg then return end
-		for chapterId, _ in ipairs(actCfg) do
+		for chapterId, _ in pairs(actCfg) do
 			local advPass = self.owner:getProperty("advPass")
 			advPass[chapterId] = nil
 			local advRelay = self.owner:getProperty("advRelay")
--
libgit2 0.21.2