Merge branch 'tr/bugfix' into tr/publish/qa-dev

熊润斐
2 parents 372f3515 39aebe0b
Showing 32 changed files with 1489 additions and 67 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/CarAction.lua
src/actions/DinerAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RadioAction.lua
src/actions/RoleAction.lua
src/actions/SeaportAction.lua
src/actions/TowerAction.lua
src/adv/AdvBlock.lua
src/adv/AdvBuff.lua
src/adv/AdvPassive.lua
src/csvdata
src/models/Activity.lua
src/models/Diner.lua
@@ -80,6 +80,8 @@ ItemType = {
 	SpeedBox					= 16, 	-- 加速箱子
 	SelectItemBox				= 17, 	-- 自选箱子
 	CommonPaster				= 18, 	-- 万能贴纸
+	BossTicket					= 20, 	-- boss挑战门票
+	Spark						= 21, 	-- 火花
 }
  
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
@@ -310,6 +312,8 @@ CardType = {
 	PaySignCard = 6, -- 付费签到卡
 	BattlePassCard = 7, -- 探索指令
 	ActBattleCommandCard = 8, -- 战令活动卡
+	NormalMonthCardLevelUp = 9,	-- 月卡升级
+	SuperMonthCardLevelUp = 10,	-- 超级月卡升级
 }
  
 ShopPackType = {
@@ -357,6 +361,7 @@ TriggerEventType = {
 	SSRCount = 6,
 	AfterTs = 7, 	-- 某时间以后
 	DrawHeroCnt = 8,	-- 每日抽卡次数
+	Appoint = 0, -- 触发指定id礼包
 }
  
 DrawCardType = {
@@ -369,7 +374,20 @@ DrawCardType = {
 TeamSystemType = {
 	Hang = 1,
 	BonusBattle = 2,
-	Tower = 3,
 	Dinner = 4,
 	FriendBattle = 5,
-}
 \ No newline at end of file
+}
+
+-- 某个功能对其他系统功能的加成类型
+SystemBnousType = {
+	TowerBuff = 1, 		-- 电波塔内战斗开始时获得buff
+	CrusadeTask = 2, 	-- 讨伐电台任务加速
+	DinerGet = 3, 		-- 食材供应商获取速度
+	DinerLimit = 4, 	-- 食材供应商上限
+	DinerSell = 5, 		-- 料理贩卖速度
+	DinerPrice = 6, 	-- 齿轮价格
+	Adv = 7, 			-- 代理拾荒获得额外道具
+	HangTime = 8, 		-- 挂机时间上限
+	PvpTicket = 9, 		-- 每周额外获得竞技场门票数量
+	SweepReward = 10, 	-- 奖励关卡每次扫荡额外获得道具
+}
@@ -51,6 +51,8 @@ actionCodes = {
 	Role_broadGetSSR = 135,		-- 全服广播 获得ssr英雄
 	Role_renameTeamRpc = 136,	-- 编队改名
 	Role_accuseRpc = 137,		-- 举报
+	Role_loadSparks = 138,		
+	Role_updateSpark = 139,		-- 更新火花
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -102,6 +104,7 @@ actionCodes = {
 	Hero_drawHeroExtraRewardNtf = 224,
 	Hero_itemComposeRpc = 225,
 	Hero_setWishPoolRpc = 226,
+	Hero_changeSparkRpc = 227,
  
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -145,12 +148,15 @@ actionCodes = {
 	Tower_rankRpc = 353,
 	Tower_bugCountRpc = 354,
 	Tower_rankInfoRpc = 355,
+	Tower_activeTowerBonusRpc = 356,
  
 	Car_makePotionRpc = 400,
 	Car_equipUpRpc = 401,
 	Car_runeUpRpc = 402,
 	Car_saleEquipRpc = 403,
 	Car_saleRuneRpc = 404,
+	Car_sparkLvlUpRpc = 405,
+	Car_sparkQualityUpRpc = 406,
  
  
 	Friend_searchRpc = 450,
@@ -236,10 +242,18 @@ actionCodes = {
 	Activity_newSignRpc = 670,
 	Activity_advLevelRpc = 671,
 	Activity_buyBattleCommandLvlRpc = 672,
+	Activity_returnerTaskRpc = 673,
  
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
 	Radio_cancelQuestRpc = 702,
+
+	Seaport_getServerProcessRpc = 750,
+	Seaport_donateRpc = 751,
+	Seaport_donateRewardRpc = 752,
+	Seaport_taskRpc = 753,
+	Seaport_shopRpc = 754,
+	Seaport_resetRpc = 755,
 }
  
 rpcResponseBegin = 10000
@@ -14,6 +14,8 @@ R_EMAIL_ITEM = &quot;email:%d:%d&quot; --邮件
 R_STORE = "role:%d:store"   -- 商店
 R_ORDERS = "role:%d:orders" -- 订单
 R_ORDER = "order:%d:%d"
+R_SPARKIDS = "role:%d:sparkIds"      -- 玩家拥有火花自增id
+R_SPARK = "role:%d:spark:%d"       -- 火花详细信息
  
 -- 通用排行榜
 RANK_COMMON 	= "rank:common:"
@@ -26,6 +28,15 @@ RANK_TYPE = {
 RANK_TOWER 	= "rank:tower"
 RANK_TOWER_INFO = "rank:tower:info"
  
+RANK_TOWER1 	= "rank:tower1"
+RANK_TOWER1_INFO = "rank:tower1:info"
+
+RANK_TOWER2 	= "rank:tower2"
+RANK_TOWER2_INFO = "rank:tower2:info"
+
+RANK_TOWER3 	= "rank:tower3"
+RANK_TOWER3_INFO = "rank:tower3:info"
+
 -- adv
 RANK_ADV 	= {"rank:adv1", "rank:adv2"}
 RANK_ADV_INFO = "rank:adv:info"
@@ -40,8 +51,8 @@ RANK_PVP_HIGHT 	= &quot;rank:pvph&quot;
 RANK_PVP_HIGHT_KEY 	= {"rank:pvph1", "rank:pvph2"}
 RECORD_PVP_HIGH = "record:pvph:%d"
  
-
-
+SEAPORT_TRADE_TASK_1 = "seaport:task1"
+SEAPORT_TRADE_TASK_2 = "seaport:task2"
  
 FRIEND_KEY = "role:%d:friend"	--哈希表 好友
 FRIEND_APPLY_KEY = "role:%d:apply"	-- sort set 申请列表
@@ -1370,4 +1370,52 @@ function _M.advLevelRpc(agent, data)
 	return true
 end
  
+function _M.returnerTaskRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local taskId = msg.id or 0
+	if taskId == 0 then return 0 end
+
+	local returner = role:getProperty("returner") or {}
+	if not returner[taskId] then return 1 end
+
+	local tday = specTime({hour = 4})
+	local curAllDay = (tday - returner.time) / 86400 + 1
+
+	local TaskCsv = csvdb["activity_taskCsv"][76] or {}
+	local taskData = TaskCsv[taskId]
+	if not taskData then return 2 end
+	if curAllDay < taskData.day then return 2 end
+
+	local status = returner.status or {}
+	if status[taskId] then return 3 end
+
+	status[taskId] = 1
+	returner.status = status
+
+	local done = true
+	for _, data in pairs(TaskCsv) do
+		if not status[data.id] then
+			done = false
+			break
+		end
+	end
+
+	if done then
+		returner = {}
+	end
+
+	local reward, change = role:award(taskData.reward, {log = {desc = "returner", int1 = taskData.day, int2 = taskId}})
+
+	local pack = globalCsv.returner_pack:toArray(true,"=")
+	if pack[1] == taskData.id then
+		role:checkTaskEnter("Appoint", {id = pack[2]})
+	end
+
+	role:updateProperty({field = "returner", value = returner})
+	SendPacket(actionCodes.Activity_returnerTaskRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
@@ -278,6 +278,7 @@ function _M.startHangRpc(agent, data)
 	end
 	adv_idle_time = adv_idle_time * 60
  
+
 	local advHang = role:getProperty("advHang")
 	if advHang[chapterId] then return 3 end --正在挂机
  
@@ -463,6 +464,15 @@ function _M.endHangRpc(agent, data)
 		for itemId, count in pairs(idleReward) do
 			idleReward[itemId] = count * adv_idle_reward_coef
 		end
+
+		local bnousReward = role:getBnousAdv()
+		for time, set in pairs(bnousReward) do
+			local delta = math.floor(adv_idle_time / time)
+			for key, value in pairs(set) do
+				idleReward[key] = (idleReward[key] or 0) + value * delta
+			end
+		end
+
 		reward, change = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
 	else
 		if cancel then
@@ -211,4 +211,92 @@ function _M.saleRuneRpc(agent, data )
 	return true
 end
  
+function _M.sparkQualityUpRpc( agent, data )
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local uid = msg.uid
+	local ownSpark = role.sparkBag[uid]
+	if not ownSpark then return 1 end
+
+
+	local cfg_id = ownSpark:getProperty("cfg_id")
+	local level = ownSpark:getProperty("level")
+
+	local sparkSet = csvdb["sparkCsv"][cfg_id]
+	if not sparkSet then return 4 end
+	local sparkData = sparkSet[level]
+	if not sparkData then return 5 end
+
+	if sparkData.star_up == 0 then return 6 end
+	local cost = sparkData.star_item:toNumMap()
+	if not role:checkItemEnough(cost) then
+		return 7
+	end
+
+	role:costItems(cost, {log = {desc = "sparkQualityUp", int1 = uid, int2 = level}})
+
+	local newSet = csvdb["sparkCsv"][sparkData.star_up]
+	if not newSet then return 8 end
+	local newSparkData = newSet[0]
+	if not newSparkData then return 9 end
+	local attrs = newSparkData.attr:toNumMap()
+	ownSpark:addAttr(attrs)
+	ownSpark:updateProperty({field = "level",value = 0})
+	ownSpark:updateProperty({field = "cfg_id",value = sparkData.star_up})
+	--role:checkTaskEnter("SparkQualityUp")
+
+
+	ownSpark:mylog({desc = "sparkQualityUp", int1 = sparkData.id , int2 = sparkData.star_up})
+
+	SendPacket(actionCodes.Car_sparkQualityUpRpc, '')
+	return true
+end
+
+function _M.sparkLvlUpRpc( agent, data )
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local uid = msg.uid
+	local ownSpark = role.sparkBag[uid]
+	if not ownSpark then return 1 end
+
+
+	local cfg_id = ownSpark:getProperty("cfg_id")
+	local level = ownSpark:getProperty("level")
+
+	local sparkSet = csvdb["sparkCsv"][cfg_id]
+	if not sparkSet then return 4 end
+	local sparkData = sparkSet[level]
+	if not sparkData then return 5 end
+
+	if level >= #sparkSet then return 6 end
+	local cost = sparkData.lv_up_item:toNumMap()
+	if not role:checkItemEnough(cost) then
+		return 7
+	end
+	local weight = math.random(0, 100)
+	local addLvl = 1
+	if weight < sparkData.probability then
+		addLvl = 2
+	end
+
+	role:costItems(cost, {log = {desc = "sparkLvlUp", int1 = uid, int2 = level}})
+	local attrs = {}
+	for i = 1, addLvl do
+		local cfg = sparkSet[level + i]
+		if not cfg  then break end
+		for k, v in pairs(cfg.attr:toNumMap()) do
+			attrs[k] = (attrs[k] or 0) + v
+		end
+	end
+	ownSpark:addAttr(attrs)
+	ownSpark:updateProperty({field = "level",value = level+addLvl})
+	--role:checkTaskEnter("SparkLvlUp")
+
+
+	ownSpark:mylog({desc = "sparkLvlUp", int1 = level + addLvl})
+
+	SendPacket(actionCodes.Car_sparkLvlUpRpc, MsgPack.pack({big = (addLvl == 2)}))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -75,7 +75,8 @@ function _M.addSellRpc( agent, data )
 	sells[slot].count = count
 	sells[slot].time = skynet.timex() - calSell.deltaTime
  
-	local needTime = sells[slot].count * dishData.sell_time + sells[slot].time - skynet.timex()
+	local timeSub = role:getBnousDiner(3,dishData.sell_time)
+	local needTime = sells[slot].count * (dishData.sell_time + timeSub) + sells[slot].time - skynet.timex()
 	role:pushMsg({type = "food", slot = slot, time = needTime})
  
 	-- 检查解锁的顾客
@@ -742,11 +743,15 @@ function _M.getGreenhouseRpc( agent, data )
 	local now = skynet.timex()
 	local gfood = role.dinerData:getProperty("gfood")
 	if not next(gfood) then return end
+
+	local timeAdd = role:getBnousDiner(2,globalCsv.diner_get_food_time_max)
+
 	for k , v in pairs(gfood) do
 		local itemId = v.id
 		local st = v.st
 		local speed = globalCsv.diner_get_food_speed[csvdb["itemCsv"][itemId].quality] * buildingData.speed / 100
-		local endTime = st + globalCsv.diner_get_food_time_max
+		speed = speed + role:getBnousDiner(1,speed)
+		local endTime = st + globalCsv.diner_get_food_time_max + timeAdd
 		local endTime2 = math.min(now, endTime)
 		reward[itemId] = math.floor((endTime2 - st) / speed)
 		if endTime2 == endTime then
@@ -166,6 +166,15 @@ function _M.rune(role, pms)
 	return result
 end
  
+table.insert(helpDes, {"获得火花"	, "spark", "零件id"})
+function _M.spark(role, pms)
+	local id = tonum(pms.pm1)
+	local result = role:addSpark({id = id, log = {desc = "gm"}})
+	role:mylog("gm_action", {desc = "spark", int1 = id, key1 = pms.sender})
+
+	return result == 0 and "成功" or "失败"
+end
+
 table.insert(helpDes, {"通关挂机副本", "fb", "挂卡id"})
 function _M.fb(role, pms) -- 直接通关
 	local carbonId = tonum(pms.pm1)
@@ -483,13 +492,25 @@ function _M.advit(role, pms)
 end
  
  
-table.insert(helpDes, {"爬塔到指定层", "tower", "层数"})
+table.insert(helpDes, {"爬塔到指定层", "tower", "塔id", "层数"})
 function _M.tower(role, pms)
-	local level = tonum(pms.pm1, 1)
+	local tType = tonum(pms.pm1, 1)
+	local level = tonum(pms.pm2, 1)
+	local layer = (tType - 1) * 10000 + level
 	if not csvdb["tower_battleCsv"][level] then return  "不存在" end
-	role:updateProperty({field = "towerInfo", value = {c = globalCsv.tower_count_limit, l = level}})
+	local values = role:getProperty("towerInfo")
+	if tType == 1 then
+		values.l = layer
+	elseif tType == 2 then
+		values.l1 = layer
+	elseif tType == 3 then
+		values.l2 = layer
+	elseif tType == 4 then
+		values.l3 = layer
+	end
+	role:updateProperty({field = "towerInfo", value = values})
  
-	role:mylog("gm_action", {desc = "tower", int1 = level, key1 = pms.sender})
+	role:mylog("gm_action", {desc = "tower", int1 = tType, int2 = layer, key1 = pms.sender})
  
 	return "成功"
 end
@@ -582,6 +603,13 @@ function _M.clearbag(role, pms)
 	end
 	role:delRunes(uids, {log = {desc = "gm"}})
  
+	-- 火花
+	uids = {}
+	for uid, _ in pairs(role.sparkBag) do
+		table.insert(uids, uid)
+	end
+	role:delSparks(uids, {log = {desc = "gm"}})
+
 	return "成功"
 end
  
@@ -326,6 +326,7 @@ function _M.roleFormatRpc(agent , data)
 	local index = msg.index	-- 阵容索引
 	local title = msg.title -- 阵容名称
 	local tactics = msg.tactics	-- 战术
+	local tower = msg.tower
 	local team = {}
 	for slot, heroId in pairs(msg.heros) do
 		if not role.heros[heroId] then
@@ -361,7 +362,11 @@ function _M.roleFormatRpc(agent , data)
 		team.tactics = msg.tactics
 	end
  
-	role:setTeamFormat(index, team)
+	if tower then
+		role:setTowerTeamFormat(index, team)
+	else
+		role:setTeamFormat(index, team)
+	end
  
 	SendPacket(actionCodes.Hang_roleFormatRpc, '')
 	return true
@@ -376,8 +381,9 @@ function _M.getRewardRpc(agent , data)
 	table.clear(items)
 	local hangInfo = role:getProperty("hangInfo")
 	local nowTime = skynet.timex()
-	hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max
-	hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max
+	local timeAdd = role:getBnousHangTime()
+	hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max + timeAdd
+	hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max + timeAdd
 	hangInfo.coinTime = nowTime
 	hangInfo.itemTime = nowTime
 	role:updateProperty({field = "hangBag", value = items})
@@ -508,7 +514,7 @@ function _M.buyBonusCountRpc(agent, data)
 	return true
 end
  
-local function bonusWinReward(role, bonusData, rewardType, count)
+local function bonusWinReward(role, bonusData, rewardType, count, sweep)
 	count = count or 1
  
 	local reward, change = {}
@@ -548,6 +554,13 @@ local function bonusWinReward(role, bonusData, rewardType, count)
 		end
 	end
  
+	if sweep then
+		local bnousReward = role:getBnousSweep()
+		for key, value in pairs(bnousReward) do
+			reward[key] = (reward[key] or 0) + value * count
+		end
+	end
+
 	reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = bonusData.id}})
 	role:checkTaskEnter("BonusPass", {id = bonusData.id, count = count})
 	return reward, change
@@ -589,7 +602,7 @@ function _M.startBonusBattleRpc(agent, data)
 			bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + count
 			role.dailyData:updateProperty({field = "bonusC", value = bonusC})
  
-		local reward, change = bonusWinReward(role, bonusData, 3, count)
+		local reward, change = bonusWinReward(role, bonusData, 3, count, true)
 		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({reward = reward, change = change}))
  
 		role:checkTaskEnter("BonusQuick", {count = count})
@@ -105,6 +105,25 @@ function _M.wakeRpc(agent, data)
 	if not role:checkItemEnough(cost) then
 		return 4
 	end
+	local curLevel = hero:getProperty("wakeL")
+	local sparkInfo = hero:getProperty("spark")
+	-- 大于等于7的时候需要装备火花才能升
+	if curLevel >= 7 then
+		if #sparkInfo == 0 then
+			return 5
+		end
+		local ok = false
+		for _, info in ipairs(sparkInfo) do
+			local cfg = csvdb["sparkCsv"][info.cfg_id][info.level or 0]
+			if not cfg then return 6 end
+			if cfg.star == curLevel then
+				ok = true
+				break
+			end
+		end
+		if not ok then return 7 end
+	end
+	
  
 	role:costItems(cost, {log = {desc = "heroWake", int1 = msg.id, int2 = hero:getProperty("type")}})
  
@@ -112,7 +131,6 @@ function _M.wakeRpc(agent, data)
 	local oldBattleV = hero:getProperty("battleV")
 	hero:updateProperty({field = "wakeL", delta = 1})
  
-	local curLevel = hero:getProperty("wakeL")
 	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
 	if curLevel == 3 then -- 解锁cg
 		role:checkTaskEnter("WakeCG", {heroType = typ})
@@ -1193,4 +1211,52 @@ function _M.setWishPoolRpc(agent, data)
 	return true
 end
  
+function _M.changeSparkRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local idx = msg.index
+	local sparkId = msg.spark_id
+	local heroId = msg.hero_id
+	local hero = role.heros[heroId]
+	if not hero then return 1 end
+
+	local spark = role.sparkBag[sparkId]
+	if not spark then return 2 end
+
+	local lvl = spark:getProperty("level")
+	local cfgId = spark:getProperty("cfg_id")
+
+	local dataSet =  csvdb["sparkCsv"][cfgId]
+	if not dataSet then return 3 end
+	local cfg = dataSet[lvl]
+	if not cfg then return 4 end
+	
+	if hero:getProperty("wakeL") < cfg.star then return 5 end
+
+	local itemCfg = csvdb["itemCsv"][cfgId]
+	if not itemCfg then  return 6 end
+	if itemCfg.quality ~= hero:getRare() then return 6 end
+
+	local sparkList = hero:getProperty("spark") or {}
+	local oldSparkInfo = sparkList[idx] or {}
+	sparkList[idx] = spark:data()
+	hero:updateProperty({field="spark", value=sparkList})
+
+	role:delSparks({sparkId}, {log = {desc = "changeSpark"}})
+	local oldId = oldSparkInfo["cfg_id"] or 0
+	local oldLevel = oldSparkInfo["level"] or 0
+	local oldSparkSet = csvdb["sparkCsv"][oldId]
+	local reward = {}
+	if oldSparkSet then
+		local oldSparkCfg = oldSparkSet[oldLevel]
+		if oldSparkSet then
+			reward = oldSparkCfg.back:toNumMap()
+		end
+	end
+
+	SendPacket(actionCodes.Hero_changeSparkRpc, MsgPack.pack({reward = reward}))
+	return true
+end
+
 return _M
@@ -95,8 +95,9 @@ function _M.startQuestRpc(agent, data)
         return 5
     end
     -- start quest, set finish time
+    local timeSub = role:getBnousCrusade(config.time)
     local taskData = {}
-    taskData["time"] = skynet.timex() + config.time
+    taskData["time"] = skynet.timex() + config.time + timeSub
     taskData["heros"] = heros
     radioTask[id] = taskData
     role:updateProperty({field="radioTask", value=radioTask, notNotify=true})
@@ -16,6 +16,7 @@ local httpc = require(&quot;http.httpc&quot;)
  
 local WAVE_HERO_NUMS = 150
 local WAVE_RUNE_NUMS = 150
+local WAVE_SPARK_NUMS = 150
  
 local function validName(name)
 	name = string.upper(name)
@@ -159,6 +160,7 @@ function _M.loginRpc( agent, data )
 	role:changeStructVersion() -- 数据结构 版本更新
 	role:getAdvData(true) -- 清掉不合格的数据
 	role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
+	role:checkSeaportTrade() -- 检查海港贸易季活动
  
 	-- 跨天登陆事件
 	local resetMode = role:updateTimeReset(now)
@@ -203,6 +205,16 @@ function _M.loginRpc( agent, data )
 		table_insert(modules, "runeBag")
 	end
  
+	local sparkIds = {}
+	for id ,_ in pairs(role.sparkBag) do
+		table.insert(sparkIds, id)
+	end 
+	local sparkWave = math.ceil(#sparkIds / WAVE_SPARK_NUMS)
+	if #sparkIds <= 50 then
+		sparkWave = 0
+		table_insert(modules, "sparkBag")
+	end
+
 	for _, name in ipairs(modules) do
 		response[name] = {}
 		for id, unit in pairs(role[name]) do
@@ -210,12 +222,29 @@ function _M.loginRpc( agent, data )
 		end
 	end
  
-	response.wave = 1 + heroWave + runeWave + 1
+	response.wave = 1 + heroWave + runeWave + sparkWave + 1
  
 	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
  
 	local curWave = 1 
  
+	local sparkIndex = 1
+	for index = curWave + 1, curWave + sparkWave do
+		local sparkResponse = {sparkBag = {}}
+		for i = sparkIndex, sparkIndex + WAVE_SPARK_NUMS do
+			local sparkId = sparkIds[i]
+			if not sparkId then
+				break
+			end
+			local spark = role.sparkBag[sparkId]
+			table.insert(sparkResponse.sparkBag, spark:data())
+			sparkIndex = sparkIndex + 1
+		end
+		sparkResponse.sparkWave = index
+		SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(sparkResponse))
+	end
+	curWave = curWave + sparkWave
+
 	local runeIndex = 1
 	for index = curWave + 1, curWave + runeWave do
 		local runeResponse = {runeBag = {}}
@@ -745,6 +774,7 @@ function _M.openSpeedUpBoxRpc(agent, data)
 			for k , v in pairs(gfood) do
 				local itemId = v.id
 				local speed = globalCsv.diner_get_food_speed[csvdb["itemCsv"][itemId].quality] * buildingData.speed / 100
+				speed = speed + role:getBnousDiner(1,speed)
 				reward[itemId] = (reward[itemId] or 0) + math.floor((time / speed) * count)
 			end
 		else
@@ -0,0 +1,306 @@
+local ipairs = ipairs
+local table = table
+local math = math
+local redisproxy = redisproxy
+local MsgPack = MsgPack
+
+local _M = {}
+
+function _M.getServerProcessRpc(agent, data)
+	local role = agent.role
+	local result = role:getSeaportServerProgress()
+
+	SendPacket(actionCodes.Seaport_getServerProcessRpc, MsgPack.pack(result))
+	return true
+end
+
+function _M.donateRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	
+	local phase = msg.phase or 0
+	local id = msg.id or 0
+	local itemId = msg.itemId or 0
+	local itemCount = msg.count or 0
+
+	if itemId == 0 or itemCount == 0 then return 0 end
+	if role:getItemCount(itemId) < itemCount then return 1 end
+	local DonateCsv = csvdb["seaport_purchaseCsv"]
+	if not DonateCsv[phase] or not DonateCsv[phase][id] then return 2 end
+
+	local ddata = DonateCsv[phase][id]
+	local needs = ddata.need_item:toArray(true,"=")
+	if itemId ~= needs[1] then return 3 end
+	if itemCount % needs[2] ~= 0 then return 4 end
+
+	local group = itemCount / needs[2]
+	local rewards = ddata.award:toNumMap()
+
+	for id, value in pairs(rewards) do
+		rewards[id] = value * group
+	end
+
+	if phase == 1 then
+		local old = tonumber(redisproxy:hget(SEAPORT_TRADE_TASK_1,id)) or 0
+		local need = ddata.need_num - old
+		if need >= itemCount then
+			redisproxy:hincrby(SEAPORT_TRADE_TASK_1,id,itemCount)
+		else
+			redisproxy:hincrby(SEAPORT_TRADE_TASK_1,id,need)
+			for _, temp in pairs(DonateCsv[2]) do
+				local items = temp.need_item:toArray(true,"=")
+				if items[1] == itemId then
+					redisproxy:hincrby(SEAPORT_TRADE_TASK_2,temp.id,itemCount - need)
+					break
+				end
+			end
+		end
+	else
+		redisproxy:hincrby(SEAPORT_TRADE_TASK_2,id,itemCount)
+	end
+
+	role:costItems({[itemId] = itemCount}, {log = {desc = "seaportDonate", int1 = phase, int2 = id}})
+	local reward, change = role:award(rewards, {log = {desc = "seaportDonate", int1 = ddata.phase, int2 = ddata.id}})
+
+	role:mylog("role_action", {desc = "seaportDonate", int1 = itemId, int2 = itemCount})
+
+	SendPacket(actionCodes.Seaport_donateRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+function _M.donateRewardRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local id = msg.id
+	local dataCsv = csvdb["seaport_purchaseCsv"]
+	if not dataCsv[id] then return 0 end
+
+	local seaport = role:getProperty("seaport") or {}
+	local donate = seaport.donate or {}
+	if donate[id] then return 3 end
+
+	local data = dataCsv[id][1]
+
+	local result = role:getSeaportServerProgress()
+	if not result[id] then return 1 end
+
+	for _, tempData in ipairs(dataCsv[id]) do
+		if tempData.need_num > (result[id][tempData.id] or 0) then
+			return 2
+		end
+	end
+
+	donate[id] = 1
+	seaport.donate = donate
+
+	local reward, change = role:award(data.phase_award, {log = {desc = "seaportReward", int1 = data.phase, int2 = data.id}})
+
+	role:updateProperty({field = "seaport", value = seaport})
+	SendPacket(actionCodes.Seaport_donateRewardRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+-- 获取英雄大成功率
+local function getHeroCoef(hero, condition)
+    -- 基础概率
+    local rareMap = {[HeroQuality.N] = 10, [HeroQuality.R] = 10, [HeroQuality.SR] = 15, [HeroQuality.SSR] = 20}
+    local rare = hero:getRare()
+    local result = 0
+    for _, it in ipairs(condition:toTableArray(true)) do
+        local type = it[1]
+        local value = it[2]
+        local add = it[3]
+        if type == 1 then   -- 种族加成
+            if hero:getCamp() == value then
+                result = result + add
+            end
+        elseif type == 2 then   -- 定位加成
+            if hero:getPosition() == value then
+                result = result + add
+            end
+        end
+    end
+
+    return result + (rareMap[rare] or 0)
+end
+
+function _M.taskRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local oper = msg.oper or 0
+	local team = msg.team or ""
+	local taskId = msg.id or 0
+	local level = msg.level or 0
+
+	if oper == 0 then return 0 end
+	local TaskCsv = csvdb["seaport_taskCsv"]
+	if not TaskCsv[taskId] or not TaskCsv[taskId][level] then return 1 end
+
+	local reward, change = {}, {}
+	local heroFaithMap = {}
+	local seaport = role:getProperty("seaport")
+
+	local data = TaskCsv[taskId][level]
+	if data.phase == 2 then
+		local openTime = tonumber(redisproxy:hget("autoincrement_set", "seaportTime0")) or 0
+		local nowTime = skynet.timex()
+		if nowTime < (openTime + 86400) or nowTime > (openTime + 172800) then return 9 end
+	end
+
+	if oper == 1 then -- 开始委托
+		if team == "" then return 3 end
+		local conditions = data.condition:toTableArray(true)
+		local heros = team:toArray(true,"=")
+		if not next(heros) then return 8 end
+		local UnitCsv = csvdb["unitCsv"]
+		for _, conds in pairs(conditions) do
+			local count = 0
+			for _, heroId in pairs(heros) do
+				local hero = role.heros[heroId]
+				if not hero then return 8 end
+
+				if conds[1] == 1 then
+					if hero:getProperty("level") >= conds[2] then
+						count = count + 1
+					end
+				elseif conds[1] == 2 then
+					if UnitCsv[hero:getProperty("type")].rare >= conds[2] then
+						count = count + 1
+					end
+				elseif conds[1] == 3 then
+					count = count + 1
+				end
+			end
+			if count < conds[#conds] then
+				return 4
+			end
+		end
+
+		local collect = seaport.collect or {}
+		collect[taskId] = {}
+		collect[taskId].time = skynet.timex()
+		collect[taskId].level = level
+		collect[taskId].team = team
+
+		seaport.collect = collect
+	elseif oper == 2 then -- 领取委托奖励
+		local collects = seaport.collect or {}
+		local collect = collects[taskId] or {}
+		if not next(collects) or not next(collect) then
+			return 5
+		end
+		local quick = msg.quick
+		local endTime = data.time + collect.time
+		local remainT = endTime - skynet.timex()
+		if not quick and remainT > 0 then return 6 end
+
+		if quick and remainT > 0 then
+			local cost = math.ceil(remainT / 3600) * globalCsv.seaport_task_quick
+			if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return 8 end
+			role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "seaportTask", int1 = taskId, int2 = level}})
+		end
+
+		local carbonCsv = csvdb["idle_battleCsv"]
+		local expCarbonId = role:getProperty("hangInfo").expCarbonId
+		if not carbonCsv[expCarbonId] then return 7 end
+
+		local totalCoef = 0
+	    for _, heroId in ipairs(collect.team:toArray(true,"=")) do
+	        local hero = role.heros[heroId]
+	        if hero then
+	            totalCoef = totalCoef + getHeroCoef(hero, data.success)
+	            hero:addHeroFaith(data.trust)
+	            heroFaithMap[heroId] = hero:getProperty("faith")
+	        end
+    	end
+
+		local bigSuccess = false
+	    local result = math.randomInt(0, 100)
+	    if result < totalCoef then
+	        bigSuccess = true
+	    end
+
+		local money = math.ceil(carbonCsv[expCarbonId].money / 5 * data.time * data.money_clear)
+		local exp = math.ceil(carbonCsv[expCarbonId].exp / 5 * data.time * data.exp_clear)
+		local itemReward = data.item_clear_special:toNumMap()
+		itemReward[ItemId.Gold] = (itemReward[ItemId.Gold] or 0) + money
+    	itemReward[ItemId.Exp] = (itemReward[ItemId.Exp] or 0) + exp
+    
+		if bigSuccess then
+	        for key, value in pairs(itemReward) do
+	            itemReward[key] = math.ceil(1.5 * value)
+	        end
+	    end
+
+	    reward, change = role:award(itemReward, {log = {desc = "seaportTask", int1 = taskId, int2 = level}})
+
+		seaport.collect[taskId] = nil
+	else
+		return 0
+	end
+
+	role:updateProperty({field = "seaport", value = seaport})
+
+	local result = role:packReward(reward, change)
+	result["heroFaith"] = heroFaithMap
+
+	SendPacket(actionCodes.Seaport_taskRpc, MsgPack.pack(result))
+	return true
+end
+
+function _M.shopRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id or 0
+	local count = msg.count or 1
+
+	local shopCsv = {}
+	local dataSet = csvdb["shop_normalCsv"]
+	for _, datat in pairs(dataSet) do
+		if datat.shop == 5 then
+			shopCsv[datat.id] = datat
+		end
+	end
+	local sdata = shopCsv[id]
+	
+	if not sdata then return 2 end
+
+	local seaport = role:getProperty("seaport")
+	local shop = seaport.shop or {}
+
+	if (shop[id] or 0) >= sdata.limit then return 1 end
+
+	
+
+	
+
+	if role:getItemCount(sdata.icon) < sdata.cost * count then return 3 end
+
+	role:costItems({[sdata.icon] = sdata.cost * count}, {log = {desc = "seaportShop", int1 = id, int2 = count}})
+
+	local itemReward = sdata.gift:toNumMap()
+	for itemId, value in pairs(itemReward) do
+		itemReward[itemId] = value * count
+	end
+
+	local reward, change = role:award(itemReward, {log = {desc = "seaportShop", int1 = id, int2 = count}})
+
+	shop[id] = (shop[id] or 0) + count
+	seaport.shop = shop
+
+	role:updateProperty({field = "seaport", value = seaport})
+
+	SendPacket(actionCodes.Seaport_shopRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+function _M.resetRpc(agent, data)
+	local role = agent.role
+	role:checkSeaportTrade()
+	SendPacket(actionCodes.Seaport_resetRpc, MsgPack.pack(""))
+	return true
+end
+
+return _M
@@ -23,14 +23,32 @@ function _M.startBattleRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
-	
-	if not role:isFuncUnlock(FuncUnlock.Tower) then return end
+	local towerType = math.floor(id / 10000)
+
+	if not id or towerType < 0 or towerType > 3 then return 0 end
+	if not role:isFuncUnlock(FuncUnlock.Tower) then return 1 end
  
 	local towerInfo = role:getProperty("towerInfo")
  
-	if towerInfo.l ~= id then return end  -- 层数不对
+	if towerType == 0 and (towerInfo.l or 1) ~= id then return 2 end  -- 层数不对
+	if towerType == 1 and ((towerInfo.l1 or 10001) ~= id or (towerInfo.l or 1) <= globalCsv.tower_open[towerType]) then return 2 end  -- 层数不对
+	if towerType == 2 and ((towerInfo.l2 or 20001) ~= id or (towerInfo.l or 1) <= globalCsv.tower_open[towerType]) then return 2 end  -- 层数不对
+	if towerType == 3 and ((towerInfo.l3 or 30001) ~= id or (towerInfo.l or 1) <= globalCsv.tower_open[towerType]) then return 2 end  -- 层数不对
+
+	if not csvdb["tower_battleCsv"][id] then return 4 end
+
+	local teams = role:getTowerTeamFormat(towerType + 1)
+	if not next(teams) then return 5 end
+
+	if towerType ~= 0 then
+		for _, heroId in pairs(teams.heros) do
+			local hero = role.heros[heroId]
+			if not hero then return 6 end
+			local unit = csvdb["unitCsv"][hero:getProperty("type")]
+			if unit.camp ~= towerType then return 7 end
+		end
+	end
  
-	if not csvdb["tower_battleCsv"][id] then return end
 	local curCount, nextTime = getUpdateTime(towerInfo.c, towerInfo.t)
 	--if curCount < 1 then return end -- 没有次数返回
  
@@ -57,18 +75,24 @@ function _M.endBattleRpc(agent, data)
 	local key = msg.key
 	local passTime = msg.passTime
  
+	local curTower = csvdb["tower_battleCsv"][id] 
+	if not curTower then return 2 end
+
 	local towerInfo = role:getProperty("towerInfo")
-	if towerInfo.l ~= id or not towerInfo.k or towerInfo.k ~= key then 
+	local towerType = math.floor(id / 10000)
+	local towerLevel = {[0] = (towerInfo.l or 1), [1] = (towerInfo.l1 or 10001), [2] = (towerInfo.l2 or 20001), [3] = (towerInfo.l3 or 30001)}
+	local curLevel = towerLevel[towerType]
+
+	if curLevel ~= id or not towerInfo.k or towerInfo.k ~= key then 
 		SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({errorCode = 1}))
 		return true
 	end
-	local curTower = csvdb["tower_battleCsv"][id] 
-	if not curTower then return 2 end
  
 	-- 防作弊
 	if not role:checkBattleCheat("tower", {
 		isWin = msg.starNum and msg.starNum > 0,
-		info = msg.info
+		info = msg.info,
+		tower = towerType + 1
 	}) then
 		SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({errorCode = 1}))
 		return true
@@ -81,11 +105,23 @@ function _M.endBattleRpc(agent, data)
 	if msg.starNum and msg.starNum > 0 then --win
 		curCount = math.min(curCount + 1, globalCsv.tower_count_limit) -- 返还次数
 		--排行榜
-		role:setTowerRank(towerInfo.l)
+		role:setTowerRank(curLevel % 10000, towerType + 1)
  
-		towerInfo.l = towerInfo.l + 1
+		curLevel = curLevel + 1
 		reward, change = role:award(curTower.reward, {log = {desc = "towerBattle", int1 = id}})
-		role:checkTaskEnter("TowerPass", {level = towerInfo.l - 1})
+		if towerType == 0 then
+			role:checkTaskEnter("TowerPass", {level = towerInfo.l})
+		end
+	end
+
+	if towerType == 0 then
+		towerInfo.l = curLevel
+	elseif towerType == 1 then
+		towerInfo.l1 = curLevel
+	elseif towerType == 2 then
+		towerInfo.l2 = curLevel
+	elseif towerType == 3 then
+		towerInfo.l3 = curLevel
 	end
  
 	towerInfo.c = curCount
@@ -93,8 +129,9 @@ function _M.endBattleRpc(agent, data)
 	towerInfo.k = nil
 	role:updateProperty({field = "towerInfo", value = towerInfo})
  
-
-	local rank = redisproxy:ZREVRANK(RANK_TOWER, role:getProperty("id"))
+	local RankTower = {[0] = RANK_TOWER,[1] = RANK_TOWER1,[2] = RANK_TOWER2,[3] = RANK_TOWER3}
+	local rankName = RankTower[towerType]
+	local rank = redisproxy:ZREVRANK(rankName, role:getProperty("id"))
 	if not rank then
 		rank = -1
 	else
@@ -106,6 +143,7 @@ function _M.endBattleRpc(agent, data)
 		info = msg.info,
 		reward = reward,
 		rank = rank,
+		tower = towerType + 1
 	})
 	role:mylog("tower_action", {desc = "endBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
  
@@ -143,7 +181,9 @@ end
  
 function _M.rankRpc(agent , data)
 	local role = agent.role
-	SendPacket(actionCodes.Tower_rankRpc, MsgPack.pack(role:getTowerRank()))
+	local msg = MsgPack.unpack(data)
+	local towerType = msg.tower or 1
+	SendPacket(actionCodes.Tower_rankRpc, MsgPack.pack(role:getTowerRank(towerType)))
 	return true
 end
  
@@ -151,7 +191,43 @@ function _M.rankInfoRpc(agent , data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local roleId = msg.roleId
-	SendPacket(actionCodes.Tower_rankInfoRpc, MsgPack.pack({format = role:getTowerRankOneInfo(roleId)}))
+	local towerType = msg.tower or 1
+	SendPacket(actionCodes.Tower_rankInfoRpc, MsgPack.pack({format = role:getTowerRankOneInfo(roleId, towerType)}))
+	return true
+end
+
+function _M.activeTowerBonusRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local tType = msg.tower
+	local id = msg.id
+
+	local bnousCsv = csvdb["tower_battle_additionCsv"]
+
+	if not tType or not id or not bnousCsv[tType] then return 0 end
+	local bnousData = bnousCsv[tType][id]
+	if not bnousData then return 1 end
+
+	local towerInfo = role:getProperty("towerInfo")
+	local towerBnous = role:getProperty("towerBnous")
+
+	if towerBnous[tType] and towerBnous[tType][id] then return 2 end
+	local towerLevel = {[1] = (towerInfo.l or 1), [2] = (towerInfo.l1 or 10001), [3] = (towerInfo.l2 or 20001), [4] = (towerInfo.l3 or 30001)}
+	local curLevel = towerLevel[tType]
+	
+	if tType ~= 1 then
+		if curLevel <= globalCsv.tower_open[tType - 1] then return 4 end
+	end
+
+	if (curLevel % 10000) <= bnousData.floor then return 3 end
+
+	if not towerBnous[tType] then
+		towerBnous[tType] = {}
+	end
+	towerBnous[tType][id] = 1
+	role:updateProperty({field = "towerBnous", value = towerBnous})
+	role:getTowerBnousActive(true)
+	SendPacket(actionCodes.Tower_activeTowerBonusRpc, '')
 	return true
 end
  
@@ -215,7 +215,9 @@ function Block:randomEvent()
 	randomFunc[AdvEventType.Trap] = function()
 		local data = csvdb["event_trapCsv"][self.event.id]
 		-- 因为一些神器效果 提前触发被动
-		adv.battle.player:triggerPassive(Passive.CLICK_TRAP)
+		if not data.classify:sismember(1, " ") then
+			adv.battle.player:triggerPassive(Passive.CLICK_TRAP)
+		end
  
 		local buffs = data.effect:toArray(true, "=")
  
@@ -704,11 +704,13 @@ function Buff:overlay(releaser, data, layer)
  
 		self.release = releaser or self.release
 		-- 叠加层数
+		local oldLayer = self.layer
 		self.layer = self.layer + layer
 		if maxLayer ~= 0 then
 			self.layer = math.min(maxLayer, self.layer)
 		end
-		if self._overlay then
+
+		if oldLayer ~= self.layer and self._overlay then
 			self:_overlay()
 		end
  
@@ -565,6 +565,16 @@ end
  
 -- 在指定地点召唤event项目							
 function Passive:effect12(eventType, triggerPms, eventId, count, stage)
+	if eventType == AdvEventType.Monster then
+		for _, buff in ipairs(self.owner.battle.player.buffs) do
+			if not buff.isDel and buff:getType() == buff.Buff_NO_PASSIVE_MONSTER then
+				local effect = buff:effect()
+				if effect == 0 or effect == eventId then
+					return
+				end
+			end
+		end
+	end
 	local change = self.owner.battle.adv:getCurMap():layEventToStage(eventType, eventId, count, stage)
 	for _, one in ipairs(change) do
 		self.owner.battle.adv:backBlockChange(one[1].roomId, one[2].blockId)
-Subproject commit 9ab88a62f1c2ff1121be7547f02668db43dc1f75
+Subproject commit ec92ed50d3d5ff9655b1715239e7fda48f8ef5cb
@@ -489,7 +489,7 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 		role:checkTaskEnter("RoleLevelUp", {level = rLevel})
  
 		local towerInfo = role:getProperty("towerInfo")
-		role:checkTaskEnter("TowerPass", {level = towerInfo.l})
+		role:checkTaskEnter("TowerPass", {count = towerInfo.l, type = 1})
 		--"PvpWin"
 		--role:checkTaskEnter("HangPass", {id = 0})
 		role:checkCalendaTask(true, 15, 3)
@@ -557,7 +557,7 @@ activityFunc[Activity.ActivityType.BattleCommandTask] = {
 		role:checkTaskEnter("RoleLevelUp", {level = rLevel})
  
 		local towerInfo = role:getProperty("towerInfo")
-		role:checkTaskEnter("TowerPass", {level = towerInfo.l})
+		role:checkTaskEnter("TowerPass", {count = towerInfo.l, type = 1})
 		--"PvpWin"
 		--role:checkTaskEnter("HangPass", {id = 0})
 		role:checkCalendaTask(true, 15, 3)
@@ -1039,6 +1039,14 @@ activityFunc[Activity.ActivityType.BattleCommand] = {
 	["init"] = function (self, actType, isCrossDay, notify, actId)
 		local data = {unlock = 0, freeR = "", payR = "", lvl = 0, sum = 0, week = 0}
 		self:updateActData(actType, data, not notify)
+
+		local rechargeRecord = self.owner.storeData:getProperty("payR")
+		for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
+			if cfg.shop == 2 and cfg.type == CardType.ActBattleCommandCard then
+				rechargeRecord[id] = nil
+			end
+		end
+		self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
 	end,
 	["check"] = function(self, actType, notify, id, count) -- 检查	itemid, count
 		local isOpen, actId = self:isOpen(actType)
@@ -1082,6 +1090,15 @@ activityFunc[Activity.ActivityType.BattleCommand] = {
 		actData["week"] = 0
 		self:updateActData(actType, actData, true)
 	end,
+	["close"] = function (self, actType, notify, actId)
+		local rechargeRecord = self.owner.storeData:getProperty("payR")
+		for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
+			if cfg.shop == 2 and cfg.type == CardType.ActBattleCommandCard then
+				rechargeRecord[id] = nil
+			end
+		end
+		self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
+	end,
 }
  
  
@@ -179,8 +179,13 @@ function Diner:checkDinerTask(typ, count, param1, param2, notNotify)
 	return dirty
 end
  
-function Diner:calSellReward(sell, delta, dishData)
+function Diner:calSellReward(sell, delta, dishData, isExpedite)
 	local reward = sell.reward or ""
+
+	if isExpedite then
+		reward = ""
+	end
+
 	local popular = 0
 	if delta <= 0 then
 		return reward, popular
@@ -225,10 +230,16 @@ function Diner:calSellReward(sell, delta, dishData)
 	end
 	upValue[-1] = (upValue[-1] or 0) + collectAdd
  
+	-- 电波塔加成
+	local goldCount = self.owner:getBnousDiner(4,addReward[ItemId.Gold])
+
 	for id, count in pairs(addReward) do
 		addReward[id] = math.floor(count * (1 + (upValue[id] or 0) / 100))
 		reward = reward:incrv(id, addReward[id])
 	end
+
+	reward = reward:incrv(ItemId.Gold, goldCount)
+
 	popular = math.floor(popular * (1 + (upValue[-1] or 0) / 100))
  
 	return reward, popular
@@ -245,7 +256,7 @@ function Diner:updateSell(slot, calOnly)
 	local deltaTime = 0
 	local deltaCount = 0
 	local timePass = skynet.timex() - sell.time
-	local sellTime = dishData.sell_time
+	local sellTime = dishData.sell_time + self.owner:getBnousDiner(3, dishData.sell_time)
  
 	deltaCount = math.floor(timePass / sellTime)
 	if deltaCount < sell.count then
@@ -284,11 +295,11 @@ function Diner:expediteSell(slot)
 	local dishData = csvdb["diner_dishCsv"][sell.dish][sell.level]
 	local expediteCount = 0
 	local expediteTime = globalCsv.diner_sell_expediteTime
-	local sellTime = dishData.sell_time
+	local sellTime = dishData.sell_time + self.owner:getBnousDiner(3,dishData.sell_time)
 	expediteCount = math.floor(expediteTime / sellTime)
 	expediteCount = math.min(expediteCount, sell.count)
 	local lastCount = sell.count - expediteCount
-	local reward, popular = self:calSellReward(sell, expediteCount, dishData)
+	local reward, popular = self:calSellReward(sell, expediteCount, dishData, true)
 	local deltaTime = math.floor(expediteTime - sellTime * expediteCount)
 	if expediteCount > 0 then
 		sells[slot].time = sell.time - deltaTime
@@ -16,6 +16,7 @@ Hero.schema = {
 	equip       = {"string",""},        --装备 type=level
 	rune       = {"string",""},        --零件 type=id
 	faith	   = {"number", 0},			-- 信赖
+	spark		= {"table", {}},		-- 火花属性
 }
  
 function Hero:ctor( properties )
@@ -47,7 +48,7 @@ end
 function Hero:updateProperties(params, notNotify)
 	self:setProperties(params)
  
-	local check = {level = true, breakL = true, wakeL = true, talent = true, loveL = true, equip = true, rune = true}
+	local check = {level = true, breakL = true, wakeL = true, talent = true, loveL = true, equip = true, rune = true, spark = true}
 	local datas = {}
 	local updateBV = false
 	for k , v in pairs(params) do
@@ -78,7 +79,7 @@ function Hero:updateProperty(params)
 	local datas = {}
 	table.insert(datas, {key = params.field, newValue = self:getProperty(params.field)})
  
-	local check = {level = true, breakL = true, wakeL = true, talent = true, loveL = true, equip = true, rune = true}
+	local check = {level = true, breakL = true, wakeL = true, talent = true, loveL = true, equip = true, rune = true, spark = true}
 	if check[params.field] then
 		local orginValue = self:getProperty("battleV")
 		local curValue = self:saveBattleValue()
@@ -103,7 +104,8 @@ function Hero:data()
 		-- loveL = self:getProperty("loveL"),
 		equip = self:getProperty("equip"),
 		rune = self:getProperty("rune"),
-		faith = self:getProperty("faith")
+		faith = self:getProperty("faith"),
+		spark = self:getProperty("spark"),
 	}
 end
  
@@ -121,11 +121,13 @@ function HeroPlugin.bind(Hero)
 		local attrs = self:getBaseAttrs()
 		-- 装备零件
 		local equipAttrs = self:getRuneEquipAttrs()
+		local sparkAttrs = self:getSparkAttrs()
  
 		for _, attName in pairs(AttsEnumEx) do
 			attrs[attName] = attrs[attName] or 0
 			attrs[attName] = attrs[attName] + addAttr(attrs[attName], equipAttrs.percent[attName], 1, attName)
 			attrs[attName] = attrs[attName] + addAttr(attrs[attName], equipAttrs.value[attName], 0, attName)
+			attrs[attName] = attrs[attName] + addAttr(attrs[attName], sparkAttrs[attName], 0, attName)
 		end
  
 		-- 羁绊加成
@@ -225,6 +227,19 @@ function HeroPlugin.bind(Hero)
 		return attrs
 	end
  
+	function Hero:getSparkAttrs()
+		local attrs = {}
+		for _, attName in pairs(AttsEnumEx) do
+			attrs[attName] = 0
+		end
+		for _, data in pairs(self:getProperty("spark") or {}) do
+			for k, v in pairs(data.attrs) do
+				attrs[AttsEnumEx[k]] = attrs[AttsEnumEx[k]] + v
+			end
+		end
+		return attrs
+	end
+
  
 	-- 战斗力（当前属性）= POWER[（生命 + 防御 * 7 + 闪避 * 4）*（攻击*4 + 命中 * 2）*（1 + 暴击几率/100 * 暴击伤害/100）* 攻击速度 / 60000 ，0.8 ]
 	-- function Hero:getBattleValue(activeRelation) -- isReal包括队伍加成
@@ -25,6 +25,7 @@ function Role:ctor( properties )
 	self.storeData = nil
 	self.heros = {}
 	self.runeBag = {}
+	self.sparkBag = {}
 	self.advData = nil
 	self.activity = nil
 	self._pushToken = nil
@@ -115,6 +116,7 @@ Role.schema = {
 	hangTeams			= {"table", {}},	-- pve自选编队
 	teamIndex			= {"table", {}},	-- 各个系统使用的编队索引 type->index 见TeamSystemType
 	advTeams			= {"table", {}},	-- 拾荒自选编队
+	towerTeams 			= {"table", {}}, 	-- 四个电波塔的队伍
  
 	bonusStar			= {"table", {}}, 	-- 奖励关卡 通关星星  {[id] = 1}  三个二进制位 表示三个星 从低到高  (1 << 0) (1 << 1) (1 << 2)  满星 (1 << 3) - 1
  
@@ -146,7 +148,8 @@ Role.schema = {
  
 	boxL				= {"table", {}}, -- boxList  正开启的箱子  -- {[1] = {id = 1010, gem = 101, time = 1313}}
  
-	towerInfo			= {"table", {c = globalCsv.tower_count_limit, l = 1}}, -- 当天爬塔消耗的次数  -- {t = time, c = count, l = layer, k = battleKey}
+	towerInfo			= {"table", {c = globalCsv.tower_count_limit, l = 1, l1 = 10001, l2 = 20001, l3 = 30001}}, -- 当天爬塔消耗的次数  -- {t = time, c = count, l = layer, k = battleKey}
+	towerBnous			= {"table", {}}, -- 电波塔加成 {[1] = {[1] = 1, [2] = 1}, [2] = {}, [3] = {}, [4] = {}}
  
 	spTask				= {"table", {}}, -- 特殊任务  -- {id = status}
  
@@ -186,6 +189,10 @@ Role.schema = {
 	calTask				= {"table", {}}, -- 英雄令活动 日历任务活动
 	bcTask				= {"table", {}}, -- 英雄令活动 日历任务活动 临时使用
 	radioTask			= {"table", {}}, -- 电台任务 {id = {time=end_ts,heros=heros}}	表crusadeCsv
+
+	seaport 			= {"table", {}}, -- 海岛贸易季 {time = 1234567890, donate = {}, collect = {[1] = {team = "1=2=3", time = 1234567890}}, shop = {}}
+
+	returner			= {"table", {}}, -- 回归者 {time = 12334233423, [1] = 1, [2] = 2, status = {[1] = 1}}
 }
  
  
@@ -368,6 +375,7 @@ function Role:data()
 		hangTeams = self:getProperty("hangTeams"),
 		teamIndex = self:getProperty("teamIndex"),
 		advTeams = self:getProperty("advTeams"),
+		towerTeams = self:getProperty("towerTeams"),
  
 		bonusStar = self:getProperty("bonusStar"),
  
@@ -385,6 +393,7 @@ function Role:data()
 		equips = self:getProperty("equips"),
 		boxL = self:getProperty("boxL"),
 		towerInfo = self:getProperty("towerInfo"),
+		towerBnous = self:getProperty("towerBnous"),
 		spTask = self:getProperty("spTask"),
 		dTask = self:getProperty("dTask"),
 		wTask = self:getProperty("wTask"),
@@ -414,6 +423,9 @@ function Role:data()
 		calTask = self:getProperty("calTask"),
 		bcTask = self:getProperty("bcTask"),
 		radioTask = self:getProperty("radioTask"),
+
+		seaport = self:getProperty("seaport"),
+		returner = self:getProperty("returner"),
 	}
 end
  
@@ -104,7 +104,7 @@ function Role:checkBattleCheat(battleType, params)
 		-- enemyServer = packBattleEnemyCommon(carbonData)
 	end
 	cheat["tower"] = function()
-		local team = self:getTeamBattleInfo(self:getTeamFormatByType(TeamSystemType.Tower))
+		local team = self:getTeamBattleInfo(self:getTowerTeamFormat(params.tower))
 		for slot, hero in pairs(team.heros) do
 			local temp = {}
 			for arr, _ in pairs(checkCheatAttrs) do
@@ -198,7 +198,7 @@ function Role:checkBattle(battleType, params)
 			end
 		end,
 		tower = function()
-			local towerF = self:getTeamFormatByType(TeamSystemType.Tower)
+			local towerF = self:getTowerTeamFormat(params.tower)
 			for slot, hero in pairs(self:getTeamHerosInfo(towerF).heros) do
 				selflist[slot] = hero.type
 			end
@@ -57,6 +57,7 @@ local ItemReason = {
 	actBuyBpLevel = 141, -- 购买活动战令等级
 	newSign = 142,-- 新的活动签到
 	advLevelStage = 143, -- 拾荒活动阶段奖励
+	towerBnous = 144, -- 爬塔到一定层数对某些功能的奖励
  
  
 	advHang = 301, -- 拾荒挂机
@@ -126,6 +127,9 @@ local ItemReason = {
 	refer = 1210, -- 穿戴
 	itemCompose = 1211, 	-- 天赋道具合成
 	radioQuest = 1212,		-- 电台任务奖励
+	changeSpark = 1213,		-- 穿戴火花
+	sparkLvlUp = 1214,		-- 火花强化
+	sparkQualityUp = 1215,	-- 火花升华
  
 	-- pvp 
 	pvpCHead = 1301, -- pvp 跨服竞技场头像
@@ -134,6 +138,13 @@ local ItemReason = {
 	--adv
 	chooseEvent = 1351, -- 冒险选择
 	clickTrader = 1352, -- 冒险商店
+
+	seaportDonate = 1400, -- 贸易港捐赠
+	seaportShop = 1401, -- 贸易港商店兑换
+	seaportReward = 1402, -- 贸易港阶段奖励
+	seaportTask = 1403, -- 贸易港任务奖励
+
+	returner = 1410, -- 回归者奖励
 }
  
  
@@ -616,6 +627,8 @@ local LogType = {
 	in_adv = "common",
 	out_adv = "common",
 	in_artifact = "common",
+	in_spark = "common",
+	out_spark = "common",
  
 	mail_action = "common",
 	role_action = "common",
@@ -628,6 +641,7 @@ local LogType = {
 	tower_action = "common",
 	gm_action = "common",
 	act_action = "common",
+	spark_action = "common",
 }
  
 -- 如要修改 要提前修改 _template mapping -- 对应 mapping 为 gamelog-*
@@ -12,6 +12,7 @@ function RolePlugin.bind(Role)
 		self:loadDiner()
 		self:loadActivity()
 		self:loadStoreInfo()
+		self:loadSparks()
 	end
  
 	function Role:reloadWhenLogin()
@@ -96,6 +97,11 @@ function RolePlugin.bind(Role)
 					self:addRune({type = typ,id = itemId, notNotify = pms.notNotify, log = pms.log})
 				end
 			end,
+			[ItemType.Spark] = function()
+				for _= 1, count do
+					self:addSpark({id = itemId, notNotify = pms.notNotify, log = pms.log})
+				end
+			end,
 			[ItemType.AdvItem] = function()  --冒险道具不会进入 玩家仓库
 				count = 0
 			end,
@@ -134,6 +140,12 @@ function RolePlugin.bind(Role)
 			[ItemType.Potion] = function ()
 				self:addPotion({id = itemId, count = count, notNotify = pms.notNotify, log = pms.log})
 			end,
+			[ItemType.BossTicket] = function ()
+				if not self.activity:isOpen("ChallengeLevel") then return end
+				local actData = self.activity:getActData("ChallengeLevel")
+				actData["ticket"] = (actData["ticket"] or 0) + count
+				self.activity:updateActData("ChallengeLevel", actData)
+			end,
 		}
  
 		if count > 0 then
@@ -303,7 +315,6 @@ function RolePlugin.bind(Role)
 	end
  
 	function Role:addPotion(params)
-		dump(params)
 		local pId = globalCsv.adv_item_potion[params.id]
 		local potionBag = self:getProperty("potionBag")
 		local origin = potionBag[pId] or 0
@@ -743,6 +754,23 @@ function RolePlugin.bind(Role)
 		end
 	end
  
+	function Role:loadSparks()
+		local roleId = self:getProperty("id")
+		local sparkIds = redisproxy:smembers(string.format(R_SPARKIDS, roleId))
+		local redret = redisproxy:pipelining(function (red)
+			for _, sparkId in ipairs(sparkIds) do
+				red:hgetall(string.format(R_SPARK, roleId, sparkId))
+			end
+		end)
+		for index, sparkId in ipairs(sparkIds) do
+			local spark = require("models.Spark").new({key = string.format(R_SPARK, roleId, sparkId)})
+			if spark:load(table.array2Table(redret[index])) then
+				spark.owner = self
+				self.sparkBag[tonumber(sparkId)] = spark
+			end
+		end
+	end
+
 	-- 0 为操作成功
 	function Role:addRune(params)
 		if params.type and params.id then
@@ -797,6 +825,101 @@ function RolePlugin.bind(Role)
 		end
 	end
  
+	-- 0 为操作成功
+	function Role:addSpark(params)
+		if params.id then
+			local set  = csvdb["sparkCsv"][params.id]
+			if not set then return 2 end
+			local data = set[0]
+			if not data then return 3 end
+
+			local roleId = self:getProperty("id")
+			local sparkUid = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "spark", 1))
+
+			redisproxy:sadd(string.format(R_SPARKIDS, roleId), sparkUid)
+
+			local sparkInfo = {
+				key = string.format(R_SPARK, roleId, sparkUid),
+				id = sparkUid,
+				cfg_id = params.id,
+			}
+
+			local newSpark = require("models.Spark").new(sparkInfo)
+			newSpark:create()
+			newSpark:addAttr(data.attr:toNumMap())
+			newSpark.owner = self
+			self.sparkBag[sparkUid] = newSpark
+			if not params.notNotify then
+				local response = {}
+				table.insert(response, newSpark:data())
+				dump(response)
+				SendPacket(actionCodes.Role_loadSparks, MsgPack.pack(response))
+			end
+			--self:checkTaskEnter("AddRune", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
+
+			self:logItems(params.id, 0, 1, params.log)
+			if params.log then
+				local log = clone(params.log)
+				if log["cint1"] or log["cint2"] or log["cint3"] then
+					print("addRune error log have cint1 or cint2 or cint3 ", debug.traceback())
+				end
+
+				log["cint1"] = sparkUid
+				log["cint2"] = params.cfg_id
+
+				self:mylog("in_spark", log)
+			else
+				print("addSpark no log ", debug.traceback())
+			end
+
+			return 0, newSpark
+		else
+			return 1
+		end
+	end
+
+	function Role:delSparks(sparkIds, params) -- 批量删除 {id, }
+		params = params or {}
+		local roleId = self:getProperty('id')
+		local bDel = {}
+		for _, sparkId in pairs(sparkIds) do
+			local spark = self.sparkBag[sparkId]
+			if spark then
+
+				self:logItems(spark:getProperty("id"), 1, 0, params.log)
+				if params.log then
+					local log = clone(params.log)
+					if log["cint1"] or log["cint2"] then
+						print("delSpark error log have cint1 or cint2 ", debug.traceback())
+					end
+
+					log["cint1"] = sparkId
+					log["cint2"] = spark:getProperty("cfg_id")
+
+					self:mylog("out_spark", log)
+				else
+					print("delSparks no log ", debug.traceback())
+				end
+
+				self.sparkBag[sparkId] = nil
+				table.insert(bDel, sparkId)
+			end
+		end
+
+		redisproxy:pipelining(function (red)
+			for _, sparkId in pairs(bDel) do
+				red:del(string.format(R_SPARK, roleId, sparkId))
+				red:srem(string.format(R_SPARKIDS, roleId), sparkId)
+			end
+		end)
+		local response = {}
+		for _, sparkId in pairs(bDel) do
+			table.insert(response, {id = sparkId, bDel = true})
+		end
+
+		SendPacket(actionCodes.Role_loadSparks, MsgPack.pack(response))
+	end
+
 	function Role:delRunes(runeIds, params) -- 批量删除 {id, }
 		params = params or {}
 		local roleId = self:getProperty('id')
@@ -1203,6 +1326,167 @@ function RolePlugin.bind(Role)
 		end
 	end
  
+	-- 结算上期海港贸易季
+	function Role:checkSeaportTrade()
+		local openTime0 = tonum(redisproxy:hget("autoincrement_set", "seaportTime0") or 0)
+		local openTime1 = tonum(redisproxy:hget("autoincrement_set", "seaportTime1") or 0)
+		local openTime2 = tonum(redisproxy:hget("autoincrement_set", "seaportTime2") or 0)
+		local seaport = self:getProperty("seaport") or {}
+		local oldTime = seaport.time or 0
+		local update = false
+
+		local function getReward(reset)
+			-- 全服捐赠奖励
+			local donate = seaport.donate or {}
+			if not reset and (not donate[1] or not donate[2]) then
+				local result = self:getSeaportServerProgress()
+				local seaportCsv = csvdb["seaport_purchaseCsv"]
+				for idx, set in ipairs(seaportCsv) do
+					local done = true
+					for id, data in ipairs(set) do
+						if donate[id] or not result[idx] or not result[idx][id] or result[idx][id] < data.need_num then
+							done = false
+							break
+						end
+					end
+					if done then
+						update = true
+						self:award(set[1].phase_award, {log = {desc = "seaportReward", int1 = set[1].phase, int2 = set[1].id}})
+						donate[idx] = 1
+					end
+				end
+				seaport.donate = donate
+			end
+
+			-- 委托任务的奖励
+			local collect = seaport.collect or {}
+			if next(collect) then
+				local function getHeroCoef(hero, condition)
+				    -- 基础概率
+				    local rareMap = {[HeroQuality.N] = 10, [HeroQuality.R] = 10, [HeroQuality.SR] = 15, [HeroQuality.SSR] = 20}
+				    local rare = hero:getRare()
+				    local result = 0
+				    for _, it in ipairs(condition:toTableArray(true)) do
+				        local type = it[1]
+				        local value = it[2]
+				        local add = it[3]
+				        if type == 1 then   -- 种族加成
+				            if hero:getCamp() == value then
+				                result = result + add
+				            end
+				        elseif type == 2 then   -- 定位加成
+				            if hero:getPosition() == value then
+				                result = result + add
+				            end
+				        end
+				    end
+
+				    return result + (rareMap[rare] or 0)
+				end
+
+				local carbonCsv = csvdb["idle_battleCsv"]
+				local expCarbonId = self:getProperty("hangInfo").expCarbonId
+				local taskCsv = csvdb["seaport_taskCsv"]
+				local endTime = openTime0 + 86400 * 2
+				for slot, set in pairs(taskCsv) do
+					if collect[slot] then
+						update = true
+						local level = collect[slot].level
+						local data = set[level]
+						local teams = collect[slot].team
+						local time = collect[slot].time
+						if time + data.time <= endTime then
+							if not carbonCsv[expCarbonId] then break end
+
+							local totalCoef = 0
+						    for _, heroId in ipairs(teams:toArray(true,"=")) do
+						        local hero = self.heros[heroId]
+						        if hero then
+						            totalCoef = totalCoef + getHeroCoef(hero, data.success)
+						            hero:addHeroFaith(data.trust)
+						        end
+					    	end
+
+							local bigSuccess = false
+						    local result = math.randomInt(0, 100)
+						    if result < totalCoef then
+						        bigSuccess = true
+						    end
+
+							local money = math.ceil(carbonCsv[expCarbonId].money / 5 * data.time * data.money_clear)
+							local exp = math.ceil(carbonCsv[expCarbonId].exp / 5 * data.time * data.exp_clear)
+							local itemReward = data.item_clear_special:toNumMap()
+							itemReward[ItemId.Gold] = (itemReward[ItemId.Gold] or 0) + money
+					    	itemReward[ItemId.Exp] = (itemReward[ItemId.Exp] or 0) + exp
+					    
+							if bigSuccess then
+						        for key, value in pairs(itemReward) do
+						            itemReward[key] = math.ceil(1.5 * value)
+						        end
+						    end
+							self:award(itemReward, {log = {desc = "seaportTask", int1 = slot, int2 = level}})
+						end
+					end
+				end
+			end
+			seaport.collect = {}
+
+			if update or reset then
+				if reset then
+					seaport = {
+						time = openTime0,
+						shop = {},
+						collect = {},
+						donate = {}
+					}
+				end
+				self:updateProperty({field = "seaport", value = seaport})
+			end
+		end
+		
+		if oldTime == openTime0 then
+			if openTime1 == 1 or openTime2 == 1 then
+				return
+			end
+			getReward()
+		else
+			getReward(true)
+		end
+	end
+
+	-- 检查回归者
+	function Role:checkReturner()
+		local returner = self:getProperty("returner") or {}
+		if next(returner) then return end
+
+		local now = specTime({hour = 4})
+		returner.time = now
+
+		self:updateProperty({field = "returner", value = returner})
+	end
+
+	function Role:getSeaportServerProgress()
+		local result = {}
+
+		local dataCsv = csvdb["seaport_purchaseCsv"]
+		local rediskey = {SEAPORT_TRADE_TASK_1,SEAPORT_TRADE_TASK_2}
+		for idx, set in ipairs(dataCsv) do
+			local temp = {}
+			temp = redisproxy:pipelining(function (red)
+				for id, data in ipairs(set) do
+					red:hget(rediskey[idx], id)
+				end
+			end)
+			result[idx] = {}
+			for i,v in pairs(temp) do
+				if v then
+					result[idx][i] = tonumber(v)
+				end
+			end
+		end
+		return result
+	end
+
 	-- 获得激活的冒险效果
 	function Role:getAdvActiveSupportEffect()
 		local effect = {}
@@ -1270,11 +1554,21 @@ function RolePlugin.bind(Role)
 	end
  
 	local StdTowerRankTime = toUnixtime("2019010100")
-	function Role:setTowerRank(level)
+	local TowerRankInfo = {
+		[1] = {rank = RANK_TOWER, rankInfo = RANK_TOWER_INFO},
+		[2] = {rank = RANK_TOWER1, rankInfo = RANK_TOWER1_INFO},
+		[3] = {rank = RANK_TOWER2, rankInfo = RANK_TOWER2_INFO},
+		[4] = {rank = RANK_TOWER3, rankInfo = RANK_TOWER3_INFO},
+	}
+	function Role:setTowerRank(level,tType)
+		tType = tType or 1
 		local now = skynet.timex()
 		local ct = math.ceil((now - StdTowerRankTime) / 86400) --按天计算  365 * 27 < 10000  可以维持 27 年
 		local ct = 10000 - ct  -- 越早的排名越靠前
-		local towerTeam = self:getTeamFormatByType(TeamSystemType.Tower)
+
+		
+		local info = TowerRankInfo[tType]
+		local towerTeam = self:getTowerTeamFormat(tostring(tType))
 		local battleV = self:getTeamBattleValue(towerTeam.heros)
 		local score = (level * 10000 + ct) * 10000000 + battleV
  
@@ -1288,21 +1582,23 @@ function RolePlugin.bind(Role)
 		}
 		local roleId = self:getProperty("id")
 		redisproxy:pipelining(function (red)
-			red:zadd(RANK_TOWER, score, roleId)	--更新分数
-			red:hset(RANK_TOWER_INFO, roleId,  MsgPack.pack(curInfo))
+			red:zadd(info.rank, score, roleId)	--更新分数
+			red:hset(info.rankInfo, roleId,  MsgPack.pack(curInfo))
 		end)
 	end
  
-	function Role:getTowerRank()
+	function Role:getTowerRank(tType)
+		tType = tType or 1
+		local info = TowerRankInfo[tType]
 		local list = {}
-		local ids = redisproxy:zrevrange(RANK_TOWER, 0 , 99)
+		local ids = redisproxy:zrevrange(info.rank, 0 , 99)
 		local redret = {}
 		if ids and next(ids) then
 			redret = redisproxy:pipelining(function (red)
 				for i = 1, #ids do
 					local roleId = ids[i]
 					table.insert(list, {roleId = tonumber(roleId)})
-					red:hget(RANK_TOWER_INFO, roleId)
+					red:hget(info.rankInfo, roleId)
 				end
 			end)
 		end
@@ -1311,7 +1607,7 @@ function RolePlugin.bind(Role)
 			player.format = nil
 			list[i].player = player
 		end
-		local rank = redisproxy:ZREVRANK(RANK_TOWER, self:getProperty("id"))
+		local rank = redisproxy:ZREVRANK(info.rank, self:getProperty("id"))
 		if not rank then
 			rank = -1
 		else
@@ -1320,8 +1616,10 @@ function RolePlugin.bind(Role)
 		return {list = list, rank = rank}
 	end
  
-	function Role:getTowerRankOneInfo(roleId)
-		local data = redisproxy:hget(RANK_TOWER_INFO, roleId)
+	function Role:getTowerRankOneInfo(roleId,tType)
+		tType = tType or 1
+		local info = TowerRankInfo[tType]
+		local data = redisproxy:hget(info.rankInfo, roleId)
 		if data then
 			local player = MsgPack.unpack(data)
 			return player.format
@@ -1541,6 +1839,19 @@ function RolePlugin.bind(Role)
 		})
 	end
  
+	-- 设置电波塔阵容
+	function Role:getTowerTeamFormat(teamIdx)
+		local teams = self:getProperty("towerTeams") or {}
+		local team = teams[tostring(teamIdx)] or {}
+		return team
+	end
+
+	function Role:setTowerTeamFormat(teamIdx, team)
+		local teams = self:getProperty("towerTeams") or {}
+		teams[tostring(teamIdx)] = team
+		self:updateProperty({field = "towerTeams", value = teams, notNotify = false})
+	end
+
 	-- update
 	function Role:onRecoverTimer(now)
 		self:updateTimeReset(now, true)
@@ -2146,6 +2457,110 @@ function RolePlugin.bind(Role)
 		return hero:getProperty("faith")
 	end
  
+	function Role:getTowerBnousActive(update)
+		if not update and self.towerBnousActive then
+			return self.towerBnousActive
+		end
+		local towerInfo = self:getProperty("towerInfo")
+		local towerLevel = {towerInfo.l or 1, towerInfo.l1 or 10001, towerInfo.l2 or 20001, towerInfo.l3 or 30001}
+		local towerBnous = self:getProperty("towerBnous")
+		local bnousCsv = csvdb["tower_battle_additionCsv"]
+		self.towerBnousActive = {}
+
+		for towerIdx, Set in pairs(towerBnous) do
+			for id, _ in pairs(Set) do
+				local data = bnousCsv[towerIdx][id]
+				if data then
+					local effects = data.effect:toTableArraySec()
+					for _, effect in pairs(effects) do
+						local pm1, pm2, pm3, pm4 = tonumber(effect[1]), tonumber(effect[2]), tonumber(effect[3]), tonumber(effect[4])
+						if not self.towerBnousActive[pm1] then
+							self.towerBnousActive[pm1] = {}
+						end
+						if pm1 == SystemBnousType.TowerBuff then
+							if not self.towerBnousActive[pm1][pm2] then
+								self.towerBnousActive[pm1][pm2] = {}
+							end
+							table.insert(self.towerBnousActive[pm1][pm2],pm3)
+						elseif pm1 == SystemBnousType.Adv then
+							if not self.towerBnousActive[pm1][pm4] then
+								self.towerBnousActive[pm1][pm4] = {}
+							end
+							self.towerBnousActive[pm1][pm4][pm2] = (self.towerBnousActive[pm1][pm4][pm2] or 0) + pm3
+						elseif pm1 == SystemBnousType.HangTime then
+							if type(self.towerBnousActive[pm1]) == "table" then
+								self.towerBnousActive[pm1] = 0
+							end
+							self.towerBnousActive[pm1] = self.towerBnousActive[pm1] + pm2
+						else
+							self.towerBnousActive[pm1][pm2] = (self.towerBnousActive[pm1][pm2] or 0) + pm3
+						end
+					end
+				end
+			end
+		end
+
+		return self.towerBnousActive
+	end
+
+	function Role:getDeltaValue(result, value)
+		if not result then return 0 end
+		local delta = 0
+		if result[1] and value then
+			delta = math.floor(value * result[1] / 100)
+		end
+		if result[0] then
+			delta = delta + result[0]
+		end
+		return delta
+	end
+
+	function Role:getBnousBattleBuff()
+		local towerBnous = self:getTowerBnousActive()
+		return towerBnous[SystemBnousType.TowerBuff]
+	end
+
+	function Role:getBnousCrusade(value)
+		local towerBnous = self:getTowerBnousActive()
+		return self:getDeltaValue(towerBnous[SystemBnousType.CrusadeTask], value)
+	end
+
+	function Role:getBnousDiner(type, value)
+		local towerBnous = self:getTowerBnousActive()
+		type = type or 1
+		local result
+		if type == 1 then
+			result = towerBnous[SystemBnousType.DinerGet]
+		elseif type == 2 then
+			result = towerBnous[SystemBnousType.DinerLimit]
+		elseif type == 3 then
+			result = towerBnous[SystemBnousType.DinerSell]
+		elseif type == 4 then
+			result = towerBnous[SystemBnousType.DinerPrice]
+		end
+		return self:getDeltaValue(result, value)
+	end
+
+	function Role:getBnousAdv()
+		local towerBnous = self:getTowerBnousActive()
+		return towerBnous[SystemBnousType.Adv] or {}
+	end
+
+	function Role:getBnousHangTime()
+		local towerBnous = self:getTowerBnousActive()
+		return towerBnous[SystemBnousType.HangTime] or 0
+	end
+
+	function Role:getBnousPvpTicket()
+		local towerBnous = self:getTowerBnousActive()
+		return towerBnous[SystemBnousType.PvpTicket] or {}
+	end
+
+	function Role:getBnousSweep()
+		local towerBnous = self:getTowerBnousActive()
+		return towerBnous[SystemBnousType.SweepReward] or {}
+	end
+
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -109,6 +109,7 @@ local TaskType = {
 	CostDiamond = 909,			-- 消耗钻石
 	WeekTask = 910,				-- 完成每周活跃任务
 	ActBattlePass = 911,		-- 活动关卡通关		-- chapterId
+	Appoint = 912, 				-- 触发限时礼包，指定id
  
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -249,6 +250,7 @@ local ActivityListener = {
 		[TaskType.Pay] = {{Activity.ActivityType.PayBack, f("twd")}},
 		[TaskType.AdvMineKill] = {{Activity.ActivityType.Crisis, 1}},
 		[TaskType.AdvMineLayer] = {{Activity.ActivityType.Crisis, 2}},
+		[TaskType.AdvCostPower] = {{Activity.ActivityType.Crisis, 3, f("count")}},
 		[TaskType.DailyTask] = {{Activity.ActivityType.CommonSignIn, f("pre"), f("cur")}},
 		[TaskType.AddItem] = {{Activity.ActivityType.BattleCommand, f("id"), f("count")}},
 	}
@@ -263,6 +265,7 @@ local StoreListener = {
 		[TaskType.AdvPassFirst] = {{TriggerEventType.AdvPass, f("id")}},
 		[TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}},
 		[TaskType.DrawHeroLimitPack] = {{TriggerEventType.DrawHeroCnt, f("count")}},
+		[TaskType.Appoint] = {{TriggerEventType.Appoint, f("id")}},
 	}
 }
  
@@ -318,6 +321,11 @@ local BattleCommandTaskListener = {
 	listen = CalendaTaskListener["listen"]
 }
  
+local ReturnerTask = {
+	func = "checkReturnerTask",
+	listen = CalendaTaskListener["listen"]
+}
+
 local TaskListeners = {
 	StoryListener,
 	CommonListener,
@@ -327,6 +335,7 @@ local TaskListeners = {
 	StoreListener,
 	CalendaTaskListener,
 	BattleCommandTaskListener,
+	ReturnerTask,
 }
  
 local RoleTask = {}
@@ -824,6 +833,15 @@ function RoleTask.bind(Role)
 		self:checkActTask(notNotify, keyName, actData, mainType, subType, param1, param2)
 	end
  
+	function Role:checkReturnerTask(notNotify, mainType, subType, param1, param2)
+		-- print("check returner task", mainType, subType, param1, param2)
+		local returner = self:getProperty("returner") or {}
+		if not returner.time then return end
+		local actData = csvdb["activity_ctrlCsv"][76]
+		local keyName = "returner"
+		self:checkActTask(notNotify, keyName, actData, mainType, subType, param1, param2)
+	end
+
 end
  
 return RoleTask
@@ -28,6 +28,11 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 		self.storeData:resetStoreReored(3)		--商店跨月重置 time_reset表关联id 
 	end
  
+	-- 检查回归者
+	if ltime ~= 0 and (now - ltime) >= 86400 * globalCsv.returner_time then
+		self:checkReturner()
+	end
+
 	response.dTask = {}
 	response.advSup = self:getProperty("advSup")
 	self:log("onLogin")
@@ -48,6 +53,12 @@ ResetFunc[&quot;CrossWeek&quot;] = function(self, notify, response)
 	response.dinerS = {}
  
 	self.activity:refreshWeekData(notify)
+
+	-- 跨周送一些道具
+	local BnousReward = self:getBnousPvpTicket()
+	if next(BnousReward) then
+		local reward, change = self:award(BnousReward, {log = {desc = "towerBnous"}})
+	end
 end
  
  
@@ -0,0 +1,78 @@
+local Spark = class("Spark", require("shared.ModelBase"))
+Spark.schema = {
+	id 		    = {"number"},      		-- 唯一自增id
+	cfg_id 		= {"number"},
+	level		= {"number", 0},		-- 等级
+	attrs       = {"table", {}}         -- 基础属性值 id=value
+}
+
+function Spark:ctor( properties )
+    Spark.super.ctor(self, properties)
+end
+
+function Spark:notifyUpdateProperty(field, newValue, oldValue)
+	local datas = {
+		id = self:getProperty("id"),
+		datas = {
+			{
+				key = field,
+				newValue = newValue,
+				oldValue = oldValue,
+			}
+		}
+	}
+	self:notifyUpdateProperties(datas)
+end
+
+function Spark:mylog(contents)
+	contents = contents or {}
+	if contents["cint1"] or contents["cint2"] then
+		print("sparkLog error log have cint1 or cint2  ", debug.traceback())
+	end
+	contents["cint1"] = self:getProperty("id")
+	contents["cint2"] = self:getProperty("cfg_id")
+
+	self.owner:mylog("spark_action", contents)
+end
+
+function Spark:notifyUpdateProperties(params)
+	local updateData = {
+		id = self:getProperty("id"),
+		datas = params
+	}
+	SendPacket(actionCodes.Role_updateSpark, MsgPack.pack(updateData))
+end
+
+function Spark:updateProperty(params)
+	if not params.field or (not params.delta and not params.value) then
+		return
+	end
+	if params.delta then
+		self:incrProperty(params.field, params.delta)
+	elseif params.value then
+		self:setProperty(params.field, params.value)
+	end
+	local datas = {}
+	table.insert(datas, {key = params.field, newValue = self:getProperty(params.field)})
+
+	self:notifyUpdateProperties(datas)
+end
+
+function Spark:addAttr(attrs)
+    local curAttrs = clone(self:getProperty("attrs"))
+    for k, v in pairs(attrs) do
+        curAttrs[k] = (curAttrs[k] or 0) + v
+    end
+	self:updateProperty({field = "attrs", value = curAttrs})
+end
+
+function Spark:data()
+	return {
+		id = self:getProperty("id"),
+		cfg_id = self:getProperty("cfg_id"),
+		level = self:getProperty("level"),
+		attrs = self:getProperty("attrs"),
+	}
+end
+
+return Spark
 \ No newline at end of file
@@ -3,7 +3,29 @@
 local Store = class("Store", require("shared.ModelBase"))
  
 function Store:ctor(properties)
-	Store.super.ctor(self, properties)
+    Store.super.ctor(self, properties)
+end
+
+function Store:onLoad()
+    local monEx = self:getProperty("monthCardEx")
+    local smonEx = self:getProperty("smonthCardEx")
+    local monId = self:getProperty("monthCardId")
+    local smonId = self:getProperty("smonthCardId")
+    local timeNow = skynet.timex()
+    local flag = false
+    if monEx > timeNow and monId == 0 then
+        self:updateProperty({field = "monthCardId", value = 101})
+        self:updateProperty({field = "getMailT1", value = 0})
+        flag = true
+    end
+    if smonEx > timeNow and smonId == 0 then
+        self:updateProperty({field = "smonthCardId", value = 102})
+        self:updateProperty({field = "getMailT2", value = 0})
+        flag = true
+    end
+    if flag then
+        self:sendMonthCardEmail()
+    end
 end
  
 ActGoodsType = {
@@ -17,7 +39,9 @@ Store.schema = {
     growFundR  = {"string", ""},        -- 成长基金领取记录
  
 	monthCardEx	= {"number", 0},		-- 月卡过期时间戳
+	monthCardId	= {"number", 0},		-- 月卡id
     smonthCardEx	= {"number", 0},		-- 超级月卡过期时间戳
+    smonthCardId	= {"number", 0},		-- 超级月卡id
  
 	battleCard	= {"number", 0},		-- 赛季卡
 	battleFR = {"string", ""},		-- 免费赛季卡领取记录
@@ -51,7 +75,7 @@ function Store:updateProperty(params)
 		return
 	end
 	local newValue = self:getProperty(params.field)
-	if not params.notNotify then
+    if not params.notNotify then
 		self:notifyUpdateProperty(params.field, newValue, oldValue)
 	end
 end
@@ -77,13 +101,16 @@ end
 -- 发送月卡邮件
 function Store:sendMonthCardEmail()
     local timeNow = skynet.timex()
-    local tabs = {{ex="monthCardEx", t="getMailT1", mail=MailId.MonthCard, alert=MailId.MonthCardEx},
-    {ex="smonthCardEx", t="getMailT2", mail=MailId.SuperMonthCard, alert=MailId.SuperMonthCardEx}}
+
+    local tabs = {{ex="monthCardEx", t="getMailT1", id= self:getProperty("monthCardId")},
+    {ex="smonthCardEx", t="getMailT2", id=self:getProperty("smonthCardId")}}
     for _, v in ipairs(tabs) do
         local ex  = self:getProperty(v.ex)
         local ts  = self:getProperty(v.t) or 0
-        local mailId = v.mail
-        local alertId = v.alert
+        local cfg = csvdb["shop_cardCsv"][v.id] or {}
+
+        local mailId = cfg.email
+        local alertId = cfg.email_2
         local alertTs = dayLater(ex) - DAY_SEC
         if ex > timeNow then
             local cnt = 0
@@ -184,24 +211,66 @@ function Store:getHangDropCoef()
     return (1 + globalCsv.hang_drop_exp_coef) or 1, (1 + globalCsv.hang_drop_item_coef) or 1
 end
  
+function Store:getCurMonthCardLvl(isSuper)
+    local id = 0
+    if isSuper then
+       id = self:getProperty("smonthCardId") or 0
+    else
+       id = self:getProperty("monthCardId") or 0
+    end
+    local cfg = csvdb["shop_cardCsv"][id]
+    if not cfg then return 0 end
+
+    return cfg.level or 0
+end
  
 -- 购买通行证
 function Store:onBuyCard(type, duration, id, actid)
     local timeNow = skynet.timex()
     if type == CardType.NormalMonthCard then
         if self:isMonthCardExpire() then
+            self:updateProperty({field = "monthCardId", value = id})
             self:updateProperty({field = "monthCardEx", value = timeNow + duration})
         else
             self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + duration})
         end
         self:sendMonthCardEmail()
+    elseif type == CardType.NormalMonthCardLevelUp then
+        if self:isMonthCardExpire() then
+            skynet.error(string.format("month card expired, can not level up,%d,%d",self.owner:getProperty("id"), id))
+        else
+            local cfg = csvdb["shop_cardCsv"][id]
+            if not cfg then return end 
+            local dif = cfg.level - self:getCurMonthCardLvl(false)
+            if dif > 1 and dif < 0 then
+                return
+            end
+            self:updateProperty({field = "monthCardId", value = id})
+            self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + duration})
+        end
+        self:sendMonthCardEmail()
     elseif type == CardType.SuperMonthCard then
         if self:isSuperMonthCardExpire() then
+            self:updateProperty({field = "smonthCardId", value = id})
             self:updateProperty({field = "smonthCardEx", value = timeNow + duration})
         else
             self:updateProperty({field = "smonthCardEx", value = self:getProperty("smonthCardEx") + duration})
         end
         self:sendMonthCardEmail()
+    elseif type == CardType.SuperMonthCardLevelUp then
+        if self:isSuperMonthCardExpire() then
+            skynet.error(string.format("super month card expired, can not level up,%d,%d",self.owner:getProperty("id"), id))
+        else
+            local cfg = csvdb["shop_cardCsv"][id]
+            if not cfg then return end 
+            local dif = cfg.level - self:getCurMonthCardLvl(true)
+            if dif > 1 and dif < 0 then
+                return
+            end
+            self:updateProperty({field = "smonthCardId", value = id})
+            self:updateProperty({field = "smonthCardEx", value = self:getProperty("smonthCardEx") + duration})
+        end
+        self:sendMonthCardEmail()
     elseif type == CardType.PrivilegeCard then
         if self:isPrivCardExpire() then
             self:updateProperty({field = "privCardEx", value = timeNow + duration})
@@ -253,7 +322,7 @@ function Store:notifyUpdateProperty(field, newValue, oldValue)
 		key = field,
 		newValue = newValue,
 		oldValue = oldValue,
-	}
+    }
 	SendPacket(actionCodes.Store_updateproperty, MsgPack.pack(datas))
 end
  
@@ -494,6 +563,8 @@ function Store:data()
         actGoodsFlag = self:getProperty("actGoodsFlag"),
         bpInfo = self:getProperty("bpInfo"),
         totalRR = self:getProperty("totalRR"),
+        monthCardId  = self:getProperty("monthCardId"),
+        smonthCardId  = self:getProperty("smonthCardId"),
 	}
 end
  
@@ -153,7 +153,36 @@ local function check_battle_act_close()
 	skynet.timeout(CHECK_BATTLE_ACT_CLOSE_INTERVAL, check_battle_act_close)
 end
  
+-- @desc: 检查海港贸易开启、关闭
+local function check_trade_seaport_status()
+	local nowTime = skynet.timex()
+	local nextTime = dayLater(nowTime)
+	local interval = 100 * (nextTime - nowTime + 1)
+
+	local curTm = os.date("*t", nowTime)
+	if curTm.wday == 7 and curTm.hour >= 4 then -- 周六
+		local oldTime = tonumber(redisproxy:hget("autoincrement_set", "seaportTime0")) or 0
+		local cur4Time = specTime({hour = 4},nowTime)
+		if cur4Time ~= oldTime then
+			redisproxy:hset("autoincrement_set", "seaportTime0", cur4Time)
+			redisproxy:hset("autoincrement_set", "seaportTime1", 1)
+			redisproxy:del(SEAPORT_TRADE_TASK_1)
+			redisproxy:del(SEAPORT_TRADE_TASK_2)
+		end
+	end
+	if curTm.wday == 1 and curTm.hour >= 4 then -- 周日
+		if (tonumber(redisproxy:hget("autoincrement_set", "seaportTime1")) or 0) == 1 then
+			redisproxy:hset("autoincrement_set", "seaportTime2", 1)
+		end
+	end
+	if curTm.wday == 2 and curTm.hour >= 4 then -- 周一
+		-- redisproxy:hset("autoincrement_set", "seaportTime0", 0)
+		redisproxy:hset("autoincrement_set", "seaportTime1", 0)
+		redisproxy:hset("autoincrement_set", "seaportTime2", 0)
+	end
  
+	skynet.timeout(interval, check_trade_seaport_status)
+end
  
 local CMD = {}
  
@@ -178,6 +207,7 @@ end
 function CMD.start()
 	check_mail_queue()
 	--check_battle_act_close()
+	check_trade_seaport_status()
 end
  
 local function __init__()
@@ -178,7 +178,7 @@ function ModelBase:loadProperties(properties)
             properties[field] = MsgPack.unpack(properties[field])
         end
  
-        local val = properties[field] or def
+        local val = properties[field] or clone(def)
         if val ~= nil then
             if typ == "number" then val = tonumber(val) end
             assert(type(val) == typ,