火花系统建表，新增虹光玉

测试
2 parents ec0df561 3fbbd115
Showing 24 changed files with 689 additions and 40 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/ActivityAction.lua
src/actions/CarAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/csvdata
src/models/Hero.lua
src/models/HeroPlugin.lua
src/models/Order.lua
src/models/Role.lua
src/models/RoleIncre.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/RoleTimeReset.lua
@@ -25,6 +25,7 @@ MAX_SVR_ID = 10000
 MAX_ROLE_NUM = 1000000
 MAX_HERO_NUM = 1000000 -- 英雄的id = roleId * MAX_HERO_NUM + index
 MAX_RUNE_NUM = 1000000 -- 铭文的id = roleId * MAX_RUNE_NUM + index
+MAX_SPARK_NUM = 1000000 -- 火花的id = roleId * MAX_SPARK_NUM + index
 -- 属性枚举
 AttsEnum = {
 	hp = 1,				-- 血量
@@ -87,6 +88,7 @@ ItemType = {
 	SelectItemBox				= 17, 	-- 自选箱子
 	CommonPaster				= 18, 	-- 万能贴纸
 	BossTicket					= 20, 	-- boss挑战门票
+	Spark						= 21, 	-- 火花
 }
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
@@ -367,6 +369,7 @@ TriggerEventType = {
 	SSRCount = 6,
 	AfterTs = 7, 	-- 某时间以后
 	DrawHeroCnt = 8,	-- 每日抽卡次数
+	Appoint = 0, -- 触发指定id礼包
 }
 DrawCardType = {
@@ -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,
@@ -152,6 +155,8 @@ actionCodes = {
 	Car_runeUpRpc = 402,
 	Car_saleEquipRpc = 403,
 	Car_saleRuneRpc = 404,
+	Car_sparkLvlUpRpc = 405,
+	Car_sparkQualityUpRpc = 406,
 	Friend_searchRpc = 450,
@@ -241,6 +246,7 @@ actionCodes = {
 	Activity_newSignRpc = 670,
 	Activity_advLevelRpc = 671,
 	Activity_buyBattleCommandLvlRpc = 672,
+	Activity_returnerTaskRpc = 673,
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -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:"
@@ -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
@@ -1358,4 +1365,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
@@ -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
@@ -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)
@@ -594,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
@@ -328,6 +328,8 @@ function _M.roleFormatRpc(agent , data)
 	local tactics = msg.tactics	-- 战术
 	local tower = msg.tower
 	local team = {}
+	dump(role.heros)
+	dump(msg)
 	for slot, heroId in pairs(msg.heros) do
 		if not role.heros[heroId] then
 			return 1
@@ -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
@@ -18,6 +18,7 @@ require &quot;utils.MysqlUtil&quot;
 local WAVE_HERO_NUMS = 150
 local WAVE_RUNE_NUMS = 150
+local WAVE_SPARK_NUMS = 150
 local function validName(name)
 	name = string.upper(name)
@@ -206,6 +207,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
@@ -213,12 +224,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 = {}}
@@ -358,7 +386,7 @@ function _M.createRpc(agent, data)
 		SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
 		return true
 	end
-	newRole:loadRoleIncre()
+	--newRole:loadRoleIncre()
 	newRole:startActionUcode()
 	newRole.sysVersion = msg.sysVersion
 	newRole.ip = agent.ip:toArray(false, ":")[1]
@@ -7,12 +7,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
@@ -160,13 +161,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"
@@ -188,13 +190,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 = {
@@ -214,13 +217,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 = {
-Subproject commit 82e5e1f2e6dd2bbbd469d24f7a310c1210655be8
+Subproject commit 7253317be1301eaa5c45dc1d7d71f17d2f180a18
@@ -17,6 +17,7 @@ Hero.schema = {
 	equip       = {"string",""},        --装备 type=level
 	rune       = {"string",""},        --零件 type=id
 	faith	   = {"number", 0},			-- 信赖
+	spark		= {"table", {}},		-- 火花属性
 }
 function Hero:ctor( properties )
@@ -52,7 +53,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
@@ -83,7 +84,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()
@@ -108,7 +109,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包括队伍加成
@@ -14,6 +14,7 @@ Order.schema = {
     finishTime 	= {"number", 0},	-- 服务端验证完成时间
     status 		= {"string", "create"},
     sid 		= {"number",0}, 	-- 创建单号的设备的sid
+    choose 		= {"string", ""}, -- 自选奖励
 }
 Order.fields = {
@@ -24,6 +25,7 @@ Order.fields = {
 	finishTime = true,
 	status = true,
 	sid = true,
+	choose = true,
 }
 return Order
 \ No newline at end of file
@@ -26,6 +26,7 @@ function Role:ctor( properties )
 	self.heros = {}
 	self.runeBag = {}
 	self.friends = {}
+	self.sparkBag = {}
 	self.advData = nil
 	self.activity = nil
 	self._pushToken = nil
@@ -194,6 +195,10 @@ Role.schema = {
 	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}}
+
+	roleIncre			= {"table", {}},  -- 角色英雄，铭文，火花自增序列 {heroId = 1, runeId = 1, sparkId = 1}
 }
@@ -426,6 +431,7 @@ function Role:data()
 		radioTask = self:getProperty("radioTask"),
 		seaport = self:getProperty("seaport"),
+		returner = self:getProperty("returner"),
 	}
 end
@@ -9,6 +9,7 @@ RoleIncre.schema = {
 	id 					= {"number", 0, "pri"},
 	heroId             = {"number", 0},
 	runeId             = {"number", 0},
+	sparkId            = {"number", 0},
 }
 function RoleIncre:increBy(keyName, val)
@@ -127,6 +127,9 @@ local ItemReason = {
 	refer = 1210, -- 穿戴
 	itemCompose = 1211, 	-- 天赋道具合成
 	radioQuest = 1212,		-- 电台任务奖励
+	changeSpark = 1213,		-- 穿戴火花
+	sparkLvlUp = 1214,		-- 火花强化
+	sparkQualityUp = 1215,	-- 火花升华
 	-- pvp 
 	pvpCHead = 1301, -- pvp 跨服竞技场头像
@@ -140,6 +143,8 @@ local ItemReason = {
 	seaportShop = 1401, -- 贸易港商店兑换
 	seaportReward = 1402, -- 贸易港阶段奖励
 	seaportTask = 1403, -- 贸易港任务奖励
+
+	returner = 1410, -- 回归者奖励
 }
@@ -622,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",
@@ -634,6 +641,7 @@ local LogType = {
 	tower_action = "common",
 	gm_action = "common",
 	act_action = "common",
+	spark_action = "common",
 }
 -- 如要修改 要提前修改 _template mapping -- 对应 mapping 为 gamelog-*
@@ -15,8 +15,9 @@ function RolePlugin.bind(Role)
 		self:loadDiner()
 		self:loadActivity()
 		self:loadStoreInfo()
-		self:loadRoleIncre()
+		--self:loadRoleIncre()
 		self:loadFriends()
+		self:loadSparks()
 	end
 	function Role:reloadWhenLogin()
@@ -101,6 +102,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,
@@ -346,7 +352,7 @@ function RolePlugin.bind(Role)
 	function Role:addItem(params)
 		params = params or {}
 		params.count = math.floor(params.count or 0)
-		if params.itemId ==  ItemId.Jade then
+		if params.itemId ==  ItemId.Diamond then
 			self:gainDiamond(params)
 			return
 		end
@@ -476,7 +482,7 @@ function RolePlugin.bind(Role)
 			--self:incrProperty("diamond", count)
 		--end
-		self:logItems(ItemId.Jade, origin, count, params.log)
+		self:logItems(ItemId.Diamond, origin, count, params.log)
 		if params.log then
 			local log = clone(params.log)
 			if log["cint1"] or log["cint2"] or log["cint3"] then
@@ -548,6 +554,14 @@ function RolePlugin.bind(Role)
 		return true
 	end
+	function Role:increBy(field, val)
+		local roleIncre = self:getProperty("roleIncre")
+		local curId = roleIncre[field] or 0
+		roleIncre[field] = curId + val
+		self:setProperty("roleIncre", roleIncre)
+		return curId + val
+	end
+
 	function Role:addHero(params)
 		local roleId = self:getProperty("id")
 		local heroType = params.type
@@ -555,7 +569,7 @@ function RolePlugin.bind(Role)
 		local unitData = csvdb["unitCsv"][heroType] 
 		if not unitData then return false end
-		local heroId = self.roleIncre:increBy("heroId" , 1)
+		local heroId = self:increBy("heroId" , 1)
 		local heroInfo = {
 			key = string.format("%d",roleId * MAX_HERO_NUM + heroId),
@@ -697,17 +711,17 @@ function RolePlugin.bind(Role)
 		end
 	end
-	function Role:loadRoleIncre()
-		local roleId = self:getProperty("id")
-		local dataKey = string.format("%d", roleId)
-		self.roleIncre = require("models.RoleIncre").new({key = dataKey, id = roleId})
-		self.roleIncre.owner = self
-		if not self.roleIncre:checkKeyExists(dataKey) then
-			self.roleIncre:create()
-		else
-			self.roleIncre:load()
-		end
-	end
+	--function Role:loadRoleIncre()
+	--	local roleId = self:getProperty("id")
+	--	local dataKey = string.format("%d", roleId)
+	--	self.roleIncre = require("models.RoleIncre").new({key = dataKey, id = roleId})
+	--	self.roleIncre.owner = self
+	--	if not self.roleIncre:checkKeyExists(dataKey) then
+	--		self.roleIncre:create()
+	--	else
+	--		self.roleIncre:load()
+	--	end
+	--end
 	function Role:addEquip(equipType, equipLv, count, pms)
 		pms = pms or {}
@@ -774,6 +788,18 @@ function RolePlugin.bind(Role)
 		end
 	end
+	function Role:loadSparks()
+		local roleId = self:getProperty("id")
+		local res = mysqlproxy:query(string.format("SELECT * FROM `Spark` WHERE `roleid` = %s", roleId))
+		for _, data in ipairs(res) do
+			local spark = require("models.Spark").new({key = string.format("%d",data.id), id=data.id})
+			if spark:load(data) then
+				spark.owner = self
+				self.sparkBag[data.id] = spark
+			end
+		end
+	end
+
 	-- 0 为操作成功
 	function Role:addRune(params)
 		if params.type and params.id then
@@ -783,7 +809,7 @@ function RolePlugin.bind(Role)
 			if not data then return 3 end
 			local roleId = self:getProperty("id")
-			local runeUid = self.roleIncre:increBy("runeId" , 1)
+			local runeUid = self:increBy("runeId" , 1)
 			local runeInfo = {
 				key = string.format("%d",roleId * MAX_RUNE_NUM + runeUid),
@@ -827,6 +853,96 @@ 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 = self:increBy("sparkId" , 1)
+
+			local sparkInfo = {
+				key = string.format("%d",roleId * MAX_SPARK_NUM + sparkUid),
+				id = roleId * MAX_SPARK_NUM + sparkUid,
+				roleid = roleId,
+				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())
+				SendPacket(actionCodes.Role_loadSparks, MsgPack.pack(response))
+			end
+
+			--self:checkTaskEnter("AddSpark", {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("addSpark 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
+
+		-- delete spark
+		mysqlproxy:query(string.format("DELETE FROM `Spark` WHERE `id` in (%s)", table.concat(bDel, ",")))
+
+		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')
@@ -1244,8 +1360,7 @@ 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
@@ -1255,7 +1370,12 @@ function RolePlugin.bind(Role)
 					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
@@ -1292,6 +1412,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
@@ -1328,10 +1450,29 @@ 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 = {}
@@ -1358,6 +1499,17 @@ function RolePlugin.bind(Role)
 		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 = {}
@@ -1758,10 +1910,10 @@ function RolePlugin.bind(Role)
 		for _, info in ipairs(objs) do
 			info:update()
 		end
-		local tbObjs = {self.friends, self.heros, self.runeBag}
+		local tbObjs = {self.friends, self.heros, self.runeBag, self.sparkBag}
 		for _, tbObj in ipairs(tbObjs) do
 			for _, info in pairs(tbObj) do
-				tbObj:update()
+				info:update()
 			end
 		end
 	end
@@ -1910,7 +2062,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
@@ -1920,7 +2072,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
@@ -1932,7 +2084,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]
@@ -1962,6 +2131,7 @@ function RolePlugin.bind(Role)
 			transactionId = transactionId,
 			roleid = roleId,
 			sid = self:getProperty("sid"),
+			choose = choose or "",
 		})
 		order:create()
 		-- 正在进行中的订单 缓存
@@ -2038,7 +2208,7 @@ function RolePlugin.bind(Role)
 			})
 		end
-		return true, rechargeId, sid
+		return true, rechargeId, sid, orderObject:getProperty("choose")
 	end
 	-- 充值 --
@@ -2056,7 +2226,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
 				-- 订单已经处理
@@ -2079,6 +2249,7 @@ function RolePlugin.bind(Role)
 			pay_time = params.pay_time,
 			order = partnerOrderStr,
 			sid = sid,
+			choose = choose,
 		})
 		if not status then
@@ -2126,6 +2297,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.Jade] = (reward[ItemId.Jade] or 0) + diamondCount
 		end
@@ -109,6 +109,7 @@ local TaskType = {
 	CostDiamond = 909,			-- 消耗钻石
 	WeekTask = 910,				-- 完成每周活跃任务
 	ActBattlePass = 911,		-- 活动关卡通关		-- chapterId
+	Appoint = 912, 				-- 触发限时礼包，指定id
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -264,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")}},
 	}
 }
@@ -319,6 +321,11 @@ local BattleCommandTaskListener = {
 	listen = CalendaTaskListener["listen"]
 }
+local ReturnerTask = {
+	func = "checkReturnerTask",
+	listen = CalendaTaskListener["listen"]
+}
+
 local TaskListeners = {
 	StoryListener,
 	CommonListener,
@@ -328,6 +335,7 @@ local TaskListeners = {
 	StoreListener,
 	CalendaTaskListener,
 	BattleCommandTaskListener,
+	ReturnerTask,
 }
 local RoleTask = {}
@@ -825,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")
@@ -0,0 +1,79 @@
+local Spark = class("Spark", require("shared.ModelBaseMysql"))
+Spark.schema = {
+	id 		    = {"number", 0, "pri"},      		-- 唯一自增id
+	roleid 		= {"number", 0, "index"},      		-- 唯一自增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
@@ -140,7 +140,7 @@ local function initAdvSeasonTable()
 end
 local function checkRoleTables()
-	local list = {"Role", "Daily", "Activity", "Diner", "Store", "Hero", "RoleIncre", "Rune", "Order", "Email", "Friend"}
+	local list = {"Role", "Daily", "Activity", "Diner", "Store", "Hero", "Rune", "Order", "Email", "Friend", "Spark"}
 	for _, name in ipairs(list) do
 		local obj = require("models."..name).new({key = "key"})
 		print("check table [" .. name .. "] begin.")
@@ -229,6 +229,67 @@ 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 CMD = {}
@@ -255,6 +316,7 @@ function CMD.start()
 	save_autoincrement_timer()
 	check_trade_seaport_status()
 	save_seaport_task()
+	check_trade_seaport_donate()
 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,