活动

zhouhaihai
1 parent 823ab846
Showing 8 changed files with 187 additions and 24 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/models/Activity.lua
src/models/RoleTask.lua
src/models/RoleTimeReset.lua
 XXTEA_KEY = "699D448D6D24f7F941E9F6E99F823E18"
-RESET_TIME = 4
+RESET_TIME = 0
 START_RESET_TIME_BASE = 1584316800 -- 0时区
 TIME_ZONE = math.floor(os.difftime(START_RESET_TIME_BASE, os.time(os.date("!*t", START_RESET_TIME_BASE))) / 3600)  -- 本地时区
@@ -193,6 +193,7 @@ actionCodes = {
 	Activity_sudokuRpc = 650,
 	Activity_signRpc = 651,
 	Activity_sudokuRewardRpc = 652,
+	Activity_actSignRpc = 653,
 }
 rpcResponseBegin = 10000
@@ -125,14 +125,41 @@ function _M.signRpc(agent, data)
 	end
 	signs[curDay] = yearMonth
-	local raward = role:award(monthData[curDay].item, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}})
+	local reward = role:award(monthData[curDay].item, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}})
 	role:changeUpdates({{type = "sign", field = curDay, value = yearMonth}})
-	SendPacket(actionCodes.Activity_signRpc, MsgPack.pack(raward))
+	SendPacket(actionCodes.Activity_signRpc, MsgPack.pack(reward))
 	return true
 end
+function _M.actSignRpc(agent, data)
+	local role = agent.role
+	if not role.activity:isOpen("Sign") then return end
+
+	local curData = role.activity:getActData("Sign")
+	local reward = {}
+	for day, csvData in ipairs(csvdb["new_signlnCsv"]) do
+		if day <= (curData[0] or 0) then
+			if not curData[day] then
+				curData[day] = -1
+				-- 奖励
+				for itemId, count in pairs(csvData.reward:toNumMap()) do
+					reward[itemId] = (reward[itemId] or 0) + count
+				end
+			end
+		else
+			break
+		end
+	end
+	if next(reward) then
+		self.activity:updateActData("Sign", curData)
+		reward = role:award(reward, {log = "actSign"})
+	end
+	SendPacket(actionCodes.Activity_actSignRpc, MsgPack.pack(reward))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -121,10 +121,14 @@ function _M.loginRpc( agent, data )
 	role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
 	-- 跨天登陆事件
-	role:updateTimeReset(now)
+	local resetMode = role:updateTimeReset(now)
+	if not resetMode["CrossDay"] then -- 没有跨天
+		self.activity:checkActivityStatus(now, false, false)
+	end
+
 	redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
-	for _, name in ipairs({"dailyData", "dinerData"}) do
+	for _, name in ipairs({"dailyData", "dinerData", "activity"}) do
 		response[name] = role[name]:data()
 	end
@@ -776,8 +776,10 @@ function Adv:over(success, rewardRatio, overType)
 	end
 	reward = self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}})
+	local backAdvCount
 	if not self:isEndless() then
-		self.owner:changeAdvCount(self.level - chapterData.limitlevel)
+		backAdvCount = chapterData.limitlevel - self.level
+		self.owner:changeAdvCount(-backAdvCount)
 	end
 	if success then
@@ -819,6 +821,16 @@ function Adv:over(success, rewardRatio, overType)
 		advAFWear = {},
 	})
 	self:backEnd(success, score, scoreInfo, reward, overType, scoreReward, chapterId)
+	self:pushBackEvent(AdvBackEventType.End, {
+		success = success,
+		score = score,
+		scoreInfo = scoreInfo,
+		reward = reward,
+		type = overType,
+		scoreAward = scoreAward,
+		chapterId = chapterId,
+		backAdvCount = backAdvCount,
+	})
 end
 function Adv:exit()
@@ -1925,9 +1937,6 @@ function Adv:backNext()
 	self:pushBackEvent(AdvBackEventType.Next, {})
 end
-function Adv:backEnd(success, score, scoreInfo, reward, overType, scoreAward, chapterId)
-	self:pushBackEvent(AdvBackEventType.End, {success = success, score = score, scoreInfo = scoreInfo, reward = reward, type = overType, scoreAward = scoreAward, chapterId = chapterId})
-end
 function Adv:backBlockChange(roomId, blockId, itemChangeType)
 	self:pushBackEvent(AdvBackEventType.BlockChange, {roomId = roomId, blockId = blockId, itemChangeType = itemChangeType})
@@ -2,7 +2,7 @@ local Activity = class(&quot;Activity&quot;, require(&quot;shared.ModelBase&quot;))
 Activity.ActivityType = {
-	DoubleDrop = 1,  -- 双倍掉落
+	Sign = 1,  -- 签到
 }
@@ -10,7 +10,7 @@ local function checkActivityType(activityType)
 	if type(activityType) == "string" then
 		activityType = Activity.ActivityType[activityType]
 	end
-	return activityType
+	return activityType or 0
 end
@@ -22,13 +22,13 @@ end
 Activity.schema = {
-	ctime 	= {"table", {}}, -- 最近检查某项活动的开始时间  {id = time}
-	_1		= {"table", {}},
+	ctime 	= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
+	act1		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
 }
 function Activity:data()
 	return {
-		_1 = self:getProperty("_1"),
+		act1 = self:getProperty("act1"),
 	}
 end
@@ -54,26 +54,141 @@ function Activity:updateProperty(params)
 end
+function Activity:isOpenRaw(activityType, now)
+	activityType = checkActivityType(activityType)
+	local actData = csvdb["activity_ctrlCsv"][activityType]
+	if not actData then return end
+
+	if actData.time == "" then -- 关闭
+		return false
+	end
+
+	local st = 0
+	local et = 0
+	local now = skynet.timex()
+
+	if actData.ttype == 0 then -- 时间开放
+		local openTimes = actData.time:toArray(false, "=")
+		if openTimes[1] ~= "0" then
+			st = toUnixtime(openTimes[1]..string_format("%02x", RESET_TIME))
+		end
+		if openTimes[2] ~= "0" then
+			et = toUnixtime(openTimes[2]..string_format("%02x", RESET_TIME))
+		end
+ 	elseif actData.ttype == 1 then -- 周期开放
+ 		local openTimes = actData.time:toArray(true, "=")
+ 		local resetTime = toUnixtime(tostring(openTimes[1]) .. string_format("%02x", RESET_TIME))
+ 		local r = math.floor((now - resetTime) / (openTimes[3] * 86400))
+ 		st = resetTime + r * (openTimes[3] * 86400)
+ 		et = st + openTimes[2] * 86400
+	else
+		return
+	end
+
+	if now >= st and (et == 0 or now < et) then
+		return true, st
+	end
+	return false
+end
+
+-- 缓存开放
 function Activity:isOpen(activityType)
 	activityType = checkActivityType(activityType)
+	return self._isOpen[activityType]
+end
+
+function Activity:getActData(actType)
+	actType = checkActivityType(actType)
+	return self:getProperty("act" .. actType)
+end
+function Activity:updateActData(actType, data, notNotify)
+	actType = checkActivityType(actType)
+	self:updateProperty({field = "act" .. actType,  value = data, notNotify = notNotify})
 end
+
 -- 跨天刷新 --登录刷新
-function Activity:checkActivityStatus(ltime, now, notify)
-	
+function Activity:checkActivityStatus(now, isCrossDay, notify)
+	self._isOpen = {}
+	local ctime = self:getProperty("ctime")
+	local change = false
+	for actType, actData in paris(csvdb["activity_ctrlCsv"]) do
+		local isOpen, startTime = self:isOpenRaw(actType, now)
+		self._isOpen[actType] = isOpen
+
+		if isOpen then
+			if ctime[actType] and ctime[actType] == startTime then -- 还是之前的状态 开放中
+			else  -- 重置
+				ctime[actType] = startTime
+				self:closeActivity(actType, notify, true)
+				self:initActivity(actType, isCrossDay, notify)
+				change = true
+			end
+		else
+			if ctime[actType] then
+				self:closeActivity(actType, notify)
+				ctime[actType] = nil
+				change = true
+			end
+		end
+	end
+	if change then
+		self:setProperty("ctime", ctime)
+	end
 end
-local checkActivityFunc = {}
+local activityFunc = {}
-checkActivityFunc[Activity.ActivityType.DoubleDrop] = function(self, notNotify, activityType, ...)
+activityFunc[Activity.ActivityType.Sign] = {
+	-- ["check"] = function(self, actType, notify) -- 检查
+	-- end,
+	["init"] = function(self, actType, isCrossDay, notify)
+		if not isCrossDay then
+			activityFunc[Activity.ActivityType.Sign]["crossDay"](self, actType, notify)
+		end
+	end,
+	-- ["close"] = function(self, actType, notify)
+	-- end,
+	["crossDay"] = function(self, actType, notify)
+		local curData = self:getActData(actType)
+		curData[0] = (curData[0] or 0) + 1
+		local actData = csvdb["new_signlnCsv"]
+		if curData[0] > #actData then return end -- 满了就忽略了
+
+		-- 没满更新一下
+		self:updateActData(actType, curData, not notify)
+	end,
+}
+function Activity:initActivity(actType, isCrossDay, notify)
+	if activityFunc[actType] and activityFunc[actType]['close'] then
+		activityFunc[actType]["init"](self, actType, isCrossDay, notify)
+	end
+end
+
+function Activity:closeActivity(actType, notify, notUpdateAct)
+	if activityFunc[actType] and activityFunc[actType]['close'] then
+		activityFunc[actType]["close"](self, actType, notify)
+	end
+	self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
+end
+
+function Activity:refreshDailyData(notify)
+	for actType, status in pairs(self._isOpen) do
+		if status then
+			if activityFunc[actType] and activityFunc[actType]['crossDay'] then
+				activityFunc[actType]["crossDay"](self, actType, notify)
+			end
+		end
+	end
 end
-function Activity:checkActivityEnter(notNotify, activityType, ...)
+function Activity:checkActivity(notNotify, activityType, ...)
 	if not activityType then return end
-	if checkActivityFunc[activityType] then
-		checkActivityFunc[activityType](self, notNotify, activityType, ...)
+	if not self:isOpen(activityType) then return end
+	if activityFunc[activityType] and activityFunc[activityType]['check'] then
+		activityFunc[activityType]["check"](self, activityType, not notNotify, ...)
 	end
 end
@@ -526,7 +526,7 @@ function RoleTask.bind(Role)
 	end
 	function Role:checkActivityTask(notNotify, activityType, ...)
-		self.activity:checkActivityEnter(notNotify, activityType, ...)
+		self.activity:checkActivity(notNotify, activityType, ...)
 	end
 end
@@ -4,9 +4,12 @@ RoleTimeReset.bind = function (Role)
 -- 重置内容 对应 GlobalVar TimeReset
 local ResetFunc = {}
-ResetFunc["CrossDay"] = function(self, notify, response)
+ResetFunc["CrossDay"] = function(self, notify, response, now)
+	self.activity:checkActivityStatus(now, true, notify)
+
 	self.dailyData:refreshDailyData(notify)
 	self.dinerData:refreshDailyData(notify)
+	self.activity:refreshDailyData(notify)
 	self:setProperty("dTask", {})
 	self:advRandomSupportEffect(not notify)
@@ -55,10 +58,13 @@ function Role:updateTimeReset(now, notify)
 	end
 	if not next(needResetId) then return end
+	local resetMode = {}
+
 	local response = {}
 	for funcName, resetId in pairs(TimeReset) do
 		if needResetId[resetId] and ResetFunc[funcName] then
-			ResetFunc[funcName](self, notify, response)
+			ResetFunc[funcName](self, notify, response, now)
+			resetMode[funcName] = true
 		end
 	end
@@ -71,6 +77,7 @@ function Role:updateTimeReset(now, notify)
 	if notify then
 		self:notifyUpdateProperties(response)
 	end
+	return resetMode
 end
 -- 持续时间取  min(interval, duration) duration 填 0 默认使用 interval 作为持续时间