Merge branch 'cn/develop' into cn/publish/preview

熊润斐
2 parents 411a0e4b ce0149f4
Showing 17 changed files with 501 additions and 22 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/ActivityAction.lua
src/actions/HangAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/csvdata
src/models/Activity.lua
src/models/Order.lua
src/models/Role.lua
src/models/RoleBattle.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTimeReset.lua
src/services/globald.lua
src/utils/CommonFunc.lua
@@ -16,6 +16,12 @@ TIME_ZONE = math.floor(os.difftime(START_RESET_TIME_BASE, os.time(os.date(&quot;!*t&quot;,
 START_RESET_TIME = START_RESET_TIME_BASE - TIME_ZONE * 3600
+function weekday(now)
+	local day = math.ceil((now - START_RESET_TIME) % 604800 / 86400)
+	if day == 0 then day = 1 end
+	return day
+end
+
 STRUCT_VERSION = 3 -- 数据结构版本
 IOS_SID = 4 -- 判断是不是ios设备
@@ -158,6 +164,11 @@ TimeReset = {
 	DrawType1 = 17, -- 变异 抽卡加成
 	DrawType2 = 18, -- 通常 抽卡加成
 	DrawType3 = 19, -- 魔法 抽卡加成
+	WorkBattle1 = 22, -- 夜间玩法 1
+	WorkBattle2 = 23, -- 夜间玩法 2
+	WorkBattle3 = 24, -- 夜间玩法 3
+	WorkBattle4 = 25, -- 夜间玩法 4
+	WorkBattle5 = 26, -- 夜间玩法 5
 }
 -- TimeReset 索引数组
@@ -121,6 +121,10 @@ actionCodes = {
 	Hang_bagFieldRpc = 263,
 	Hang_chatLineRpc = 264,
 	Hang_selectTeamRpc = 265,
+	Hang_startWorkBattleRpc = 266,
+	Hang_endWorkBattleRpc = 267,
+	Hang_workBattleInfoRpc = 268,
+	Hang_getWorkRewardRpc = 269,
 	Diner_updateProperty = 300,
 	Diner_addSellRpc = 301,
@@ -62,7 +62,7 @@ FRIEND_ENERGY = &quot;role:%d:energy&quot; -- set 送给我活动能量的好友
 FRIEND_RECOMMEND = "friend:recommend" -- sort set 登录排序 获取推荐好友
 CHAT_OFFLINE = "chat:offline:%d" --消息离线缓存
-
+WORK_BATTLE_COUNT = "global:workbattle" -- 世界次数统计
 -- FRIEND_DINER_LIKE_KEY = "role:%d:diner:like" -- list
 -- UNION_SET = "global:union"
@@ -140,6 +140,13 @@ function _M.signRpc(agent, data)
 	role:changeUpdates({{type = "sign", field = curDay, value = yearMonth}})
 	role:checkTaskEnter("SignIn")
+	if monthData[curDay].daily_sign_email ~= "" then
+		local emails = monthData[curDay].daily_sign_email:toArray(true,"=")
+		for _, emailId in pairs(emails) do
+			redisproxy:insertEmail({roleId = role:getProperty("id"), emailId = emailId})
+		end
+	end
+
 	SendPacket(actionCodes.Activity_signRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -750,6 +750,251 @@ function _M.endBonusBattleRpc(agent, data)
 	return true
 end
+
+
+local function workWinReward(role, bonusData, rewardType, count, sweep)
+	count = count or 1
+	local reward, change = {}
+	
+
+	reward = bonusData.reward:toNumMap()
+	for itemId, c in pairs(reward) do
+		reward[itemId] = c * count
+	end
+	if rewardType == 2 or rewardType == 4 then
+		for k, v in pairs(bonusData.perfect_reward:toNumMap()) do
+			reward[k] = (reward[k] or 0) + v
+		end
+	end
+	for i = 1, count do
+		local chance = bonusData.chance:randWeight(true)
+		if chance[1] ~= 0 then
+			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
+		end
+	end
+	reward, change = role:award(reward, {log = {desc = "workBattle", int1 = bonusData.id}})
+	return reward, change
+end
+
+function _M.workBattleInfoRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local workMainCsv = csvdb["work_mainCsv"][msg.type]
+	if not workMainCsv then return 1 end
+	if not role:isTimeResetOpen(TimeReset["WorkBattle" .. msg.type]) then return 2 end
+	SendPacket(actionCodes.Hang_workBattleInfoRpc, MsgPack.pack({count = tonum(redisproxy:hget(WORK_BATTLE_COUNT, role:getTimeResetRound(TimeReset["WorkBattle" .. msg.type]) * 10 + msg.type))}))
+	return true
+end
+
+
+function _M.getWorkRewardRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local workMainCsv = csvdb["work_mainCsv"][msg.type]
+	if not workMainCsv then return 1 end
+	if not role:isTimeResetOpen(TimeReset["WorkBattle" .. msg.type]) then return 2 end
+	local count = tonum(redisproxy:hget(WORK_BATTLE_COUNT,  role:getTimeResetRound(TimeReset["WorkBattle" .. msg.type]) * 10 + msg.type))
+	if count < workMainCsv.target_num then return 3 end
+	local workBattle = role:getProperty("workBattle")
+	if workBattle[msg.type] ~= 1 then
+		return 4
+	end
+	workBattle[msg.type] = -1
+	role:updateProperty({field = "workBattle", value = workBattle})
+	local reward, change = role:award(workMainCsv.phase_award, {log = {desc = "workReward"}})
+	SendPacket(actionCodes.Hang_getWorkRewardRpc, MsgPack.pack({reward = reward, change = change}))
+	return true
+end
+
+function _M.startWorkBattleRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+	local count = msg.count or 1
+
+	if not role:isFuncUnlock(FuncUnlock.BonusBattle) then return 1 end
+
+	local bonusData = csvdb["work_battleCsv"][id]
+
+	if not bonusData then return 3 end
+
+	if not role:isTimeResetOpen(TimeReset["WorkBattle" .. bonusData.type]) then return 2 end
+
+	local ticketId = csvdb["work_mainCsv"][bonusData.type].ticket
+	local workStar = role:getProperty("workStar")
+
+	if bonusData.unlock ~= 0 and (not workStar[bonusData.unlock] or workStar[bonusData.unlock] == 0) then return 4 end
+	local workBattle = role:getProperty("workBattle")
+	workBattle[bonusData.type] = workBattle[bonusData.type] or 0
+	local needCount = count - (workBattle[bonusData.type] == 0 and 1 or 0)
+	if needCount ~= 0 and not role:checkItemEnough({[ticketId] = needCount}) then return 11 end
+
+	if workStar[id] and workStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then 
+		if workBattle[bonusData.type] == 0 then
+			workBattle[bonusData.type] = 1
+			role:updateProperty({field = "workBattle", value = workBattle})
+		end
+		if needCount > 0 then
+			role:costItems({[ticketId] = needCount}, {log = {desc = "workBattle", int1 = id}})
+		end
+		redisproxy:hincrby(WORK_BATTLE_COUNT,  role:getTimeResetRound(TimeReset["WorkBattle" .. bonusData.type]) * 10 + bonusData.type, count * bonusData.target_add)
+		local reward, change = workWinReward(role, bonusData, 3, count, true)
+		SendPacket(actionCodes.Hang_startWorkBattleRpc, MsgPack.pack({reward = reward, change = change}))
+	else
+		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
+		if not next(bTeam) then return 5 end
+		role.__bonusBattleCache = {
+			key = tostring(math.random()),
+			id = id,
+		}
+		SendPacket(actionCodes.Hang_startWorkBattleRpc, MsgPack.pack({key = role.__bonusBattleCache.key}))
+	end
+
+	return true
+end
+
+function _M.endWorkBattleRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+	local key = msg.key
+	local starNum = msg.starNum
+	if not role.__bonusBattleCache then return 1 end
+	
+
+	if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then 
+		SendPacket(actionCodes.Hang_endWorkBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
+	end
+	role.__bonusBattleCache = nil
+
+	-- 防作弊
+	if not role:checkBattleCheat("work", {
+		id = id,
+		isWin = starNum and starNum > 0,
+		info = msg.info
+	}) then
+		SendPacket(actionCodes.Hang_endWorkBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
+	end
+
+	local bonusData = csvdb["work_battleCsv"][id]
+	local ticketId = csvdb["work_mainCsv"][bonusData.type].ticket
+	local reward, change = {}
+
+	local workStar = role:getProperty("workStar")
+	local oldStar = workStar[id] or 0
+	local curStar = 0
+ 	if starNum and starNum > 0 then
+ 		-- 胜利扣除次数
+ 		
+ 		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
+ 		local herosInfo = role:getTeamHerosInfo(bTeam).heros
+
+ 		local check = {}
+ 		-- 1 通关
+		check[1] = function(_)
+			return true
+		end
+		-- 2 阵亡人数 <= N
+		check[2] = function(_, cond)
+			return msg.info.dead and msg.info.dead <= cond
+		end
+		-- 3 全员存活
+		check[3] = function(_)
+			return msg.info.dead and msg.info.dead == 0
+		end
+		-- 4 指定种族 >= N
+		check[4] = function(_, cond)
+			local count = 0
+			for _, one in pairs(herosInfo) do
+				local heroData = csvdb["unitCsv"][one.type]
+				if heroData.camp == cond then
+					count = count + 1
+				end
+			end
+			return count >= cond
+		end
+		-- 5 指定职业 >= N
+		check[5] = function(_, cond)
+			local count = 0
+			for _, one in pairs(herosInfo) do
+				local heroData = csvdb["unitCsv"][one.type]
+				if heroData.job == cond then
+					count = count + 1
+				end
+			end
+			return count >= cond
+		end
+		-- 6 含有指定角色 
+		check[6] = function(_, cond)
+			for _, one in pairs(herosInfo) do
+				if one.type == cond then
+					return true
+				end
+			end
+			return false
+		end
+		-- 7 通关耗时 <= X 秒  msg.info.atime
+		check[7] = function(_, cond)
+			return msg.info.atime and msg.info.atime <= cond
+		end
+		curStar = 0
+		local sweepConds = bonusData.sweep_condition:toTableArray(true)
+ 		for i, cond in ipairs(sweepConds) do
+ 			if check[cond[1]] and check[cond[1]](table.unpack(cond)) then
+ 				curStar = curStar + (1 << (i - 1))
+ 			end
+ 		end
+ 		local status
+ 		local rewardType = 0
+ 		if curStar >= (1 << #sweepConds) - 1 then -- 满星
+ 			rewardType = 2
+ 			if oldStar == 0 then  --通关
+ 				rewardType = 4
+ 			end
+ 		elseif oldStar == 0 then --通关
+ 			rewardType = 1
+ 		end
+
+ 		if rewardType ~= 0 then
+ 			local workBattle = role:getProperty("workBattle")
+			workBattle[bonusData.type] = workBattle[bonusData.type] or 0
+			local needCount = 1 - (workBattle[bonusData.type] == 0 and 1 or 0)
+			if workBattle[bonusData.type] == 0 then
+				workBattle[bonusData.type] = 1
+				role:updateProperty({field = "workBattle", value = workBattle})
+			end
+			if needCount > 0 then
+				role:costItems({[ticketId] = needCount}, {log = {desc = "workBattle", int1 = id}})
+			end
+			redisproxy:hincrby(WORK_BATTLE_COUNT,  role:getTimeResetRound(TimeReset["WorkBattle" .. bonusData.type]) * 10 + bonusData.type, bonusData.target_add)
+	 		reward, change = workWinReward(role, bonusData, rewardType)
+	 	end
+ 	else
+ 		curStar = oldStar
+ 	end
+ 	if curStar ~= oldStar then
+ 		workStar[id] = curStar
+ 		role:updateProperty({field = "workStar", value = workStar})
+ 	end
+
+ 	role:checkBattle("work", {
+		id = id,
+		isWin = starNum and starNum > 0,
+		info = msg.info,
+		reward = reward,
+	})
+	role:mylog("hang_action", {desc = "workBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
+
+	SendPacket(actionCodes.Hang_endWorkBattleRpc, MsgPack.pack({
+		starNum = starNum, 
+		reward = reward,
+		change = change
+	}))
+	return true
+end
+
 function _M.hangGiftRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -161,6 +161,9 @@ function _M.loginRpc( agent, data )
 	role:getAdvData(true) -- 清掉不合格的数据
 	role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
 	role:checkSeaportTrade() -- 检查海港贸易季活动
+	if not next(role:getProperty("workBattle")) then
+		role:setProperty("workBattle", {round = math.floor((now - START_RESET_TIME) / 604800)})
+	end
 	-- 跨天登陆事件
 	local resetMode = role:updateTimeReset(now)
@@ -936,7 +939,15 @@ function _M.taskActiveRpc(agent, data)
 		return
 	end
-	local reward, change = role:award(taskData.reward, {log = {desc = "taskActive", int1 = taskType, int2 = taskId}})
+	local needReward = taskData.reward:toNumMap()
+	if taskData.reward_2 ~= 0 then
+		local day = weekday(skynet.timex())
+		local workMainCsv = csvdb["work_mainCsv"][day]
+		if workMainCsv then
+			needReward[workMainCsv.ticket] = taskData.reward_2
+		end
+	end
+	local reward, change = role:award(needReward, {log = {desc = "taskActive", int1 = taskType, int2 = taskId}})
 	role:changeUpdates({
 		{ type = roleField[taskType], field = {"at", taskId}, value = -1 }
 	})
@@ -8,12 +8,13 @@ function _M.rechargeRpc(agent , data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
+	local choose = msg.choose or ""
 	local dataSet = csvdb["shop_rechargeCsv"][id]
 	if not dataSet then return end
 	local roleId = role:getProperty("id")
 	--创建订单号
-	local partnerOrderId = role:getPurchaseOrder(id)
+	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
 	if partnerOrderId == "" then
 		return 1
 	end
@@ -162,13 +163,14 @@ function _M.googleRechargeRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
+	local choose = msg.choose or ""
 	local dataSet = csvdb["shop_rechargeCsv"][id]
 	if not dataSet then return end
 	local roleId = role:getProperty("id")
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = role:getPurchaseOrder(id)
+	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
 	-- 签名
 	-- local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
 	local secret_key = "8920e9dcf0cb4ebca87393ce48021ead"
@@ -190,13 +192,14 @@ function _M.myCardRechargeRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
+	local choose = msg.choose or ""
 	local dataSet = csvdb["shop_rechargeCsv"][id]
 	if not dataSet then return end
 	local roleId = role:getProperty("id")
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = role:getPurchaseOrder(id)
+	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
 	-- 签名
 	local secret_key = "48759e07540f46d9af17ec82669b4272"
 	local need = {
@@ -216,13 +219,14 @@ function _M.iosRechargeRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
+	local choose = msg.choose or ""
 	local dataSet = csvdb["shop_rechargeCsv"][id]
 	if not dataSet then return end
 	local roleId = role:getProperty("id")
 	role.ignoreHeartbeat = true
 	--创建订单号
-	local partnerOrderId = role:getPurchaseOrder(id)
+	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
 	-- 签名
 	local secret_key = "1916d62251dd4a8aa5e452121eefc9a1"
 	local need = {
@@ -283,7 +287,7 @@ function _M.shopBuyRpc(agent , data)
 	local cost = {[dataSet.icon] = dataSet.cost * count}
-	local desc = "unknown"
+	local desc = "unknowShop"
 	if dataSet.shop == 1 then		-- 普通商店
 		desc = "dailyShop"
 		local dailySDD = role.dailyData:getProperty("dailySDD")
-Subproject commit ec92ed50d3d5ff9655b1715239e7fda48f8ef5cb
+Subproject commit 2499d73adbdf6ea3562ce3a815d3189e3a3aab7c
@@ -884,6 +884,11 @@ function Activity:getBattleTicket(actId)
 	local ticketId, init, limit, duration = arr[1] or 0, arr[2] or 0, arr[3] or 0, arr[4] or 10000
 	local count = actData["ticket"] or init
+	if count >= limit then
+		actData["ts"] = timeNow
+		self:updateActData("ChallengeLevel", actData)
+		return
+	end
 	local add = math.max(math.floor((timeNow - startTs) / (duration * 60)), 0)
 	local newCount= math.min(count + add, limit)
@@ -13,6 +13,7 @@ Order.schema = {
     finishTime 	= {"number", 0},	-- 服务端验证完成时间
     status 		= {"string", "create"},
     sid 		= {"number",0}, 	-- 创建单号的设备的sid
+    choose 		= {"string", ""}, -- 自选奖励
 }
 Order.fields = {
@@ -23,6 +24,7 @@ Order.fields = {
 	finishTime = true,
 	status = true,
 	sid = true,
+	choose = true,
 }
 return Order
 \ No newline at end of file
@@ -120,6 +120,8 @@ Role.schema = {
 	towerTeams 			= {"table", {}}, 	-- 四个电波塔的队伍
 	bonusStar			= {"table", {}}, 	-- 奖励关卡 通关星星  {[id] = 1}  三个二进制位 表示三个星 从低到高  (1 << 0) (1 << 1) (1 << 2)  满星 (1 << 3) - 1
+	workStar			= {"table", {}},	-- 夜间玩法 通关星星  {[id] = 1}  三个二进制位 表示三个星 从低到高  (1 << 0) (1 << 1) (1 << 2)  满星 (1 << 3) - 1
+	workBattle 			= {"table", {}},	-- 夜间玩法记录 {[1] = 1, [2] = 1, [3] = 1,  [4] = 1, round = 10} -- 第N天打了多少次 round 轮次
 	--引导相关
 	newerGuide 			= {"string","1=1"}, -- 新手引导 master=slave
@@ -379,6 +381,8 @@ function Role:data()
 		towerTeams = self:getProperty("towerTeams"),
 		bonusStar = self:getProperty("bonusStar"),
+		workStar = self:getProperty("workStar"),
+		workBattle = self:getProperty("workBattle"),
 		newerGuide = self:getProperty("newerGuide"),
 		funcGuide = self:getProperty("funcGuide"),
@@ -17,6 +17,7 @@ local BattleType = {
 	pvpc = 500,
 	pvph = 501,
 	act_battle = 502,
+	work = 301,
 }
 RoleBattle.bind = function (Role)
@@ -127,6 +128,18 @@ function Role:checkBattleCheat(battleType, params)
 		-- local carbonData = csvdb["bonus_battleCsv"][params.id]
 		-- enemyServer = packBattleEnemyCommon(carbonData)
 	end
+	cheat["work"] = function()
+		local team = self:getTeamBattleInfo(self:getTeamFormatByType(TeamSystemType.BonusBattle))
+		for slot, hero in pairs(team.heros) do
+			local temp = {}
+			for arr, _ in pairs(checkCheatAttrs) do
+				temp[arr] = hero[arr]
+			end
+			selfTeamServer[hero.type] = temp
+		end
+		-- local carbonData = csvdb["bonus_battleCsv"][params.id]
+		-- enemyServer = packBattleEnemyCommon(carbonData)
+	end
 	cheat["pvpc"] = function()
 		if not params.format then return end
 		local team = self:getTeamBattleInfo(params.format)
@@ -58,6 +58,7 @@ local ItemReason = {
 	newSign = 142,-- 新的活动签到
 	advLevelStage = 143, -- 拾荒活动阶段奖励
 	towerBnous = 144, -- 爬塔到一定层数对某些功能的奖励
+	unknowShop = 145, -- 未知商店
 	advHang = 301, -- 拾荒挂机
@@ -72,6 +73,8 @@ local ItemReason = {
 	towerBattle = 310, -- 电波塔战斗
 	advOver = 311, -- 冒险结算
 	advUnlock = 312, -- 拾荒解锁
+	workBattle = 313, -- workBattle夜间打工
+	workReward = 314, -- workBattle夜间打工 阶段奖励
 	dinerFinishTask = 401, -- 餐厅完成任务
 	storybookReward = 402, -- 剧情奖励
@@ -144,7 +144,9 @@ function RolePlugin.bind(Role)
 				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 isOpen, actId = self.activity:isOpen("ChallengeLevel")
+				if not isOpen then return end
+				self.activity:getBattleTicket(actId)
 				local actData = self.activity:getActData("ChallengeLevel")
 				actData["ticket"] = (actData["ticket"] or 0) + count
 				self.activity:updateActData("ChallengeLevel", actData)
@@ -861,7 +863,6 @@ function RolePlugin.bind(Role)
 			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)
@@ -1349,18 +1350,22 @@ function RolePlugin.bind(Role)
 			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
+				for idx, set in ipairs(csvdb["seaport_purchaseCsv"]) 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
+						if donate[idx] 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}})
+						redisproxy:insertEmail({
+							roleId = self:getProperty("id"),
+							emailId = idx == 1 and 361 or 362,
+							attachments = set[1].phase_award,
+						})
+						-- self:award(set[1].phase_award, {log = {desc = "seaportReward", int1 = set[1].phase, int2 = set[1].id}})
 						donate[idx] = 1
 					end
 				end
@@ -1397,6 +1402,8 @@ function RolePlugin.bind(Role)
 				local expCarbonId = self:getProperty("hangInfo").expCarbonId
 				local taskCsv = csvdb["seaport_taskCsv"]
 				local endTime = openTime0 + 86400 * 2
+				local reward = {}
+
 				for slot, set in pairs(taskCsv) do
 					if collect[slot] then
 						update = true
@@ -1433,9 +1440,28 @@ function RolePlugin.bind(Role)
 						            itemReward[key] = math.ceil(1.5 * value)
 						        end
 						    end
-							self:award(itemReward, {log = {desc = "seaportTask", int1 = slot, int2 = level}})
+
+						    for itemId, value in pairs(itemReward) do
+						    	reward[itemId] = (reward[itemId] or 0) + value
+						    end
+							-- self:award(itemReward, {log = {desc = "seaportTask", int1 = slot, int2 = level}})
+						end
+					end
+				end
+
+				if next(reward) then
+					local rewardStr = ""
+					for itemId, value in pairs(reward) do
+						if rewardStr ~= "" then
+							rewardStr = rewardStr .. " "
 						end
+						rewardStr = rewardStr .. string.format("%s=%s",itemId,value)
 					end
+					redisproxy:insertEmail({
+						roleId = self:getProperty("id"),
+						emailId = 363,
+						attachments = rewardStr,
+					})
 				end
 			end
 			seaport.collect = {}
@@ -2022,7 +2048,7 @@ function RolePlugin.bind(Role)
 					return "error money"
 				end
 				-- 发现需要的id
-				local partnerOrderId = self:getPurchaseOrder(k, params.transactionId)
+				local partnerOrderId = self:getPurchaseOrder(k, params.transactionId, params.choose)
 				if partnerOrderId == "" then
 					return "no product"
 				end
@@ -2032,7 +2058,7 @@ function RolePlugin.bind(Role)
 	end
 	-- 获取充值订单号
-	function Role:getPurchaseOrder(rechargeId, transactionId)
+	function Role:getPurchaseOrder(rechargeId, transactionId, choose)
 		local roleId = self:getProperty("id")
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
 		if not rechargeData then
@@ -2044,7 +2070,24 @@ function RolePlugin.bind(Role)
 	    if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
 	        return ""
 		end
-		
+		-- 检查礼包自选奖励合法
+		if choose and choose ~= "" then
+			if rechargeData.itemgift == "" then return "" end
+			local slot = rechargeData.itemdirect or 0
+			local set = choose:toTableArray(true)
+			if slot ~= #set then return "" end
+			local pass = {}
+			local groups = rechargeData.itemgift:toTableArray(true)
+			for idx, item in ipairs(set) do
+				for _, group in ipairs(groups) do
+					if group[2] == item[1] and group[3] == item[2] and idx == group[1] then
+						pass[group[1]] = 1
+						break
+					end
+				end
+			end
+			if #pass ~= slot then return "" end
+		end
 		--判断是否是活动商品
 		if rechargeData.activity_id ~= 0 then
 			local actCfg = csvdb["activity_ctrlCsv"][rechargeData.activity_id]
@@ -2071,6 +2114,7 @@ function RolePlugin.bind(Role)
 			createTime = skynet.timex(),
 			transactionId = transactionId,
 			sid = self:getProperty("sid"),
+			choose = choose or "",
 		})
 		order:create()
 		-- 正在进行中的订单 缓存
@@ -2139,7 +2183,7 @@ function RolePlugin.bind(Role)
 			})
 		end
-		return true, rechargeId, sid
+		return true, rechargeId, sid, orderObject:getProperty("choose")
 	end
 	-- 充值 --
@@ -2157,7 +2201,7 @@ function RolePlugin.bind(Role)
 		local roleId = self:getProperty("id")
 		local partnerOrderStr = params.order
-		local status, back, sid = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
+		local status, back, sid, choose = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
 		if not status then
 			if back == "finsh" then
 				-- 订单已经处理
@@ -2180,6 +2224,7 @@ function RolePlugin.bind(Role)
 			pay_time = params.pay_time,
 			order = partnerOrderStr,
 			sid = sid,
+			choose = choose,
 		})
 		if not status then
@@ -2227,6 +2272,17 @@ function RolePlugin.bind(Role)
 			return 3
 		end
+		-- 自选奖励部分
+		if params.choose and params.choose ~= "" then
+			local tReward, tChange = self:award(params.choose, {log = {desc = "recharge", int1 = id}})
+			for itemId, value in pairs(tReward) do
+				reward[itemId] = (reward[itemId] or 0) + value
+			end
+			for itemId, value in pairs(tChange or {}) do
+				reward[itemId] = (reward[itemId] or 0) + value
+			end
+		end
+
 		if diamondCount > 0 then
 			reward[ItemId.Diamond] = (reward[ItemId.Diamond] or 0) + diamondCount
 		end
@@ -33,6 +33,38 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 		self:checkReturner()
 	end
+	-- 检查 夜间打工
+	local workBattle = self:getProperty("workBattle")
+	local need = {}
+	for i = 1, 5 do
+		if workBattle[i] == 1 then
+			need[#need + 1] = workBattle.round * 10 + i
+		end
+	end
+	local change = false
+	if next(need) then
+		local ret = redisproxy:hmget(WORK_BATTLE_COUNT, table.unpack(need))
+		for idx, v in ipairs(need) do
+			local ctype = v % 10
+			local ccount = tonum(ret[idx])
+			local workMainCsv = csvdb["work_mainCsv"][ctype]
+			if ccount >= workMainCsv.target_num then 
+				self:sendMail(workMainCsv.email, nil, workMainCsv.phase_award)
+			end
+			workBattle[ctype] = -1
+		end
+		change = true
+	end
+	local newRound = math.floor((now - START_RESET_TIME) / 604800)
+	if newRound ~= workBattle.round then
+		workBattle = {round = newRound}
+		change = true
+	end
+	if change then
+		self:setProperty("workBattle", workBattle)
+		response.workBattle = workBattle
+	end
+
 	response.dTask = {}
 	response.advSup = self:getProperty("advSup")
 	self:log("onLogin")
@@ -184,6 +184,84 @@ local function check_trade_seaport_status()
 	skynet.timeout(interval, check_trade_seaport_status)
 end
+-- @desc: 海港贸易捐赠作弊
+local seaportTimes = {}
+local function check_trade_seaport_donate()
+	local time1 = tonumber(redisproxy:hget("autoincrement_set", "seaportTime1")) or 0
+	local time2 = tonumber(redisproxy:hget("autoincrement_set", "seaportTime2")) or 0
+	if time1 == 0 and time2 == 0 then
+		seaportTimes = {}
+		skynet.timeout(360000, check_trade_seaport_donate)
+		return
+	end
+
+	local csvdb = require "shared.csvdata"
+	local donateCsv = csvdb["seaport_purchaseCsv"]
+
+	local times = {time1, time2}
+	for phase, open in ipairs(times) do
+		if open == 1 and not seaportTimes[phase] then
+			seaportTimes[phase] = {}
+			for _, _ in ipairs(donateCsv[phase]) do
+				table.insert(seaportTimes[phase],math.randomInt(1800, 3600))
+			end
+		end
+	end
+
+	local interval = 3600
+	local phase, id = 0, 0
+
+	for key1, data in ipairs(seaportTimes) do
+		for key2, temp in pairs(data) do
+			if times[key1] == 1 and temp < interval then
+				interval = temp
+				phase = key1
+				id = key2
+			end
+		end
+	end
+
+	for _, data in ipairs(seaportTimes) do
+		for id, temp in pairs(data) do
+			data[id] = temp - interval
+			if data[id] == 0 then
+				data[id] = math.randomInt(1800, 3600)
+			end
+		end
+	end
+
+	if phase ~= 0 and id ~= 0 then
+		local redisKeys = {SEAPORT_TRADE_TASK_1,SEAPORT_TRADE_TASK_2}
+		local all = donateCsv[phase][id].need_num
+		local old = tonumber(redisproxy:hget(redisKeys[phase],id)) or 0
+		local add = math.min(math.randomInt(math.floor(all/20),math.floor(all/12)),all - old)
+		if add > 0 then
+			redisproxy:hincrby(redisKeys[phase],id,add)
+		else
+			seaportTimes[phase][id] = nil
+		end
+	end
+
+	skynet.timeout(interval * 100, check_trade_seaport_donate)
+end
+
+local function check_work_battle()
+	local csvdb = require "shared.csvdata"
+	local now = skynet.timex()
+	local day = weekday(now)
+	local workMainCsv = csvdb["work_mainCsv"][day]
+	if workMainCsv and isSpecTime(now - RESET_TIME * 3600, csvdb["time_resetCsv"][TimeReset["WorkBattle1"]].start / 3600, 24) then
+		local round = math.floor((now - START_RESET_TIME) / 604800)
+		local field = round * 10 + day
+		local count = tonum(redisproxy:hget(WORK_BATTLE_COUNT, field))
+		if count < workMainCsv.target_num then
+			local add = math.floor(workMainCsv.target_num * math.randomInt(3125, 5000) / 100000)
+			redisproxy:hincrby(WORK_BATTLE_COUNT, field, add)
+		end
+	end
+	skynet.timeout(math.randomInt(10 * 60, 15 * 60) * 100, check_work_battle)
+end
+
 local CMD = {}
@@ -205,9 +283,12 @@ end
 function CMD.start()
+	math.randomInit(skynet.timex())
 	check_mail_queue()
 	--check_battle_act_close()
 	check_trade_seaport_status()
+	check_trade_seaport_donate()
+	check_work_battle()
 end
 local function __init__()
@@ -235,8 +235,9 @@ function specMonday(now)
 	return time - (wday - 1) * 86400
 end
-function isSpecTime(startHour, endHour, specday)
-	local tm = os.date("*t", skynet.timex())
+function isSpecTime(ctime, startHour, endHour, specday)
+	ctime = ctime or skynet.timex()
+	local tm = os.date("*t", ctime)
 	if specday then
 		local day = (tm.wday+6)%7
 		if day == 0 then day = 7 end