Merge branch 'tr/bugfix' into tr/publish/preview

熊润斐
2 parents 36f7de0d 4d0f1626
Showing 2 changed files with 42 additions and 5 deletions Show diff stats
src/actions/GmAction.lua
src/models/Activity.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
@@ -1097,9 +1097,11 @@ activityFunc[Activity.ActivityType.NewSign] = {
 	-- end,
 	["crossDay"] = function(self, actType, notify)
 		local curData = self:getActData(actType)
-		curData["0"] = (curData["0"] or 0) + 1
-		local actData = csvdb["activity_signInCsv"][48] or {}
-		if curData["0"] > #actData then return end -- 满了就忽略了
+		local isOpen, actId = self:isOpen(actType)
+		local actData = csvdb["activity_signInCsv"][actId] or {}
+		curData["0"] = curData["0"] or 0
+		if curData["0"] >= #actData then return end -- 满了就忽略了
+		curData["0"] = curData["0"] + 1
  
 		-- 没满更新一下
 		self:updateActData(actType, curData, not notify)
@@ -1146,7 +1148,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 +1164,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")