From dd328bd6dcd9809b08078fdac69e245f79a24936 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Mon, 11 Oct 2021 11:45:56 +0800
Subject: [PATCH] fix: 常规世界boss，防作弊

---
 src/actions/ActivityAction.lua | 14 +++++++-------
 src/models/RoleLog.lua         |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/actions/ActivityAction.lua b/src/actions/ActivityAction.lua
index dea003f..4fc6f8c 100644
--- a/src/actions/ActivityAction.lua
+++ b/src/actions/ActivityAction.lua
@@ -1607,13 +1607,13 @@ function _M.startRegularWorldBossBattleRpc(agent, data)
 	role:checkStoryStatus(false, 5, id)
 
 	if not count then
-		role.__actBattleCache = {
+		role.__regularWorldBossBattleCache = {
 			key = tostring(math.random()),
 			actid = actid,
 			id = id,
 			format = msg.format,
 		}
-		SendPacket(actionCodes.Activity_startRegularWorldBossBattleRpc, MsgPack.pack({key = role.__actBattleCache.key}))
+		SendPacket(actionCodes.Activity_startRegularWorldBossBattleRpc, MsgPack.pack({key = role.__regularWorldBossBattleCache.key}))
 	else
 		if count <= 0 then
 			return
@@ -1634,7 +1634,7 @@ function _M.startRegularWorldBossBattleRpc(agent, data)
 		for k, v in pairs(award) do
 			award[k] = v * count
 		end
-		local reward, change  = role:award(award, {log = {desc = "actBattle", int1 = actid, int2 = count or 0}})
+		local reward, change  = role:award(award, {log = {desc = "regularWorldBossBattle", int1 = actid, int2 = count or 0}})
 
 		changeFlag = true
 		actData["ticket"] = ticket - num
@@ -1679,9 +1679,9 @@ function _M.endRegularWorldBossBattleRpc(agent, data)
 		return true
 	end
 
-	if not role.__actBattleCache then return 2 end
+	if not role.__regularWorldBossBattleCache then return 2 end
 
-	if role.__actBattleCache.id ~= id or role.__actBattleCache.key ~= key and role.__actBattleCache.actid ~= actid then
+	if role.__regularWorldBossBattleCache.id ~= id or role.__regularWorldBossBattleCache.key ~= key and role.__regularWorldBossBattleCache.actid ~= actid then
 		SendPacket(actionCodes.Activity_endRegularWorldBossBattleRpc, MsgPack.pack({errorCode = 1}))
 	end
 
@@ -1690,12 +1690,12 @@ function _M.endRegularWorldBossBattleRpc(agent, data)
 		id = id,
 		isWin = isWin,
 		info = msg.info,
-		format = role.__actBattleCache.format
+		format = role.__regularWorldBossBattleCache.format
 	}) then
 		SendPacket(actionCodes.Activity_endRegularWorldBossBattleRpc, MsgPack.pack({errorCode = 1}))
 		return true
 	end
-	role.__actBattleCache = nil
+	role.__regularWorldBossBattleCache = nil
 
 	local actCfg = csvdb["activity_battleCsv"][actid]
 	if not actCfg then return 3 end
diff --git a/src/models/RoleLog.lua b/src/models/RoleLog.lua
index 5fe986f..088b02e 100644
--- a/src/models/RoleLog.lua
+++ b/src/models/RoleLog.lua
@@ -72,6 +72,8 @@ local ItemReason = {
 	firstSMonthCardReward = 156, --首次订阅特刊奖励
 	regularWorldBossReward = 157,	-- 常规世界boss
 	regularWorldBossMilestone = 158,	-- 常规世界boss伤害里程碑
+	regularWorldBossBattle = 159, -- 常规世界boss战斗奖励
+
 
 
 	advHang = 301, -- 拾荒挂机
--
libgit2 0.21.2