Merge branch 'taptap' into tr/publish

zhouhaihai
2 parents d025775f 211382c3
Showing 23 changed files with 416 additions and 133 deletions Show diff stats
docs/日志说明.xlsx
publish/publish.sh
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/actions/TowerAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvPlayer.lua
src/config
src/models/Activity.lua
src/models/Daily.lua
src/models/Role.lua
src/models/RolePlugin.lua
@@ -28,7 +28,7 @@ cd -
 rsync -aP --exclude=".git" ./src/ ${dist}/src/
 rsync -aP ./publish/skynet ${dist}/
 rsync -aP --exclude={config/develop.lua,config/nodenames.lua} config ${dist}/
-cp kill.sh ${dist}/
-cp run.sh ${dist}/
+# cp kill.sh ${dist}/
+# cp run.sh ${dist}/
 # rsync -aP --exclude-from="./publish/exclude.list" ${origin}/ ./${dist}/
 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)  -- 本地时区
@@ -101,6 +101,7 @@ actionCodes = {
 	Hang_endBonusBattleRpc = 261,
 	Hang_hangGiftRpc = 262,
 	Hang_bagFieldRpc = 263,
+	Hang_chatLineRpc = 264,
 	Diner_updateProperty = 300,
 	Diner_addSellRpc = 301,
@@ -192,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 1 end
+
+	local curData = role.activity:getActData("Sign")
+	local reward = {}
+	for day, csvData in ipairs(csvdb["new_signInCsv"]) 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
+		role.activity:updateActData("Sign", curData)
+		reward = role:award(reward, {log = {desc = "actSign"}})
+	end
+	SendPacket(actionCodes.Activity_actSignRpc, MsgPack.pack(reward))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -89,6 +89,9 @@ function _M.startAdvRpc( agent, data )
 	--上一个关卡结束才可以开始新的关卡
 	if role:getAdvData():isRunning() then return 8 end
+	local advHang = role:getProperty("advHang")
+	if advHang[chapterId] then return 9 end --正在挂机
+
 	local chapterData = csvdb["adv_chapterCsv"][chapterId]
 	if not chapterData or layer < 1 then return  1 end
@@ -112,7 +115,7 @@ function _M.startAdvRpc( agent, data )
 			if advElM < relayData.unlockfloor then return 15 end --未解锁
 		end 
 	else   -- 普通模式判断
-		if role.dailyData:getProperty("advC") >= role:getAdvHangLimit() then return 2 end -- 是否有体力
+		if not role:checkAdvCount(chapterData.limitlevel) then return 2 end -- 是否有体力
 		if layer >= chapterData.limitlevel  then return 4 end
 		-- 关卡开放判断
 		if not role:advChapterIsOpen(chapterId) then return 5 end
@@ -139,7 +142,7 @@ function _M.startAdvRpc( agent, data )
 	if AdvCommon.isEndless(chapterId) then
 		role.dailyData:updateProperty({field = "advElC", delta = 1})
 	else
-		role.dailyData:updateProperty({field = "advC", delta = 1})
+		role:changeAdvCount(chapterData.limitlevel)
 	end
 	local support = {}  -- 支援效果
@@ -177,7 +180,6 @@ function _M.startAdvRpc( agent, data )
 	return true
 end
-
 function _M.startHangRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -186,24 +188,38 @@ function _M.startHangRpc(agent, data)
 	local chapterData = csvdb["adv_chapterCsv"][chapterId]
 	if not chapterData then return end
+	if chapterData.idleReward == "" then return end --没有奖励 没有挂机
 	local advHang = role:getProperty("advHang")
 	if advHang[chapterId] then return end --正在挂机
 	if role:getAdvData():isRunning() and role:getAdvData().chapterId == chapterId then return end
-	local advPass = role:getProperty("advPass")
-	if AdvCommon.isEndless(chapterId) or advPass[chapterId] ~= chapterData.limitlevel then return end -- 没有全通关
+	if AdvCommon.isEndless(chapterId) then return end -- 无尽没有代理
+
+	local advRelay = role:getProperty("advRelay") 
+	if not next(advRelay[chapterId] or {}) then return end -- 没有开放
-	if role.dailyData:getProperty("advC") >= role:getAdvHangLimit() then return end -- 是否有体力
+
+	if not role:checkAdvCount(chapterData.limitlevel) then return end -- 是否有体力
 	if not checkFormat(role, format, role:getAdvData():isRunning()) then return end --编队是否正确
-	local battleV = 0
-	for _, heroId in pairs(format.heros) do
-		local hero = role.heros[heroId]
-		battleV = battleV + hero:getProperty("battleV")
+	local player = {}
+	local attrs = role:getTeamBattleInfo(format).heros
+	for attrName, _ in pairs(AdvAttsEnum) do
+		for _, hero in pairs(attrs) do
+			player[attrName] = (player[attrName] or 0) + hero[attrName]
+		end
+		player[attrName] = player[attrName] * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
 	end
+
+	local battleV = 1 * player["hp"]
+		+ 2 * player["atk"]
+		+ 1.25 * player["def"]
+		+ 0.226 * player["hit"]
+		+ 0.26 * player["miss"]
+
 	if battleV < chapterData.idleValue then return end -- 战斗力是否满足
 	local info = {}
@@ -223,7 +239,7 @@ function _M.startHangRpc(agent, data)
 	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
-	role.dailyData:updateProperty({field = "advC", delta = 1})
+	role:changeAdvCount(chapterData.limitlevel)
 	role:checkTaskEnter("AdvStart", {id = chapterId})
 	role:log("adv_action", {desc = "startHang", int1 = chapterId})
@@ -276,14 +292,44 @@ function _M.endHangRpc(agent, data)
 	local reward, isFull
 	if skynet.timex() >= info.time then
-		reward = role:award(chapterData.idleReward, {log = {desc = "advHang", int1 = chapterId}})
-	else
-		if cancel then
-			if role.dailyData:getProperty("advC") <= 0 then 
-				isFull = true
+		-- 英雄加成
+		local idleUnit = chapterData.idleUnit:toNumMap()
+		local upUnit = 0
+		for slot, heroId in pairs((info.format or {}).heros or {}) do
+			local hero = role.heros[heroId]
+			if hero then
+				if idleUnit[hero:getProperty("type")] then
+					upUnit = upUnit + idleUnit[hero:getProperty("type")]
+				end
+			end
+		end
+		-- 中继加成
+		local advPass = role:getProperty("advPass")
+		local maxCampsite = nil
+		local campsiteCsv = csvdb["adv_chapter_campsiteCsv"][chapterId]
+		for _, campsite in ipairs(campsiteCsv) do
+			if campsite.floor <= advPass[chapterId] then
+				maxCampsite = campsite
 			else
-				role.dailyData:updateProperty({field = "advC", delta = -1})
+				break
 			end
+		end
+
+		if not maxCampsite then return end
+
+		local idleReward = chapterData.idleReward:toNumMap()
+		for itemId, count in pairs(idleReward) do
+			idleReward[itemId] = math.floor(count * (maxCampsite.idleValue + upUnit) / 100)
+		end
+		reward = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
+	else
+		if cancel then
+			role:changeAdvCount(-chapterData.limitlevel)
+			-- if role:getProperty("advC") <= 0 then 
+			-- 	isFull = true
+			-- else
+			-- 	role:updateProperty({field = "advC", delta = -chapterData.limitlevel})
+			-- end
 		else
 			return
 		end
@@ -319,7 +365,7 @@ function _M.buyAdvCountRpc(agent , data)
 		role.dailyData:updateProperty({field = "advElC", delta = -count})
 		role.dailyData:updateProperty({field = "advElBC", delta = count})
 	else
-		role.dailyData:updateProperty({field = "advC", delta = -count})
+		role:changeAdvCount(-count * globalCsv.adv_daily_buy_num)
 		role.dailyData:updateProperty({field = "advBC", delta = count})
 	end
 	role:log("adv_action", {desc = "buyAdvCount", short1 = isEl and 1 or 0, int1 = count})
@@ -213,8 +213,6 @@ function _M.fbc(role, pms) -- 直接通关
 	role:updateProperty({field = "hangPass", value = {}})
 	addPre(carbonId)
-	role:checkTaskEnter("HangPass", {id = carbonId})
-
 	role:log("gm_action", {desc = "fbc", int1 = carbonId, key1 = pms.sender})
 	return "成功"
@@ -339,7 +337,7 @@ end
 table.insert(helpDes, {"冒险次数恢复", "advf"})
 function _M.advf(role, pms)
-	role.dailyData:updateProperty({field = "advC", value = 0})
+	role:updateProperty({field = "advC", value = 0})
 	role.dailyData:updateProperty({field = "advElC", value = 0})
 	role:log("gm_action", {desc = "advf", key1 = pms.sender})
@@ -363,7 +361,7 @@ function _M.adv(role, pms)
 		advPass[chapterId] = layer
 		role:updateProperty({field = "advPass", value = advPass})
 	end
-	role:log("gm_action", {desc = "advf", int1 = chapterId, int2 = layer, key1 = pms.sender})
+	role:log("gm_action", {desc = "adv", int1 = chapterId, int2 = layer, key1 = pms.sender})
 	return "成功"
 end
@@ -559,4 +559,28 @@ function _M.bagFieldRpc(agent, data)
 	return true
 end
+function _M.chatLineRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+
+	local idleData = csvdb["idle_battleCsv"][id]
+	if not idleData or idleData.chatline == 0 then
+		return
+	end
+
+	local chatline = role:getProperty("chatline")
+	if chatline[id] then return end
+
+	if not role:checkHangPass(id) then return end
+
+	chatline[id] = skynet.timex()
+	role:updateProperty({field = "chatline", value = chatline})
+
+	local reward = role:award(idleData.chatline_reward, {log = {desc = "chatline", int1 = id}})
+	
+	SendPacket(actionCodes.Hang_chatLineRpc, MsgPack.pack(reward))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -846,8 +846,8 @@ function _M.drawHeroRpc(agent, data)
 		local isNewerSSR = btype == 4 and (newerHadSSR == 0 and newerDrawCount >= globalCsv.draw_newer[1]) or false
 		local ssrUp = 0
-		if draw_ssr_up_count_rate then
-			ssrUp = math.min(math.floor(ssrUpCount / draw_ssr_up_count_rate[1]) * draw_ssr_up_count_rate[2], draw_ssr_up_count_rate[3]) / 100
+		if draw_ssr_up_count_rate and ssrUpCount > draw_ssr_up_count_rate[1] then
+			ssrUp = math.min((ssrUpCount - draw_ssr_up_count_rate[1]) * draw_ssr_up_count_rate[2], draw_ssr_up_count_rate[3]) / 100
 		end
 		while not next(resultPool) do
 			if isNewerSSR then
@@ -862,7 +862,7 @@ function _M.drawHeroRpc(agent, data)
 		end
 		-- 引导必送 613 丝路德
-		local itemId = guide and 613 or math.randWeight(resultPool, 1)
+		local itemId = (guide and drawType == 1) and 613 or math.randWeight(resultPool, 1)
 		local itemData = csvdb["itemCsv"][itemId]
 		if itemData.quality == 4 then
 			ssrCount = ssrCount + 1
@@ -892,13 +892,13 @@ function _M.drawHeroRpc(agent, data)
 	if draw_floor_back_counts then
 		local floorHero = role:getProperty("floorHero")
-		floorHero[pool] = floorHeroCount
+		floorHero[btype] = floorHeroCount
 		role:setProperty("floorHero", floorHero)
 	end
 	if draw_ssr_up_count_rate then
 		local ssrUp = role:getProperty("ssrUp")
-		ssrUp[pool] = ssrUpCount
+		ssrUp[btype] = ssrUpCount
 		role:setProperty("ssrUp", ssrUp)
 	end
@@ -914,7 +914,7 @@ function _M.drawHeroRpc(agent, data)
 	-- 	role:updateProperty({field = "repayHero", value = repayHero})
 	-- end
-	role:checkTaskEnter("DrawHero", {pool = pool, count = drawCount[drawType]})
+	role:checkTaskEnter("DrawHero", {pool = btype, count = drawCount[drawType]})
 	if ssrCount > 0 then
 		role:checkTaskEnter("DrawSSR", {count = ssrCount})
 	end
@@ -121,10 +121,14 @@ function _M.loginRpc( agent, data )
 	role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
 	-- 跨天登陆事件
-	role:updateTimeReset(now)
+	local resetMode = role:updateTimeReset(now)
+	if not resetMode or not resetMode["CrossDay"] then -- 没有跨天
+		role.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
@@ -577,10 +581,19 @@ function _M.storyBookRewardRpc(agent, data)
 	local storyBookData = csvdb["story_bookCsv"][storyId]
 	if not storyBookData then return end
 	local storyStatus = role:getProperty("storyB")
-	if not storyStatus[storyId] or not storyStatus[storyId].s or storyStatus[storyId].s ~= 1 then 
-		return 
+
+	local status = (storyStatus[storyId] or {}).s
+
+	if status == -1 then return end
+	
+	if not status or status ~= 1 then 
+		if storyBookData.unlockType == 1 and role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) then  -- 挂机剧情正在挂机也可以领奖
+		else
+			return 
+		end
 	end
 	-- 获取奖励
+	storyStatus[storyId] = storyStatus[storyId] or {}
 	storyStatus[storyId].s = -1
 	role:changeUpdates({{ type = "storyB", field = storyId, value = storyStatus[storyId] }})
 	local reward = role:award(storyBookData.gift, {log = {desc = "storybookReward", int1 = storyId}})
@@ -211,6 +211,7 @@ function _M.dailyBuyRpc(agent , data)
 		gift[itemId] = count_ * count
 	end
 	local reward = role:award(gift, {log = {desc = "dailyShop", int1 = id, int2 = count}})
+	role:checkTaskEnter("ShopAll", {count = count})
 	role:log("role_action", {desc = "dailyShop", int1 = id, int2 = count})
@@ -113,7 +113,7 @@ function _M.endBattleRpc(agent, data)
 	towerInfo.k = nil
 	role:updateProperty({field = "towerInfo", value = towerInfo})
-	role:log("tower_action", {desc = "startBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
+	role:log("tower_action", {desc = "endBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
 	SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({reward = reward}))
 	return true
@@ -776,6 +776,12 @@ 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
+		backAdvCount = chapterData.limitlevel - self.level
+		self.owner:changeAdvCount(-backAdvCount)
+	end
+
 	if success then
 		self.owner:checkTaskEnter("AdvPass", {id = self.chapterId, level = self.level, score = score})
@@ -814,7 +820,16 @@ function Adv:over(success, rewardRatio, overType)
 		advAFGet = {},
 		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 = scoreReward,
+		chapterId = chapterId,
+		backAdvCount = backAdvCount,
+	})
 end
 function Adv:exit()
@@ -1921,9 +1936,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})
@@ -288,6 +288,15 @@ function Battle:afterRound()
 		return e1.id < e2.id
 	end)
+
+	self.player:afterRound("buffBefore")
+	for _, enemy in ipairs(self.enemys[mapIdx]) do
+		enemy:afterRound("buffBefore")
+	end
+	for _, build in ipairs(self.builds[mapIdx]) do
+		build:afterRound("buffBefore")
+	end
+
 	self.player:afterRound("passive")
 	for _, enemy in ipairs(self.enemys[mapIdx]) do
 		enemy:afterRound("passive")
@@ -296,12 +305,12 @@ function Battle:afterRound()
 		build:afterRound("passive")
 	end
-	self.player:afterRound("buff")
+	self.player:afterRound("buffAfter")
 	for _, enemy in ipairs(self.enemys[mapIdx]) do
-		enemy:afterRound("buff")
+		enemy:afterRound("buffAfter")
 	end
 	for _, build in ipairs(self.builds[mapIdx]) do
-		build:afterRound("buff")
+		build:afterRound("buffAfter")
 	end
@@ -330,7 +339,7 @@ function Battle:afterRound()
 	self.player:triggerPassive(Passive.AFTER_ROUND)
 	if self.player.isDead then
-		self.adv:over(false)
+		self.adv:over(false, nil, -2)
 	end
 end
@@ -55,9 +55,17 @@ function BaseObject:afterRound(roundType)
 		for _, passive in ipairs(self.passives) do
 			passive:afterRound(self)
 		end
-	elseif roundType == "buff" then
+	elseif roundType == "buffBefore" then
 		for _, buff in ipairs(self.buffs) do
-			buff:afterRound()
+			if buff.buffData.intoEffect == 1 then
+				buff:afterRound()
+			end
+		end
+	elseif roundType == "buffAfter" then
+		for _, buff in ipairs(self.buffs) do
+			if buff.buffData.intoEffect == 0 then
+				buff:afterRound()
+			end
 		end
 	end
 end
@@ -416,9 +424,13 @@ end
 function BaseObject:recover(value, releaser, params)
 	params = params or {}
 	value = math.max(0, math.ceil(value))
+	local old = self.hp
 	self.hp = math.min(self.hpMax, self.hp + value)
+	local change = self.hp - old
 	if self:is("Player") then
-		self.battle.adv:pushBackEvent(AdvBackEventType.HpChange, {change = value})
+		if change > 0 then
+			self.battle.adv:pushBackEvent(AdvBackEventType.HpChange, {change = value})
+		end
 	end
 end
@@ -627,7 +639,9 @@ function Player:changeSp(value, cType)
 	elseif cType == 1 then
 		change = self.sp * value / 100
 	end
+	local old = self.sp
 	self.sp = math.floor(math.min(self.spMax, math.max(0, self.sp + change)))
+	change = self.sp - old
 	if change ~= 0 then
 		self.battle.adv:pushBackEvent(AdvBackEventType.SpChange, {change = math.floor(change)})
 	end
@@ -1,18 +0,0 @@
-root = "./"
-thread = 8
-logger = "server.log"
-harbor = 0
-start = "main"	-- main script
-bootstrap = "snlua bootstrap"	-- The service for bootstrap
-logd = 0 -- 是否开启日志
-servId = 1
-baseId = 0
-codeurl = "106.13.60.20:9090"
-cluster = "./src/nodenames.lua"
-
-lua_path = root .."skynet/lualib/?.lua;"..root.."src/?.lua;"..root.."tools/?.lua"
-luaservice = root.."skynet/service/?.lua;"..root.."src/?.lua"
-lualoader = "skynet/lualib/loader.lua"
-preload = "./src/preload.lua"	-- run preload.lua before every lua service run
-cpath = root.."skynet/cservice/?.so"
-lua_cpath = "skynet/luaclib/?.so"
 \ No newline at end of file
 local Activity = class("Activity", require("shared.ModelBase"))
-
+local string_format = string.format
 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,14 @@ end
 Activity.schema = {
-	ctime 	= {"table", {}}, -- 最近检查某项活动的开始时间  {id = time}
-	_1		= {"table", {}},
+	actime 		= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
+	act1		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
 }
 function Activity:data()
 	return {
-		_1 = self:getProperty("_1"),
+		actime = self:getProperty("actime"),
+		act1 = self:getProperty("act1"),
 	}
 end
@@ -54,26 +55,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 actime = self:getProperty("actime")
+	local change = false
+	for actType, actData in pairs(csvdb["activity_ctrlCsv"]) do
+		local isOpen, startTime = self:isOpenRaw(actType, now)
+		self._isOpen[actType] = isOpen
+
+		if isOpen then
+			if actime[actType] and actime[actType] == startTime then -- 还是之前的状态 开放中
+			else  -- 重置
+				actime[actType] = startTime
+				self:closeActivity(actType, notify, true)
+				self:initActivity(actType, isCrossDay, notify)
+				change = true
+			end
+		else
+			if actime[actType] then
+				self:closeActivity(actType, notify)
+				actime[actType] = nil
+				change = true
+			end
+		end
+	end
+	if change then
+		self:updateProperty({field = "actime", value = actime, notNotify = not notify})
+	end
 end
-local checkActivityFunc = {}
+local activityFunc = {}
+
+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_signInCsv"]
+		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
-checkActivityFunc[Activity.ActivityType.DoubleDrop] = function(self, notNotify, activityType, ...)
+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
@@ -10,7 +10,6 @@ Daily.schema = {
 	commentHero		= {"string", ""},		-- 单日评论食灵记录 type=1
 	hangQC			= {"number", 0},		-- 挂机快速次数
 	dinerQC			= {"number", 0},		-- 贩卖加速次数
-	advC			= {"number", 0},		-- 冒险次数（消耗体力）
 	advElC			= {"number", 0},		-- 无尽次数（消耗体力）
 	advBC			= {"number", 0},		-- 冒险次数购买次数(冒险体力购买次数)
 	advElBC			= {"number", 0},		-- 无尽次数购买次数(冒险体力购买次数)
@@ -52,7 +51,7 @@ function Daily:refreshDailyData(notify)
 	redisproxy:del(FRIEND_POINT:format(self.owner:getProperty("id")))
 	local dataMap = {}
 	for field, schema in pairs(self.schema) do
-		if field == "advC" or field == "advElC" then
+		if field == "advElC" then
 			if self:getProperty(field) > 0 then
 				dataMap[field] = 0
 			end
@@ -85,7 +84,6 @@ function Daily:data()
 	return {
 		hangQC = self:getProperty("hangQC"),
 		dinerQC = self:getProperty("dinerQC"),
-		advC = self:getProperty("advC"),
 		advBC = self:getProperty("advBC"),
 		advElC = self:getProperty("advElC"),
 		advElBC = self:getProperty("advElBC"),
@@ -83,6 +83,8 @@ Role.schema = {
 	advRelay			= {"table", {}}, -- 冒险中继点记录  {[chapter] = {[level] = 1}, [-1] = {[level] = 1}}  -- -1 无尽 方便重置
 	advSup 				= {"table", {}}, -- 冒险支援效果 待选项
 	advLimit			= {"table", {}}, -- 冒险事件每次的limit
+	advC				= {"number", 0}, -- 冒险次数（消耗体力）
+	advCT 				= {"number", 0}, -- 冒险次数 上次恢复时间
 	--挂机相关
 	hangPass 			= {"table", {}}, -- 挂机通过的最大关卡
@@ -152,6 +154,8 @@ Role.schema = {
 	sign 				= {"table", {}}, -- 签到记录 {[1] = 20181029}
 	redp 				= {"table", {}}, -- 待消除红点 -- 通常打开对应界面就消除的红点  红点消除的方法 在对应的协议中使用 {tag = pms }
+
+	chatline			= {"table", {}}, -- 奖励发放 id=时间
 }
@@ -322,6 +326,8 @@ function Role:data()
 		advShop = self:getProperty("advShop"),
 		advEAchiev = self:getProperty("advEAchiev"),
 		advSup = self:getProperty("advSup"),
+		advC = self:getProperty("advC"),
+		advCT = self:getProperty("advCT"),
 		hangPass = self:getProperty("hangPass"),
 		hangGift = self:getProperty("hangGift"),
@@ -364,6 +370,7 @@ function Role:data()
 		sign = self:getProperty("sign"),
 		redp = self:getProperty("redp"),
+		chatline = self:getProperty("chatline"),
 	}
 end
@@ -67,9 +67,16 @@ function RolePlugin.bind(Role)
 		local itemTypeAward = {
 			[ItemType.Hero] = function()
 				pms.type = itemId - ItemStartId.Hero
-				for _= 1, count do
-					self:addHero(pms)
+				local status = self:addHero(pms)
+				local gcount = 1
+				if not status then
+					gcount = 0
+				end
+				if count - gcount > 0 then
+					local heroData = csvdb["unitCsv"][pms.type]
+					change[pms.type] = (change[pms.type] or 0) + (count - gcount) * globalCsv.draw_unit_tofragment[heroData.rare]
 				end
+				count = gcount
 			end,
 			[ItemType.EquipBase] = function()
 				local typ = math.floor((itemId-7000)/100)
@@ -105,7 +112,7 @@ function RolePlugin.bind(Role)
 			end
 		end
-		return count, change --  count 刷新实际发放的奖励个数 change 物品实际奖励与当前id 不符 就发生转换 而不实际发奖
+		return count, change --  count 实际发放的奖励个数 change 物品实际奖励与当前id 不符 就发生转换 而不实际发奖
 	end
@@ -122,17 +129,18 @@ function RolePlugin.bind(Role)
 		end
 		local reward, allChange = {}, {}
-		for itemId, count in pairs(tgift) do
-			local count, change = _award(self, itemId, count, params)
+		for itemId, rcount in pairs(tgift) do
+			local count, change = _award(self, itemId, rcount, params)
+			if count > 0 then
+				reward[itemId] = (reward[itemId] or 0) + count
+			end
 			if next(change) then
-				local cr, cc = self:award(change, params) -- 内部转换忽略
-				for _id, _ct in pairs(cr) do
-					reward[_id] = (reward[_id] or 0) + _ct
-				end
-				table.insert(allChange, {form = {[itemId] = count}, to = cr})
-			else
-				if count > 0 then
-					reward[itemId] = (reward[itemId] or 0) + count
+				local cr, _ = self:award(change, params) -- 内部转换忽略 防止死循环
+				if next(cr) then
+					for _id, _ct in pairs(cr) do
+						reward[_id] = (reward[_id] or 0) + _ct
+					end
+					table.insert(allChange, {form = {[itemId] = rcount - count}, to = cr})
 				end
 			end
 		end
@@ -398,22 +406,14 @@ function RolePlugin.bind(Role)
 		if not unitData then return false end
 		local heroId = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "hero", 1))
-		
 		redisproxy:sadd(string.format(R_HEROS, roleId), heroId)
-		local wakeL = 1
-		if unitData.rare == 3 then
-			wakeL = 2
-		elseif unitData.rare == 4 then
-			wakeL = 3
-		end
-
 		local heroInfo = {
 			key = string.format(R_HERO, roleId, heroId),
 			id 	= heroId,
 			type= heroType,
-			wakeL = wakeL,
+			wakeL = globalCsv.unit_wake_initLevel[unitData.rare],
 		}
 		local newHero = require("models.Hero").new(heroInfo)
@@ -846,6 +846,37 @@ function RolePlugin.bind(Role)
 		return globalCsv.adv_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCount)
 	end
+	function Role:checkAdvCount(need)
+		local oldCount = self:getProperty("advC")
+		local oldTime = self:getProperty("advCT")
+		local newCount = oldCount
+		if oldCount > 0 then
+			local add = math.max(math.floor((skynet.timex() - oldTime) / (globalCsv.adv_daily_regain_min * 60)), 0)
+			newCount = math.max(oldCount - add, 0)
+		end
+
+		return newCount + need <= self:getAdvHangLimit()
+	end
+
+	--忽略上限
+	function Role:changeAdvCount(change)
+		if change == 0 then return end
+		local count = self:getProperty("advC")
+		local ctime = self:getProperty("advCT")
+		if ctime == 0 then
+			ctime = skynet.timex()
+		end
+		local add = math.max(math.floor((skynet.timex() - ctime) / (globalCsv.adv_daily_regain_min * 60)), 0)
+		local nextTime = ctime + add * (globalCsv.adv_daily_regain_min * 60)
+		if count > 0 then
+			count = math.max(count - add, 0)
+		end
+		self:updateProperties({
+			advC = count + change,
+			advCT = nextTime,
+		})
+	end
+
 	function Role:getAdvElLimit()
 		return globalCsv.adv_endless_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCountEL)
 	end
@@ -132,7 +132,7 @@ local CommonListener = {
 		[TaskType.GetFriendP] = {{22, f("count")}},
 		[TaskType.BonusPass] = {{23}},
 		[TaskType.AdvStartSelf] = {{24}},
-		[TaskType.ShopAll] = {{25}},
+		[TaskType.ShopAll] = {{25, f("count")}},
 		[TaskType.RuneUp] = {{26}},
 		[TaskType.OpenBox] = {{27, 1, f("id")}},
 		[TaskType.AdvDraw] = {{28, f("count"), f("ptype")}},
@@ -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 作为持续时间
@@ -103,31 +103,27 @@ end
 local function hideMatchInfo()
 	local day, ctime = getDayAndTime()
 	local tempMatchCache = {}
-	if day > globalCsv.pvp_cross_server_day then
-		return MatchCache
-	else
-		for round, tempData in pairs(MatchCache) do
-			if round == day and ctime < globalCsv.pvp_cross_server_show_result - 1 then
-				tempMatchCache[round] = {}
-				for idx, match in pairs(tempData) do
-					tempMatchCache[round][idx] = {
-						[1] = match[1],
-						[2] = match[2],
-					}
-				end
-			elseif round <= day then
-				tempMatchCache[round] = {}
-				for idx, match in pairs(tempData) do
-					tempMatchCache[round][idx] = {
-						[1] = match[1],
-						[2] = match[2],
-						win = match.win,
-						battleV = {
-							[match[1]] = (match.teams[match[1]] or {}).battleV,
-							[match[2]] = (match.teams[match[2]] or {}).battleV,
-						}
+	for round, tempData in pairs(MatchCache) do
+		if round == day and ctime < globalCsv.pvp_cross_server_show_result - 1 then
+			tempMatchCache[round] = {}
+			for idx, match in pairs(tempData) do
+				tempMatchCache[round][idx] = {
+					[1] = match[1],
+					[2] = match[2],
+				}
+			end
+		elseif round <= day then
+			tempMatchCache[round] = {}
+			for idx, match in pairs(tempData) do
+				tempMatchCache[round][idx] = {
+					[1] = match[1],
+					[2] = match[2],
+					win = match.win,
+					battleV = {
+						[match[1]] = (match.teams[match[1]] or {}).battleV,
+						[match[2]] = (match.teams[match[2]] or {}).battleV,
 					}
-				end
+				}
 			end
 		end
 	end