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

# Conflicts: # src/csvdata

Merge branch 'cn/develop' into cn/publish/preview
# Conflicts: # src/csvdata
熊润斐
2 parents f043cffc 4a25969f
Showing 24 changed files with 681 additions and 94 deletions Show diff stats
config/develop.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/DinerAction.lua
src/actions/EmailAction.lua
src/actions/FriendAction.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/StoreAction.lua
src/adv/Adv.lua
src/models/Daily.lua
src/models/Hero.lua
src/models/HeroPlugin.lua
src/models/Role.lua
src/models/RoleBattle.lua
 include("basic.lua")
-logd = 0 -- 是否开启日志
+logd = 1 -- 是否开启日志
 thread = 4
 codeurl = "192.168.0.199:9090"
 servId = 1
@@ -20,4 +20,4 @@ redis_auth = nil
 mysql_host = "127.0.0.1"
 mysql_port = 3306
 mysql_user = "root"
-mysql_password = "123456"
 \ No newline at end of file
+mysql_password = "123456"
@@ -107,6 +107,7 @@ actionCodes = {
 	Hero_itemComposeRpc = 225,
 	Hero_setWishPoolRpc = 226,
 	Hero_changeSparkRpc = 227,
+	Hero_saveGeniusTreeRpc = 228,
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -143,7 +143,8 @@ function _M.signRpc(agent, data)
 	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})
+			--redisproxy:insertEmail({roleId = role:getProperty("id"), emailId = emailId})
+			role:sendMail(emailId)
 		end
 	end
@@ -312,6 +313,7 @@ function _M.actBattleCommandTaskRpc(agent, data)
 		activity_type = role.activity.ActivityType.BattleCommandTask, -- 活动类型，见活动类型枚举表
 		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
+	role:mylog("act_action", {desc="bcTask", int1=taskId, int2=taskCfg.resetType})
 	role:checkTaskEnter("FinishSpeTask", {taskId = taskId, actId = actId})
@@ -1327,6 +1329,7 @@ function _M.buyBattleCommandLvlRpc(agent, data)
 	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "actBuyBpLevel", int1 = curLvl}})
 	actData["lvl"] = nextLvl
 	role.activity:updateActData("BattleCommand", actData)
+	role:mylog("act_action", {desc="buyBcLvl", int1=count, int2=nextLvl})
 	SendPacket(actionCodes.Activity_buyBattleCommandLvlRpc, MsgPack.pack({}))
 	return true
@@ -183,6 +183,7 @@ function _M.startAdvRpc( agent, data )
 		cost = relayData.supply
 	end
 	role:checkTaskEnter("AdvCostPower", {count = cost})
+	role:mylog("adv_action", {desc = "costPower", int1 = cost})
 	local support = {}  -- 支援效果
 	if AdvCommon.isEndless(chapterId) then
@@ -293,6 +294,8 @@ function _M.startHangRpc(agent, data)
 	if not role:checkAdvCount(adv_idle_energy) then return 7 end -- 是否有体力
 	role:checkTaskEnter("AdvCostPower", {count = adv_idle_energy})
+	role:checkTaskEnter("AdvHangTime", {count = math.ceil(adv_idle_time / 3600)})
+	role:mylog("adv_action", {desc = "costPower", int1 = adv_idle_energy})
 	if not checkFormat(role, format, role:getAdvData():isRunning()) then return 8 end --编队是否正确
@@ -494,7 +497,6 @@ function _M.endHangRpc(agent, data)
 	role:checkTaskEnter("AdvHang", {})
 	role:checkTaskEnter("AdvHangHeroCnt", {count = heroCnt})
-	role:checkTaskEnter("AdvHangTime", {count = math.ceil(adv_idle_time / 3600)})
 	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull, heroFaith = heroFaithMap}))
 	return true
@@ -182,13 +182,17 @@ function _M.getSellRewardRpc( agent, data )
 	local sells = json.decode(role.dinerData:getProperty("sells"))
 	local deltaTimes = {}
-	for slot, _ in pairs(sells) do
+	for slot, sell in pairs(sells) do
+		local oldCount = sell.count
+		local sellDish = sell.dish
 		local temp = role.dinerData:updateSell(slot) or {
 			deltaCount = 0,
 			deltaTime = 0,
 			lastCount = 0,
 		}
 		deltaTimes[slot] = temp.deltaTime
+		local sellCount = oldCount - temp.lastCount
+		role:mylog("diner_action", {desc = "sell", int1 = sellDish, int2 = sellCount})
 	end
 	sells = json.decode(role.dinerData:getProperty("sells"))
 	for slot, sell in pairs(sells) do
@@ -238,7 +242,7 @@ function _M.getSellRewardRpc( agent, data )
 		role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
 	end
-	role:mylog("diner_action", {desc = "sell"})
+	--role:mylog("diner_action", {desc = "sell"})
 	SendPacket(actionCodes.Diner_getSellRewardRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -327,7 +331,7 @@ function _M.expediteSellRpc( agent, data )
 	end
 	role:checkTaskEnter("FoodSellQuick")
-	role:mylog("diner_action", {desc = "sellQ"})
+	role:mylog("diner_action", {desc = "sellQ", int1 = count + 1})
 	SendPacket(actionCodes.Diner_expediteSellRpc, MsgPack.pack({reward = reward, change = change, popular = popular}))
 	return true
@@ -703,37 +707,47 @@ function _M.addWantFoodRpc(agent , data)
 	if #ids > buildingData.business then return 2 end
 	local had = {}
-	for _, itemId in ipairs(ids) do
-		if had[itemId] then return end
-		had[itemId] = 1
-		local foodData = csvdb["diner_materialCsv"][itemId]
-		if not foodData then return 3 end
-		if foodData.unlock ~= 0 then
-			-- 遍历adv_potion 
-			for potionId, _ in pairs(csvdb["adv_potionCsv"]) do
-				local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 0)
-				if potionLv < 1 then return 4 end
-
-				local potionSet = csvdb["adv_potionCsv"][potionId]
-				if not potionSet then return 5 end
-
-				local potionData = potionSet[potionLv]
-				if not potionData then return 6 end
-
-				local cost = potionData.material:toNumMap()
-				if not cost[itemId] then return 7 end
+	-- 遍历adv_potion 
+	for potionId, potionData in pairs(csvdb["adv_potionCsv"]) do
+		local potionLv = role:getPotionLevel(potionId)
+		if potionLv > 0 then 
+			local cfg = potionData[potionLv]
+			if cfg then
+				local cost = cfg.material:toNumMap()
+				for id, _ in pairs(cost) do
+					local itemData = csvdb["itemCsv"][id]
+					local mData = csvdb["diner_materialCsv"][id]
+					if itemData.type == ItemType.Cuisine and not had[id] then
+						had[id] = true
+					end
+				end
 			end
-			if not role:checkHangPass(foodData.unlock) then
-				return 4
+		end
+	end
+	-- 遍历dish
+	for id, lv in pairs(role.dinerData:getProperty("dishTree"):toNumMap()) do
+		if csvdb["diner_dishCsv"][id] and csvdb["diner_dishCsv"][id][lv] then
+			local data = csvdb["diner_dishCsv"][id][lv]
+			local costs = data.material:toNumMap()
+			for id, _ in pairs(costs) do
+				local itemData = csvdb["itemCsv"][id]
+				local mData = csvdb["diner_materialCsv"][id]
+				if itemData.type == ItemType.Cuisine and not had[id] then
+					had[id] = true
+				end
 			end
 		end
 	end
+	for _, itemId in ipairs(ids) do
+		if not had[itemId] then return 3 end 
+	end
+	
 	local gfood = {}
 	for slot, itemId in ipairs(ids) do
 		gfood[slot] = {id = itemId, st = skynet.timex()}
 	end
-	role:finishGuide(36)
+	role:finishGuide(30)
 	role:mylog("diner_action", {desc = "wantFood"})
 	role.dinerData:updateProperty({field = "gfood", value = gfood})
@@ -133,6 +133,7 @@ function _M.drawAttachRpc(agent, data)
 	local email = require("models.Email").new({key = string.format("%d", id), id = id})
+	email.owner = role
 	if not email:load() then return end
 	local attachments = getEmailAttachments(email)
@@ -142,7 +143,7 @@ function _M.drawAttachRpc(agent, data)
 	email:setProperty("status", 2, true)
 	email:log(role, 2)
 	SendPacket(actionCodes.Email_drawAttachRpc, MsgPack.pack({reward = reward, change = change}))
-	role:mylog("mail_action", {desc = "draw_attach", int1 = id, key1 = email:getProperty("title"), key2 = attachments})
+	role:mylog("mail_action", {desc = "draw_attach", int1 = email:getProperty("emailId"), key1 = email:getProperty("title"), key2 = attachments})
 	return true
 end
@@ -118,7 +118,6 @@ function _M.applyRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local objectId = msg.roleId
-	dump(msg)
 	if objectId == roleId then
 		return
@@ -130,7 +129,6 @@ function _M.applyRpc(agent, data)
 		red:sismember(FRIEND_BLACK_KEY:format(objectId), roleId)
 		red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
 	end)
-	dump(redret)
 	-- 玩家id不存在
 	if not result and not roleExists(objectId) then
@@ -171,7 +169,7 @@ function _M.applyRpc(agent, data)
 		myInfo.online = true
 		myInfo.hadApply = true
-		role:mylog("role_action", {desc = "addFriend", int1 = 1})
+		role:mylog("role_action", {desc = "applyFriend", int1 = 1})
 		rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newApply = 1, info = {myInfo}})) 	-- 通知对方
 	end
@@ -420,6 +418,7 @@ function _M.deleteRpc(agent, data)
 		friend_roleid = objectId, -- 好友账户下的角色id
 		friend_cnt = 0, -- 操作后好友数量
 	})
+	role:mylog("role_action", {desc = "delFriend", int1 = 1})
 	SendPacket(actionCodes.Friend_deleteRpc, MsgPack.pack(""))
 	return true
 end
@@ -646,18 +645,19 @@ function _M.randomRpc(agent, data)
 	for idx, objId in ipairs(needRoleIds) do
 		if not redret[idx] then
 			local online, info = getRoleInfo(objId)
-			table.insert(randomRoles, table_merge({
-				roleId = objId, 
-				online = online,  
-				hadApply = hadApply,
-				inBlack = inBlack,
-			}, info, {
-
-			}))
-			if #randomRoles >= globalCsv.friendRecommendLimit then break end
+			if next(info) then
+				table.insert(randomRoles, table_merge({
+					roleId = objId, 
+					online = online,  
+					hadApply = hadApply,
+					inBlack = inBlack,
+				}, info, {
+
+				}))
+				if #randomRoles >= globalCsv.friendRecommendLimit then break end
+			end
 		end
 	end
-
 	SendPacket(actionCodes.Friend_randomRpc, MsgPack.pack({list = randomRoles}))
 	return true
 end
@@ -301,9 +301,13 @@ function _M.get(role, pms)
 			end
 		end
 	elseif pms.pm1 == "HERO" then
-		for itemId = 400 , 700 do
+		local unitCsv = csvdb["unitCsv"]
+		for itemId = 400 , 800 do
 			if csvdb["itemCsv"][itemId] then
-				role:award({[itemId] = 1}, {log = {desc = "gm"}})
+				local heroUnit = unitCsv[itemId - 300]
+				if heroUnit.open == 1 then
+					role:award({[itemId] = 1}, {log = {desc = "gm"}})
+				end
 			end
 		end
 	elseif pms.pm1 == "MAXHERO" then
@@ -984,5 +988,43 @@ function _M.drawHero(role, t, act)
 	return result
 end
+table.insert(helpDes, {"宝藏图鉴", "treasure", "list"} )
+function _M.treasure(role, pms)
+	local pm1  = pms.pm1
+	if pm1 == "LIST" then
+		local treasureList= role.dailyData:getProperty("treasureList")
+		dump(treasureList)
+		return "宝藏图鉴"
+	elseif pm1 == "FLUSH" then
+		local treasureList= role.dailyData:getTreasrueList(role)
+		dump(treasureList)
+		return "宝藏图鉴"	
+	elseif pm1 == "CHECK" then
+		local treasureList = role.dailyData:checkTreasureList(role)
+		if treasureList == nil then
+			return "未挖到宝藏"
+		end
+		dump(treasureList)
+		return "挖宝成功"
+	elseif pm1 == "RESET" then
+		role.dailyData:resetTreasureList()
+		return "重置宝藏图鉴"
+	else
+		return "暂无指令: ".. pm1
+	end
+end
+
+table.insert(helpDes, {"天赋点设置", "savegenius", "heroId", "wakeL", "awake"})
+function _M.savegenius(role, pms)
+	local heroId = pms.pm1
+	local wakeL = pms.pm2
+	local awake = pms.pm3
+	local hero = role.heros[tonumber(heroId)]
+
+	if not hero then return "英雄不存在" end
+	local genius = hero:saveGeniusTree(wakeL, awake)
+	print(genius)
+	return "天赋点设置成功"
+end
 return _M
 \ No newline at end of file
@@ -16,7 +16,18 @@ local table_unpack = table.unpack
 local _M = {}
-local function checkReward(role)
+local function getHangTime(role)
+	local hangInfo = role:getProperty("hangInfo")
+	if not hangInfo.carbonId or not hangInfo.coinTime or not hangInfo.itemTime then
+		return 0
+	end
+	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
+	local nowCoinTime = math.min(skynet.timex(), hangInfo.endCoinTime or 0)
+
+	return nowCoinTime - hangInfo.coinTime
+end
+
+local function checkReward(role, isTreasure, carbonId)
 	local hangInfo = role:getProperty("hangInfo")
 	if not hangInfo.carbonId or not hangInfo.coinTime or not hangInfo.itemTime then
 		return false
@@ -45,7 +56,7 @@ local function checkReward(role)
 	coinCount = (coinCount + coinDoubleCount) * expCoef
 	items[ItemId.Gold] = math.floor((items[ItemId.Gold] or 0) + coinCount * (expCarbonData.money or 0))
 	items[ItemId.Exp] = math.floor((items[ItemId.Exp] or 0) + coinCount * (expCarbonData.exp or 0))
-	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + (coinCount * expCarbonData.playerExp or 0))
+	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + coinCount * (expCarbonData.playerExp or 0))
 	local pool = {}
 	for _, temp in pairs(carbonData.item:toArray()) do
@@ -114,6 +125,19 @@ local function checkReward(role)
 		randomItem()
 	end
+	--挂机得到的宝藏加入到挂机奖励
+	if isTreasure or false == true then
+		local treasureList= role.dailyData:checkTreasureList(hangInfo.carbonId) or {}
+		if next(treasureList) ~= nil then
+			for id, val in pairs(treasureList) do
+				local award  = val.award:toNumMap()
+				for k,v in pairs(award) do
+					items[k] = (award[k] or 0) + v
+				end
+			end
+		end
+	end
+
 	if coinCount > 0 or itemCount > 0 then
 		return true
 	end
@@ -147,7 +171,7 @@ function _M.startRpc( agent, data )
 		end
 	end
-	if checkReward(role) then
+	if checkReward(role, true, carbonId) then
 		role:updateProperty({field = "hangBag", value = role:getProperty("hangBag")})
 	end
@@ -214,6 +238,7 @@ function _M.startBattleRpc(agent, data)
 	end
 	_BattleKey = tostring(math.random())
+	role._StartBattleTs = skynet.timex()
 	role:checkTaskEnter("HangBattle", {id = carbonId})
 	SendPacket(actionCodes.Hang_startBattleRpc, MsgPack.pack({key = _BattleKey}))
@@ -241,7 +266,7 @@ function _M.endBattleRpc(agent, data)
 	--	end
 	--end
-	if role:checkHangPass(carbonId) then 
+	if role:checkHangPass(carbonId) then
 		return 4
 	end
@@ -313,6 +338,12 @@ function _M.endBattleRpc(agent, data)
 		--	hangInfo.bossTime = skynet.timex() + cfg.idle_time
 		--end
 	end
+
+	--刷新宝藏图鉴
+	if isWin and globalCsv.idle_treasure_point and globalCsv.idle_treasure_point == carbonId then
+		role.dailyData:getTreasrueList()
+	end
+
 	role:updateProperty({field = "hangInfo", value = hangInfo})
 	role:checkBattle("hang", {
@@ -323,7 +354,9 @@ function _M.endBattleRpc(agent, data)
 	})
 	local team = role:getProperty("pvpTC")
-	role:mylog("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), cint1 = role:getHerosCamp(team.heros)})
+
+	local battleTime = skynet.timex() - role._StartBattleTs
+	role:mylog("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), cint1 = role:getHerosCamp(team.heros), cint2 = battleTime})
 	SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({
 		starNum = msg.starNum, 
@@ -394,7 +427,8 @@ end
 function _M.getRewardRpc(agent , data)
 	local role = agent.role
-	checkReward(role)
+	local hangTime = getHangTime(role)
+	checkReward(role, true)
 	local items = role:getProperty("hangBag")
 	if not next(items) then return end
 	local reward, change = role:award(items, {log = {desc = "hangReward"}})
@@ -424,6 +458,7 @@ function _M.getRewardRpc(agent , data)
 		residence_reward = reward, --获得奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 	})
+	role:mylog("hang_action", {desc = "hangReward", int1 = hangInfo.carbonId, int2=hangTime})
 	SendPacket(actionCodes.Hang_getRewardRpc, MsgPack.pack({
 		reward = reward,
@@ -493,6 +528,8 @@ function _M.quickRpc(agent , data)
 		residence_time = time, --挂机或排名时长
 		residence_reward = reward, --获得奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 	})
+	role:mylog("hang_action", {desc = "quick", int1 = hangInfo.carbonId, short1 = curCount})
+
 	SendPacket(actionCodes.Hang_quickRpc, MsgPack.pack({
 		reward = reward,
 		change = change
@@ -151,6 +151,10 @@ function _M.wakeRpc(agent, data)
 	if curLevel == 3 then -- 解锁cg
 		role:checkTaskEnter("WakeCG", {heroType = typ})
 	end
+
+	if curLevel >= 4 then --自动觉醒技能
+		hero:increGeniusTree()
+	end
 	hero:mylog({desc = "wake", int1 = hero:getProperty("wakeL")})
 	role:log("hero_rise", {
@@ -728,7 +732,7 @@ function _M.getResetRewardRpc(agent, data)
 		equip = "",
 		rune = "",
 	})
-	hero:mylog({desc = "resetHero"})
+	hero:mylog({desc = "resetHero", int1=tmpLevel})
 	--local coef = globalCsv.unit_back_discount
 	--coef = (pay or tmpLevel <= 60) and  1 or coef
@@ -805,6 +809,7 @@ function _M.drawHeroRpc(agent, data)
 	-- 计算抽卡消耗品
 	local cost = {}
+	local drawAddReward = {}
 	if buildTypeData["draw_coin_1"] == "" then
 		return 11
 	end
@@ -991,19 +996,29 @@ function _M.drawHeroRpc(agent, data)
 			local fragId = itemData.id - ItemStartId.Hero
 			local heroData = csvdb["unitCsv"][fragId]
 			local count = globalCsv.draw_unit_tofragment[heroData.rare]
-			role:award({[fragId] = count}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+			role:award({[fragId] = count}, {log = {desc = "drawHero", int1 = btype, int2 = poolId, short1=isFloorBack and 1 or 0}})
 			logReward[fragId] = (logReward[fragId] or 0) + count
 			table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
 		else
-			role:award({[itemId] = 1}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+			role:award({[itemId] = 1}, {log = {desc = "drawHero", int1 = btype, int2 = poolId, short1=isFloorBack and 1 or 0}})
 			logReward[itemId] = (logReward[itemId] or 0) + 1
 			table.insert(reward, {id = itemId, count = 1})
 		end
+		-- 招募得到的英雄追加奖励
+		local unitData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
+		if unitData.build_award ~= "" then
+			for tId, tCount in pairs(unitData.build_award:toNumMap()) do
+				drawAddReward[tId] = (drawAddReward[tId] or 0) + tCount
+			end
+		end
+		--
+
 		dailyDrawCnt = dailyDrawCnt + 1
 		role:checkTaskEnter("DrawHeroLimitPack", {count = dailyDrawCnt})
 	end
+	role:award(drawAddReward, {log = {desc = "drawHero", int1 = btype}})
 	role.dailyData:setProperty("drawHeroCnt", dailyDrawCnt)
 	if draw_floor_back_counts then
@@ -1035,7 +1050,9 @@ function _M.drawHeroRpc(agent, data)
 		gacha_cost = cost, -- 购买道具消耗的货币
 		gacha_cnt = floorHeroCount,
 	})
-	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
+
+	role:mylog("hero_action", {desc = "drawHero", int1=poolId, int2=btype, short1 = drawCount[drawType]})
+	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward, subReward = drawAddReward})) -- 这个 reward 是数组
 	local feedbackId = buildTypeData["can_feedback"] or 0
 	if feedbackId ~= 0 then
@@ -1275,4 +1292,26 @@ function _M.changeSparkRpc(agent, data)
 	return true
 end
+function _M.saveGeniusTreeRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local awake = msg.awake
+	local wakeL = msg.wakeL
+	local heroId = msg.hero_id
+	local hero = role.heros[tonumber(heroId)]
+
+	if not hero then  print("hero is nil") return 0 end
+
+	if wakeL > hero:getProperty("wakeL") then return 1 end
+
+	local genius = hero:saveGeniusTree(wakeL, awake)
+	if #genius == 0 then
+		genius = ""
+	end
+	hero:updateProperty({field="genius", value=genius})
+	SendPacket(actionCodes.Hero_saveGeniusTreeRpc, MsgPack.pack({genius = genius}))
+	return true
+end
+
 return _M
@@ -199,7 +199,8 @@ function _M.finishQuestRpc(agent, data)
 		mission_result = 1, -- 战斗结果(0-无效，1-胜利，2-失败)
         mission_roundtime = config.time, -- 完成耗时（秒）
         mission_cleartype = 2,  -- 1-开始; 2-完成(领取奖励时）
-	})
+    })
+    role:mylog("role_action", {desc = "radioTask", int1 = id, short1 = bigSuccess and 1 or 0})
 	return true
 end
@@ -399,7 +399,8 @@ function _M.createRpc(agent, data)
 	newRole:award(globalCsv.birthItem, {log = {desc = "birth"}, notNotify = true})
 	-- 欢迎邮件
-	mysqlproxy:insertEmail({roleId = roleId, emailId = 1})
+	--mysqlproxy:insertEmail({roleId = roleId, emailId = 1})
+	newRole:sendMail(1)
 	if msg.newuser then
 		newRole:log("onCreateAccount")
@@ -904,8 +905,10 @@ function _M.taskRpc(agent, data)
 	-- 日常活动完成
 	if taskType == 1 then
 		role:checkTaskEnter("DailyTask", {pre = (taskStatus["a"] or 0), cur = active})
+		role:mylog("role_action", {desc="dayTask", int1=taskId, int2=active})
 	else
 		role:checkTaskEnter("WeekTask", {pre = (taskStatus["a"] or 0), cur = active})
+		role:mylog("role_action", {desc="weekTask", int1=taskId, int2=active})
 	end
 	role:changeUpdates({
@@ -1000,6 +1003,8 @@ function _M.achiveRpc(agent, data)
 						achievement_type = cfg.type, -- 成就类型，具体枚举表中成就类型枚举表
 						achievement_reward = award, -- 达成成就奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 					})
+
+					role:mylog("role_action", {desc="finishAchieve", int1=cfg.id})
 				end
 			end
 		end
@@ -1034,6 +1039,7 @@ function _M.achiveRpc(agent, data)
 			achievement_type = achiveTask.type, -- 成就类型，具体枚举表中成就类型枚举表
 			achievement_reward = reward, -- 达成成就奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 		})
+		role:mylog("role_action", {desc="finishAchieve", int1=taskId})
 		SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack(role:packReward(reward, change)))
 	end
@@ -1057,6 +1063,7 @@ function _M.achiveRpc(agent, data)
 				if preMaxCount < pData.request and overCount >= pData.request then
 					role:sendMail(101, skynet.timex(), pData.reward, {pData.level})
 					flag = true
+					role:mylog("role_action", {desc="fux", int1=pdata.level})
 				end
 			end
 			if flag then
@@ -1381,7 +1388,7 @@ function _M.goldBuyRpc(agent, data)
 	if not costD then
 		return 1
 	end
-	if costD ~= 0 and not role:checkItemEnough({[ItemId.Diamond] = costD}) then
+	if costD ~= 0 and not role:checkItemEnough({[ItemId.Jade] = costD}) then
 		return 2
 	end
 	local goldC = 0
@@ -1403,7 +1410,7 @@ function _M.goldBuyRpc(agent, data)
 	local coef = role.storeData:getGearExchangeCoef()
 	goldC = goldC * coef
 	role.dailyData:updateProperty({field = "goldBuyT", value = curT + 1})
-	role:costItems({[ItemId.Diamond] = costD}, {log = {desc = "goldBuy"}})
+	role:costItems({[ItemId.Jade] = costD}, {log = {desc = "goldBuy"}})
 	local reward, change = role:award({[ItemId.Gold] = math.floor(goldC)}, {log = {desc = "goldBuy"}})
 	SendPacket(actionCodes.Role_goldBuyRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -1424,7 +1431,7 @@ function _M.diamondConvertRpc(agent, data)
 	role:costDiamond({count = cost, log = {desc = "convert", int1 = oper, int2 = get}})
 	local reward, change
 	if oper == 1 then -- 钻石兑换成虹光玉
-		reward, change = role:award({[ItemId.Jade] = get}, {log = {desc = "convert"}})
+		reward, change = role:award({[ItemId.Jade] = get}, {log = {desc = "convert", short1=oper}})
 	elseif oper == 2 then -- 钻石兑换成虹光玉再兑换成招募券
 		local old = role:getItemCount(ItemId.Jade)
 		get = old + get
@@ -1437,7 +1444,7 @@ function _M.diamondConvertRpc(agent, data)
 			allReward[ItemId.Jade] = remain - old
 		elseif remain == old then
 		else
-			role:costItems({[ItemId.Jade] = old - remain}, {log = {desc = "convert"}})
+			role:costItems({[ItemId.Jade] = old - remain}, {log = {desc = "convert", short1=oper}})
 		end
 		if quan > 0 then
@@ -59,6 +59,12 @@ function _M.donateRpc(agent, data)
 		redisproxy:hincrby(SEAPORT_TRADE_TASK_2,id,itemCount)
 	end
+	local seaport = role:getProperty("seaport") or {}
+	if not seaport.join then
+		seaport.join = 1
+		role:updateProperty({field = "seaport", value = seaport})
+	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}})
@@ -237,6 +243,8 @@ function _M.taskRpc(agent, data)
 	    reward, change = role:award(itemReward, {log = {desc = "seaportTask", int1 = taskId, int2 = level}})
 		seaport.collect[taskId] = nil
+
+		role:mylog("role_action", {desc="seaportTask", int1=taskId, int2=level, short1=bigSuccess and 1 or 0})
 	else
 		return 0
 	end
@@ -268,7 +268,7 @@ function _M.shopBuyRpc(agent , data)
 	local id = msg.id
 	local count = msg.count or 1
-	local dataSet = csvdb["shop_normalCsv"][id]
+    local dataSet = csvdb["shop_normalCsv"][id]
 	if not dataSet then return end
 	if dataSet.unlock ~= "" then
@@ -278,6 +278,13 @@ function _M.shopBuyRpc(agent , data)
 		end
 	end
+	--判断是否是活动商品
+	if dataSet.activity_id and dataSet.activity_id ~= 0 then
+		local actCfg = csvdb["activity_ctrlCsv"][dataSet.activity_id]
+		if not actCfg then return 2 end
+		if not role.activity:isOpenById(dataSet.activity_id, "ActShopGoods") then return 3 end
+	end
+
 	local buyRecord = role.storeData:getProperty("buyR")
 	if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (buyRecord[id] or 0))) then 
 		skynet.error(string.format("shop buy over limit, user_id:%d, goods_id:%d", role:getProperty("id"), id))
@@ -299,19 +306,19 @@ function _M.shopBuyRpc(agent , data)
 		desc = "pvpShop"
 	end
-	if not role:checkItemEnough(cost) then return end
+	if not role:checkItemEnough(cost) then return 4 end
 	if dataSet.limit ~= 0 then
 		buyRecord[id] = (buyRecord[id] or 0) + count
 		role.storeData:updateProperty({field = "buyR", value = buyRecord})
 	end
-	role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count}})
+	role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, short1 = dataSet.shop}})
 	local gift = {}
 	for _id, _count in pairs(dataSet.gift:toNumMap()) do
 		gift[_id] = _count * count
 	end
-	local reward = role:award(gift, {log = {desc = desc, int1 = id, int2 = count}})
+	local reward = role:award(gift, {log = {desc = desc, int1 = id, int2 = count, short1=dataSet.shop}})
 	if dataSet.shop == 1 then
 		role:checkTaskEnter("ShopAll", {count = count})
@@ -922,7 +922,7 @@ function Adv:over(success, rewardRatio, overType)
 	end
 	self:clearAdvUnlockCache()
-	self:mylog({desc = "over", short1 = success and 1 or 0, int1 = overType})
+	self:mylog({desc = "over", short1 = success and 1 or 0, int1 = overType, int2 = self.chapterId, long1 = self.level})
 	local team = self.owner:getProperty("advTeam")
@@ -2,6 +2,8 @@
 local Daily = class("Daily", require("shared.ModelBaseMysql"))
+oneDay = 60*60*24
+
 function Daily:ctor(properties)
 	Daily.super.ctor(self, properties)
 end
@@ -30,6 +32,8 @@ Daily.schema = {
 	unlockPool		= {"table", {}},		-- 解锁的属性卡池
 	curPool 		= {"number", 0},		-- 属性卡池当前索引
 	drawHeroCnt		= {"number", 0},		-- 每日抽卡次数
+
+	treasureList 	= {"table", {}}, 		--挂机图鉴
 }
 function Daily:updateProperty(params)
@@ -60,6 +64,8 @@ function Daily:refreshDailyData(notify)
 			if self:getProperty(field) > 0 then
 				dataMap[field] = 0
 			end
+		elseif field == "treasureList" then
+			dataMap[field] = self:getTreasrueList()
 		elseif field ~= "key" then
 			local typ, def = table.unpack(schema)
 			dataMap[field] = def
@@ -85,6 +91,279 @@ function Daily:refreshDailyData(notify)
 	end
 end
+--解锁
+function Daily:checkUnlock(treaval)
+	local role = self.owner
+	local treasureC = treaval.unlock:toArray(true, "=")
+	local show = false
+	if treasureC[1] == 1 then --通关关卡
+		if  self.owner:checkHangPass(treasureC[2]) then show = true end
+	elseif treasureC[1] == 2 then --通关拾荒章节=x层
+		local chapterId = treasureC[2]
+		local layer = 1
+		local advCsv = csvdb["adv_chapterCsv"][chapterId]
+		if not advCsv then return false end --不存在的章节
+		if math.floor(chapterId / 100) ~= 2 then
+			layer = math.min(layer, advCsv.limitlevel)
+		end
+		local advPass = role:getProperty("advPass")
+		if (advPass[chapterId] or 0) < layer then
+			show = false
+		else
+			show = true
+		end
+	elseif treasureC[1] == 3 then --拥有指定id的角色时
+		local hero = role:getHeroByID(treasureC[2])
+		if hero then show = true end
+	else
+		show = true
+    end
+	return show
+end
+
+--CD
+function Daily:checkTreasureExpired(treasureAttr, treasureList)
+	local curInfo = treasureList[treasureAttr.id]
+	if curInfo then
+		-- check finish
+		if curInfo["expire_time"] then
+			if curInfo.cool_time > 1 then
+				if skynet.timex() >= curInfo["expire_time"] then
+					treasureList[treasureAttr.id] = nil
+					curInfo = clone(treasureAttr)
+				elseif skynet.timex() >= curInfo["expire_time"] -  curInfo.cool_time * oneDay then --未冷却
+					curInfo = nil
+				else
+					curInfo = clone(treasureAttr)
+				end
+			else
+				if skynet.timex() >= curInfo["expire_time"] then
+					treasureList[treasureAttr.id] = nil
+				end
+				curInfo = clone(treasureAttr)
+			end
+		else
+			curInfo = clone(treasureAttr)
+		end
+	else
+		curInfo = clone(treasureAttr)
+	end
+
+	return curInfo
+end
+
+--资源
+function Daily:checkTreasureBase(treasureList, treasureBase, removeId)
+	local tmptreasure = {}
+	local num = 0
+	for k, val in pairs(treasureList) do
+		if removeId and val.id == removeId then
+			treasureList[k] = nil
+		else
+			if treasureBase >= val.treasure_value then
+				treasureBase = treasureBase - val.treasure_value
+				tmptreasure[val.id] = val
+				num = num + 1
+			end
+		end
+
+	end
+	return tmptreasure, num
+end
+
+--绑定通关关卡
+function Daily:checkChapters()
+	local  chapters = {}
+	local tmp_chapters = {}
+	local treasureList = self:getProperty("treasureList")
+	if next(treasureList) ~= nil then
+		for id, curInfo in pairs(treasureList) do
+			if curInfo["end_time"] then
+				if skynet.timex() < curInfo["end_time"] then
+					tmp_chapters[curInfo.chapter_id] = curInfo
+				end
+			end
+		end
+	end
+
+	for chapter_id, val in pairs(csvdb["idle_battleCsv"]) do
+		if self.owner:checkHangPass(chapter_id) then
+			if next(tmp_chapters) == nil then
+				chapters[chapter_id] = val
+			else
+				if not tmp_chapters[chapter_id] then
+					chapters[chapter_id] = val
+				end
+			end
+		end
+	end
+	return chapters
+end
+
+--权重
+function Daily:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
+	local removeId
+	local chapters = self:checkChapters()
+	local treasure
+	if next(chapters) == nil then return end
+
+	while next(tmptreasure) do
+		local tmp, num = self:checkTreasureBase(tmptreasure, treasureBase, removeId)
+
+		if num == 0 then
+			break
+		elseif num == 1 then
+			for _, val in pairs(tmp) do
+				treasure = val
+			end
+		else
+			local id = math.randWeight(tmp, "weight") --宝藏id
+			if not id then
+				break
+			end
+			treasure = tmp[id]
+		end
+	
+		if treasureBase >= treasure.treasure_value  then
+			--扣除资源值
+			treasureBase =  treasureBase - treasure.treasure_value
+		else
+			break
+		end
+		local chapterId = math.randWeight(chapters, "treasure_weight") --关卡id
+		if not chapterId then
+			break
+		end
+
+		treasure.chapter_id = chapterId
+		treasureList[treasure.id] = treasure
+		removeId = treasure.id
+	end
+end
+
+--chapterId
+function Daily:checkTreasureChapterId(curInfo, treasureList, chapterId)
+	local treasure = nil
+
+	if not curInfo then
+		print("curInfo is nil")
+		return treasure
+	end
+
+	--开始挖宝关卡ID=挂机关卡ID
+	if chapterId == curInfo.chapter_id then
+		--开始挖宝
+		if not curInfo["end_time"] then
+			curInfo["end_time"] = skynet.timex() + curInfo.working_time
+		else
+			if skynet.timex() >= curInfo["end_time"] then
+				if curInfo.cool_time > 1 then
+					--宝藏冷却时间
+					if not curInfo["expire_time"] then
+						treasure = treasureList[curInfo.id]
+						curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
+					else
+						--已经领取宝藏 检索宝藏冷却时间
+						if skynet.timex() >= curInfo["expire_time"] then
+							treasureList[curInfo.id] = nil
+						end
+					end
+				else
+					treasure = treasureList[curInfo.id]
+					treasureList[curInfo.id] = nil
+				end
+			end
+		end
+	else
+		--已经开始挖宝
+		if curInfo["end_time"] then
+			if skynet.timex() >= curInfo["end_time"] then
+				if curInfo.cool_time > 1 then
+					--宝藏冷却时间
+					if not curInfo["expire_time"] then
+						treasure = treasureList[curInfo.id]
+						curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
+					else
+						--已经领取宝藏 检索宝藏冷却时间
+						if skynet.timex() >= curInfo["expire_time"] then
+							treasureList[curInfo.id] = nil
+						end
+					end
+				else
+					treasure = treasureList[curInfo.id]
+					treasureList[curInfo.id] = nil
+				end
+			else
+				curInfo["end_time"]	= nil
+			end
+		end
+	end
+	return treasure
+end
+
+function Daily:buyTreasure(treasureList)
+	local boughtTreasurer = {}
+	local treasureBase = globalCsv.idle_treasure_base
+	for id, val in pairs(treasureList) do
+		treasureBase = treasureBase - val.treasure_value
+		if treasureBase < 0 then
+			treasureBase = treasureBase + val.treasure_value
+			return
+		else
+			boughtTreasurer[id] = val
+		end
+	end
+	--self:updateProperty({field = "treasureBase", value = treasureBase})
+	return boughtTreasurer
+end
+
+--重置宝藏图鉴
+function Daily:resetTreasureList()
+	self:updateProperty({field = "treasureList", value = {}})
+end
+
+--宝藏图鉴
+function Daily:getTreasrueList()
+	local tmpcsv = csvdb["idle_treasureCsv"]
+	local treasureList = self:getProperty("treasureList") or {} --挖宝列表 过期删除 领取奖励删除 跨天更新
+	local tmptreasure = {}
+	local treasureBase = globalCsv.idle_treasure_base
+	for id, val in pairs(tmpcsv) do
+		if self:checkUnlock(val) == true then
+			local treasure = self:checkTreasureExpired(val, treasureList)
+			if treasure then
+				table.insert(tmptreasure, treasure)
+			end
+		end
+	end
+	table.sort(tmptreasure, function (a,b) return a.treasure_value > b.treasure_value end)
+
+	self:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
+	self:updateProperty({field = "treasureList", value = treasureList})
+	return treasureList
+end
+
+
+--检索挖宝列表
+function Daily:checkTreasureList(chapterId)
+	local treasureList = self:getProperty("treasureList") or {}
+	local tmptreasure = {}
+	for id, val in pairs(treasureList) do
+		local treasure = self:checkTreasureChapterId(val, treasureList, chapterId)
+		if treasure ~= nil then
+			tmptreasure[id] = treasure
+		end
+	end
+
+	if next(tmptreasure) == nil then
+		self:updateProperty({field = "treasureList", value = treasureList})
+		return nil
+	end
+	local boughtTreasurer = self:buyTreasure(tmptreasure)
+	self:updateProperty({field = "treasureList", value = treasureList})
+	return boughtTreasurer
+end
+
 function Daily:data()
 	return {
 		hangQC = self:getProperty("hangQC"),
@@ -104,6 +383,7 @@ function Daily:data()
 		goldBuyT = self:getProperty("goldBuyT"),
 		unlockPool = self:getProperty("unlockPool"),
 		curPool = self:getProperty("curPool"),
+		treasureList = self:getProperty("treasureList"),
 	}
 end
@@ -18,6 +18,7 @@ Hero.schema = {
 	rune       = {"string",""},        --零件 type=id
 	faith	   = {"number", 0},			-- 信赖
 	spark		= {"table", {}},		-- 火花属性
+	genius	   = {"string", "" }, --天赋点 4=10201 5=10201 6=10203 7=10204
 }
 function Hero:ctor( properties )
@@ -111,6 +112,7 @@ function Hero:data()
 		rune = self:getProperty("rune"),
 		faith = self:getProperty("faith"),
 		spark = self:getProperty("spark"),
+		genius = self:getProperty("genius"),
 	}
 end
@@ -381,6 +381,90 @@ function HeroPlugin.bind(Hero)
 			end
 		end
 		self:setProperty("faith", faith)
+		self:mylog({desc = "addFaith", int1 = exp})
+	end
+
+	--检验天赋树是否合理
+	function Hero:checkGeniusTree(genius)
+		local maxWakeL = 0
+		local star = self:getProperty("wakeL")
+		if star < 4 then return maxWakeL end
+		if #genius == 0 then return maxWakeL end
+
+		local geniusTree = genius:toNumMap()
+		local tmpgenius = ""
+		for wakeL, val in pairs(geniusTree) do
+			if wakeL < 4 then return maxWakeL end
+			if wakeL % 2 == 0 then
+				if geniusTree[wakeL+1] and geniusTree[wakeL+1] ~= val then
+					return 0, 0, tmpgenius
+				end
+			end
+			maxWakeL = math.max(maxWakeL, wakeL)
+			if #tmpgenius == 0 then
+				tmpgenius = string.format("%s=%s", tostring(wakeL), tostring(val))
+			else
+				tmpgenius = string.format("%s %s=%s", tmpgenius, tostring(wakeL), tostring(val))
+			end
+		end
+		return tonumber(maxWakeL), tonumber(geniusTree[maxWakeL]), tmpgenius
+	end
+
+	function Hero:increGeniusTree()
+		local genius = self:getProperty("genius")
+		local wakeL = self:getProperty("wakeL")
+		local maxWakeL, awake
+		maxWakeL, awake, genius = self:checkGeniusTree(genius)
+		if maxWakeL >= 4 and wakeL > maxWakeL and maxWakeL % 2 == 0 then
+			maxWakeL = maxWakeL + 1
+			if #genius == 0 then
+				genius = string.format("%s=%s", tostring(maxWakeL), tostring(awake))
+			else
+				genius = string.format("%s %s=%s", genius, tostring(maxWakeL), tostring(awake))
+			end
+		end
+		return genius
+	end
+
+	function Hero:resetGeniusTree()
+		local unit_starTalent_reset = globalCsv["unit_starTalent_reset"]
+		local cost = unit_starTalent_reset:toNumMap()
+		if not self.owner:checkItemEnough(cost) then return false end
+
+		self.owner:costItems(cost, {log = {desc = "heroGenius", int1 = self:getProperty("id"), int2 = self:getProperty("type")}})
+		return true
+	end
+
+	function Hero:saveGeniusTree(wakeL, awake)
+		local genius = self:getProperty("genius")
+		local typ = self:getProperty("type")
+		local curWakeL = self:getProperty("wakeL")
+		if not wakeL or not awake then
+			if self:resetGeniusTree() == true then return "" end
+			return genius
+		end
+
+		local heroUnit = csvdb["unitCsv"][typ]
+		if not heroUnit then return genius end
+		if not heroUnit.awake_1 or not heroUnit.awake_2 then return genius end
+
+		if #genius == 0 then
+			genius = string.format("%s=%s", tostring(wakeL), tostring(awake))
+		else
+			genius = string.format("%s %s=%s", genius, tostring(wakeL), tostring(awake))
+		end
+
+		local maxWakeL
+		maxWakeL, _, genius = self:checkGeniusTree(genius)
+		if maxWakeL == 0 then
+			genius = self:getProperty("genius")
+		else
+			if curWakeL > wakeL and wakeL % 2 == 0 then --自动升一级，举例，6星设置4星觉醒技能。自动升级到5星
+				genius = string.format("%s %s=%s", genius, tostring(wakeL + 1), tostring(awake))
+				maxWakeL, _, genius = self:checkGeniusTree(genius)
+			end
+		end
+		return genius
 	end
 end
@@ -198,7 +198,7 @@ Role.schema = {
 	nbTask				= {"table", {}}, -- 新用户活动
 	radioTask			= {"table", {}}, -- 电台任务 {id = {time=end_ts,heros=heros}}	表crusadeCsv
-	seaport 			= {"table", {}}, -- 海岛贸易季 {time = 1234567890, donate = {}, collect = {[1] = {team = "1=2=3", time = 1234567890}}, shop = {}}
+	seaport 			= {"table", {}}, -- 海岛贸易季 {time = 1234567890, donate = {}, collect = {[1] = {team = "1=2=3", time = 1234567890}}, shop = {}, join = 1}
 	returner			= {"table", {}}, -- 回归者 {time = 12334233423, [1] = 1, [2] = 2, status = {[1] = 1}}
@@ -99,7 +99,8 @@ function Role:checkBattleCheat(battleType, params)
 			for arr, _ in pairs(checkCheatAttrs) do
 				temp[arr] = hero[arr]
 			end
-			selfTeamServer[hero.type] = temp
+            selfTeamServer[hero.type] = temp
+            self:log_battle_hero(hero.type, "hangTeam")
 		end
 		-- local carbonData = csvdb["idle_battleCsv"][params.id]
 		-- enemyServer = packBattleEnemyCommon(carbonData)
@@ -112,6 +113,7 @@ function Role:checkBattleCheat(battleType, params)
 				temp[arr] = hero[arr]
 			end
 			selfTeamServer[hero.type] = temp
+            self:log_battle_hero(hero.type, "towerTeam")
 		end
 		-- local carbonData = csvdb["tower_battleCsv"][params.id]
 		-- enemyServer = packBattleEnemyCommon(carbonData)
@@ -124,6 +126,7 @@ function Role:checkBattleCheat(battleType, params)
 				temp[arr] = hero[arr]
 			end
 			selfTeamServer[hero.type] = temp
+            self:log_battle_hero(hero.type, "bonusTeam")
 		end
 		-- local carbonData = csvdb["bonus_battleCsv"][params.id]
 		-- enemyServer = packBattleEnemyCommon(carbonData)
@@ -136,6 +139,7 @@ function Role:checkBattleCheat(battleType, params)
 				temp[arr] = hero[arr]
 			end
 			selfTeamServer[hero.type] = temp
+            self:log_battle_hero(hero.type, "workTeam")
 		end
 		-- local carbonData = csvdb["bonus_battleCsv"][params.id]
 		-- enemyServer = packBattleEnemyCommon(carbonData)
@@ -149,6 +153,7 @@ function Role:checkBattleCheat(battleType, params)
 				temp[arr] = hero[arr]
 			end
 			selfTeamServer[hero.type] = temp
+            self:log_battle_hero(hero.type, "pvpcTeam")
 		end
 	end
 	cheat["pvph"] = cheat["pvpc"]
@@ -136,6 +136,7 @@ local ItemReason = {
 	changeSpark = 1213,		-- 穿戴火花
 	sparkLvlUp = 1214,		-- 火花强化
 	sparkQualityUp = 1215,	-- 火花升华
+	heroGenius = 1216,  	-- 英雄天赋点
 	-- pvp 
 	pvpCHead = 1301, -- pvp 跨服竞技场头像
@@ -252,7 +252,8 @@ function RolePlugin.bind(Role)
 								local headData = csvdb["player_iconCsv"][itemId]
 								-- pvp 跨服竞技场奖励
 								if headData and headData.path == 2 then
-									mysqlproxy:insertEmail({roleId = self:getProperty("id"), emailId = 19})
+									--mysqlproxy:insertEmail({roleId = self:getProperty("id"), emailId = 19})
+									self:sendMail(19)
 								end
 							end
 						end
@@ -397,10 +398,11 @@ function RolePlugin.bind(Role)
 			return true, less
 		end
 		for itemId, count in pairs(itemCountT) do
-			if count <= 0 then
-				-- 判断物品数量值不应该小于等于0
-				less[itemId] = 0
-			else
+			--if count <= 0 then
+			--	-- 判断物品数量值不应该小于等于0
+			--	less[itemId] = 0
+            --else
+            if count > 0 then
 				local last = self:getItemCount(itemId) - count
 				if last < 0 then
 					less[itemId] = -last
@@ -636,6 +638,15 @@ function RolePlugin.bind(Role)
 		return count
 	end
+	function Role:getHeroByID(heroId)
+		for id, hero in pairs(self.heros) do
+			if id == heroId then
+				return hero
+			end
+		end
+		return nil
+	end
+
 	function Role:loadHeros()
 		local roleId = self:getProperty("id")
@@ -825,7 +836,7 @@ function RolePlugin.bind(Role)
 			newRune:create()
 			newRune:generateAttrs()
 			newRune.owner = self
-			self.runeBag[runeUid] = newRune
+			self.runeBag[roleId * MAX_RUNE_NUM + runeUid] = newRune
 			if not params.notNotify then
 				local response = {}
 				table.insert(response, newRune:data())
@@ -876,7 +887,7 @@ function RolePlugin.bind(Role)
 			newSpark:create()
 			newSpark:addAttr(data.attr:toNumMap())
 			newSpark.owner = self
-			self.sparkBag[sparkUid] = newSpark
+			self.sparkBag[roleId * MAX_SPARK_NUM + sparkUid] = newSpark
 			if not params.notNotify then
 				local response = {}
 				table.insert(response, newSpark:data())
@@ -1360,7 +1371,7 @@ function RolePlugin.bind(Role)
 		local function getReward(reset)
 			-- 全服捐赠奖励
 			local donate = seaport.donate or {}
-			if not reset and (not donate[1] or not donate[2]) then
+			if not reset and seaport.join and (not donate[1] or not donate[2]) then
 				local result = self:getSeaportServerProgress()
 				for idx, set in ipairs(csvdb["seaport_purchaseCsv"]) do
 					local done = true
@@ -1372,11 +1383,12 @@ function RolePlugin.bind(Role)
 					end
 					if done then
 						update = true
-						redisproxy:insertEmail({
-							roleId = self:getProperty("id"),
-							emailId = idx == 1 and 361 or 362,
-							attachments = set[1].phase_award,
-						})
+						--redisproxy:insertEmail({
+						--	roleId = self:getProperty("id"),
+						--	emailId = idx == 1 and 361 or 362,
+						--	attachments = set[1].phase_award,
+						--})
+						self:sendMail(idx == 1 and 361 or 362, nil, 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
@@ -1469,11 +1481,12 @@ function RolePlugin.bind(Role)
 						end
 						rewardStr = rewardStr .. string.format("%s=%s",itemId,value)
 					end
-					redisproxy:insertEmail({
-						roleId = self:getProperty("id"),
-						emailId = 363,
-						attachments = rewardStr,
-					})
+					--redisproxy:insertEmail({
+					--	roleId = self:getProperty("id"),
+					--	emailId = 363,
+					--	attachments = rewardStr,
+					--})
+					self:sendMail(363, nil, rewardStr)
 				end
 			end
 			seaport.collect = {}
@@ -1695,6 +1708,7 @@ function RolePlugin.bind(Role)
 		if level > advL[1] then
 			self:checkTaskEnter("AdvLevel", {level = level})
+			self:mylog("adv_action", {desc = "adv_level", int1 = level})
 		end
 		advL[1] = level
 		advL[2] = newExp
@@ -1763,6 +1777,7 @@ function RolePlugin.bind(Role)
 			info.type = hero:getProperty("type")
 			info.level = hero:getProperty("level")
 			info.wakeL = hero:getProperty("wakeL")
+			info.genius = hero:getProperty("genius")
 			info.blockLevel = hero:getSkillLevel(4)
 			info.specialLevel = hero:getSkillLevel(1)
 			info.passiveLevel = hero:getSkillLevel(3)
@@ -1786,6 +1801,7 @@ function RolePlugin.bind(Role)
 				type = hero:getProperty("type"),
 				level = hero:getProperty("level"),
 				wakeL = hero:getProperty("wakeL"),
+				genius = hero:getProperty("genius"),
 			}
 		end
 		format.heros = heros
@@ -2341,6 +2357,8 @@ function RolePlugin.bind(Role)
 			gift = gift .. k.."="..v.." "
 		end
 		mysqlproxy:insertEmail({roleId = self:getProperty("id"), emailId = mailId, createtime = createTime, attachments = gift, contentPms = contentPms})
+
+		self:mylog("role_action", {desc="sendMail", int1 = mailId})
 		self.sendMailFlag = true
 	end
@@ -2757,6 +2775,37 @@ function RolePlugin.bind(Role)
 		return towerBnous[SystemBnousType.SweepReward] or {}
 	end
+	function Role:getPotionLevel(id)
+		local level = self.dinerData:getProperty("dishTree"):getv(id, 1)
+		local talentSet = csvdb["diner_talentCsv"][id]
+		if not talentSet then return 0 end
+		local talentData = talentSet[level]
+		if not talentData then return 0 end
+	
+		if talentData.pointFront == "" then
+			if talentData.levelFront ~= "" and not self:checkHangPass(tonumber(talentData.levelFront)) then
+				if level == 0 then return 0 end
+			end
+			return level
+		end
+	
+		if talentData.levelFront ~= "" and not self:checkHangPass(tonumber(talentData.levelFront)) then
+			if level == 0 then return 0 end
+		end
+	
+		for preId, needV in pairs(talentData.pointFront:toNumMap()) do
+			if self.dinerData:getProperty("dishTree"):getv(preId, 0) < needV then
+				if level == 0 then return 0 end
+				if level == 1 then return 0 end
+			end
+		end
+		return level
+	end
+
+    function Role:log_battle_hero(heroType, desc)
+        self:mylog("hero_action", {desc = desc, int1 = heroType})
+    end
+
 end
 return RolePlugin
 \ No newline at end of file
@@ -301,7 +301,9 @@ function Store:onBuyCard(type, duration, id, actid)
         actData["unlock"] = 1
         if actCfg.condition ~= 0 then
             actData["lvl"] = (actData["lvl"] or 0) + actCfg.condition
+            role:mylog("act_action", {desc="buyBcLvl", int1=actCfg.condition, int2=actData["lvl"]})
         end
+        self.owner:mylog("act_action", {desc="buyBc", int1=id, int2=actData["lvl"] or 0})
         self.owner.activity:updateActData("BattleCommand", actData)
     end
 end
@@ -438,19 +440,19 @@ function Store:OnTriggerLimitTimePack(eventType, param)
         end
     end
     if config ~= nil then
-        local rechargeCfg = csvdb["shop_rechargeCsv"][config.packId]
+        local rechargeCfg = csvdb["shop_normalCsv"][config.packId]
         if rechargeCfg then
             limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
             self.owner:log("push_gift", {
                 gift_id = rechargeCfg.id, --礼包ID
-                gift_name = rechargeCfg.title,   --礼包名称
+                gift_name = rechargeCfg.descId,   --礼包名称
             })
             -- 每日抽卡限时礼包 触发重置
             if eventType == TriggerEventType.DrawHeroCnt then
-                local payR = self:getProperty("payR")
+                local payR = self:getProperty("buyR")
                 if payR[rechargeCfg.id] then
                     payR[rechargeCfg.id] = nil
-                    self:updateProperty({field = "payR", value = payR})
+                    self:updateProperty({field = "buyR", value = payR})
                 end
             end
             self:updateProperty({field = "limitTPack", value = limitPack})
@@ -280,12 +280,14 @@ function ModelBaseMysql:setProperties(fields, forceSave)
                  tostring(self), self.class.__cname, property, typ, type(value)))
             if typ == "number" or typ == "string" then
-                if self[propname] == value then
-                    return
+                if self[propname] ~= value then
+                    self[propname] = value
+                    self.cacheFields[property] = self[propname]
                 end
+            else
+                self[propname] = value
+                self.cacheFields[property] = self[propname]
             end
-            self[propname] = value
-            self.cacheFields[property] = self[propname]
         end
     end
     if forceSave then