Merge branch 'develop' into player

* develop: (47 commits) 返还冒险bug 签名回调地址由客户端上传邮件时间bug 停止注册日志端口修改报错，下载cv奖励记录字段增加pay_url 挂机选定关卡时，指定新手引导步骤 battle bug 引导招募必送思露德判定出了大问题战斗日志新的被动效果挂机战斗胜利才触发对应的引导不回复更改看板娘增加记录log log 增加触发神器引导的代码移到发奖励的方法里神器的引导步骤从55步开始 10连保底使用池子全随机 ... # Conflicts: # src/actions/HeroAction.lua

Merge branch 'develop' into player
* develop: (47 commits) 返还冒险bug 签名回调地址由客户端上传邮件时间bug 停止注册日志端口修改报错，下载cv奖励记录字段增加pay_url 挂机选定关卡时，指定新手引导步骤 battle bug 引导招募必送思露德判定出了大问题战斗日志新的被动效果挂机战斗胜利才触发对应的引导不回复更改看板娘增加记录log log 增加触发神器引导的代码移到发奖励的方法里神器的引导步骤从55步开始 10连保底使用池子全随机 ... # Conflicts: # src/actions/HeroAction.lua
zhouhaihai
2 parents 80b06009 c3a70cde
Showing 39 changed files with 1813 additions and 1201 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/CarAction.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/PvpAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/actions/TowerAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvMap.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
@@ -290,12 +290,24 @@ MailId = {
 	SuperMonthCardEx = 204,
 	BattleCardAward = 210,
  
-	ActDrawCard = 231,
-	ActOpenBox = 232,
+	ActSellFood = 231,
+	ActDrawCard = 232,
 	ActAdvDraw = 233,
-	ActSellFood = 234,
-	ActDrawCardReward = 221,
-	ActOpenBoxReward = 222,
+	ActOpenBox = 234,
+	ActSellFoodReward = 221,
+	ActDrawCardReward = 222,
 	ActAdvDrawReward = 223,
-	ActSellFoodReward = 224,
+	ActOpenBoxReward = 224,
 }
+
+TriggerEventType = {
+    HangPass = 1,
+    LevelUp = 2,
+    TowerPass = 3,
+}
+
+DrawCardType = {
+	SpecifyDraw = 1,
+	NormalDraw = 2,
+	FriendDraw = 3
+}
 \ No newline at end of file
@@ -44,6 +44,7 @@ actionCodes = {
 	Role_guideRpc = 129,
 	Role_getRandomNameRpc = 130,
 	Role_goldBuyRpc = 131,
+	Role_getDownloadCvRewardRpc = 132,
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -89,6 +90,7 @@ actionCodes = {
 	Hero_drawHeroRpc = 220,
 	Hero_repayHeroRpc = 221,
 	Hero_unlockPoolRpc = 222,
+	Hero_changeCrown = 223,
  
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -65,7 +65,11 @@ function _M.sudokuRpc(agent, data)
  
 	role:updateProperty({field = "sudoku", value = sudoku})
  
-	role:log("act_action", {desc = "sudoku", int1 = id, int2 = phase})
+	role:log("activity", {
+		activity_id = id, -- 活动ID（或活动指定任务的ID）
+		activity_type = 0, -- 活动类型，见活动类型枚举表
+		activity_reward = reward or {}, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	})
  
 	SendPacket(actionCodes.Activity_sudokuRpc, MsgPack.pack({task = role:packReward(task, tchange), reward = role:packReward(reward, rchange), rId = rId}))
 	return true
@@ -100,6 +104,12 @@ function _M.sudokuRewardRpc(agent, data)
 	end
 	role:updateProperty({field = "sudoku", value = sudoku})
  
+	role:log("activity", {
+		activity_id = 10000 + phase, -- 活动ID（或活动指定任务的ID）
+		activity_type = 0, -- 活动类型，见活动类型枚举表
+		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	})
+
 	SendPacket(actionCodes.Activity_sudokuRewardRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -156,6 +166,13 @@ function _M.actSignRpc(agent, data)
 		role.activity:updateActData("Sign", curData)
 		reward, change = role:award(reward, {log = {desc = "actSign"}})
 	end
+
+	role:log("activity", {
+		activity_id = curData[0], -- 活动ID（或活动指定任务的ID）
+		activity_type = role.activity.ActivityType.Sign, -- 活动类型，见活动类型枚举表
+		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	})
+
 	SendPacket(actionCodes.Activity_actSignRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -90,7 +90,7 @@ function _M.startAdvRpc( agent, data )
 	--上一个关卡结束才可以开始新的关卡
 	if role:getAdvData():isRunning() then return 8 end
 	local advHang = role:getProperty("advHang")
-	if advHang[chapterId] then return 9 end --正在挂机
+	-- if advHang[chapterId] then return 9 end --正在挂机
  
  
 	local chapterData = csvdb["adv_chapterCsv"][chapterId]
@@ -174,7 +174,6 @@ function _M.startAdvRpc( agent, data )
 	role:checkTaskEnter("AdvStart", {id = chapterId})
 	role:checkTaskEnter("AdvStartSelf", {id = chapterId})
 	role:getAdvData():popBackEvents() -- 清一下事件
-	role:getAdvData():log({desc = "start", int1 = supportIdx})
  
 	SendPacket(actionCodes.Adv_startAdvRpc, '')
 	return true
@@ -184,16 +183,28 @@ function _M.startHangRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local chapterId = msg.chapterId --关卡id
+	local campId = msg.campId or 2 --营地id
 	local format = msg.format --编队
+	local index = msg.index or 1--时间索引id
  
-	local chapterData = csvdb["adv_chapterCsv"][chapterId]
+	local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId]
 	if not chapterData then return 1 end
-	if chapterData.idleReward == "" then return 2 end --没有奖励 没有挂机
+	local campSiteData = chapterData[campId]
+	if not campSiteData then return 1 end
+	if campSiteData.idleReward_1 == "" and campSiteData.idleReward_2 == "" then return 2 end --没有奖励 没有挂机
+
+	local adv_idle_time = globalCsv.adv_idle_time[index]
+	local adv_idle_energy = globalCsv.adv_idle_energy[index]
+	local adv_idle_reward_coef = globalCsv.adv_idle_reward[index]
+	if not adv_idle_time or not adv_idle_energy or not adv_idle_reward_coef then
+		return 2
+	end
+	adv_idle_time = adv_idle_time * 60
  
 	local advHang = role:getProperty("advHang")
 	if advHang[chapterId] then return 3 end --正在挂机
  
-	if role:getAdvData():isRunning() and role:getAdvData().chapterId == chapterId then return 4 end
+	-- if role:getAdvData():isRunning() and role:getAdvData().chapterId == chapterId then return 4 end
  
 	if AdvCommon.isEndless(chapterId) then return 5 end -- 无尽没有代理
  
@@ -201,7 +212,7 @@ function _M.startHangRpc(agent, data)
 	if not next(advRelay[chapterId] or {}) then return 6 end -- 没有开放
  
  
-	if not role:checkAdvCount(chapterData.limitlevel) then return 7 end -- 是否有体力
+	if not role:checkAdvCount(adv_idle_energy) then return 7 end -- 是否有体力
  
 	if not checkFormat(role, format, role:getAdvData():isRunning()) then return 8 end --编队是否正确
  
@@ -220,7 +231,7 @@ function _M.startHangRpc(agent, data)
 		+ 0.226 * player["hit"]
 		+ 0.26 * player["miss"]
  
-	if battleV < chapterData.idleValue then return 9 end -- 战斗力是否满足
+	if battleV < campSiteData.idleValue then return 9 end -- 战斗力是否满足
  
 	local info = {}
 	info.format = {}
@@ -230,7 +241,9 @@ function _M.startHangRpc(agent, data)
 	for slot, heroId in pairs(format.heros) do
 		info.format.heros[slot] = heroId
 	end
-	info.time = skynet.timex() + chapterData.idleTime --挂机时间
+	info.time = skynet.timex() + adv_idle_time --挂机时间
+	info.campId = campId
+	info.index = index
  
 	-- 没有在战斗  用team来挂机了  把team清掉
 	if not role:getAdvData():isRunning() then
@@ -239,9 +252,8 @@ function _M.startHangRpc(agent, data)
  
 	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
  
-	role:changeAdvCount(chapterData.limitlevel)
+	role:changeAdvCount(adv_idle_energy)
 	role:checkTaskEnter("AdvStart", {id = chapterId})
-	role:log("adv_action", {desc = "startHang", int1 = chapterId})
  
 	SendPacket(actionCodes.Adv_startHangRpc, '')
 	return true
@@ -257,21 +269,30 @@ function _M.quickHangRpc(agent, data)
 	local info = advHang[chapterId]
 	if not info then return end 
  
-	local chapterData = csvdb["adv_chapterCsv"][chapterId]
+	local index = info.index
+	local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId]
 	if not chapterData then return end
+
+	local campSiteData = chapterData[info.campId]
+	if not campSiteData then return 1 end
+	if campSiteData.idleReward_1 == "" and campSiteData.idleReward_2 == "" then return 2 end --没有奖励 没有挂机
+
+	local adv_idle_time = globalCsv.adv_idle_time[index]
+	if not adv_idle_time then
+		return 2
+	end
+	adv_idle_time = adv_idle_time * 60
  
 	local reward, isFull
 	if skynet.timex() >= info.time then return end  -- 已经完成了
  
-	local cost = math.ceil((info.time - skynet.timex()) / chapterData.idleTime * chapterData.accelerate)
+	local cost = math.ceil((info.time - skynet.timex()) / 3600 * globalCsv.adv_idle_quicken)
  
 	if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return end
 	role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "advQuickHang", int1 = chapterId}})
 	info.time = 0
 	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
  
-	role:log("adv_action", {desc = "advQuickHang", int1 = chapterId})
-
 	SendPacket(actionCodes.Adv_quickHangRpc, '')
 	return true
 end
@@ -287,11 +308,25 @@ function _M.endHangRpc(agent, data)
 	local info = advHang[chapterId]
 	if not info then return end 
  
-	local chapterData = csvdb["adv_chapterCsv"][chapterId]
+	local index = info.index or 1
+	local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId]
 	if not chapterData then return end
+	local campSiteData = chapterData[info.campId or 2]
+	if not campSiteData then return 1 end
+	if campSiteData.idleReward_1 == "" and campSiteData.idleReward_2 == "" then return 2 end --没有奖励 没有挂机
+
+	local adv_idle_time = globalCsv.adv_idle_time[index]
+	local adv_idle_energy = globalCsv.adv_idle_energy[index]
+	local adv_idle_reward_coef = globalCsv.adv_idle_reward[index]
+	if not adv_idle_time or not adv_idle_energy or not adv_idle_reward_coef then
+		return 2
+	end
+	adv_idle_time = adv_idle_time * 60
  
 	local reward, isFull, change
 	if skynet.timex() >= info.time then
+		-- 最新需求加成取消
+		--[[
 		-- 英雄加成
 		local idleUnit = chapterData.idleUnit:toNumMap()
 		local upUnit = 0
@@ -316,15 +351,17 @@ function _M.endHangRpc(agent, data)
 		end
  
 		if not maxCampsite then return end
+		]]
+		local totalReward = campSiteData.idleReward_1 .. " " .. campSiteData.idleReward_2
  
-		local idleReward = chapterData.idleReward:toNumMap()
+		local idleReward = totalReward:toNumMap()
 		for itemId, count in pairs(idleReward) do
-			idleReward[itemId] = math.floor(count * (maxCampsite.idleValue + upUnit) / 100)
+			idleReward[itemId] = count * adv_idle_reward_coef
 		end
 		reward, change = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
 	else
 		if cancel then
-			role:changeAdvCount(-chapterData.limitlevel)
+			--role:changeAdvCount(-chapterData.limitlevel)
 			-- if role:getProperty("advC") <= 0 then 
 			-- 	isFull = true
 			-- else
@@ -337,8 +374,6 @@ function _M.endHangRpc(agent, data)
  
 	role:changeUpdates({{type = "advHang", field = chapterId, value = nil}})
  
-	role:log("adv_action", {desc = "endHang", int1 = chapterId, short1 = cancel and 1 or 0})
-
 	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull}))
 	return true
 end
@@ -360,7 +395,7 @@ function _M.buyAdvCountRpc(agent , data)
  
  
 	if not role:checkItemEnough(cost) then return end
-	role:costItems(cost, {log = {desc = "buyAdvCount", short1 = isEl and 1 or 0, int1 = count}})
+	role:costItems(cost, {log = {desc = "buyAdvCount", int1 = isEl and 1 or 0, int2 = count}})
 	if isEl then
 		role.dailyData:updateProperty({field = "advElC", delta = -count})
 		role.dailyData:updateProperty({field = "advElBC", delta = count})
@@ -368,7 +403,6 @@ function _M.buyAdvCountRpc(agent , data)
 		role:changeAdvCount(-count * globalCsv.adv_daily_buy_num)
 		role.dailyData:updateProperty({field = "advBC", delta = count})
 	end
-	role:log("adv_action", {desc = "buyAdvCount", short1 = isEl and 1 or 0, int1 = count})
  
 	SendPacket(actionCodes.Adv_buyAdvCountRpc, '')
 	return true
@@ -393,8 +427,6 @@ function _M.finishTaskRpc(agent, data)
 	if not status then return end
 	role:checkTaskEnter("AdvOverTask", {id = taskId})
  
-	adv:log({desc = "finishTask", int1 = taskId})
-
 	SendPacket(actionCodes.Adv_finishTaskRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -416,8 +448,6 @@ function _M.clickBlockRpc(agent, data)
  
 	if adv:isWaitChooseArtifact() then return returnFail() end
  
-	adv:log({desc = "clickBlock", int1 = msg.roomId, int2 = msg.blockId})
-
 	local status, errorCode = adv:clickBlock(msg.roomId, msg.blockId, msg)
 	if not status then return returnFail(errorCode) end
  
@@ -450,8 +480,11 @@ function _M.useItemRpc(agent, data)
 		adv:backUse({[itemId] = count})
 	end
  
+	if itemId == 5020 then
+		role:finishGuide(53)
+	end
+
 	adv:checkAchievement(adv.AchievType.UseItem, count, itemId)
-	adv:log({desc = "useItem", int1 = itemId, int2 = count})
  
 	for i = 1, count do
 		adv:doActive(itemData.effect, target) -- target
@@ -487,7 +520,6 @@ function _M.usePotionRpc(agent, data)
 	local adv = role:getAdvData()
 	if adv:isWaitChooseArtifact() then return end
  
-	adv:log({desc = "usePotion", int1 = potionId})
  
 	local status = adv:doActive(potionData.effect, target) -- target
 	if not status then return end
@@ -499,6 +531,8 @@ function _M.usePotionRpc(agent, data)
 	adv:saveDB()
 	role:checkTaskEnter("AdvUsePotion")
  
+	role:finishGuide(61)
+
 	SendPacket(actionCodes.Adv_usePotionRpc, MsgPack.pack({events = adv:popBackEvents()}))
 	return true
 end
@@ -539,6 +573,8 @@ function _M.wearArtifactRpc(agent, data)
 	if not status then return 3 end
 	adv:saveDB()
  
+	role:finishGuide(55)
+
 	SendPacket(actionCodes.Adv_wearArtifactRpc, '')
 	return true
 end
@@ -568,6 +604,7 @@ function _M.upArtifactRpc(agent, data)
 	else
 		adv:updateAchievement()
 	end
+
 	SendPacket(actionCodes.Adv_upArtifactRpc, '')
 	return true
 end
@@ -577,9 +614,10 @@ function _M.exitAdvRpc(agent, data)
 	local role = agent.role
 	-- local msg = MsgPack.unpack(data)
 	if not isCanContinue(role) then return end
-
+	if not role:checkOverGuide(57) then
+		role:saveGuide(57,1,true)
+	end
 	local adv = role:getAdvData()
-	adv:log({desc = "exit"})
 	local status = adv:exit() -- target {roomId = 1, blockId = 1} 选择的目标
 	SendPacket(actionCodes.Adv_exitAdvRpc, MsgPack.pack({events = adv:popBackEvents()}))
 	return true
@@ -638,7 +676,19 @@ function _M.endBattleRpc(agent, data)
 	if enemy.monsterId ~= monsterId or enemy.roomId ~= roomId or enemy.blockId ~= blockId then return end
 	adv.__battleCache = nil
  
-	adv:log({desc = "endBattle"})
+	-- 打完野猪怪
+	role:finishGuide(52)
+	-- 调理剂使用引导(生命药剂)
+	if not role:checkOverGuide(61) then
+		local potionBag = role:getProperty("potionBag")
+		local own = potionBag[10] or 0
+		if own > 0 then
+			-- 造假
+			player.hp = player.hp * 0.8
+			role:saveGuide(61,1,true)
+		end
+	end
+
 	local status = adv:clickBlock(roomId, blockId, {player = player, bySkill = bySkill})
  
 	if not status then return end
@@ -720,9 +770,8 @@ function _M.wheelSurfRpc(agent, data)
 		table.insert(backReward, gift)
 	end
 	role:award(reward, {log = {desc = "advWheelSurf", int1 = ptype}})
-
+	role:finishGuide(58)
 	role:checkTaskEnter("AdvDraw", {count = count, ptype = ptype})
-	role:log("adv_action", {desc = "advWheelSurf", int1 = ptype, int2 = count})
  
 	SendPacket(actionCodes.Adv_wheelSurfRpc, MsgPack.pack({reward = backReward}))
 	return true
@@ -751,7 +800,6 @@ function _M.repayWheelSurfRpc(agent, data)
 	local gift = drawData["pool3"]:randWeight(true)
 	local reward, change = {[gift[1]] = gift[2]}
 	reward, change = role:award(reward, {log = {desc = "advRepayWheelSurf", int1 = ptype}})
-	role:log("adv_action", {desc = "advRepayWheelSurf", int1 = ptype})
  
 	SendPacket(actionCodes.Adv_repayWheelSurfRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -774,8 +822,7 @@ function _M.finishAchievRpc(agent, data)
 	end
 	if not status then return end
 	adv:updateAchievement()
-	role:log("adv_action", {desc = "finishAchiev", short1 = ctype, int1 = chapterId, int2 = taskId})
-
+	role:finishGuide(57)
 	SendPacket(actionCodes.Adv_finishAchievRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -831,7 +878,6 @@ function _M.refreshSupportRpc(agent, data)
 	end
  
 	role:advRandomSupportEffect()
-	role:log("adv_action", {desc = "advSupRe", short1 = cr < al and 0 or 1})
  
 	SendPacket(actionCodes.Adv_refreshSupportRpc, '')
 	return true
@@ -40,7 +40,13 @@ function _M.makePotionRpc( agent, data )
 	role:updateProperty({field = "potionBag", value = potionBag})
 	role:checkTaskEnter("PotionMake", {count = count, id = potionId})
  
-	role:log("role_action", {desc = "makePotion", int1 = potionId, int2 = count})
+	role:log("carriage_cook", {
+		item_id = potionId, -- 道具id
+		item_level = potionLv, -- 道具等级
+		item_type = 0, -- 道具类型，具体见枚举表中道具类型枚举表
+		carriage_cook_amount = count, -- 制作总量
+		carriage_cook_cost = cost, -- 制作消耗道具，json格式记录，{'itemid1':10,'itemid2':5,…………..}
+	})
 	SendPacket(actionCodes.Car_makePotionRpc, MsgPack.pack({potionBag = potionBag}))
 	return true
 end
@@ -91,7 +97,14 @@ function _M.equipUpRpc( agent, data )
 	role:addEquip(typ, nextLv ,count, {log = {desc = "equipUp"}})
 	role:checkTaskEnter("EquipUp", {count = count})
  
-	role:log("role_action", {desc = "equipUp", int1 = id, int2 = count})
+	role:log("equip_upgrade", {
+		equip_upgrade_part = typ, -- 升级部位，记录部位ID
+		equip_id = nextLv, -- 升级后的装备ID
+		equip_upgrade_amount = count, -- 升级获取的装备数量
+		equip_upgrade_usedid = lv, -- 升级消耗的装备ID
+		equip_upgrade_cost = costCount, -- 升级操作消耗装备数量
+		equip_upgrade_current = cost, -- 升级消耗的货币类型
+	})
  
 	SendPacket(actionCodes.Car_equipUpRpc, '')
 	return true
@@ -167,8 +180,6 @@ function _M.saleEquipRpc(agent, data )
 	role:checkTaskEnter("SaleEquip", {count = allCount})
 	reward, change = role:award(reward, {log = {desc = "saleEquip"}})
  
-	role:log("role_action", {desc = "saleEquip", int1 = allCount})
-
 	SendPacket(actionCodes.Car_saleEquipRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -104,8 +104,7 @@ function _M.addSellRpc( agent, data )
 	if change then 
 		role.dinerData:updateProperty({field = "customer", value = customer})
 	end
-
-	role:log("diner_action", {desc = "addSell", int1 = dish, int2 = count})
+	role:finishGuide(28)
  
 	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
 	SendPacket(actionCodes.Diner_addSellRpc, "")
@@ -140,7 +139,7 @@ function _M.removeSellRpc( agent, data )
 		return 5
 	end
  
-	role.dinerData:updateSell(slot)
+	local temp = role.dinerData:updateSell(slot)
 	local reward, change = {}
 	local cost = dishData.material:toNumMap()
 	for k, n in pairs(cost) do
@@ -150,7 +149,14 @@ function _M.removeSellRpc( agent, data )
 	reward, change = role:award(reward, {log = {desc = "removeSell"}})
 	sells[slot].count = 0
  
-	role:log("diner_action", {desc = "removeSell", int1 = dish})
+	role:log("restaurant_sale", {
+		item_id = dish, -- 售卖物品ID
+		restaurant_sale_seat = slot, -- 售卖物品所在位置
+		restaurant_sale_time = temp.deltaTime or 0, -- 售卖时长
+		restaurant_sale_type = 2, -- 售卖方式，正常售卖:0,  加速:1，移除售卖:2
+		restaurant_sale_coin = reward[ItemId.DinerCoin] or 0, -- 售卖获得美食币
+		restaurant_sale_gear = reward[ItemId.Gold] or 0, -- 售卖获得齿轮
+	})
  
 	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
 	SendPacket(actionCodes.Diner_removeSellRpc, MsgPack.pack({reward = reward, change = change}))
@@ -162,8 +168,11 @@ function _M.getSellRewardRpc( agent, data )
 	local dirty = false
 	local reward, popular = "", 0
 	local sells = json.decode(role.dinerData:getProperty("sells"))
+
+	local deltaTimes = {}
 	for slot, _ in pairs(sells) do
-		role.dinerData:updateSell(slot)
+		local temp = role.dinerData:updateSell(slot)
+		deltaTimes[slot] = temp.deltaTime
 	end
 	sells = json.decode(role.dinerData:getProperty("sells"))
 	for slot, sell in pairs(sells) do
@@ -187,6 +196,15 @@ function _M.getSellRewardRpc( agent, data )
 		end
 		sells[slot].reward = ""
 		sells[slot].popular = 0
+
+		role:log("restaurant_sale", {
+			item_id = sell.dish, -- 售卖物品ID
+			restaurant_sale_seat = slot, -- 售卖物品所在位置
+			restaurant_sale_time = deltaTimes[slot] or 0, -- 售卖时长
+			restaurant_sale_type = 0, -- 售卖方式，正常售卖:0,  加速:1，移除售卖:2
+			restaurant_sale_coin = rewards[ItemId.DinerCoin] or 0, -- 售卖获得美食币
+			restaurant_sale_gear = rewards[ItemId.Gold] or 0, -- 售卖获得齿轮
+		})
 	end
 	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
 	local gift = reward:toNumMap()
@@ -204,7 +222,7 @@ function _M.getSellRewardRpc( agent, data )
 		role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
 	end
  
-	role:log("diner_action", {desc = "sell"})
+
  
 	SendPacket(actionCodes.Diner_getSellRewardRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -254,6 +272,15 @@ function _M.expediteSellRpc( agent, data )
 					dirty = true
 				end
 			end
+
+			role:log("restaurant_sale", {
+				item_id = sell.dish, -- 售卖物品ID
+				restaurant_sale_seat = slot, -- 售卖物品所在位置
+				restaurant_sale_time = result.deltaTime or 0, -- 售卖时长
+				restaurant_sale_type = 1, -- 售卖方式，正常售卖:0,  加速:1，移除售卖:2
+				restaurant_sale_coin = rewards[ItemId.DinerCoin] or 0, -- 售卖获得美食币
+				restaurant_sale_gear = rewards[ItemId.Gold] or 0, -- 售卖获得齿轮
+			})
 		end
 	end
  
@@ -284,8 +311,6 @@ function _M.expediteSellRpc( agent, data )
 	end
 	role:checkTaskEnter("FoodSellQuick")
  
-	role:log("diner_action", {desc = "sellQ"})
-
 	SendPacket(actionCodes.Diner_expediteSellRpc, MsgPack.pack({reward = reward, change = change, popular = popular}))
 	return true
 end
@@ -325,7 +350,13 @@ function _M.levelUpRpc( agent, data )
 	role.dinerData:updateProperty({field = "buildL", value = buildL:setv(index, curLevel + 1)})
 	role:checkTaskEnter("DinerLevelUp", {type = index, level = curLevel + 1})
  
-	role:log("diner_action", {desc = "buildUp", int1 = index, int2 = curLevel + 1})
+	role:log("restaurant_up", {
+		restaurant_up_type = index - 1, --升级部件类型，店面:0, 接客:1, 满意度:2, 宣传:3, 广告:4, 周边:5
+		restaurant_up_gear = cost[ItemId.Gold] or 0, --消耗齿轮数量
+		restaurant_up_coin = cost[ItemId.DinerCoin] or 0, --花费美食币数量
+		restaurant_up_effectbef = curLevel, --升级前加成
+		restaurant_up_effect = curLevel + 1, --升级后加成
+	})
  
 	SendPacket(actionCodes.Diner_levelUpRpc, '')
 	return true
@@ -407,9 +438,14 @@ function _M.talentUpRpc( agent, data )
 	-- end
  
 	role:checkTaskEnter("DinerTalentUp", {type = talentData.effect:toArray(true,"=")[1], level = dishLevel + 1})
-
-	role:log("diner_action", {desc = "talentUp", int1 = dish, int2 = dishLevel + 1})
-
+	role:finishGuide(27)
+	role:log("carriage_logistics", {
+		carriage_logistics_type = typ, -- 后勤室制作类型ID，变异:0，通常:1，魔法:2
+		carriage_logistics_itemid = dish, -- 后勤室升级物品或技能ID
+		carriage_logistics_itemlv = dishLevel + 1, -- 升级后物品或技能等级
+		carriage_logistics_gear = cost[ItemId.Gold] or 0, -- 后勤室升级花费齿轮数量
+		carriage_logistics_coin = cost[ItemId.DinerCoin] or 0, -- 后勤室升级花费美食币数量
+	})
 	SendPacket(actionCodes.Diner_talentUpRpc, '')
 	return true
 end
@@ -443,7 +479,6 @@ function _M.skillUpRpc( agent, data )
  
 	role:costItems(cost, {log = {desc = "dinerSkillUp", int1 = skill, int2 = skillLevel + 1}})
 	role.dinerData:updateProperty({field = "skillTree", value = skillTree:setv(skill, skillLevel + 1)})
-	role:log("diner_action", {desc = "skillUp", int1 = skill, int2 = skillLevel + 1})
  
 	SendPacket(actionCodes.Diner_skillUpRpc, '')
 	return true
@@ -471,8 +506,6 @@ function _M.lockTaskRpc( agent, data )
 	end
 	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
  
-	role:log("diner_action", {desc = "lockTask", int1 = order.id})
-
 	SendPacket(actionCodes.Diner_lockTaskRpc, MsgPack.pack({lock = order.lock}))
 	return true
 end
@@ -509,8 +542,6 @@ function _M.updateTaskRpc( agent, data )
 		orders[index].status = 1
 		orders[index].lock = 1
  
-		role:log("diner_action", {desc = "getTask", int1 = order.id})
-
 		role:checkTaskEnter("GetOderTask", {rarity = taskSet.rarity})
 	elseif cmd == 1 then
 		if order.status ~= 1 then
@@ -519,8 +550,6 @@ function _M.updateTaskRpc( agent, data )
 		orders[index].status = 0
 		orders[index].lock = 0
  
-		role:log("diner_action", {desc = "deleteTask", int1 = order.id})
-
 	elseif cmd == 2 then
 		if order.status ~= 1 then
 			return 32
@@ -528,7 +557,6 @@ function _M.updateTaskRpc( agent, data )
 		if order.n < taskData.value then
 			return 6
 		end
-		role:log("diner_action", {desc = "finishTask", int1 = order.id})
  
 		reward, change = role:award(taskData.reward, {log = {desc = "dinerFinishTask", int1 = order.id}})
 		table.remove(orders,index)
@@ -537,6 +565,14 @@ function _M.updateTaskRpc( agent, data )
 		return 33
 	end
  
+
+	role:log("restaurant_order", {
+		restaurant_order_id = order.id, -- 订单任务ID
+		restaurant_order_status = cmd, -- 订单任务状态，接受:0, 拒绝:1, 完成:2
+		restaurant_order_rwd = reward, -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		restaurant_order_lv = taskSet.rarity, -- 订单品质等级，普通:0, 稀有:1, 顶级:2, 豪华:3
+	})
+
 	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
 	SendPacket(actionCodes.Diner_updateTaskRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -611,8 +647,7 @@ function _M.refreshTaskRpc( agent, data )
 		end
 	end
  
-	role:log("diner_action", {desc = "reTask"})
-
+	role:finishGuide(41)
 	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
  
 	SendPacket(actionCodes.Diner_refreshTaskRpc, '')
@@ -652,8 +687,7 @@ function _M.addWantFoodRpc(agent , data)
 		gfood[slot] = {id = itemId, st = skynet.timex()}
 	end
  
-	role:log("diner_action", {desc = "wantFood"})
-
+	role:finishGuide(36)
 	role.dinerData:updateProperty({field = "gfood", value = gfood})
  
 	SendPacket(actionCodes.Diner_addWantFoodRpc, '')
@@ -687,12 +721,19 @@ function _M.getGreenhouseRpc( agent, data )
 		else
 			gfood[k].st = st + speed * reward[itemId]
 		end
+
+		role:log("restaurant_material", {
+			item_id = itemId, -- 获取物品ID
+			restaurant_material_start = st, -- 申请获取时间
+			restaurant_material_time = endTime2 - st, -- 申请到领取耗时
+			restaurant_material_num = reward[itemId], -- 获取物品数量
+		})
+
 	end
 	role.dinerData:updateProperty({field = "gfood", value = gfood})
 	local reward, change = role:award(reward, {log = {desc = "greenHourse", int1 = level}})
 	role:checkTaskEnter("FoodMGet")
  
-	role:log("diner_action", {desc = "greenHourse"})
  
 	SendPacket(actionCodes.Diner_getGreenhouseRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -830,7 +871,7 @@ function _M.entrustRpc(agent , data)
 	end
 	role.dinerData:updateProperty({field = "entrust", value = entrust})
  
-	role:log("diner_action", {desc = "entrus", short1 = ctype, int1 = entrustId})
+	role:finishGuide(26)
  
 	SendPacket(actionCodes.Diner_entrustRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -856,7 +897,17 @@ function _M.collectRpc(agent , data)
 	local reward, change = role:award(customerData.reward, {log = {desc = "dinerCollect", int1 = id}})
 	customer[id] = 1
 	role.dinerData:updateProperty({field = "customer", value = customer}) -- 解锁了
-	role:log("diner_action", {desc = "collect", int1 = id})
+
+	local count = 0
+	for c_, v in pairs(customer) do
+		count = count + 1
+	end
+
+	role:log("restaurant_collect", {
+		restaurant_collect_id = id, -- 图谱收集ID
+		restaurant_collect_rwd = reward, -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		restaurant_collect_plan = count, -- 收集进度，即解锁顾客，数字表示
+	})
  
 	SendPacket(actionCodes.Diner_collectRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -886,8 +937,6 @@ function _M.comboRewardRpc(agent , data)
  
 	role.dinerData:updateProperty({field = "comboStatus", value = comboStatus}) -- 解锁了
  
-	role:log("diner_action", {desc = "combo", int1 = id})
-
 	SendPacket(actionCodes.Diner_comboRewardRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -53,7 +53,6 @@ function _M.listRpc(agent, data)
 					content = email.content, 
 					attachments = email.attachments
 				})
-				role:log("mail_action", {desc = "get_global", key1 = email.title, key2 = email.attachments})
 			end
 		end
 	end
@@ -90,21 +89,17 @@ function _M.drawAllAttachRpc(agent, data)
 	local ids = {}
  
 	local emails = loadEmails(roleId)
-	redisproxy:pipelining(function (red)
-		for _, email in ipairs(emails) do
-			local attachments = getEmailAttachments(email)
-			if attachments ~= "" then
-				local emailId = email:getProperty("id")
-				ids[emailId] = 1
-				red:hset(string.format(R_EMAIL_ITEM, roleId, emailId), "status", 2) 
-				role:log("mail_action", {desc = "draw_attach", int1 = emailId, key1 = email:getProperty("title"), key2 = attachments})
-
-				for key, v in pairs(attachments:toNumMap()) do
-					reward[key] = (reward[key] or 0) + v
-				end
+	for _, email in ipairs(emails) do
+		local attachments = getEmailAttachments(email)
+		if attachments ~= "" then
+			email:setProperty("status", 2)
+			email:log(role, 2)
+			ids[email:getProperty("id")] = 1
+			for key, v in pairs(attachments:toNumMap()) do
+				reward[key] = (reward[key] or 0) + v
 			end
 		end
-	end)
+	end
 	reward, change = role:award(reward, {log = {desc = "draw_attach"}})
 	SendPacket(actionCodes.Email_drawAllAttachRpc, MsgPack.pack({ids = ids, reward = reward, change = change}))
 	return true
@@ -124,11 +119,11 @@ function _M.drawAttachRpc(agent, data)
 	local attachments = getEmailAttachments(email)
 	if attachments == "" then return end
  
-	local reward, change = role:award(attachments, {log = {desc = "draw_attach", int1 = emailId, key1 = email:getProperty("title")}})
-	redisproxy:hset(rds, "status", 2) 	-- 领取标记
+	local reward, change = role:award(attachments, {log = {desc = "draw_attach", int1 = emailId}})
+	email:setProperty("status", 2)
+	email:log(role, 2)
 	SendPacket(actionCodes.Email_drawAttachRpc, MsgPack.pack({reward = reward, change = change}))
  
-	role:log("mail_action", {desc = "draw_attach", int1 = id, key1 = email:getProperty("title"), key2 = attachments})
 	return true
 end
  
@@ -139,11 +134,12 @@ function _M.checkRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
  
-	local rds = string.format(R_EMAIL_ITEM, roleId, id)
-	if not redisproxy:exists(rds) then return end
+	local emailRds = string.format("email:%d:%s", roleId, id)
+	local email = require("models.Email").new({key = emailRds})
+	if not email:load() then return end
  
-	redisproxy:hset(rds, "status", 1)
-	role:log("mail_action", {desc = "check_mail", int1 = id})
+	email:setProperty("status", 1)
+	email:log(role, 1)
  
 	SendPacket(actionCodes.Email_checkRpc, '')
 	return true
@@ -171,6 +167,7 @@ function _M.delRpc(agent, data)
 					attachments = emailData.attachment
 				end
 				if status == 2 or (status == 1 and attachments:len() == 0) then
+					email:log(role, 3)
 					red:lrem(rds, 0, id)
 					red:del(emailRds)
 					result[tonum(id)] = 1
@@ -178,9 +175,6 @@ function _M.delRpc(agent, data)
 			end
 		end
 	end)
-	for delId, _ in ipairs(result) do
-		role:log("mail_action", {desc = "del_mail", int1 = delId})
-	end
 	SendPacket(actionCodes.Email_delRpc, MsgPack.pack({result = result}))
 	return true
 end
@@ -111,7 +111,6 @@ function _M.searchRpc(agent, data)
 		}))
 	end
  
-	role:log("role_action", {desc = "searchFriend"})
 	SendPacket(actionCodes.Friend_searchRpc, MsgPack.pack({searchList = searchList}))
 	return true
 end
@@ -178,8 +177,6 @@ function _M.applyRpc(agent, data)
 		myInfo.online = true
 		myInfo.hadApply = true
  
-		role:log("role_action", {desc = "addFriend", int1 = 1})
-
 		rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newApply = 1, info = {myInfo}})) 	-- 通知对方
 	end
  
@@ -217,6 +214,7 @@ local function checkHandleApply(roleId, objectId, needAddNew)
 		red:sismember(FRIEND_BLACK_KEY:format(objectId), roleId)
 		red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
 	end)
+
 	--自己好友满了
 	if (redret[1] + needAddNew) >= globalCsv.friendListLimit then
 		return 1
@@ -233,6 +231,8 @@ local function checkHandleApply(roleId, objectId, needAddNew)
 	if redret[4] == 1 then
 		return 4
 	end
+
+	return nil, redret[1]
 end
  
 function _M.handleApplyRpc(agent, data)
@@ -251,7 +251,8 @@ function _M.handleApplyRpc(agent, data)
 		if not redisproxy:zscore(FRIEND_APPLY_KEY:format(roleId), objectId) then
 			return
 		end
-		result = checkHandleApply(roleId, objectId)
+		local curCount
+		result, curCount = checkHandleApply(roleId, objectId)
  
 		if not result then
 			redisproxy:pipelining(function (red)
@@ -277,8 +278,11 @@ function _M.handleApplyRpc(agent, data)
 			otherInfo.pGet = redret[2] == 1 and 1 or nil
 			SendPacket(actionCodes.Friend_updateProperty, MsgPack.pack({newFriend = 1, info = {otherInfo}}))
  
-			role:log("role_action", {desc = "addFriend", int1 = 1})
-
+			role:log("friend_opt", {
+				friend_opt_type = 100, -- 好友操作类型，见枚举表中 好友操作类型枚举表
+				friend_roleid = objectId, -- 好友账户下的角色id
+				friend_cnt = curCount + 1, -- 操作后好友数量
+			})
 		end
  
 	elseif cmd == 0 then	-- 不同意
@@ -301,7 +305,7 @@ function _M.handleApplyRpc(agent, data)
 		local needAddInfo = {}
 		for _, objId in ipairs(allIds) do
 			objId = tonumber(objId)
-			local cr = checkHandleApply(roleId, objId, #needAdd)
+			local cr, curCount = checkHandleApply(roleId, objId, #needAdd)
 			if not cr then 
 				table.insert(needAdd, objId)
 				table.insert(needAddMy, objId)
@@ -312,6 +316,12 @@ function _M.handleApplyRpc(agent, data)
 				otherInfo.isFriend = true
 				otherInfo.pGet = fpoint[objId] and 1 or nil
 				table.insert(needAddInfo, otherInfo)
+
+				role:log("friend_opt", {
+					friend_opt_type = 100, -- 好友操作类型，见枚举表中 好友操作类型枚举表
+					friend_roleid = objId, -- 好友账户下的角色id
+					friend_cnt = curCount + 1, -- 操作后好友数量
+				})
 			end
 		end
  
@@ -337,8 +347,6 @@ function _M.handleApplyRpc(agent, data)
 			rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newFriend = 1, info = {myInfo}}))	-- 通知对方
 		end
 		if next(needAdd) then
-			role:log("role_action", {desc = "addFriend", int1 = #needAdd})
-
 			SendPacket(actionCodes.Friend_updateProperty, MsgPack.pack({newFriend = 1, info = needAddInfo}))
 		else
 			result = 1
@@ -420,6 +428,11 @@ function _M.deleteRpc(agent, data)
 	end
 	rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({deleteFriend = 1, roleId = roleId}))
  
+	role:log("friend_opt", {
+		friend_opt_type = 200, -- 好友操作类型，见枚举表中 好友操作类型枚举表
+		friend_roleid = objectId, -- 好友账户下的角色id
+		friend_cnt = 0, -- 操作后好友数量
+	})
 	SendPacket(actionCodes.Friend_deleteRpc, MsgPack.pack(""))
 	return true
 end
@@ -449,15 +462,18 @@ function _M.blockRpc(agent, data)
 				red:ZREM(FRIEND_APPLY_KEY:format(objectId), roleId)
 				red:sadd(FRIEND_BLACK_KEY:format(roleId), objectId)
 			end)
-		rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({deleteFriend = 1, roleId = roleId}))
-
+			rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({deleteFriend = 1, roleId = roleId}))
+			role:log("friend_opt", {
+				friend_opt_type = 300, -- 好友操作类型，见枚举表中 好友操作类型枚举表
+				friend_roleid = objectId, -- 好友账户下的角色id
+				friend_cnt = 0, -- 操作后好友数量
+			})
 		end
 	elseif cmd == 2 then
 		redisproxy:SREM(FRIEND_BLACK_KEY:format(roleId), objectId)
 	else
 		return
 	end
-
 	SendPacket(actionCodes.Friend_blockRpc, MsgPack.pack({result = result}))
 	return true
 end
@@ -537,8 +553,6 @@ function _M.pointRpc(agent, data)
 			role.dailyData:updateProperty({field = "giveFP", value = giveP})
 			role:checkTaskEnter("GiveFriendP", {count = 1})
 			rpcRole(objId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newPoint = 1, roleId = roleId}))
-
-			role:log("role_action", {desc = "giveFPoint", int1 = 1})
 		end
 	elseif cmd == 2 then -- 领取
 		local objId = msg.roleId
@@ -558,7 +572,6 @@ function _M.pointRpc(agent, data)
 			role.dailyData:updateProperty({field = "getFP", value = getP})
 			role:checkTaskEnter("GetFriendP", {count = 1})
  
-			role:log("role_action", {desc = "getFPoint", int1 = 1})
 		end
 	elseif cmd == 3 then -- 一键赠送领取
 		-- 赠送
@@ -580,8 +593,6 @@ function _M.pointRpc(agent, data)
 			role.dailyData:updateProperty({field = "giveFP", value = giveP})
 			role:checkTaskEnter("GiveFriendP", {count = change})
  
-			role:log("role_action", {desc = "giveFPoint", int1 = change})
-
 		else
 			result = 1
 		end
@@ -606,7 +617,6 @@ function _M.pointRpc(agent, data)
 				reward = role:award({[ItemId.FriendPoint] = getCount}, {log = {desc = "friendPoint"}})
 				role.dailyData:updateProperty({field = "getFP", value = getP})
 				role:checkTaskEnter("GetFriendP", {count = getCount})
-				role:log("role_action", {desc = "getFPoint", int1 = getCount})
 			else
 				result = (result or 0) + 2
 			end
@@ -27,7 +27,6 @@ function _M.ignoreout(role, pms)
 	else  -- 解除
 		role:updateProperty({field = "ignoreMt", value = 0})
 	end
-	role:log("gm_action", {desc = "ignoreout", key1 = pms.sender})
 	return "指令生效"
 end
  
@@ -47,17 +46,11 @@ function _M.ban(role, pms)
 			end)
 		end
 	end
-
-	role:log("gm_action", {desc = "ban", int1 = time, int2 = ctype, key1 = pms.sender})
-
 	return isBan and "解封杀成功" or "封杀成功"
 end
  
 function _M.unban(role, pms)
 	role:setBan(0, 0)
-
-	role:log("gm_action", {desc = "unban", key1 = pms.sender})
-
 	return "解封杀成功"
 end
  
@@ -70,8 +63,6 @@ function _M.gmmsg(role, pms)
 			skynet.call(agent.gate_serv, "lua", "forcekick", agent.fd)
 		end)
 	end
-	role:log("gm_action", {desc = "gmmsg", text1 = pms.pm1, key1 = pms.sender})
-
 	return "指令成功"
 end
  
@@ -82,8 +73,6 @@ function _M.silent(role, pms)
 		return "解禁言成功"
 	end
 	role:updateProperty({field = "silent", value = specTime({hour = 0}, skynet.timex()) + pm1 * 86400})
-
-	role:log("gm_action", {desc = "silent", int1 = pms.pm1, key1 = pms.sender})
 	return "禁言成功"
 end
  
@@ -101,8 +90,6 @@ function _M.hero(role, pms)
 	if not role:addHero({type = heroType, log = {desc = "gm"}}) then
 		return "失败"
 	end
-
-	role:log("gm_action", {desc = "hero", int1 = heroType, key1 = pms.sender})
 	return "成功"
 end
  
@@ -135,8 +122,6 @@ function _M.herol(role, pms)
 	hero:updateProperty({field = "level", delta = addLevel})
 	role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
  
-	role:log("gm_action", {desc = "herol", int1 = heroType, int2 = addLevel, key1 = pms.sender})
-
 	return "成功"
 end
  
@@ -148,8 +133,6 @@ function _M.herola(role, pms)
 		_M.herol(role, {pm1 = hero:getProperty("type"), pm2 = addLevel})
 	end
  
-	role:log("gm_action", {desc = "herola", int1 = addLevel, key1 = pms.sender})
-
 	return "成功"
 end
  
@@ -160,7 +143,6 @@ function _M.equip(role, pms)
 	local level = tonum(pms.pm2)
 	local count = tonum(pms.pm3)
 	role:addEquip(typ, level, count, {log = {desc = "gm"}})
-	role:log("gm_action", {desc = "equip", int1 = typ, int2 = level, long1 = count, key1 = pms.sender})
 	return "成功"
 end
  
@@ -169,7 +151,6 @@ function _M.rune(role, pms)
 	local typ = tonum(pms.pm1)
 	local id = tonum(pms.pm2)
 	local result = role:addRune({type = typ,id = id, log = {desc = "gm"}})
-	role:log("gm_action", {desc = "rune", int1 = typ, int2 = id, key1 = pms.sender})
  
 	return result
 end
@@ -190,8 +171,6 @@ function _M.fb(role, pms) -- 直接通关
 	role:hangFinish(carbonId)
 	addPre(carbonId)
  
-	role:log("gm_action", {desc = "fb", int1 = carbonId, key1 = pms.sender})
-
 	role:checkTaskEnter("HangPass", {id = carbonId})
 	return "成功"
 end
@@ -212,8 +191,6 @@ function _M.fbc(role, pms) -- 直接通关
 	end
 	role:updateProperty({field = "hangPass", value = {}})
 	addPre(carbonId)
-	
-	role:log("gm_action", {desc = "fbc", int1 = carbonId, key1 = pms.sender})
  
 	return "成功"
 end
@@ -247,8 +224,6 @@ function _M.exp(role, pms)
 	exp = math.floor(math.max(exp, 0))
 	role:addPlayExp(exp, {log = {desc = "gm"}})
  
-	role:log("gm_action", {desc = "exp", int1 = exp, key1 = pms.sender})
-
 	return "成功"
 end
  
@@ -305,7 +280,6 @@ function _M.get(role, pms)
 		end
 		local count = tonum(pms.pm2, 1)
 		role:award({[itemId] = count}, {log = {desc = "gm"}})
-		role:log("gm_action", {desc = "get", int1 = itemId, int2 = count, key1 = pms.sender})
 	end
 	return "成功"
 end
@@ -329,9 +303,6 @@ function _M.advc(role, pms)
 		advAFWear = {},
 	}, notNotify)
 	role.advData = nil
-
-	role:log("gm_action", {desc = "advc", key1 = pms.sender})
-
 	return "成功"
 end
  
@@ -340,8 +311,6 @@ function _M.advf(role, pms)
 	role:updateProperty({field = "advC", value = 0})
 	role.dailyData:updateProperty({field = "advElC", value = 0})
  
-	role:log("gm_action", {desc = "advf", key1 = pms.sender})
-
 	return "成功"
 end
  
@@ -361,7 +330,6 @@ function _M.adv(role, pms)
 		advPass[chapterId] = layer
 		role:updateProperty({field = "advPass", value = advPass})
 	end
-	role:log("gm_action", {desc = "adv", int1 = chapterId, int2 = layer, key1 = pms.sender})
  
 	return "成功"
 end
@@ -388,7 +356,6 @@ function _M.advt(role, pms)
 		isEnter = true,
 		debugMapId = mapId,
 	})
-	role:log("gm_action", {desc = "advt", int1 = chapterId, int2 = layer, key1 = pms.sender})
 	return "成功"
 end
  
@@ -397,8 +364,6 @@ function _M.advl(role, pms)
 	local exp = tonum(pms.pm1)
 	role:addAdvLvExp(math.max(0, exp))
  
-	role:log("gm_action", {desc = "advl", int1 = exp, key1 = pms.sender})
-
 	return "成功"
 end
  
@@ -412,7 +377,6 @@ function _M.advcl(role, pms)
 	end
 	advData.battle.player:addExp(exp)
 	advData:saveDB()
-	role:log("gm_action", {desc = "advcl", int1 = exp, key1 = pms.sender})
  
 	return "成功"
 end
@@ -422,7 +386,6 @@ function _M.idlec(role, pms)
 	role:updateProperty({field = "hangTeam", value = {}})
 	role:updateProperty({field = "hangInfo", value = {}})
 	role:updateProperty({field = "hangBag", value = {}})
-	role:log("gm_action", {desc = "idlec", key1 = pms.sender})
  
 	role.advData = nil
 	return "成功"
@@ -447,8 +410,6 @@ function _M.advit(role, pms)
 		local itemId = tonum(pms.pm1)
 		local count = tonum(pms.pm2)
 		reward[itemId] = count
-
-		role:log("gm_action", {desc = "advit", int1 = itemId, int2 = count, key1 = pms.sender})
 	end
  
  
@@ -464,8 +425,6 @@ function _M.tower(role, pms)
 	if not csvdb["tower_battleCsv"][level] then return  "不存在" end
 	role:updateProperty({field = "towerInfo", value = {c = globalCsv.tower_count_limit, l = level}})
  
-	role:log("gm_action", {desc = "tower", int1 = level, key1 = pms.sender})
-
 	return "成功"
 end
  
@@ -484,8 +443,6 @@ function _M.email(role, pms)
 		rewardPms = id ~= 0 and reward or nil,
 	})
  
-	role:log("gm_action", {desc = "email", int1 = id, key1 = pms.sender})
-
 	return "成功"
 end
  
@@ -503,7 +460,6 @@ function _M.cguide(role, pms)
 		role:updateProperty({field = "funcGuide", value = ""})
 	end
  
-	role:log("gm_action", {desc = "cguide", int1 = id, key1 = pms.sender})
 	return "成功"
 end
  
@@ -39,9 +39,9 @@ local function checkReward(role)
  
 	local items = role:getProperty("hangBag")
 	coinCount = coinCount + coinDoubleCount
-	items[ItemId.Gold] = (items[ItemId.Gold] or 0) + coinCount * carbonData.money
-	items[ItemId.Exp] = (items[ItemId.Exp] or 0) + coinCount * carbonData.exp
-	items[ItemId.PlayerExp] = (items[ItemId.PlayerExp] or 0) + coinCount * carbonData.playerExp
+	items[ItemId.Gold] = math.floor((items[ItemId.Gold] or 0) + coinCount * carbonData.money)
+	items[ItemId.Exp] = math.floor((items[ItemId.Exp] or 0) + coinCount * carbonData.exp)
+	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + coinCount * carbonData.playerExp)
  
 	local pool = {}
 	for _, temp in pairs(carbonData.item:toArray()) do
@@ -69,7 +69,7 @@ local function checkReward(role)
 		while #tempPool > 0 do
 			local idx = math.randWeight(tempPool, 3)
 			local cur = clone(pool[idx])
-			if cur[1] ~= 1 then  -- 轮空 id
+			if cur[1] ~= 0 then  -- 轮空 id
 				if cur[1] == ItemId.BreakCost and doubleTime > 0 then
 					cur[2] = cur[2] * 2
 				end
@@ -156,7 +156,16 @@ function _M.startRpc( agent, data )
 	end
 	role:updateProperty({field = "hangInfo", value = hangInfo})
  
-	role:log("hang_action", {desc = "startHang", int1 = carbonId})
+	-- 指定当前引导的步骤
+	if carbonId == 10101 then
+		role:saveGuide(5,11)
+	elseif carbonId == 10102 then
+		role:saveGuide(8,2)
+	elseif carbonId == 10103 then
+		role:saveGuide(9,2)
+	elseif carbonId == 10220 then
+		role:saveGuide(22,1)
+	end
  
 	SendPacket(actionCodes.Hang_startRpc, '')
 	return true
@@ -211,6 +220,7 @@ function _M.endBattleRpc(agent, data)
 		return true
 	end
 	local carbonId = msg.carbonId
+	local isWin = msg.starNum and msg.starNum > 0
 	local carbonData = csvdb["idle_battleCsv"][carbonId]
 	if not carbonData then
 		return 2
@@ -224,8 +234,9 @@ function _M.endBattleRpc(agent, data)
 	if role:checkHangPass(carbonId) then 
 		return 4
 	end
+
 	local reward, change
-	if msg.starNum and msg.starNum > 0 then --win
+	if isWin then --win
 		role:hangFinish(carbonId)
 		if carbonData.main ~= 1 then
 			hangInfo.bossTime = nil
@@ -241,11 +252,35 @@ function _M.endBattleRpc(agent, data)
 		reward, change = role:award(reward, {log = {desc = "hangBattle", int1 = carbonId}})
  
 		role:checkTaskEnter("HangPass", {id = carbonId})
+		
+		-- 引导
+		if carbonId == 10101 then
+			role:finishGuide(5)
+		elseif carbonId == 10102 then
+			role:finishGuide(8)
+		elseif carbonId == 10103 then
+			role:finishGuide(9)
+		elseif carbonId == 10220 then
+			role:finishGuide(22)
+		end
+		for _, guideData in pairs(csvdb["guide_unlockCsv"]) do
+			if guideData.type == 3 and guideData.carbonId == carbonId then
+				role:saveGuide(guideData.guideId,1,true)
+				break
+			end
+		end
+	end
+	if hangInfo.carbonId < carbonId then
+		hangInfo.carbonId = carbonId
 	end
 	role:updateProperty({field = "hangInfo", value = hangInfo})
  
-	local team = role:getProperty("pvpTC")
-	role:log("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), cint1 = role:getHerosCamp(team.heros)})
+	role:checkBattle("hang", {
+		id = carbonId,
+		isWin = isWin,
+		info = msg.info,
+		reward = reward,
+	})
  
 	SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({
 		starNum = msg.starNum, 
@@ -312,6 +347,17 @@ function _M.getRewardRpc(agent , data)
 	if reward[ItemId.Gold] then
 		role:checkTaskEnter("HangGetGold", {count = reward[ItemId.Gold]})
 	end
+
+	role:log("residence_reward", {
+		mission_threadid = math.floor(hangInfo.carbonId / 10000), --大关卡ID
+		mission_id = hangInfo.carbonId, --关卡ID
+		mission_type = 100, --关卡类型，见关卡类型枚举表
+		residence_reward_type = 0, --领取奖励方式，快速（超前领取）记录为1，正常领取记录为0
+		residence_time = 0, --挂机或排名时长
+		residence_reward = reward, --获得奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+	})
+	
+
 	SendPacket(actionCodes.Hang_getRewardRpc, MsgPack.pack({
 		reward = reward,
 		change = change
@@ -319,65 +365,6 @@ function _M.getRewardRpc(agent , data)
 	return true
 end
  
--- function _M.getRewardItemRpc(agent , data)
--- 	local role = agent.role
--- 	checkReward(role)
--- 	local items = role:getProperty("hangBag")
--- 	if not next(items) then return end
-
--- 	local notNeed = {[ItemId.Gold] = 1, [ItemId.Exp] = 1, [ItemId.PlayerExp] = 1}
--- 	local reward = {}
--- 	for itemId , count in pairs(items) do
--- 		if not notNeed[itemId] then
--- 			reward[itemId] = count
--- 			items[itemId] = nil
--- 		end
--- 	end
--- 	if not next(reward) then return end
--- 	local reward = role:award(reward)
-
--- 	local hangInfo = role:getProperty("hangInfo")
--- 	local nowTime = skynet.timex()
--- 	hangInfo.endItemTime = nowTime + globalCsv.idle_producetime_max
--- 	hangInfo.itemTime = nowTime
--- 	role:updateProperty({field = "hangBag", value = items})
--- 	role:updateProperty({field = "hangInfo", value = hangInfo})
-
--- 	SendPacket(actionCodes.Hang_getRewardItemRpc, MsgPack.pack({
--- 		reward = reward
--- 	}))
--- 	return true
--- end
-
--- function _M.getRewardCoinRpc(agent , data)
--- 	local role = agent.role
--- 	checkReward(role)
--- 	local items = role:getProperty("hangBag")
--- 	if not next(items) then return end
-
--- 	local need = {[ItemId.Gold] = 1, [ItemId.Exp] = 1, [ItemId.PlayerExp] = 1}
--- 	local reward = {}
--- 	for itemId , count in pairs(items) do
--- 		if need[itemId] then
--- 			reward[itemId] = count
--- 			items[itemId] = nil
--- 		end
--- 	end
--- 	local reward = role:award(reward)
-	
--- 	local hangInfo = role:getProperty("hangInfo")
--- 	local nowTime = skynet.timex()
--- 	hangInfo.endCoinTime = nowTime + globalCsv.idle_producetime_max
--- 	hangInfo.coinTime = nowTime
--- 	role:updateProperty({field = "hangBag", value = items})
--- 	role:updateProperty({field = "hangInfo", value = hangInfo})
-
--- 	SendPacket(actionCodes.Hang_getRewardCoinRpc, MsgPack.pack({
--- 		reward = reward
--- 	}))
--- 	return true
--- end
-
 function _M.quickRpc(agent , data)
 	local role = agent.role
  
@@ -400,8 +387,9 @@ function _M.quickRpc(agent , data)
  
 	local coinCount = math.floor(time / globalCsv.idle_money_produce_cd)
 	local itemCount = math.floor(time / globalCsv.idle_item_produce_cd)
-	reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + coinCount * carbonData.money
-	reward[ItemId.Exp] = (reward[ItemId.Exp] or 0) + coinCount * carbonData.exp
+	reward[ItemId.Gold] = math.floor((reward[ItemId.Gold] or 0) + coinCount * carbonData.money)
+	reward[ItemId.Exp] = math.floor((reward[ItemId.Exp] or 0) + coinCount * carbonData.exp)
+	reward[ItemId.PlayerExp] = math.floor((reward[ItemId.PlayerExp] or 0) + coinCount * carbonData.playerExp)
  
 	local pool = {}
 	for _, temp in pairs(carbonData.item:toArray()) do
@@ -412,11 +400,13 @@ function _M.quickRpc(agent , data)
 		reward[cur[1]] = (reward[cur[1]] or 0) + cur[2]
 	end
  
+	local doubleCoef = role.activity:isOpen("DoubleDrop") and 2 or 1
+
 	-- 特权卡获取加速获得额外道具
 	local coef = role.storeData:getProduceItemSpeedCoef()
 	if coef > 1 then
 		for k, cnt in pairs(reward) do
-			reward[k] = math.floor(cnt * coef)
+			reward[k] = math.floor(cnt * coef * doubleCoef)
 		end
 	end
  
@@ -426,6 +416,15 @@ function _M.quickRpc(agent , data)
 		role:checkTaskEnter("HangGetGold", {count = reward[ItemId.Gold]})
 	end
 	role:checkTaskEnter("HangQuick")
+
+	role:log("residence_reward", {
+		mission_threadid = math.floor(hangInfo.carbonId / 10000), --大关卡ID
+		mission_id = hangInfo.carbonId, --关卡ID
+		mission_type = 100, --关卡类型，见关卡类型枚举表
+		residence_reward_type = 1, --领取奖励方式，快速（超前领取）记录为1，正常领取记录为0
+		residence_time = time, --挂机或排名时长
+		residence_reward = reward, --获得奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+	})
 	SendPacket(actionCodes.Hang_quickRpc, MsgPack.pack({
 		reward = reward,
 		change = change
@@ -480,7 +479,7 @@ function _M.buyBonusCountRpc(agent, data)
  
 	if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}) then return 2 end
  
-	role:costItems({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}, {log = {desc = "buyBonusCount", short1 = btype, int1 = count}})
+	role:costItems({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}, {log = {desc = "buyBonusCount", int1 = btype, int2 = count}})
 	bonusC[btype]["b"] = bonusC[btype]["b"] + count
 	bonusC[btype]["c"] = bonusC[btype]["c"] - count
  
@@ -551,8 +550,12 @@ function _M.endBonusBattleRpc(agent, data)
  		role:checkTaskEnter("BonusPass", {id = id})
  	end
  
-	role:log("hang_action", {desc = "bonusBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
-
+ 	role:checkBattle("bonus", {
+		id = id,
+		isWin = starNum and starNum > 0,
+		info = msg.info,
+		reward = reward,
+	})
 	SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({
 		starNum = starNum, 
 		reward = reward,
@@ -573,7 +576,6 @@ function _M.hangGiftRpc(agent, data)
 	if hangGift[id] then return 2 end
  
 	local reward, change = role:award(carbonData.item_clear_special, {log = {desc = "hangGift", int1 = id}})
-	role:log("hang_action", {desc = "hangGift",  int1 = id})
  
 	role:changeUpdates({{type = "hangGift", field = id, value = 1}})
  
@@ -16,6 +16,18 @@ local table_unpack = table.unpack
  
 local _M = {}
  
+local function getChangeAttrJson(oldAttr, newAttr)
+	local change = {}
+	for k, v in pairs(newAttr) do
+		change[k] = v - oldAttr[k]
+		change[k] = math.ceil(change[k])
+		if change[k] == 0 then
+			change[k] = nil
+		end
+	end
+	return change
+end
+
 function _M.levelUpRpc( agent, data )
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -28,9 +40,23 @@ function _M.levelUpRpc( agent, data )
 	local cost = {[ItemId.Exp] = curData.exp, [ItemId.Gold] = curData.gold}
 	if not role:checkItemEnough(cost) then return 3 end
 	role:costItems(cost, {log = {desc = "heroLevelUp", int1 = msg.id, int2 = hero:getProperty("type")}})
+
+	local oldAttr = hero:getTotalAttrs()
+	local oldBattleV = hero:getProperty("battleV")
 	hero:updateProperty({field = "level", delta = 1})
  
-	hero:log({desc = "levelUp", int1 = hero:getProperty("level")})
+	role:log("hero_upgrade", {
+		hero_id = hero:getProperty("type"), --英雄ID
+		hero_upgrade_cost = cost, -- 英雄升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_upgrade_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄升级效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+		hero_upgrade_type = 0, -- 英雄升级方式，连续升级：1，单击升级：0
+		hero_upgrade_score = hero:getProperty("battleV"), -- 英雄升级后评分
+		hero_upgrade_scoreget = hero:getProperty("battleV") - oldBattleV, -- 通过英雄升级提升的评分
+	})
+
+	if hero:getProperty("type") == 103 then
+		role:finishGuide(7)
+	end
  
 	role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
 	SendPacket(actionCodes.Hero_levelUpRpc, '')
@@ -49,9 +75,15 @@ function _M.breakRpc( agent, data )
 	local cost = {[ItemId.BreakCost] = curData.cost, [ItemId.Gold] = curData.gold}
 	if not role:checkItemEnough(cost) then return 4 end
 	role:costItems(cost, {log = {desc = "heroBreak", int1 = msg.id, int2 = hero:getProperty("type")}})
+	local oldAttr = hero:getTotalAttrs()
 	hero:updateProperty({field = "breakL", delta = 1})
  
-	hero:log({desc = "break", int1 = hero:getProperty("breakL")})
+	role:log("hero_break", {
+		hero_id = hero:getProperty("type"), --英雄ID
+		hero_break_cost = cost, -- 英雄突破消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_break_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄突破效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+		hero_break_level = hero:getMaxLevel(), -- 英雄突破后等级上限
+	})
  
 	SendPacket(actionCodes.Hero_breakRpc, '')
 	return true
@@ -74,6 +106,7 @@ function _M.wakeRpc(agent, data)
  
 	role:costItems(cost, {log = {desc = "heroWake", int1 = msg.id, int2 = hero:getProperty("type")}})
  
+	local oldAttr = hero:getTotalAttrs()
 	hero:updateProperty({field = "wakeL", delta = 1})
  
 	local curLevel = hero:getProperty("wakeL")
@@ -81,9 +114,14 @@ function _M.wakeRpc(agent, data)
 	if curLevel == 4 then -- 解锁cg
 		role:checkTaskEnter("WakeCG", {heroType = typ})
 	end
-	hero:log({desc = "wake", int1 = hero:getProperty("wakeL")})
  
-	
+	role:log("hero_rise", {
+		hero_id = typ, --英雄ID
+		hero_rise_cost = cost, --英雄觉醒消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_rise_score = hero:getProperty("battleV"), --英雄觉醒后评分提升
+		hero_rise_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), --英雄觉醒效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+	})
+
 	SendPacket(actionCodes.Hero_wakeRpc, '')
 	return true
 end
@@ -103,7 +141,10 @@ function _M.talentRpc(agent, data)
 	local curStage = talent:getv(0, 1)
 	local curData = csvdb["unit_talentCsv"][curStage]
 	if not curData then return 4 end
+	local oldSkillLv = hero:getSkillLevel(1)
+
  
+	local cost = {}
 	if index == 0 then
 		--是否进阶
 		local max = true
@@ -131,7 +172,7 @@ function _M.talentRpc(agent, data)
  
 		if talentData.lvRequire > hero:getProperty("level") then return 6 end
  
-		local cost = talentData.money:toNumMap()
+		cost = talentData.money:toNumMap()
 		local cost2 = talentData.cost:toNumMap()
 		for k,v in pairs(cost2) do
 			cost[globalCsv.unit_talent_cost[csvdb["unitCsv"][hero:getProperty("type")].camp][k]] = v
@@ -152,7 +193,12 @@ function _M.talentRpc(agent, data)
  
 	hero:updateProperty({field = "talent", value = talent})
  
-	hero:log({desc = "talent", int1 = index, int2 = talent:getv(index, 0)})
+	role:log("hero_talent", {
+		hero_id = hero:getProperty("type"), --英雄ID
+		hero_talent_cost = cost, -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_talent_levelbef = oldSkillLv, -- 英雄技能升级前等级
+		hero_talent_level = hero:getSkillLevel(1), -- 英雄技能升级后等级
+	})
  
 	SendPacket(actionCodes.Hero_talentRpc, '')
 	return true
@@ -252,6 +298,14 @@ function _M.commentHeroRpc(agent, data)
 		comment.like = 0
 		result.comment = comment
 		role.dailyData:setProperty("commentHero", curStutus:setv(heroType, 1))
+
+
+		role:log("hero_note", {
+			hero_id = heroType, -- 英雄ID
+			hero_note_action = 0, -- 英雄评价界面操作，发布评论：0，点赞：1，反对：2
+			hero_note_id = commentId, -- 操作的评价ID
+			hero_note_text = content, -- 操作的评价内容
+		})
 	end
 	SendPacket(actionCodes.Hero_commentHeroRpc, MsgPack.pack(result))
 	return true
@@ -322,7 +376,7 @@ function _M.likeCommentRpc(agent, data)
 	local commentIndex = heroType .. ":" .. commentId
 	local commentRoleKey = string.format("comment:%d:like", role:getProperty("id"))
 	local redret = redisproxy:pipelining(function (red)
-		red:hexists(commentKey.commentKey, commentId)
+		red:hget(commentKey.commentKey, commentId)
 		red:lrem(commentRoleKey, 1, commentIndex)
 		red:lpush(commentRoleKey, commentIndex)
 		red:ltrim(commentRoleKey, 0, 999)
@@ -330,7 +384,8 @@ function _M.likeCommentRpc(agent, data)
 	if (tonumber(redret[2]) or 0) > 0 then
 		result.status = 1
 	else
-		if redret[1] == 1 then-- 查不到也返回ture
+		if redret[1] then-- 查不到也返回ture
+			local comment = json.decode(redret[1])
 			local redret2 = redisproxy:pipelining(function (red)
 				red:zrevrange(commentKey.commentRankKey, 0, RankLikeNum - 1) --热门
 				red:zincrby(commentKey.commentRankKey, add, commentId)
@@ -356,6 +411,13 @@ function _M.likeCommentRpc(agent, data)
 					red:lrem(commentKey.commentListKey, 0, tempId)
 				end
 			end)
+
+			role:log("hero_note", {
+				hero_id = heroType, -- 英雄ID
+				hero_note_action = add > 0 and 1 or 2, -- 英雄评价界面操作，发布评论：0，点赞：1，反对：2
+				hero_note_id = commentId, -- 操作的评价ID
+				hero_note_text = comment.content, -- 操作的评价内容
+			})
 		end
 	end
  
@@ -363,108 +425,6 @@ function _M.likeCommentRpc(agent, data)
 	return true
 end
  
--- function _M.loveItemRpc(agent, data)
--- 	local role = agent.role
--- 	local msg = MsgPack.unpack(data)
--- 	local hero = role.heros[msg.heroId]
--- 	if not hero then
--- 		return
--- 	end
--- 	local curL = hero:getProperty("loveL")
--- 	local curExp = hero:getProperty("loveExp")
--- 	local curType = hero:getProperty("type")
--- 	local curPlus = csvdb["unit_love_plusCsv"][curType]
--- 	if not curPlus then
--- 		return
--- 	end
--- 	if curL >= curPlus.limit then
--- 		SendPacket(actionCodes.Hero_loveItemRpc, MsgPack.pack({errMsg = 1}))	--已满级
--- 		return true
--- 	end
--- 	local curEffect = csvdb["unit_love_effectCsv"][curL]
--- 	if not curEffect then
--- 		return
--- 	end
--- 	if curExp >= curEffect.loveValue and not msg.bBreak then
--- 		SendPacket(actionCodes.Hero_loveItemRpc, MsgPack.pack({errMsg = 2}))	--当前等级经验已满
--- 		return true
--- 	end
-
--- 	if msg.bBreak then
--- 		local cost = curEffect.cost:toArray(true, "=")
--- 		if not role:checkItemEnough({[cost[1]] = cost[2]}) then
--- 			SendPacket(actionCodes.Hero_loveItemRpc, MsgPack.pack({errMsg = 3, itemId = cost[1]}))	--物品不足
--- 			return true
--- 		end
--- 		role:costItems({[cost[1]] = cost[2]})
--- 		local newLevel = curL + 1
--- 		hero:updateProperty({field = "loveL", value = newLevel})
--- 		hero:updateProperty({field = "loveExp", value = 0})
-
--- 		if role:getProperty("loveStatus"):getv(curType, 0) < newLevel then
--- 			role:changeUpdates({{type = "loveStatus", field = curType, value = newLevel}}) -- 总的
--- 		end
-
--- 		role:checkTaskEnter("LoveBreak", {heroType = curType, loveL = newLevel})
-
--- 	else
--- 		local delta = globalCsv.unit_love_presentValue[msg.itemId]
--- 		if not delta then
--- 			return
--- 		end
--- 		if not role:checkItemEnough({[msg.itemId] = 1}) then
--- 			SendPacket(actionCodes.Hero_loveItemRpc, MsgPack.pack({errMsg = 3, itemId = msg.itemId}))
--- 			return true
--- 		end
--- 		local newExp = curExp + delta
--- 		if newExp > curEffect.loveValue then
--- 			newExp = curEffect.loveValue
--- 		end
--- 		role:costItems({[msg.itemId] = 1})
--- 		hero:updateProperty({field = "loveExp", value = newExp})
--- 	end
--- 	SendPacket(actionCodes.Hero_loveItemRpc, "")
--- 	return true
--- end
-
--- function _M.loveTaskRpc(agent, data)
--- 	local role = agent.role
--- 	local msg = MsgPack.unpack(data)
--- 	local hero = role.heros[msg.id]
--- 	if not hero then return end
-
--- 	local curL = hero:getProperty("loveL")
--- 	local curExp = hero:getProperty("loveExp")
--- 	local curType = hero:getProperty("type")
--- 	local curPlus = csvdb["unit_love_plusCsv"][curType]
--- 	if not curPlus or curL >= curPlus.limit then return end
-
---  	local curEffect = csvdb["unit_love_effectCsv"][curL]
--- 	if not curEffect or curExp < curEffect.loveValue then return end
-
--- 	local lastEffect = csvdb["unit_love_effectCsv"][curL + 1]
--- 	local newExp = curExp - curEffect.loveValue
--- 	if lastEffect and curL + 1 < curPlus.limit then
--- 		if newExp >= lastEffect.loveValue then
--- 			-- todo  发任务
--- 		end
--- 	else
--- 		newExp = 0
--- 	end
--- 	local newLevel = curL + 1
--- 	hero:updateProperty({field = "loveExp", value = newExp})
--- 	hero:updateProperty({field = "loveL", value = newLevel})
-
--- 	if role:getProperty("loveStatus"):getv(curType, 0) < newLevel then
--- 		role:changeUpdates({{type = "loveStatus", field = curType, value = newLevel}}) -- 总的
--- 	end
-
--- 	role:checkTaskEnter("LoveBreak", {heroType = curType, loveL = newLevel})
-
--- 	SendPacket(actionCodes.Hero_loveTaskRpc, "")
--- 	return true
--- end
-
 function _M.createHeroRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -493,6 +453,7 @@ function _M.referEquipsRpc(agent, data)
 	local hero = role.heros[msg.id]
 	if not hero then return 10 end
 	local equips = msg.equips
+	local isAuto = msg.isAuto
 	if not equips or not next(equips) then return 11 end
  
 	for typ = 1, 4 do -- 4件装备
@@ -502,6 +463,11 @@ function _M.referEquipsRpc(agent, data)
 			end
 		end
 	end
+
+	local oldAttr = hero:getTotalAttrs()
+	local oldBattleV = hero:getProperty("battleV")
+	local wear = {}
+
 	local curEquip = hero:getProperty("equip")
 	for typ = 1, 4 do -- 4件装备
 		if equips[typ] then
@@ -512,17 +478,37 @@ function _M.referEquipsRpc(agent, data)
 				else
 					role:addEquip(typ, equips[typ], -1, {log = {desc = "refer"}}) -- 穿上
 					curEquip = curEquip:setv(typ, equips[typ])
+
+					wear[typ] = {id = equips[typ], act = 0}
 				end
  
 				if cur ~= 0 then
 					role:addEquip(typ, cur, 1, {log = {desc = "refer"}}) -- 脱掉
+
+					wear[typ] = {id = cur, act = 1}
 				end
 			end
 		end
 	end
+
 	-- 更新角色
 	hero:updateProperty({field = "equip", value = curEquip})
  
+	role:finishGuide(23)
+
+	local curAttr = hero:getTotalAttrs()
+	local attrChange = getChangeAttrJson(oldAttr, curAttr)
+	for typ, data in pairs(wear) do
+		role:log("equip_wear", {
+			hero_id = hero:getProperty("type"), --英雄ID
+			equip_id = data.id, --装备ID
+			equip_wear_action = data.act, --装备操作类型：装备：0，卸载：1
+			equip_wear_part = typ, --装备部位，记录部位ID
+			equip_wear_result = curAttr, --装备操作后结果，记录属性变化，json格式记录，{“aa”:1234,"bb":4567}
+			equip_wear_change = attrChange, --装备操作变化值，记录属性变化，记录正负值，json格式记录，{“aa”:1234,"bb":-45}
+			equip_wear_mode = isAuto and 0 or 1, --用以区分自动装备还是手动装备，自动记录为0，手动记录为1
+		})
+	end
 	SendPacket(actionCodes.Hero_referEquipsRpc, "")
 	return true
 end
@@ -559,6 +545,9 @@ function _M.referRunesRpc(agent, data)
 		chero:updateProperty({field = "rune", value = hrunes})
 	end
  
+	local oldAttr = hero:getTotalAttrs()
+	local oldBattleV = hero:getProperty("battleV")
+	local wear = {}
 	local curRune = hero:getProperty("rune")
 	for typ = 1, 6 do
 		if runes[typ] then
@@ -570,6 +559,7 @@ function _M.referRunesRpc(agent, data)
 					local newRune = role.runeBag[runes[typ]]
 					newRune:updateProperty({field = "refer",value = hero:getProperty("id")})
 					curRune = curRune:setv(typ, runes[typ])
+					wear[runes[typ]] = typ
 				end
  
 				if cur ~= 0 then
@@ -581,7 +571,22 @@ function _M.referRunesRpc(agent, data)
 			end
 		end
 	end
+
 	hero:updateProperty({field = "rune", value = curRune})
+
+	local attrChange = getChangeAttrJson(oldAttr, hero:getTotalAttrs())
+	for runeId, typ in pairs(wear) do
+		local ownRune = role.runeBag[runeId]
+		role:log("hero_jewel", {
+			hero_id = hero:getProperty("type"), -- 英雄ID
+			hero_jewel_id = ownRune:getProperty("id"), -- 铭文ID
+			hero_jewel_part = typ, -- 铭文装备部位
+			hero_jewel_score = hero:getProperty("battleV"), -- 铭文装备后的英雄分值
+			hero_jewel_scorebefore = oldBattleV, -- 铭文装备前的英雄分值
+			hero_jewel_result = attrChange, -- 铭文装备后效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+		})
+	end
+	
 	SendPacket(actionCodes.Hero_referRunesRpc, "")
 	return true
 end
@@ -666,256 +671,39 @@ function _M.getResetRewardRpc(agent, data)
 		end
 	end
  
-	hero:updateProperty({field = "level", value = level})
-	hero:updateProperty({field = "breakL", value = breakL})
-	hero:updateProperty({field = "talent", value = ""})
-	hero:log({desc = "resetHero"})
-
-	for itemId, count in pairs(reward) do
-		reward[itemId] = math.floor(count * globalCsv.unit_back_discount)
-	end
-	local change
-	reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
-
-	SendPacket(actionCodes.Hero_getResetRewardRpc, MsgPack.pack(role:packReward(reward, change)))
-	return true
-end
-
-function _M.unuse_drawHeroRpc(agent, data)
-	local role = agent.role
-	local msg = MsgPack.unpack(data)
-
-	if not role:isFuncUnlock(FuncUnlock.GetHero) then return end
-	local btype = msg.pool	-- 1 2 3 4
-	local drawType = msg.type -- 1 单抽 2 十连
-	local guide = msg.guide -- 是否是引导抽的
-	
-	local buildTypeData = csvdb["build_typeCsv"][btype]
-	if not buildTypeData then return 1 end
-
-	local drawCount = {1, 10} -- 抽取次数
-	if not drawCount[drawType] then return 2 end
-
-	local newerDraw
-	if btype == 4 then
-		newerDraw = role:getProperty("newerDraw")
-		if math.illegalNum(globalCsv.draw_newer[2] - (newerDraw[1] or 0),  drawCount[drawType],  globalCsv.draw_newer[2]) then return 11 end
-	end
-	
-	local cost = {}
-	local lastCount = drawCount[drawType]
-	for _, costType in ipairs({"draw_card", "draw_coin"}) do
-		if buildTypeData[costType] ~= "" then
-			local curCost = buildTypeData[costType]:toArray(true, "=")
-			local hadCount = role:getItemCount(curCost[1])
-			local curCount = math.floor(hadCount / curCost[2])
-			if curCount >= lastCount then
-				cost[curCost[1]] = curCost[2] * lastCount
-				lastCount = 0
-				break
-			elseif curCount > 0 then
-				cost[curCost[1]] = curCost[2] * curCount
-				lastCount = lastCount - curCount
-			end
-		end
+	local equip = hero:getProperty("equip")
+	for k, v in pairs(equip:toNumMap()) do
+		role:addEquip(k, v, 1, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
 	end
-	if lastCount > 0 then -- 钱不够
-		return 3
-	end
-
-	-- pool 固定的
-	local poolEnum = {
-		[1] = {
-			[1] = 1,
-			[2] = 2,
-			[3] = 3,
-		},
-		[2] = 10,
-		[3] = 11,
-		[4] = 12,
-	}
  
-	-- 抽取的池子
-	local pool = poolEnum[btype]
-	if btype == 1 then
-		-- 超级卡池子 每周轮换 有活动覆盖之
-		--TODO 活动判断
-		if false then
-		else
-			for idx, poolId in pairs(pool) do
-				if role:isTimeResetOpen(TimeReset["DrawType" .. idx]) then
-					pool = poolId
-					break
-				end
-			end
-			if type(pool) ~= "number" then
-				pool = -1
-			end
+	local rune = hero:getProperty("rune")
+	for _, id in pairs(rune:toNumMap()) do
+		local curRune = role.runeBag[id]
+		if curRune then
+			curRune:updateProperty({field = "refer", value = 0})
 		end
 	end
-	local unitPool = csvdb["build_unitCsv"][pool]
-	if not unitPool then return 4 end
  
-	-- 开始抽
-	local resultPool = {}
-	local function fillDrawPool(fixRare, fixCamp, ssrUp, floorBack)
-		local condition = {"rare", "camp"}
-		local values = {fixRare, fixCamp}
+	hero:updateProperties({
+		level = level,
+		breakL = breakL,
+		talent = "",
+		equip = "",
+		rune = "",
+	})
  
-		for idx, field in ipairs(condition) do
-			if not values[idx] then
-				local lpool = {}
-				local curIdx = 1
-				while unitPool[field .. "_" .. curIdx] do
-					lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
-					curIdx = curIdx + 1
-				end
-
-				-- 稀有度 ssr up
-				if field == "rare" then
-					local all = 0
-					for _, weight in pairs(lpool) do
-						all = all + weight[1]
-					end
-					--[[
-						SSR概率值：初始概率 + 步长概率
-						SR概率值：初始概率 * [ (初始概率+R初始概率) - 步长概率 ] /（初始概率+R初始概率）
-						R概率值：初始概率 * [ (初始概率+SR初始概率) - 步长概率 ] /（初始概率+SR初始概率）
-					]]
-					local ssrAdd = (ssrUp or 0) * all
-					local last = all - lpool[4][1]
-					lpool[4][1] = lpool[4][1] + ssrAdd
-					lpool[3][1] = lpool[3][1] * (last - ssrAdd) / last
-					lpool[2][1] = lpool[2][1] * (last - ssrAdd) / last
-				end
-
-				if next(lpool) then
-					values[idx] =  math.randWeight(lpool, 1)
-				end
-			end
-		end
-
-		for itemId, oneData in pairs(floorBack and csvdb["build_floorCsv"] or csvdb["build_poolCsv"]) do
-			if oneData["pool_" .. pool] and oneData["pool_" .. pool] ~= "" then
-				local itemData = csvdb["itemCsv"][itemId]
-				while itemData do
-					if itemData.type ~= ItemType.Hero then break end
-					local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
-					if not heroData then break end
-					local ok = true
-					for idx, field in ipairs(condition) do
-						if heroData[field] ~= values[idx] then ok = false break end
-					end
-					if not ok then break end
-					if oneData["pool_" .. pool] > 0 then
-						resultPool[itemId] = {oneData["pool_" .. pool]}  -- itemId, count, 概率
-					end
-					break
-				end
-			end
-		end
-	end
-
-	role:costItems(cost, {log = {desc = "drawHero", short1 = btype, int1 = pool}})
-
-	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
-	local draw_ssr_up_count_rate = globalCsv.draw_ssr_up_count_rate[btype]
-	local floorHeroCount = role:getProperty("floorHero")[btype] or 0
-	local ssrUpCount = role:getProperty("ssrUp")[btype] or 0
-
-	local newerDrawCount, newerHadSSR  
-	if btype == 4 then
-		newerDrawCount = newerDraw[1] or 0
-		newerHadSSR = newerDraw[2] or 0
-	end
-
-	local ssrCount = 0
-	local reward = {}
-	for i = 1, drawCount[drawType] do
-		floorHeroCount = floorHeroCount + 1
-		if btype == 4 then
-			newerDrawCount =  newerDrawCount + 1
-		end
-
-		resultPool = {}
-		local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
-		local isNewerSSR = btype == 4 and (newerHadSSR == 0 and newerDrawCount >= globalCsv.draw_newer[1]) or false
-
-		local ssrUp = 0
-		if draw_ssr_up_count_rate and ssrUpCount > draw_ssr_up_count_rate[1] then
-			ssrUp = math.min((ssrUpCount - draw_ssr_up_count_rate[1]) * draw_ssr_up_count_rate[2], draw_ssr_up_count_rate[3]) / 100
-		end
-		while not next(resultPool) do
-			if isNewerSSR then
-				fillDrawPool(4) -- 新手保底的 ssr 
-			elseif isFloorBack then
-				-- 保底 sr 【郑斌】明确
-				-- 保底 sr 改为 池子随机 sr 或者 ssr【郑斌】
-				fillDrawPool(nil, nil, nil, true)     
-			else
-				fillDrawPool(nil, nil, ssrUp)
-			end
-		end
-
-		-- 引导必送 613 丝路德
-		local itemId = (guide and drawType == 1) and 613 or math.randWeight(resultPool, 1)
-		local itemData = csvdb["itemCsv"][itemId]
-		if itemData.quality == 4 then
-			ssrCount = ssrCount + 1
-			ssrUpCount = 0
-			if btype == 4 then
-				newerHadSSR = newerHadSSR + 1
-			end
-		else
-			ssrUpCount = ssrUpCount + 1
-		end
-
-		if itemData.quality >= 3 then
-			floorHeroCount = 0
-		end
-
-		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
-			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", short1 = btype, int1 = pool}})
-			table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
-		else
-			role:award({[itemId] = 1}, {log = {desc = "drawHero", short1 = btype, int1 = pool}})
-			table.insert(reward, {id = itemId, count = 1})
-		end
-	end
-
-	if draw_floor_back_counts then
-		local floorHero = role:getProperty("floorHero")
-		floorHero[btype] = floorHeroCount
-		role:setProperty("floorHero", floorHero)
-	end
-
-	if draw_ssr_up_count_rate then
-		local ssrUp = role:getProperty("ssrUp")
-		ssrUp[btype] = ssrUpCount
-		role:setProperty("ssrUp", ssrUp)
-	end
-
-	if btype == 4 then
-		newerDraw[1] = newerDrawCount
-		newerDraw[2] = newerHadSSR
-		role:updateProperty({field = "newerDraw", value = newerDraw})
+	for itemId, count in pairs(reward) do
+		reward[itemId] = math.floor(count * globalCsv.unit_back_discount)
 	end
+	local change
+	reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
  
-	-- if pool == 1 then
-	-- 	local repayHero = role:getProperty("repayHero")
-	-- 	repayHero = math.min(globalCsv.draw_super_repay_count, repayHero + drawCount[drawType])
-	-- 	role:updateProperty({field = "repayHero", value = repayHero})
-	-- end
-
-	role:checkTaskEnter("DrawHero", {pool = btype, count = drawCount[drawType]})
-	if ssrCount > 0 then
-		role:checkTaskEnter("DrawSSR", {count = ssrCount})
-	end
-	role:log("hero_action", {desc = "drawHero", short1 = btype, int1 = drawCount[drawType], int2 = pool})
-	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
+	role:log("hero_recycle", {
+		hero_recycle_list = {[hero:getProperty("type")] = 1}, -- 回收的英雄id列表，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		hero_recycle_reward = reward, -- 回收后获得的奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		hero_recycle_cnt = 1, -- 总回收英雄量
+	})
+	SendPacket(actionCodes.Hero_getResetRewardRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
  
@@ -927,7 +715,6 @@ function _M.drawHeroRpc(agent, data)
 	local btype = msg.pool	-- 1 2 3	卡池类型
 	local subType = msg.subType	or 1-- 定向卡池需要传 子类型
 	local drawType = msg.type -- 1 单抽 2 十连
-	local guide = msg.guide -- 是否是引导抽的
 	if btype ~= 1 then
 		subType = 1
 	end
@@ -938,6 +725,9 @@ function _M.drawHeroRpc(agent, data)
 	local drawCount = {1, 10} -- 抽取次数
 	if not drawCount[drawType] then return 2 end
  
+	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
+	local floorHeroCount = role:getProperty("floorHero")[btype] or 0
+
 	-- 计算抽卡消耗品
 	local cost = {}
 	local lastCount = drawCount[drawType]
@@ -976,16 +766,21 @@ function _M.drawHeroRpc(agent, data)
 	end
  
 	--TODO 活动覆盖
+	local actPoolId = role.activity:getActivityPool(btype, subType)
+	if actPoolId ~= 0 then
+		poolId = actPoolId
+	end
  
 	local unitPool = csvdb["build_unitCsv"][poolId]
 	if not unitPool then return 4 end
  
 	-- 开始抽
 	local resultPool = {}
-	local function fillDrawPool()
+	local function fillDrawPool(isFloorBack)
 		local condition = {"rare", "camp"}
 		local values = {}
  
+
 		for idx, field in ipairs(condition) do
 			if not values[idx] then
 				local lpool = {}
@@ -1001,20 +796,24 @@ function _M.drawHeroRpc(agent, data)
 			end
 		end
  
-		for itemId, oneData in pairs(csvdb["build_poolCsv"]) do
-			if oneData["pool_" .. poolId] and oneData["pool_" .. poolId] ~= "" then
+		for itemId, oneData in pairs(isFloorBack and csvdb["build_floorCsv"] or csvdb["build_poolCsv"]) do
+			local pool_str = "pool_" .. poolId
+			if oneData[pool_str] and oneData[pool_str] ~= "" then
 				local itemData = csvdb["itemCsv"][itemId]
 				while itemData do
 					if itemData.type ~= ItemType.Hero then break end
 					local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
 					if not heroData then break end
 					local ok = true
-					for idx, field in ipairs(condition) do
-						if heroData[field] ~= values[idx] then ok = false break end
+					-- 保底是全随机，不用比较类型
+					if not isFloorBack then
+						for idx, field in ipairs(condition) do
+							if heroData[field] ~= values[idx] then ok = false break end
+						end
 					end
 					if not ok then break end
-					if oneData["pool_" .. poolId] > 0 then
-						resultPool[itemId] = {oneData["pool_" .. poolId]}  -- itemId, count, 概率
+					if oneData[pool_str] > 0 then
+						resultPool[itemId] = {oneData[pool_str]}  -- itemId, count, 概率
 					end
 					break
 				end
@@ -1022,35 +821,58 @@ function _M.drawHeroRpc(agent, data)
 		end
 	end
  
-	role:costItems(cost, {log = {desc = "drawHero", short1 = btype, int1 = poolId}})
+	role:costItems(cost, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+
+	local guideHero
+	if role:getProperty("newerGuide") == "11=1" then
+		guideHero = 613
+	end
  
 	local ssrCount = 0
 	local reward = {}
 	for i = 1, drawCount[drawType] do
+		floorHeroCount = floorHeroCount + 1
+		local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
 		resultPool = {}
-		while not next(resultPool) do
-			fillDrawPool()
+		fillDrawPool(isFloorBack)
+		if not next(resultPool) then
+			skynet.error("random pool error, poolId:" .. poolId)
+			return
+		end
+
+		local itemId = math.randWeight(resultPool, 1)
+		if guideHero then
+			itemId = guideHero
+			guideHero = nil
 		end
  
-		-- 引导必送 613 丝路德
-		local itemId = guide and 613 or math.randWeight(resultPool, 1)
 		local itemData = csvdb["itemCsv"][itemId]
 		if itemData.quality == HeroQuality.SSR then
 			ssrCount = ssrCount + 1
 		end
  
+		if itemData.quality >= HeroQuality.SR then
+			floorHeroCount = 0
+		end
+
 		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
 			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", short1 = btype, int1 = poolId}})
+			role:award({[fragId] = count}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
 			table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
 		else
-			role:award({[itemId] = 1}, {log = {desc = "drawHero", short1 = btype, int1 = poolId}})
+			role:award({[itemId] = 1}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
 			table.insert(reward, {id = itemId, count = 1})
 		end
 	end
  
+	if draw_floor_back_counts then
+		local floorHero = role:getProperty("floorHero")
+		floorHero[btype] = floorHeroCount
+		role:setProperty("floorHero", floorHero)
+	end
+
 	if btype == 1 or btype == 2 then
 		local repayHero = role:getProperty("repayHero") or 0
 		repayHero = repayHero + drawCount[drawType]
@@ -1061,7 +883,16 @@ function _M.drawHeroRpc(agent, data)
 	if ssrCount > 0 then
 		role:checkTaskEnter("DrawSSR", {count = ssrCount})
 	end
-	role:log("hero_action", {desc = "drawHero", short1 = btype, int1 = drawCount[drawType], int2 = poolId})
+	role:finishGuide(11)
+	
+	role:log("gacha", {
+		gacha_id = poolId, -- 卡池ID
+		gacha_type = btype, -- 卡池类型
+		gacha_up = 0, -- 卡池UP角色
+		gacha_times = drawCount[drawType], -- 抽卡次数
+		gacha_reward = reward, -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		currency = cost, -- 购买道具消耗的货币
+	})
 	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
 	return true
 end
@@ -1091,7 +922,6 @@ function _M.repayHeroRpc(agent, data)
 		role:award({[id] = 1}, {log = {desc = "heroRepay"}})
 		reward = {id = id, count = 1}
 	end
-	role:log("hero_action", {desc = "heroRepay", int1=result})
 	SendPacket(actionCodes.Hero_repayHeroRpc, MsgPack.pack({reward = reward}))
 	return true
 end
@@ -1114,7 +944,7 @@ function _M.unlockPoolRpc(agent, data)
 	end
  
 	if needCost then
-		if not role:costDiamond({count = globalCsv.draw_unlock_pool_diamond or 300, log = {desc = "unlockPool", short1 = type}}) then
+		if not role:costDiamond({count = globalCsv.draw_unlock_pool_diamond or 300, log = {desc = "unlockPool", int1 = type}}) then
 			return
 		end
 	end
@@ -1123,9 +953,24 @@ function _M.unlockPoolRpc(agent, data)
 	role.dailyData:updateProperty({field="unlockPool", value = unlockPool})
 	role.dailyData:updateProperty({field="curPool", value = type})
  
-	role:log("hero_action", {desc = "unlockPool", short1=type})
+	--role:log("hero_action", {desc = "unlockPool", int1=type})
 	SendPacket(actionCodes.Hero_unlockPoolRpc, MsgPack.pack({}))
 	return true
 end
  
+function _M.changeCrown(agnet, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local heroType = msg.heroType
+
+	if not role:isHaveHero(heroType) then return true end
+	role:setProperty("crown", heroType)
+
+	role:log("hero_show", {
+		hero_id = heroType,
+	})
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -287,7 +287,7 @@ function _M.startBattleRpc(agent, data)
 		if pvpFree >= globalCsv.pvp_battle_free_count then
 			local cost = {[ItemId.PvpKey] = 1}
 			if not role:checkItemEnough(cost) then return 5 end
-			role:costItems(cost, {log = {desc = "startPvp", short1 = 1}})
+			role:costItems(cost, {log = {desc = "startPvp", int1 = 1}})
 		else
 			role.dailyData:updateProperty({field = "pvpFree", delta = 1})
 		end
@@ -296,9 +296,6 @@ function _M.startBattleRpc(agent, data)
 		_pvpStartBattleCacheC = {idx = idx, key = key, revenge = revenge}
  
 		role:checkTaskEnter("PvpBattle")
-
-
-		role:log("pvp_action", {desc = "startBattle", short1 = 1, int1 = revenge and 1 or 0})
 	end
  
 	SendPacket(actionCodes.Pvp_startBattleRpc, MsgPack.pack({matchInfo = matchInfo, key = key, result = result, wait = wait}))
@@ -338,11 +335,6 @@ function _M.endBattleRpc(agent, data)
 	local reward, change = role:award({[temp[1]] = temp[2]}, {log = {desc = "pvpBattleC"}})
 	local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = role:changePvpScoreCommon(match.t == 1 and match.id or -1, isWin)
  
-	_pvpBattleInfoCacheC = {}  --重新发阵容了 没毛病
-	_pvpRecordInfoCacheC = {} -- 记录刷新了
-	_pvpRecordBattleInfoCacheC = {} -- 取新纪录的时候搞
-	_pvpStartBattleCacheC = nil
-
 	-- 请求上传录像
 	local params = {
 		["roleid"] = roleId,
@@ -392,8 +384,21 @@ function _M.endBattleRpc(agent, data)
 		role:checkTaskEnter("PvpWin", {score = myScore})
 	end
  
-	role:log("pvp_action", {desc = "battleEnd", short1 = 1, int1 = isWin and 1 or 0, int2 = revenge and 1 or 0})
+	role:checkBattle("pvpc", {
+		isWin = isWin,
+		info = msg.info,
+		robotId = match.t == 2 and match.id or nil,
+		enemy = match.t == 1 and _pvpBattleInfoCacheC[match.id] or nil,
+		score = myScore,
+		reward = reward,
+		rank = myRank,
+	})
  
+	_pvpBattleInfoCacheC = {}  --重新发阵容了 没毛病
+	_pvpRecordInfoCacheC = {} -- 记录刷新了
+	_pvpRecordBattleInfoCacheC = {} -- 取新纪录的时候搞
+	_pvpStartBattleCacheC = nil
+
 	SendPacket(actionCodes.Pvp_endBattleRpc, MsgPack.pack({
 		reward = reward,
 		change = change,
@@ -494,7 +499,7 @@ function _M.startBattleHRpc(agent, data)
 		if pvpFreeH >= globalCsv.pvp_battle_free_count_high then
 			local cost = {[ItemId.PvpKey] = globalCsv.pvp_battle_high_cost}
 			if not role:checkItemEnough(cost) then return 5 end
-			role:costItems(cost, {log = {desc = "startPvp", short1 = 2}})
+			role:costItems(cost, {log = {desc = "startPvp", int1 = 2}})
 		else
 			role.dailyData:updateProperty({field = "pvpFreeH", delta = 1})
 		end
@@ -520,8 +525,6 @@ function _M.startBattleHRpc(agent, data)
  
 		role:checkTaskEnter("PvpBattle")
  
-		role:log("pvp_action", {desc = "startBattle", short1 = 2, int1 = revenge and 1 or 0})
-
 	end
  
 	SendPacket(actionCodes.Pvp_startBattleHRpc, MsgPack.pack({
@@ -683,6 +686,17 @@ function _M.endBattleHRpc(agent, data)
 		end
 	end)
  
+	role:checkBattle("pvph", {
+		isWin = isWin,
+		info = msg.info,
+		robotId = match.t == 2 and match.id or nil,
+		enemy = match.t == 1 and (revenge and _pvpRecordBattleInfoCacheH[match.id] or _pvpBattleInfoCacheH[match.id]) or nil,
+		score = myScore,
+		reward = reward,
+		rank = myRank,
+	})
+
+
 	_pvpBattleInfoCacheH = {}  --重新发阵容了 没毛病
 	_pvpRecordInfoCacheH = {} -- 记录刷新了
 	_pvpRecordBattleInfoCacheH = {} -- 取新纪录的时候搞
@@ -693,8 +707,7 @@ function _M.endBattleHRpc(agent, data)
 	if isWin then
 		role:checkTaskEnter("PvpWin", {score = myScore})
 	end
-	role:log("pvp_action", {desc = "battleEnd", short1 = 2, int1 = isWin and 1 or 0, int2 = revenge and 1 or 0})
-	
+
 	SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({
 		reward = reward,
 		change = change,
@@ -842,7 +855,6 @@ function _M.highDivisionGiftRpc(agent, data)
 	})
  
 	local reward, change = role:award(newReward, {log = {desc = "pvpDivisionH"}})
-	role:log("pvp_action", {desc = "pvpDivisionH"})
  
 	SendPacket(actionCodes.Pvp_highDivisionGiftRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -877,8 +889,6 @@ function _M.shopBuyRpc(agent, data)
 	end
 	local reward, change = role:award(gift, {log = {desc = "pvpShop", int1 = id, int2 = count}})
  
-	role:log("pvp_action", {desc = "pvpShop", int1 = id, int2 = count})
-
 	SendPacket(actionCodes.Pvp_shopBuyRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -970,7 +980,6 @@ function _M.crossBetRpc(agent, data)
 	local result, code = role:setCrossServerPvpBet(msg.idx)
 	if not result then return 10 + code end
  
-	role:log("pvp_action", {desc = "crossBet"})
 	SendPacket(actionCodes.Pvp_crossBetRpc, MsgPack.pack(result))
 	return true
 end
@@ -99,6 +99,29 @@ function _M.loginRpc( agent, data )
 		role:reloadWhenLogin()
 	end
  
+
+	role.sysVersion = msg.sysVersion
+	role.ip = agent.ip:toArray(false, ":")[1]
+	role.clientVersion = msg.clientVersion
+	role.network = msg.network
+
+	if msg.subId then
+		role:setProperty("sid", msg.subId)
+	end
+
+	if msg.deviceMode then
+		local deviceMode = tostring(msg.deviceMode)
+		if role:getProperty("dmode") ~= deviceMode then
+			role:setProperty("dmode", deviceMode)
+		end
+	end
+	if msg.device then
+		local device = tostring(msg.device)
+		if role:getProperty("device") ~= device then
+			role:setProperty("device", device)
+		end
+	end
+
 	if not msg.isGMlogin then
 		local banTime = role:getProperty("banTime")
 		if banTime > now then
@@ -114,6 +137,20 @@ function _M.loginRpc( agent, data )
 			role:setBan(0)
 		end
 	end
+
+	if msg.deviceMode then
+		local deviceMode = tostring(msg.deviceMode)
+		if role:getProperty("dmode") ~= deviceMode then
+			role:setProperty("dmode", deviceMode)
+		end
+	end
+	if msg.device then
+		local device = tostring(msg.device)
+		if role:getProperty("device") ~= device then
+			role:setProperty("device", device)
+		end
+	end
+	
 	SERV_OPEN = redisproxy:hget("autoincrement_set", "server_start")
  
 	role:changeStructVersion() -- 数据结构 版本更新
@@ -253,7 +290,7 @@ function _M.loginRpc( agent, data )
 	role:savePvpHTeam()
  
 	local hangPass = role:getProperty("hangPass")
-	role:log("login", {key1 = agent.ip:toArray(false, ":")[1], int1 = hangPass[1] or 0})
+	role:log("onLogin")
  
 	return true
 end
@@ -271,6 +308,13 @@ function _M.createRpc(agent, data)
 		SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
 		return true
 	end
+	local stopcreate = tonumber(redisproxy:hget("autoincrement_set", "stopcreate"))
+	if stopcreate and stopcreate > 0 then
+		response.result = "STOP_CREATE"
+		SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
+		return true
+	end
+
  
 	local roleId = getNextRoleId()
 	if not roleId then
@@ -286,7 +330,8 @@ function _M.createRpc(agent, data)
 		sid = msg.subId or 0,
 		name = roleName,
 		uname = msg.uname or "",
-		device = tostring(msg.device)
+		device = tostring(msg.device),
+		dmode = msg.deviceMode and tostring(msg.deviceMode) or nil
 	})
  
 	if newRole:create() then
@@ -300,11 +345,20 @@ function _M.createRpc(agent, data)
 		return true
 	end
 	newRole:startActionUcode()
+	newRole.sysVersion = msg.sysVersion
+	newRole.ip = agent.ip:toArray(false, ":")[1]
+	newRole.clientVersion = msg.clientVersion
+	newRole.network = msg.network
+
 	newRole:award(globalCsv.birthItem, {log = {desc = "birth"}, notNotify = true})
 	-- 欢迎邮件
 	redisproxy:insertEmail({roleId = roleId, emailId = 1})
  
-	newRole:log("create", {key1 = agent.ip:toArray(false, ":")[1]})
+	if msg.newuser then
+		newRole:log("onCreateAccount")
+	end
+	newRole:log("onCreateRole")
+
  
 	SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
 	return true
@@ -406,11 +460,21 @@ function _M.saleItemRpc(agent, data)
 		end
 		local sellEffect = itemData.sell_effect:toArray(true, "=")
 		reward[sellEffect[1]] = (reward[sellEffect[1]] or 0) + sellEffect[2] * count
+
+		role:log("carriage_decals", {
+			item_id = itemId, --道具id
+			item_type = itemData.type, --道具类型，具体见枚举表中道具类型枚举表
+			item_level = 0, --道具等级
+			item_number = count, --道具变化数量的绝对值
+			carriage_decals_rwdid = sellEffect[1], --拆解获得物资ID
+			carriage_decals_rwdnum = sellEffect[2] * count, --拆解获得物资数量
+		})
 	end	
  
 	role:costItems(backs, {log = {desc = "saleItem"}})
 	local reward, change = role:award(reward, {log = {desc = "saleItem"}})
 	role:checkTaskEnter("DecoFrag", {count = fragCount})
+	
 	SendPacket(actionCodes.Role_saleItemRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -483,12 +547,14 @@ function _M.openTimeBoxRpc(agent, data)
 	elseif oper == 2 then -- 领取
 		local quick = msg.quick
 		if not boxL[slot] then return end
+		local costKey = 0
+		local costTime = skynet.timex() - boxL[slot].time
 		if boxL[slot].time > skynet.timex() then -- 没开完
 			if not quick then return end
 			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
-			local costD = math.ceil((boxL[slot].time - skynet.timex()) / (cost_pre[1] * 60)) * cost_pre[2]
-			if not role:checkItemEnough({[ItemId.BoxKey] = costD}) then return end
-			role:costItems({[ItemId.BoxKey] = costD}, {log = {desc = "openTimeBox"}})
+			local costKey = math.ceil((boxL[slot].time - skynet.timex()) / (cost_pre[1] * 60)) * cost_pre[2]
+			if not role:checkItemEnough({[ItemId.BoxKey] = costKey}) then return end
+			role:costItems({[ItemId.BoxKey] = costKey}, {log = {desc = "openTimeBox"}})
 		end
 		local boxId = boxL[slot].id
 		local itemData = csvdb["itemCsv"][boxId]
@@ -518,6 +584,17 @@ function _M.openTimeBoxRpc(agent, data)
 		boxL[slot] = nil
 		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = boxId}})
 		role:checkTaskEnter("OpenBox", {id = boxId, count=1})
+
+		role:log("carriage_dismantle", {
+			item_id = boxId, -- 道具id
+			item_type = itemData.type, -- 道具类型，具体见枚举表中道具类型枚举表
+			item_level = 0, -- 道具等级
+			item_number = 1, -- 道具变化数量的绝对值
+			carriage_dismantle_type = quick and 1 or 0, -- 拆解方式，时间到期:0，钥匙开启:1
+			carriage_dismantle_time = costTime, -- 拆解耗时，填写实际耗时
+			carriage_dismantle_cost = costKey, -- 拆解花费钥匙数量，未使用填写0
+			carriage_dismantle_rwd = reward, -- 拆解获得物资，json格式记录，{'itemid1':2,'itemid2':3,…………..}
+		})
 	else
 		return
 	end
@@ -605,6 +682,15 @@ function _M.storyBookRewardRpc(agent, data)
 	storyStatus[storyId].s = -1
 	role:changeUpdates({{ type = "storyB", field = storyId, value = storyStatus[storyId] }})
 	local reward, change = role:award(storyBookData.gift, {log = {desc = "storybookReward", int1 = storyId}})
+
+	role:log("carriage_decals", {
+		carriage_video_type = storyBookData.type, --放映室类型，剧情CG:0, 角色CG:1, 主线剧情:2, 角色剧情:3, 活动剧情:4, 图鉴:5
+		carriage_video_id = storyId, --放映室片段ID
+		carriage_video_coinid = reward[ItemId.Gold] and ItemId.Gold or 0, --放映奖励货币类型，无奖励则填写0
+		carriage_video_coinnum = reward[ItemId.Gold] or 0, --放映奖励货币数量，无奖励则填写0
+		carriage_video_item = reward, --放映奖励其他物品数量，json格式记录，{'itemid1':10,'itemid2':5,…………..}，无奖励则填写0
+	})
+
 	SendPacket(actionCodes.Role_storyBookRewardRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -667,6 +753,12 @@ function _M.taskRpc(agent, data)
 	local oldVal = role:getProperty("battlePoint") or 0
 	role:updateProperty({field = "battlePoint", value = oldVal + taskData.active})
  
+	role:log("task_reward", {
+		task_reward_id = taskId, --任务奖励ID
+		task_reward_type = taskType, --任务奖励类型，见 任务奖励类型枚举表
+		task_reward_detail = reward, --任务奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	})
+
 	SendPacket(actionCodes.Role_taskRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -756,6 +848,12 @@ function _M.achiveRpc(agent, data)
 		end
 	end
  
+	role:log("achievement", {
+		achievement_id = taskId, -- 成就id
+		achievement_type = achiveTask.type, -- 成就类型，具体枚举表中成就类型枚举表
+		achievement_reward = reward, -- 达成成就奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+	})
+
 	SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -874,6 +972,13 @@ function _M.chatRpc(agent, data)
 	if not result then
 		check[cmd]()
 	end
+
+	role:log("communication", {
+		publish_type = cmd, --发言类型，1，世界  2私聊 
+		publish_status = 0, --发送状态，发送成功:0，发送失败:1，被屏蔽:2，其他:3
+		publish_receive_roleid = msg.roleId, --接收者角色ID
+		publish_text = content, --发言内容
+	})
 	SendPacket(actionCodes.Role_chatRpc, MsgPack.pack({result = result, waitTime = waitTime}))
 	return true
 end
@@ -902,8 +1007,6 @@ function _M.changeSettingRpc(agent, data)
 	setting[id] = status
 	role:updateProperty({field = "setting", value = setting})
  
-	role:log("role_action", {desc = "changeSetting", int1 = id, int2 = status})
-
 	SendPacket(actionCodes.Role_changeSettingRpc,  '')
 	return true
 end
@@ -932,8 +1035,15 @@ function _M.drawCodeRpc(agent, data)
 		if ret == 0 then
 			local giftId = tonumber(result.giftId)
 			role:setProperty("codeStr", codestr:setv(giftId, 1))
-			local reward, change = role:award(result.gift, {log = {desc = "drawCode", key1 = code, int1 = giftId}})
+			local reward, change = role:award(result.gift, {log = {desc = "drawCode", int1 = giftId}})
  
+			role:log("get_gift", {
+				gift_id = giftId, -- 礼包ID
+				gift_key = code, -- 礼包key
+				gift_reward = reward, -- 礼包奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+				gift_name = "", -- 礼包名称
+				gift_reason = 0, -- 礼包发放原因，见发放原因枚举表
+			})
 			SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
 				result = ret,
 				reward = reward,
@@ -988,17 +1098,15 @@ function _M.guideRpc(agent, data)
 	local cmdType = msg.cmdType
  
 	local funcGuide = role:getProperty("funcGuide")
-	local newerGuide = role:getProperty("newerGuide")
 	if cmdType == 1 then
 		-- 新手引导
 		local master = msg.master or -1
 		local slave = msg.slave or -1
 		if master < 0 or slave < 0 then return end
-		newerGuide = string.format("%d=%d",master,slave)
-		role:updateProperty({field = "newerGuide", value = newerGuide})
-		role:log("guide", {desc = "guide_new",int1 = master*1000+slave})
+
+		role:saveGuide(master, slave)
 	elseif cmdType == 2 then
-		-- 系统引导
+		-- 系统引导（玩家可选择是否进行）
 		if not msg.skip then return end
 		local new = math.min(funcGuide:getv(0, 0), msg.skip)
 		if new < 0 then
@@ -1009,15 +1117,23 @@ function _M.guideRpc(agent, data)
  
 		if msg.funcType then
 			funcGuide = funcGuide:setv(msg.funcType, 1)
-			role:log("guide", {desc = "guide_sys", int1 = msg.funcType})
+			role:log("onGuidePoint", {guild_type = 2, guild_id = msg.funcType, guild_point = 0, guild_pass = 0})
 		end
 		role:updateProperty({field = "funcGuide", value = funcGuide})
 	elseif cmdType == 3 then
-		-- 弱引导
+		-- 系统引导（强制进行）
+		if msg.funcType and csvdb["guide_unlockCsv"][msg.funcType] then
+			role:saveGuide(csvdb["guide_unlockCsv"][msg.funcType].guideId,1)
+			funcGuide = funcGuide:setv(msg.funcType, 1)
+			role:updateProperty({field = "funcGuide", value = funcGuide})
+			role:log("onGuidePoint", {guild_type = 1, guild_id = msg.funcType, guild_point = 0, guild_pass = 0})
+		end
+	elseif cmdType == 4 then
+		-- 弹出一个tips（进入功能界面也许要自动弹说明，value要区分1、2）
 		if msg.funcType then
 			local value = msg.value or 1
 			for _, funcIdx in pairs(msg.funcType:toArray(true,"=")) do
-				role:log("guide", {desc = "guide_weak", int1 = funcIdx})
+				role:log("onGuidePoint", {guild_type = 3, guild_id = funcIdx, guild_point = 0, guild_pass = 0})
 				funcGuide = funcGuide:setv(funcIdx, value)
 			end
 			role:updateProperty({field = "funcGuide", value = funcGuide})
@@ -1065,4 +1181,17 @@ function _M.goldBuyRpc(agent, data)
 	return true
 end
  
+function _M.getDownloadCvRewardRpc(agent, data)
+	local role = agent.role
+	local flag = role:getProperty("downCvR") or 0
+	if flag ~= 0 then
+		return 1
+	end
+	local r = globalCsv.role_download_cv_reward
+	local reward, change = role:award(r, {log = {desc = "downloadCv"}})
+	role:updateProperty({field="downCvR", value=1})
+	SendPacket(actionCodes.Role_getDownloadCvRewardRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -31,6 +31,7 @@ function _M.rechargeRpc(agent , data)
 	local partnerOrderId = makeOrder(roleId, id)
 	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
  
+
 	-- 测试的 直接发奖励了
 	skynet.timeout(10, function ()
 		role:handlePurchase({
@@ -84,7 +85,7 @@ function _M.googleRechargeRpc(agent, data)
 		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
 		product_id = dataSet.productId,
-		notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/google"
+		notify_url = msg.notifyUrl
 	}
 	local sign = signPms(need, secret_key)
  
@@ -110,7 +111,7 @@ function _M.myCardRechargeRpc(agent, data)
 		out_trade_no = partnerOrderId,
 		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
-		notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/mycard"
+		notify_url = msg.notifyUrl
 	}
 	local sign = signPms(need, secret_key)
  
@@ -137,7 +138,7 @@ function _M.iosRechargeRpc(agent, data)
 		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
 		product_id = dataSet.iap_product_id,
-		notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/ios"
+		notify_url = msg.notifyUrl
 	}
 	local sign = signPms(need, secret_key)
  
@@ -164,6 +165,22 @@ function _M.purchaseOrderResult(agent, data)
  
 	if msg.status == "success" then
 		orderObject:setProperty("transactionId", msg.platformOrder or "")
+		local rechargeId = orderObject:getProperty("rechargeId")
+		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
+		
+		role:log("setOrder", {
+			order_status = 100, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
+			item_id = rechargeId, -- 道具id
+			item_type = dataSet.type, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
+			item_name = dataSet.title, -- 购买的道具名
+			item_number = 1, -- 购买的道具数量
+			item_level = 1, -- 购买的道具等级
+			order_cost = dataSet.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
+			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
+			order_type = self.getProperty("rmbC") > 0 and 0 or 1, -- 订单类型，首充记录为1，否则为0
+			order_id = msg.platformOrder, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
+		})
+
 		return true
 	end
  
@@ -178,82 +195,6 @@ function _M.purchaseOrderResult(agent, data)
 end
  
  
-function _M.dailyBuyRpc(agent , data)
-	local role = agent.role
-	local msg = MsgPack.unpack(data)
-	local id = msg.id
-	local count = msg.count or 1
-
-	local dataSet = csvdb["shop_diamondCsv"][id]
-	if not dataSet then return 1 end
-
-	local dailySDC = role.dailyData:getProperty("dailySDC")
-
-	if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (dailySDC[id] or 0))) then return 1 end
-
-	local cost = dataSet.cost
-
-	local dailySDD = role.dailyData:getProperty("dailySDD")
-	if dailySDD[id] then -- 折扣
-		cost = math.ceil(cost * (1 - dataSet.disount / 100))
-	end
-
-	if not role:costDiamond({count = cost * count, log = {desc = "dailyShop", int1 = id, int2 = count}}) then
-		return 4 
-	end
-
-	if dataSet.limit ~= 0 then
-		dailySDC[id] = (dailySDC[id] or 0) + count
-		role.dailyData:updateProperty({field = "dailySDC", value = dailySDC})
-	end
-	local gift = {}
-	for itemId, count_ in pairs(dataSet.gift:toNumMap()) do
-		gift[itemId] = count_ * count
-	end
-	local reward = role:award(gift, {log = {desc = "dailyShop", int1 = id, int2 = count}})
-	role:checkTaskEnter("ShopAll", {count = count})
-
-	role:log("role_action", {desc = "dailyShop", int1 = id, int2 = count})
-
-	SendPacket(actionCodes.Store_dailyBuyRpc, MsgPack.pack({reward = reward}))
-	return true
-end
-
-
-function _M.dinerBuyRpc(agent , data)
-	local role = agent.role
-	local msg = MsgPack.unpack(data)
-	local id = msg.id
-	local count = msg.count or 1
-
-	local dataSet = csvdb["shop_dinerCsv"][id]
-	if not dataSet then return end
-
-	local dinerS = role:getProperty("dinerS")
-	if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (dinerS[id] or 0))) then return 1 end
-
-	local cost = {[ItemId.DinerCoin] = dataSet.cost * count}
-	if not role:checkItemEnough(cost) then return end
-
-	if dataSet.limit ~= 0 then
-		dinerS[id] = (dinerS[id] or 0) + count
-		role:updateProperty({field = "dinerS", value = dinerS})
-	end
-
-	role:costItems(cost, {log = {desc = "dinerShop", int1 = id, int2 = count}})
-
-	local gift = {}
-	for _id, _count in pairs(dataSet.gift:toNumMap()) do
-		gift[_id] = _count * count
-	end
-	local reward = role:award(gift, {log = {desc = "dinerShop", int1 = id, int2 = count}})
-	
-	role:log("role_action", {desc = "dinerShop", int1 = id, int2 = count})
-
-	SendPacket(actionCodes.Store_dinerBuyRpc, MsgPack.pack({reward = reward}))
-	return true
-end
-
 function _M.shopBuyRpc(agent , data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -263,6 +204,13 @@ function _M.shopBuyRpc(agent , data)
 	local dataSet = csvdb["shop_normalCsv"][id]
 	if not dataSet then return end
  
+	if dataSet.unlock ~= "" then
+		if not role:checkHangPass(tonumber(config.unlock)) then
+			skynet.error(string.format("shopBuyRpc,user do not finish hang pass, user_id:%d", role:getProperty("id")))
+			return 1
+		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))
@@ -301,8 +249,17 @@ function _M.shopBuyRpc(agent , data)
 	if dataSet.shop == 1 then
 		role:checkTaskEnter("ShopAll", {count = count})
 	end
-	role:log("role_action", {desc = desc, int1 = id, int2 = count})
-
+	local costId, costCount = next(cost)
+
+	role:log("shop_purchase", {
+		item_id = id, -- 道具id
+		item_type = 0, -- 道具类型，具体见枚举表中道具类型枚举表
+		item_level = 0, -- 道具等级
+		item_cnt = count, -- 购买数量技术
+		currency_type = costId or 0, -- 购买道具消耗的货币类型，记录货币ID
+		shop_purchase_current = costCount or 0, -- 购买道具消耗的货币数量
+		shop_id = dataSet.shop, -- 商店ID
+	})
 	SendPacket(actionCodes.Store_shopBuyRpc, MsgPack.pack({reward = reward}))
 	return true
 end
@@ -76,8 +76,6 @@ function _M.startBattleRpc(agent, data)
 	role:updateProperty({field = "towerInfo", value = towerInfo})
 	role:checkTaskEnter("TowerBattle", {level = towerInfo.l})
  
-	role:log("tower_action", {desc = "startBattle", int1 = id})
-
 	SendPacket(actionCodes.Tower_startBattleRpc, '')
 	return true
 end
@@ -116,7 +114,20 @@ function _M.endBattleRpc(agent, data)
 	towerInfo.k = nil
 	role:updateProperty({field = "towerInfo", value = towerInfo})
  
-	role:log("tower_action", {desc = "endBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
+
+	local rank = redisproxy:ZREVRANK(RANK_TOWER, role:getProperty("id"))
+	if not rank then
+		rank = -1
+	else
+		rank = rank + 1
+	end
+	role:checkBattle("tower", {
+		id = id,
+		isWin = msg.starNum and msg.starNum > 0,
+		info = msg.info,
+		reward = reward,
+		rank = rank,
+	})
  
 	SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -140,7 +151,6 @@ function _M.bugCountRpc(agent, data)
 	towerInfo.c = curCount
 	towerInfo.t = nextTime
 	role:updateProperty({field = "towerInfo", value = towerInfo})
-	role:log("tower_action", {desc = "bugCount"})
  
 	SendPacket(actionCodes.Tower_bugCountRpc, '')
 	return true
@@ -24,17 +24,6 @@ function Adv:ctor(owner)
 	self:initByInfo(self.owner:getProperty("advInfo"))
 end
  
-function Adv:log(contents)
-	contents = contents or {}
-	if contents["cint1"] or contents["cint2"] or contents["cint3"] then
-		print("advLog error log have cint1 or cint2 or cint3 ", debug.traceback())
-	end
-	contents["cint1"] = self.chapterId
-	contents["cint2"] = self.level
-
-	self.owner:log("adv_action", contents)
-end
-
 --初始化adv 信息
 function Adv:initByInfo(advInfo)
 	if not next(advInfo) then return end --还没有 开始新地图
@@ -509,18 +498,18 @@ function Adv:awardArtifact(id, params)
 	self:checkAchievement(Adv.AchievType.GetMWeapon, 1, id)
  
  
-	if params.log then
-		local log = clone(params.log)
-		if log["cint1"] or log["cint2"] or log["cint3"] then
-			print("awardArtifact error log have cint1 or cint2 or cint3 ", debug.traceback())
-		end
-		log["cint1"] = self.chapterId
-		log["cint2"] = self.level
-		log["cint3"] = id
-		self.owner:log("in_artifact", log)
-	else
-		print("awardArtifact no log ", debug.traceback())
-	end
+	-- if params.log then
+	-- 	local log = clone(params.log)
+	-- 	if log["cint1"] or log["cint2"] or log["cint3"] then
+	-- 		print("awardArtifact error log have cint1 or cint2 or cint3 ", debug.traceback())
+	-- 	end
+	-- 	log["cint1"] = self.chapterId
+	-- 	log["cint2"] = self.level
+	-- 	log["cint3"] = id
+	-- 	self.owner:log("in_artifact", log)
+	-- else
+	-- 	print("awardArtifact no log ", debug.traceback())
+	-- end
 	if not params.isChoose then
 		self:pushBackEvent(AdvBackEventType.Artifact, {id = id})
 	end
@@ -609,7 +598,6 @@ function Adv:wearArtifact(slot, id)
 	else
 		id = nil
 	end
-	self:log({desc = "wearArtifact", int1 = id})
  
 	self.owner:changeUpdates({{type = "advAFWear", field = slot, value = id}})
 	return true
@@ -668,9 +656,6 @@ function Adv:artifactLevelUp(id, level)
 	end
 	if newLv == advAFGet[id] then return end
  
-	self:log({desc = "artifactLevelUp", int1 = id, int2 = level})
-
-
 	local status = 0
 	if curWear[id] then -- 穿着呢
 		local oldData = csvdb["adv_artifactCsv"][id][advAFGet[id]]
@@ -715,8 +700,6 @@ function Adv:chooseArtifact(index)
 	if not self.waitArtifact or not self.waitArtifact[index] then return end
 	self:award({[self.waitArtifact[index]] = 1}, {log = {desc = "chooseArtifact"}, isChoose = true})
  
-	self:log({desc = "chooseArtifact", int1 = self.waitArtifact[index]})
-
 	self.waitArtifact = nil
  
 	-- 支援效果继续选择
@@ -809,8 +792,6 @@ function Adv:over(success, rewardRatio, overType)
 	end
 	self:clearAdvUnlockCache()
  
-	self:log({desc = "over", short1 = success and 1 or 0, int1 = overType})
-
 	local chapterId = self.chapterId
 	self:clear()
 	self.owner:checkTaskEnter("AdvScore", {score = score})
@@ -903,6 +884,9 @@ function Adv:award(gift, params)
  
 		if csvdb["adv_artifactCsv"][itemId] then -- 获得神器
 			self:awardArtifact(itemId, params)
+			if not self.owner:checkOverGuide(55) then
+				self.owner:saveGuide(55,1,true)
+			end
 		else
 			if nums <= 0 then
 				items = items:delk(itemId)
@@ -911,23 +895,23 @@ function Adv:award(gift, params)
 				items = items:setv(itemId, nums)
 			end
  
-			if params.log then
-				local log = clone(params.log)
-				if log["cint1"] or log["cint2"] or log["cint3"] or log["long1"] then
-					print("addAdvItem error log have cint1 or cint2 or cint3 ", debug.traceback())
-				end
-				log["cint1"] = itemId
-				log["cint2"] = math.abs(count)
-				log["cint3"] = self.chapterId
-				log["long1"] = self.level
-				if count >= 0 then
-					self.owner:log("in_adv", log)
-				else
-					self.owner:log("out_adv", log)
-				end
-			else
-				print("addAdvItem no log ", debug.traceback())
-			end
+			-- if params.log then
+			-- 	local log = clone(params.log)
+			-- 	if log["cint1"] or log["cint2"] or log["cint3"] or log["long1"] then
+			-- 		print("addAdvItem error log have cint1 or cint2 or cint3 ", debug.traceback())
+			-- 	end
+			-- 	log["cint1"] = itemId
+			-- 	log["cint2"] = math.abs(count)
+			-- 	log["cint3"] = self.chapterId
+			-- 	log["long1"] = self.level
+			-- 	if count >= 0 then
+			-- 		self.owner:log("in_adv", log)
+			-- 	else
+			-- 		self.owner:log("out_adv", log)
+			-- 	end
+			-- else
+			-- 	print("addAdvItem no log ", debug.traceback())
+			-- end
 		end
 	end
 	if items ~= oldItems then
@@ -1021,7 +1005,6 @@ local function clickOut(self, room, block, params, isExit)
 						isRelay = true,
 					})
 				else
-					self:log({desc = "pass"})
 					self:initByChapter({
 						chapterId = self.chapterId, 
 						level = self.level + 1, 
@@ -1357,6 +1340,10 @@ local function clickDrop(self, room, block, params)
  
 	local reward = self:award({[block.event.item[1]] = block.event.item[2]}, {log = {desc = "clickDrop"}})
 	-- local reward = self:award({[5801] = 1})
+	-- 获取绷带的引导
+	if block.event.item[1] == 5020 and not self.owner:checkOverGuide(53,2) then
+		self.owner:saveGuide(53,2)
+	end
 	block:clear()
 	self:backReward(reward, {roomId = room.roomId, blockId = block.blockId})
 	return true
@@ -14,7 +14,6 @@ function Battle:ctor(adv)
 	self:initAfter()
 	if self.isNewPlayer then
 		self.player:triggerPassive(Passive.BORN_ONCE)
-		self.player:addExp((self.adv.level - 1) * 40)
 	end
 end
  
@@ -523,7 +523,7 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 		--开放出口
 		randomFunc[AdvEventType.Diner] = function() 
 			-- if not self.adv.isRelay or isEnter or isNewRelay then return false end
-			if not self.adv.isRelay or isEnter then return false end
+			-- if not self.adv.isRelay or isEnter then return false end
 		end
  
 		--boss
@@ -567,7 +567,7 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 		end
 		--建筑
 		randomFunc[AdvEventType.Build] = function()
-			if self.adv.isRelay and isEnter then return false end
+			-- if self.adv.isRelay and isEnter then return false end
 			return randomCommon()
 		end
 		--陷阱
@@ -300,8 +300,8 @@ function Passive:canEffect(effType, effValue)
 		return
 	end
 	--禁用被动技
-	local count, bc = self.owner:getDisablePassiveCount()
-	if bc > 0 and (count == 0 or self.owner:getPassiveIdx(self) <= count) then
+	local count = self.owner:getDisablePassiveCount()
+	if count and (count == 0 or self.owner:getPassiveIdx(self) <= count) then
 		return
 	end
 	return true
@@ -466,7 +466,8 @@ function Passive:effect8(dropId)
 		skynet.error(string.format("CSVDATA Error  adv_map_passive %s effect 8 not id %s in event_drop", self.id, dropId))
 	end
 	local item = dropData["range"]:randWeight(true)
-	self.owner.battle.adv:award({[item[1]] = item[2]}, {log = {desc = "passive", int1 = self.id}})
+	self.owner.battle.adv:backReward(self.owner.battle.adv:award({[item[1]] = item[2]}, {log = {desc = "passive", int1 = self.id}}), {roomId = self.owner.roomId, blockId = self.owner.blockId})
+	
 end
  
 --9=直接获得item（可在结算触发时使用）
@@ -480,7 +481,7 @@ function Passive:effect9(itemId, triggerPms, ratio, max)
 		return
 	end
 	if not cond then return end
-	self.owner.battle.adv:award({[itemId] = math.floor(math.max(0, math.min(max, cond / ratio)))}, {log = {desc = "passive", int1 = self.id}})
+	self.owner.battle.adv:backReward(self.owner.battle.adv:award({[itemId] = math.floor(math.max(0, math.min(max, cond / ratio)))}, {log = {desc = "passive", int1 = self.id}}), {roomId = self.owner.roomId, blockId = self.owner.blockId})
 end
  
 --10=战斗额外掉落次数
@@ -520,5 +521,17 @@ function Passive:effect13(eventType, triggerPms, eventId, count)
 	end
 end
  
+--14=给所有场上怪物增加buff 《 限定 怪 id》 除了自己
+function Passive:effect14(value, triggerPms, enemyId)
+	local aims = self.owner.battle.player:getTeam(2)
+	for k , aim in pairs(aims) do
+		if aim ~= self.owner then
+			if not enemyId or enemyId == 0 or aim.monsterId == enemyId then
+				aim:addBuff(value, self.owner)
+			end
+		end
+	end
+end
+
  
 return Passive
 \ No newline at end of file
@@ -122,14 +122,16 @@ function BaseObject:getPassiveIdx(passive)
 end
  
 function BaseObject:getDisablePassiveCount()
-	local count, bc = 0, 0
+	local count
 	for _, buff in ipairs(self.buffs) do
 		if not buff.isDel and buff:getType() == Buff.DISABLE_BUFF then
-			count = count + buff:effect()
-			bc = bc + 1
+			if buff:effect() == 0 then
+				return 0
+			end
+			count = (count or 0) + buff:effect()
 		end
 	end
-	return count, bc
+	return count
 end
  
 function BaseObject:addBuff(buffId, releaser)
@@ -208,6 +210,9 @@ function BaseObject:hadBuffById(bId)
 	end
 end
  
+function BaseObject:reSetSpMax()
+end
+
  
 -- 通用的buff 效果汇总  -- 0 固定 1百分比  两种分类
 function BaseObject:getCommonBuffEffect(bType, otherCond)
@@ -365,7 +365,6 @@ function AdvTask.bind(Adv)
 				else
 					if (status or -1) >= data.value1 then
 						status = -1
-						self.owner:log("adv_action", {desc = "finishAchiev", short1 = 1, int1 = self.chapterId, int2 = taskId})
 					end
 					if status and status ~= oldStatus then
 						insertChange(self, self.chapterId, taskId, status)
@@ -282,7 +282,7 @@ function CMD.close()
 	mcast_util.usub_union()
 	local role = agentInfo.role
 	if not role then return end
-	role:log("logout", {int1 = skynet.timex()-role:getProperty("ltime")})
+	role:log("onLogout", {logtime = skynet.timex()-role:getProperty("ltime")})
 	role:onOfflineEvent()
 end
  
-Subproject commit f52151f947b019976eac7ef15ec914bf7d552d64
+Subproject commit 2de1748bed665c9220f68eeb23a8ce3d1f810bda
@@ -8,6 +8,8 @@ Activity.ActivityType = {
 	DrawHero = 4,	--抽卡周 招募
 	AdvDraw = 5,	--拾荒抽周 资助
 	OpenBox = 6,	--拆解周 时钟箱
+
+	SsrUpPoolChange = 10,	-- 特定英雄活动，切卡池
 }
  
  
@@ -181,13 +183,16 @@ activityFunc[Activity.ActivityType.Sign] = {
 --loop2：累计招募N次
 --loop3：累计资助N次
 --loop4：时钟箱拆解N个
-function Activity:checkWeeklyAct(actType, notify, count)
+function Activity:checkWeeklyAct(actType, notify, count, pool)
 		local actInfoMap = {
 			[Activity.ActivityType.DrawHero] = {mailId = MailId.ActDrawCardReward, table = "activity_loop2Csv"},
 			[Activity.ActivityType.AdvDraw] = {mailId = MailId.ActAdvDrawReward, table = "activity_loop3Csv"},
 			[Activity.ActivityType.OpenBox] = {mailId = MailId.ActOpenBoxReward, table = "activity_loop4Csv"},
 			[Activity.ActivityType.FoodSell] = {mailId = MailId.ActSellFoodReward, table = "activity_loop1Csv"}
 		}
+		if actType == Activity.ActivityType.DrawHero and pool == DrawCardType.FriendDraw then
+			return
+		end
 		local info = actInfoMap[actType]
 		if not info then return end
  
@@ -210,6 +215,13 @@ function Activity:checkWeeklyAct(actType, notify, count)
 			end
 			if not curData[cfg.id] and curData[0] >= cfg.condition1 then
 				if info.mailId then 
+
+					self.owner:log("activity", {
+						activity_id = cfg.id, -- 活动ID（或活动指定任务的ID）
+						activity_type = actType, -- 活动类型，见活动类型枚举表
+						activity_reward = cfg.reward:toNumMap(), -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+					})
+
 					self.owner:sendMail(info.mailId, nil, cfg.reward, {cfg.condition1})
 					curData[cfg.id] = 1
 				end
@@ -234,8 +246,8 @@ end
  
 -- 抽卡周
 activityFunc[Activity.ActivityType.DrawHero] = {
-	["check"] = function(self, actType, notify, count) -- 检查
-		self:checkWeeklyAct(actType, notify, count)
+	["check"] = function(self, actType, notify, count, pool) -- 检查
+		self:checkWeeklyAct(actType, notify, count, pool)
 	end,
 	["init"] = function(self, actType, isCrossDay, notify)
 		local roundData = self:getProperty("round")
@@ -281,7 +293,6 @@ activityFunc[Activity.ActivityType.AdvDraw] = {
 	-- ["close"] = function(self, actType, notify)
 	-- end,
 	["crossDay"] = function(self, actType, notify)
-		print("cross day act adv cost")
 		self.owner:sendMail(MailId.ActAdvDraw)
 	end,
 }
@@ -355,5 +366,23 @@ function Activity:getActHangDoubleTime(lastTs, nowTs)
 	return 0
 end
  
+-- 获取活动卡池id
+function Activity:getActivityPool(mainType, subType)
+	if not self:isOpen(Activity.ActivityType.SsrUpPoolChange) then	
+		return 0
+	end
+	local actData = csvdb["activity_ctrlCsv"][Activity.ActivityType.SsrUpPoolChange]
+	if not actData then return 0 end
+
+	local poolMap = actData.condition2:toMap(true, "=")
+	local key = mainType .. "_" .. subType
+	for k, v in pairs(poolMap) do
+		if k == key then
+			return v
+		end
+	end
+	return 0
+end
+
  
 return Activity
@@ -70,12 +70,10 @@ function Diner:refreshDailyData(notify)
 		end
 	end
  
-	local guide = self.owner:getProperty("newerGuide")
-	local master, slave = string.match(guide,"(%d+)=(%d+)")
-	if self.owner:getProperty("funcGuide"):getv(51,0) == 0 or tonumber(master) <= 26 then
+	if self.owner:getProperty("funcGuide"):getv(51,0) == 0 or (not self.owner:checkOverGuide(27) and self.owner:checkOverGuide(25)) then
 		entrust[1] = 1001
 		entrust[2] = 1
-	elseif tonumber(master) <= 29 then
+	elseif not self.owner:checkOverGuide(29,4) and self.owner:checkOverGuide(29) then
 		local temp = entrust[1]
 		entrust[1] = 1
 		entrust[2] = temp
@@ -306,6 +304,7 @@ function Diner:expediteSell(slot)
 		lastCount = lastCount,
 		reward = reward,
 		popular = popular,
+		deltaTime = deltaTime,
 	}
 end
  
@@ -18,6 +18,23 @@ Email.schema = {
     rewardPms	= {"table", {}},
 }
  
+function Email:log(role, action)
+	role:log("onMail", {
+		mail_action_type = action, -- 操作(1=收,2=领,3=删)
+		mail_receivetime = self:getProperty("createtime"), -- 收件时间
+		mail_textid = self:getProperty("emailId"), -- 邮件文本ID
+		mial_title = self:getProperty("title"), -- 邮件标题参数
+		mail_content = json.encode(self:getProperty("contentPms")), -- 邮件内容参数
+		mail_attach = self:getProperty("attachments"), -- 邮件附件
+		mail_reason = self:getProperty("stitle"), -- 原因
+		mail_readstatus = self:getProperty("status") >= 1 and 1 or 0, -- 邮件读取状态
+		mail_attachstatus = self:getProperty("status") >= 2 and 1 or 0, -- 邮件附件状态
+		mail_timeout = 0, -- 邮件超时时间
+		mail_friend_id = 0, -- 收件方账号id
+		mail_friend_roleid = 0, -- 收件方角色id
+	})
+end
+
 function Email:data()
 	local emailId = self:getProperty("emailId")
 	local title = self:getProperty("title")
@@ -7,6 +7,7 @@ local RoleTask = import(&quot;.RoleTask&quot;) --角色任务
 local RoleChangeStruct = import(".RoleChangeStruct") --角色数据额结构更改
 local RolePvp = import(".RolePvp")  -- pvp
 local RoleCross = import(".RoleCross") -- 跨服务请求相关
+local RoleBattle = import(".RoleBattle") -- 跨服务请求相关
  
 RoleLog.bind(Role)
 RolePlugin.bind(Role)
@@ -15,6 +16,7 @@ RoleTask.bind(Role)
 RoleChangeStruct.bind(Role)
 RolePvp.bind(Role)
 RoleCross.bind(Role)
+RoleBattle.bind(Role)
  
 function Role:ctor( properties )
 	Role.super.ctor(self, properties)
@@ -38,6 +40,8 @@ Role.schema = {
 	headId				= {"number", globalCsv.defaultHead},
 	sid 				= {"number", 0},
 	device 				= {"string", ""},
+	dmode				= {"string", ""},
+	lday				= {"number", 0},
 	banTime 			= {"number", 0},
 	banType 			= {"number", 0},
 	heartWarning 		= {"number", 0},
@@ -159,6 +163,8 @@ Role.schema = {
 	redp 				= {"table", {}}, -- 待消除红点 -- 通常打开对应界面就消除的红点  红点消除的方法 在对应的协议中使用 {tag = pms }
  
 	chatline			= {"table", {}}, -- 奖励发放 id=时间
+
+	downCvR				= {"number", 0}, -- 下载cv扩展包奖励 
 }
  
  
@@ -375,6 +381,8 @@ function Role:data()
  
 		redp = self:getProperty("redp"),
 		chatline = self:getProperty("chatline"),
+
+		downCvR	= self:getProperty("downCvR"), -- 下载cv扩展包奖励 
 	}
 end
  
@@ -0,0 +1,185 @@
+local RoleBattle = {}
+
+--[[
+	100	剧情关卡类	
+	200	非剧情类普通关卡	
+	300	每日任务类、日常本类	
+	400	资源获取类关卡	
+	500	PVP关卡	
+	1000	活动期间限定类关卡	
+	2000	其他	
+]]
+
+local BattleType = {
+	hang = 100,
+	tower = 200,
+	bonus = 300,
+	pvpc = 500,
+	pvph = 501,
+}
+
+RoleBattle.bind = function (Role)
+
+
+-- TODO 检查战斗是否作弊
+local function checkBattleCheat()
+
+end
+
+
+
+function Role:checkBattle(battleType, params)
+	local clientInfo = params.info or {}
+
+	if not BattleType[battleType] then
+		print(string.format("NO find battleType: %s", battleType))
+		return
+	end
+
+	local selflist = {}
+	local heroscore = 0
+	local teamskill = {}
+	local enemylist = {}
+
+	local fixData = {
+		hang = function()
+			for slot, hero in pairs(self:getProperty("hangTS")) do
+				selflist[slot] = hero.type
+			end
+			heroscore = self:getProperty("hangTBV")
+			for slot , one in pairs(self:getProperty("hangTB").supports) do
+				teamskill[one[1]] = one[2]
+			end
+			local carbonData = csvdb["idle_battleCsv"][params.id]
+			local monsterData = csvdb[carbonData.monster:match("/([^/]*)$") .. "Csv"]
+			for slot, one in pairs(monsterData[1]) do
+				enemylist[#enemylist + 1] = one["unitType"]
+			end
+		end,
+		tower = function()
+			local towerF = self:getProperty("towerF")
+			for slot, hero in pairs(self:getTeamHerosInfo(towerF.heros)) do
+				selflist[slot] = hero.type
+			end
+			heroscore = self:getTeamBattleValue(towerF.heros)
+			for slot , one in pairs(self:getTeamBattleInfo(towerF).supports) do
+				teamskill[one[1]] = one[2]
+			end
+			local carbonData = csvdb["tower_battleCsv"][params.id]
+			local monsterData = csvdb[carbonData.monster:match("/([^/]*)$") .. "Csv"]
+			for slot, one in pairs(monsterData[1]) do
+				enemylist[#enemylist + 1] = one["unitType"]
+			end
+		end,
+		bonus = function()
+			local bTeam = self:getProperty("bTeam")
+			for slot, hero in pairs(self:getTeamHerosInfo(bTeam.heros)) do
+				selflist[slot] = hero.type
+			end
+			heroscore = self:getTeamBattleValue(bTeam.heros)
+			for slot , one in pairs(self:getTeamBattleInfo(bTeam).supports) do
+				teamskill[one[1]] = one[2]
+			end
+			local carbonData = csvdb["tower_battleCsv"][params.id]
+			local monsterData = csvdb[carbonData.monster:match("/([^/]*)$") .. "Csv"]
+			for slot, one in pairs(monsterData[1]) do
+				enemylist[#enemylist + 1] = one["unitType"]
+			end
+		end,
+		pvpc = function()
+			for slot, hero in pairs(self:getProperty("pvpTSC")) do
+				selflist[slot] = hero.type
+			end
+			heroscore = self:getProperty("pvpTBVC")
+			for slot , one in pairs(self:getProperty("pvpTBC").supports) do
+				teamskill[one[1]] = one[2]
+			end
+			if params.robotId then
+				local carbonData = csvdb["pvp_robotCsv"][params.robotId]
+				local monsterData = csvdb[carbonData.monster:match("/([^/]*)$") .. "Csv"]
+				for slot, one in pairs(monsterData[1]) do
+					enemylist[#enemylist + 1] = one["unitType"]
+				end
+			else
+				for slot, one in pairs((params.enemy or {})["heros"] or {}) do
+					enemylist[slot] = one["type"]
+				end
+			end
+		end,
+		pvph = function()
+			for idx, team in pairs(self:getProperty("pvpTSH")) do
+				selflist[idx] = selflist[idx] or {}
+				for slot, hero in pairs(team) do
+					selflist[idx][slot] = hero.type
+				end
+			end
+			for _, one in pairs(self:getProperty("pvpTBVH")) do
+				heroscore = heroscore + one
+			end
+			for idx, team in pairs(self:getProperty("pvpTBH")) do
+				for slot , one in pairs(team.supports) do
+					teamskill[one[1]] = one[2]
+				end
+			end
+
+			if params.robotId then
+				local carbonData = csvdb["pvp_robot_groupCsv"][params.robotId]
+				for idx = 1, 3 do
+					enemylist[idx] = enemylist[idx] or {}
+					local monsterData = csvdb[carbonData["monster" .. idx]:match("/([^/]*)$") .. "Csv"]
+					for slot, one in pairs(monsterData[1]) do
+						enemylist[idx][#enemylist + 1] = one["unitType"]
+					end
+				end
+			else
+				for idx, team in pairs(params.enemy or {}) do
+					enemylist[idx] = enemylist[idx] or {}
+					for slot, one in pairs(team["heros"] or {}) do
+						enemylist[idx][slot] = one["type"]
+					end
+				end
+			end
+		end
+	}
+
+	if fixData[battleType] then
+		fixData[battleType]()
+	end
+
+	-- robotId = match.t == 2 and match.id or nil,
+	-- enemy = match.t == 1 and (revenge and _pvpRecordBattleInfoCacheH[match.id] or _pvpBattleInfoCacheH[match.id]) or nil,
+	-- score = myScore,
+	-- reward = reward,
+	self:log("mission", {
+		mission_threadid = battleType == "hang" and math.floor((params.id % 100) / 100) or 0, -- 大关卡ID
+		mission_id = params.id or 0, -- 关卡ID
+		mission_type = BattleType[battleType], -- 关卡类型，见关卡类型枚举表
+		mission_herolist = selflist, -- 英雄ID，排序以玩家出战设置为准，PVP多个队伍则记录多个列表。示例：[[1,2,3],[456]]
+		mission_heroscore = heroscore, -- 编队总评分
+		mission_enemylist = enemylist, -- 地方英雄ID，排序以玩家出战设置为准，PVP多个队伍则记录多个列表。示例：[[1,2,3],[456]]
+		mission_damage = clientInfo.damage or {}, -- 英雄输出值。示例：{'heroid1':1000,'heroid2':2000,………..}
+		mission_ultskill = clientInfo.ultskill or {}, -- 大招使用情况。示例：{'heroid1':1000,'heroid2':2000,………..}
+		mission_reward = params.reward or {}, -- 获得奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		mission_starttime = clientInfo.start or 0, -- 战斗开始时间，格式 unixtime 秒级
+		mission_roundtime = clientInfo.atime or 0, -- 对局时长(秒)
+		mission_result = params.isWin and 1 or 2, -- 战斗结果(0-无效，1-胜利，2-失败)
+		mission_star = 0, -- 战斗完成星数，无星级的话填写0
+		mission_restriction = 0, -- 周期内参与限制(0表示没有上限)
+		mission_difficulty = 0, -- 关卡困难度，无难度区分的话填写0
+		mission_strength = 1, -- 消耗的体力或次数
+		mission_score = params.score or 0, -- 本局分数，PVP玩法记录为对战后积分，无得分的填0
+		mission_cleartype = 1, -- 1正常通关;2代理拾荒
+		mission_rank = params.rank, -- 对战后排名，适用于PVP玩法和电波塔，其他玩法留空
+		misson_monsterkill = clientInfo.kill or {}, -- 击杀怪物ID和数量，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		misson_teamskill = teamskill, -- 编队支援技能和技能等级情况，json格式记录，{"teamskill1":1,"teamskill2":2,………..}
+	})
+end
+
+
+
+
+
+end
+
+
+return RoleBattle
 \ No newline at end of file
+local server_id = (skynet.getenv("serverType") or "localtest") .. "_" .. skynet.getenv("servId")
  
--- logType
-local LogType = {
-	create = "common",
-	login = "common",
-	logout = "common",
-	guide = "common",
+--[[
+	100	购买/兑换行为			
+	200	交易行为(与其他玩家)			
+	300	通过关卡产出或消耗			
+	400	通过任务产出或消耗			
+	500	通过公会产出或消耗			
+	600	通过成就产出或消耗			
+	700	通过邮件产出或消耗		
+	1000	其他行为			
+--]]
+local ItemReason = {
+	recharge = 100,
+	advWheelSurf = 101, -- 资助
+	advRepayWheelSurf = 102, -- 资助回馈
+	saleEquip = 103, -- 卖装备
+	saleRune = 104, -- 卖铭文
+	drawHero = 105, -- 抽卡
+	pvpShop = 106, -- pvp商店
+	saleItem = 107, -- 售卖道具
+	openItem = 108, -- 打开箱子
+	openTimeBox = 109, -- 打开时间箱
+	speedUpBox = 110, -- 速度箱
+	dailyShop = 111, -- 每日商城
+	dinershop = 112, -- 餐厅商店
+	goldBuy = 113, -- 购买金币
+	buyAdvCount = 114, -- 购买冒险次数
+	advReSupport = 115, -- 刷新拾荒支援技
+	advQuickHang = 116, -- 冒险快速挂机
+	makePotion = 117, -- 制造药剂
+	equipUp = 118, -- 装备升级
+	runeUp = 119, -- 符文升级
+	talentUp = 120, -- 天赋升级
+	buyBonusCount = 121, -- 购买奖励副本次数
+	bagField = 122, -- 背包栏位
+	buyPvpKey = 123, -- 购买pvp钥匙
+	startPvp = 124, -- 开始pvp
+	unlockStory = 125, -- 解锁剧情
+	towerCount = 126, -- 电波塔次数
+
+
+	advHang = 301, -- 拾荒挂机
+	hangBattle = 302, -- 挂机战斗
+	hangReward = 303, -- 挂机奖励
+	quickHang = 304, -- 快速挂机
+	bonusBattle = 305, -- 奖励副本
+	hangGift = 306, -- 奖励关卡奖励
+	pvpBattleC = 307, -- pvp战斗普通
+	pvpBattleH = 308, -- pvp战斗高级
+	pvpDivisionH = 309, -- pvp高级段位奖励
+	towerBattle = 310, -- 电波塔战斗
+	advOver = 311, -- 冒险结算
+	advUnlock = 312, -- 拾荒解锁
  
-	in_item = "common",
-	out_item = "common",
-	in_diamond = "common",
-	out_diamond = "common",
-	in_hero = "common",
-	out_hero = "common",
-	in_equip = "common",
-	out_equip = "common",
-	in_rune = "common",
-	out_rune = "common",
-	player_exp = "common",
-	func_open = "common",
-	in_adv = "common",
-	out_adv = "common",
-	in_artifact = "common",
-
-	mail_action = "common",
-	role_action = "common",
-	hang_action = "common",
-	hero_action = "common",
-	adv_action = "common",
-	rune_action = "common",
-	pvp_action = "common",
-	diner_action = "common",
-	tower_action = "common",
-	gm_action = "common",
-	act_action = "common",
+	dinerFinishTask = 401, -- 餐厅完成任务
+	storybookReward = 402, -- 剧情奖励
+	finishTask = 403, -- 任务
+	taskActive = 404, -- 完成活跃任务
+	advMainTask = 405, -- 拾荒主线
+
+	finishAchive = 601, -- 完成成就
+	advAchiev = 602, -- 拾荒成就
+	advAchievReward = 603, -- 拾慌成就奖励
+
+	draw_attach = 701, -- 邮件奖励
+
+	gm = 1000, -- 获取途径：GM
+
+	-- 活动
+	sudoku = 1001, -- 九宫格
+	sudokuR = 1002, -- 九宫格连线奖励
+	sudokuRP = 1003, -- 九宫格阶段奖励
+	sign = 1004, -- 签到
+	friendPoint = 1005, -- 友情
+	birth = 1006, -- 出生奖励
+	actSign = 1007, -- 活动签到
+
+	-- 餐厅
+	greenHourse = 1101, -- 食材获得
+	dinerEntrus = 1102, -- 餐厅委托
+	dinerCollect = 1103, -- 餐厅小人收集
+	dinerCombo = 1104, -- 小人组合
+	dinerSkillUp = 1105, -- 餐厅技能升级
+	dinerReTask = 1106, -- 餐厅刷新任务
+	addSell = 1107, -- 餐厅贩卖
+	dinerBuildUp = 1108, -- 建筑升级
+	removeSell = 1109, -- 移除售卖
+	dinerSell = 1110, -- 餐饮售卖
+
+	-- 英雄
+	heroLevelUp = 1201, -- 英雄升级
+	heroBreak = 1202, -- 英雄突破
+	heroWake = 1203, -- 英雄觉醒
+	heroTalent = 1204, -- 英雄天赋
+	createHero = 1205, -- 碎片合成
+	createHeroRandom = 1206, -- 随机合成
+	resetHero = 1207, -- 重置养成
+	unlockPool = 1208, -- 解锁英雄定向抽卡池
+	downloadCv = 1209, -- 下载 cv包奖励
+	refer = 1210, -- 穿戴
 }
  
--- 如要修改 要提前修改 _template mapping -- 对应 mapping 为 gamelog-*
-local Mapping = {
-	-- 预留一些数据格式  担心integer 范围不够用 将 通用的int* 全部换为long
-	common = {
-		desc = "keyword",--索引的短字符串
-		ucode = "keyword",--关联日志对应ucode
-		key1 = "keyword", --可索引的短字符串
-		key2 = "keyword", --可索引的短字符串
-		-- 几乎不用的长文本 
-		text1 = "text",  --长字符串不索引的类型
-		-- 五个不同类型的数字 基本上满足数量要求 尽量从低到高用
-		short1 = "short", 
-		int1 = "long",
-		int2 = "long",
-		long1 = "long",
-		float1 = "float",
-
-		-- 底层使用的 一些参数
-		cint1 = "long",
-		cint2 = "long",
-		cint3 = "long",
-	}
+
+--[[
+100	教学			
+200	主线			
+300	日常			
+400	周常			
+500	联盟			
+1000	限时任务			
+2000	其他			
+--]]
+local TaskType = {
+
 }
  
--- 所有的日志都包括的部分 role 里面的信息  -- mapping 信息在 gamelog-role
-local commonRoleField = {
-	name = "keyword",
-	id = "integer",
-	uid = "keyword",
-	sid = "short",
-	device = "keyword",
-	ctime = "integer",
-	ltime = "integer",
-	level = "short",
-	rmbC = "integer",
+
+local MethodType = {
+ 	onCreateAccount = {}, -- 创建游戏账号 
+ 	onCreateRole = {}, -- 创建游戏角色  
+ 	onLogin = {}, -- 玩家登录  
+ 	onLogout = {  -- 登出  
+		logtime = true, --登录时长
+	},
+	setLevel = { -- 设置等级
+		level_before = true, -- 变动前的等级，可以跳级
+		level_changemain = true, -- 等级变动原因，副本通关：mission，领取奖励：reward
+		level_changedetail = true, -- 等级变动原因明细，副本通关则记录关卡ID，领取奖励则记录奖励ID
+		level_reward = "json", -- 等级变动奖励，json格式记录，{道具ID1：道具数量，道具ID2：道具数量}
+	},
+	onGuidePoint = { --游戏引导
+		guild_type = true, --引导类型，新手引导:0，系统引导:1，弱引导:2
+		guild_id = true, --节点ID
+		guild_point = true, --步骤ID
+		guild_pass = true, --正常操作:0，自动播放:1，跳过:2
+	},
+	setOrder = { --玩家订单记录
+		order_status = true, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
+		item_id = true, -- 道具id
+		item_type = true, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
+		item_name = true, -- 购买的道具名
+		item_number = true, -- 购买的道具数量
+		item_level = true, -- 购买的道具等级
+		order_cost = true, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
+		order_currency = true, -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
+		order_type = true, -- 订单类型，首充记录为1，否则为0
+		order_id = true, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
+	},
+	onMail = { --玩家邮件操作
+		mail_action_type = true, -- 操作(1=收,2=领,3=删)
+		mail_receivetime = true, -- 收件时间
+		mail_textid = true, -- 邮件文本ID
+		mial_title = true, -- 邮件标题参数
+		mail_content = true, -- 邮件内容参数
+		mail_attach = true, -- 邮件附件
+		mail_reason = true, -- 原因
+		mail_readstatus = true, -- 邮件读取状态
+		mail_attachstatus = true, -- 邮件附件状态
+		mail_timeout = true, -- 邮件超时时间
+		mail_friend_id = true, -- 收件方账号id
+		mail_friend_roleid = true, -- 收件方角色id
+	},
+	onItems = { --道具流通 
+		item_id = true, -- 道具id
+		item_sequenceid = "ucode", -- 道具变动关联ID，用于关联一次动作产生多条不同类型的日志，如一个礼包多个物品等情形
+		item_type = true, -- 道具类型，具体见枚举表中道具类型枚举表
+		item_level = true, -- 道具等级
+		item_number = true, -- 道具变化数量的绝对值
+		action_type = true, -- 变化类型（玩家获取：1，玩家消耗：0）
+		item_before = true, -- 道具变化前的数量
+		item_after = true, -- 道具变化后的数量
+		item_reason = true, -- 道具流动一级原因，如抽卡、装备强化、副本掉落，可参考道具动作类型枚举表
+		item_subreason = true, -- 道具流动二级原因，抽卡：卡池ID，装备强化：装备ID，副本掉落：副本ID
+		item_other = true, -- 其他（可包含阶数，强化等级，随机属性）
+	},
+	mission = { --玩家副本完成情况 
+		mission_threadid = true, -- 大关卡ID
+		mission_id = true, -- 关卡ID
+		mission_type = true, -- 关卡类型，见关卡类型枚举表
+		mission_sequenceid = "ucode", -- 本次对战ID，用于关联一次动作产生多条不同类型的日志
+		mission_herolist = "json", -- 英雄ID，排序以玩家出战设置为准，PVP多个队伍则记录多个列表。示例：[[1,2,3],[456]]
+		mission_heroscore = true, -- 编队总评分
+		mission_enemylist = "json", -- 地方英雄ID，排序以玩家出战设置为准，PVP多个队伍则记录多个列表。示例：[[1,2,3],[456]]
+		mission_damage = "json", -- 英雄输出值。示例：{'heroid1':1000,'heroid2':2000,………..}
+		mission_ultskill = "json", -- 大招使用情况。示例：{'heroid1':1000,'heroid2':2000,………..}
+		mission_reward = "json", -- 获得奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		mission_starttime = true, -- 战斗开始时间，格式 unixtime 秒级
+		mission_roundtime = true, -- 对局时长(秒)
+		mission_result = true, -- 战斗结果(0-无效，1-胜利，2-失败)
+		mission_star = true, -- 战斗完成星数，无星级的话填写0
+		mission_restriction = true, -- 周期内参与限制(0表示没有上限)
+		mission_difficulty = true, -- 关卡困难度，无难度区分的话填写0
+		mission_strength = true, -- 消耗的体力或次数
+		mission_score = true, -- 本局分数，PVP玩法记录为对战后积分，无得分的填0
+		mission_cleartype = true, -- 1正常通关;2代理拾荒
+		mission_rank = true, -- 对战后排名，适用于PVP玩法和电波塔，其他玩法留空
+		misson_monsterkill = "json", -- 击杀怪物ID和数量，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		misson_teamskill = "json", -- 编队支援技能和技能等级情况，json格式记录，{"teamskill1":1,"teamskill2":2,………..}
+		misson_teambond = "json", -- 编队羁绊和羁绊等级，json格式记录，{"bondid1":1,"bondid2":2,………..}
+	},
+	residence_reward = { --玩家挂机或排名奖励 
+		mission_threadid = true, --大关卡ID
+		mission_id = true, --关卡ID
+		mission_type = true, --关卡类型，见关卡类型枚举表
+		residence_reward_type = true, --领取奖励方式，快速（超前领取）记录为1，正常领取记录为0
+		residence_time = true, --挂机或排名时长
+		residence_reward = "json", --获得奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+	},
+	hero_rise = { --英雄觉醒 
+		hero_id = true, --英雄ID
+		hero_rise_cost = "json", --英雄觉醒消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_rise_score = true, --英雄觉醒后评分提升
+		hero_rise_result = "json", --英雄觉醒效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+	},
+	hero_upgrade = { --英雄升级
+		hero_id = true, -- 英雄ID
+		hero_upgrade_cost = "json", -- 英雄升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_upgrade_result = "json", -- 英雄升级效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+		hero_upgrade_type = true, -- 英雄升级方式，连续升级：1，单击升级：0
+		hero_upgrade_score = true, -- 英雄升级后评分
+		hero_upgrade_scoreget = true, -- 通过英雄升级提升的评分
+	},
+	hero_break = { --英雄突破
+		hero_id = true, -- 英雄ID
+		hero_break_cost = "json", -- 英雄突破消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_break_result = "json", -- 英雄突破效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+		hero_break_level = true, -- 英雄突破后等级上限
+	},
+	hero_talent = { --英雄天赋升级 
+		hero_id = true, -- 英雄ID
+		hero_talent_cost = "json", -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_talent_levelbef = true, -- 英雄技能升级前等级
+		hero_talent_level = true, -- 英雄技能升级后等级
+	},
+	hero_jewel = { --英雄铭文
+		hero_id = true, -- 英雄ID
+		hero_jewel_sequence = "ucode", -- 铭文装备编号，用以关联一次装备时产生的多条日志
+		hero_jewel_id = true, -- 铭文ID
+		hero_jewel_part = true, -- 铭文装备部位
+		hero_jewel_score = true, -- 铭文装备后的英雄分值
+		hero_jewel_scorebefore = true, -- 铭文装备前的英雄分值
+		hero_jewel_result = "json", -- 铭文装备后效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+	},
+	hero_note = { --英雄评价
+		hero_id = true, -- 英雄ID
+		hero_note_action = true, -- 英雄评价界面操作，发布评论：0，点赞：1，反对：2
+		hero_note_id = true, -- 操作的评价ID
+		hero_note_text = true, -- 操作的评价内容
+	},
+	hero_show = { --展示英雄 
+		hero_id = true, -- 英雄ID
+	},
+	hero_recycle = { --英雄回收
+		hero_recycle_list = "json", -- 回收的英雄id列表，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		hero_recycle_reward = "json", -- 回收后获得的奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		hero_recycle_cnt = true, -- 总回收英雄量
+	},
+	gacha = { --英雄招募 
+		gacha_id = true, -- 卡池ID
+		gacha_type = true, -- 卡池类型
+		gacha_up = true, -- 卡池UP角色
+		gacha_times = true, -- 抽卡次数
+		gacha_reward = "json", -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		currency = "json", -- 消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+	},
+	equip_wear = { --装备穿戴与卸载
+		hero_id = true, --英雄ID
+		equip_id = true, --装备ID
+		equip_wear_action = true, --装备操作类型：装备：0，卸载：1
+		equip_wear_part = true, --装备部位，记录部位ID
+		equip_wear_result = "json", --装备操作后结果，记录属性变化，json格式记录，{“aa”:1234,"bb":4567}
+		equip_wear_change = "json", --装备操作变化值，记录属性变化，记录正负值，json格式记录，{“aa”:1234,"bb":-45}
+		equip_wear_mode = true, --用以区分自动装备还是手动装备，自动记录为0，手动记录为1
+		equip_wear_seqid = "ucode", --自动穿戴时记录的系列ID，用以关联一次性装备时候产生的多条记录
+	},
+	equip_upgrade = { --装备升级 
+		equip_upgrade_part = true, -- 升级部位，记录部位ID
+		equip_id = true, -- 升级后的装备ID
+		equip_upgrade_amount = true, -- 升级获取的装备数量
+		equip_upgrade_usedid = true, -- 升级消耗的装备ID
+		equip_upgrade_cost = true, -- 升级操作消耗装备数量
+		equip_upgrade_current = true, -- 升级操作消耗货币数量
+	},
+	carriage_dismantle = { --物资拆解
+		item_id = true, -- 道具id
+		item_sequenceid = "ucode", -- 道具变动关联ID，用于关联一次动作产生多条不同类型的日志，如一个礼包多个物品等情形
+		item_type = true, -- 道具类型，具体见枚举表中道具类型枚举表
+		item_level = true, -- 道具等级
+		item_number = true, -- 道具变化数量的绝对值
+		carriage_dismantle_type = true, -- 拆解方式，时间到期:0，钥匙开启:1
+		carriage_dismantle_time = true, -- 拆解耗时，填写实际耗时
+		carriage_dismantle_cost = true, -- 拆解花费钥匙数量，未使用填写0
+		carriage_dismantle_rwd = "json", -- 拆解获得物资，json格式记录，{'itemid1':2,'itemid2':3,…………..}
+	},
+	carriage_logistics = { --后勤室 
+		carriage_logistics_type = true, -- 后勤室制作类型ID，变异:0，通常:1，魔法:2
+		carriage_logistics_itemid = true, -- 后勤室升级物品或技能ID
+		carriage_logistics_itemlv = true, -- 升级后物品或技能等级
+		carriage_logistics_gear = true, -- 后勤室升级花费齿轮数量
+		carriage_logistics_coin = true, -- 后勤室升级花费美食币数量
+	},
+	carriage_decals = { --贴纸拆解
+		item_id = true, --道具id
+		item_sequenceid = "ucode", --道具变动关联ID，用于关联一次动作产生多条不同类型的日志，如一个礼包多个物品等情形
+		item_type = true, --道具类型，具体见枚举表中道具类型枚举表
+		item_level = true, --道具等级
+		item_number = true, --道具变化数量的绝对值
+		carriage_decals_rwdid = true, --拆解获得物资ID
+		carriage_decals_rwdnum = true, --拆解获得物资数量
+	},
+	carriage_video = { --放映室 
+		carriage_video_type = true, --放映室类型，剧情CG:0, 角色CG:1, 主线剧情:2, 角色剧情:3, 活动剧情:4, 图鉴:5
+		carriage_video_id = true, --放映室片段ID
+		carriage_video_coinid = true, --放映奖励货币类型，无奖励则填写0
+		carriage_video_coinnum = true, --放映奖励货币数量，无奖励则填写0
+		carriage_video_item = "json", --放映奖励其他物品数量，json格式记录，{'itemid1':10,'itemid2':5,…………..}，无奖励则填写0
+	},
+	carriage_cook = { --调理室
+		item_id = true, -- 道具id
+		item_level = true, -- 道具等级
+		item_type = true, -- 道具类型，具体见枚举表中道具类型枚举表
+		carriage_cook_amount = true, -- 制作总量
+		carriage_cook_cost = "json", -- 制作消耗道具，json格式记录，{'itemid1':10,'itemid2':5,…………..}
+	},
+	activity = { --活动或指南奖励
+		activity_id = true, -- 活动ID（或活动指定任务的ID）
+		activity_type = true, -- 活动类型，见活动类型枚举表
+		activity_reward = "json", -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	},
+	task_reward = { --任务奖励
+		task_reward_id = true, --任务奖励ID
+		task_reward_type = true, --任务奖励类型，见 任务奖励类型枚举表
+		task_reward_detail = "json", --任务奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	},
+	shop_purchase = { --商店购买行为 
+		item_id = true, -- 道具id
+		item_sequenceid = "ucode", -- 道具变动关联ID，用于关联一次动作产生多条不同类型的日志，如一个购买礼包多个物品等情形
+		item_type = true, -- 道具类型，具体见枚举表中道具类型枚举表
+		item_level = true, -- 道具等级
+		item_cnt = true, -- 购买数量技术
+		currency_type = true, -- 购买道具消耗的货币类型，记录货币ID
+		shop_purchase_current = true, -- 购买道具消耗的货币数量
+		shop_id = true, -- 商店ID
+	}, 
+	--[[
+	100	添加好友
+	200	删除好友
+	300	屏蔽/拉黑
+	1000	其他
+	--]]
+	friend_opt = { --好友操作
+		friend_opt_type = true, -- 好友操作类型，见枚举表中 好友操作类型枚举表
+		friend_accountid = true, -- 好友账户id
+		friend_roleid = true, -- 好友账户下的角色id
+		friend_cnt = true, -- 操作后好友数量
+	},
+	communication = { --玩家发言
+		publish_type = true, --发言类型，全部:0，公告:1，世界:2，联盟:3，私聊:4
+		publish_status = true, --发送状态，发送成功:0，发送失败:1，被屏蔽:2，其他:3
+		publish_receive_roleid = true, --接收者角色ID
+		publish_text = true, --发言内容
+	},
+	restaurant_up = { --摊位升级
+		restaurant_up_type = true, --升级部件类型，店面:0, 接客:1, 满意度:2, 宣传:3, 广告:4, 周边:5
+		restaurant_up_gear = true, --消耗齿轮数量
+		restaurant_up_coin = true, --花费美食币数量
+		restaurant_up_effectbef = true, --升级前加成
+		restaurant_up_effect = true, --升级后加成
+	},
+	restaurant_sale = { --摊位售卖
+		item_id = true, -- 售卖物品ID
+		restaurant_sale_seat = true, -- 售卖物品所在位置
+		restaurant_sale_time = true, -- 售卖时长
+		restaurant_sale_type = true, -- 售卖方式，正常售卖:0,  加速:1，移除售卖:2
+		restaurant_sale_coin = true, -- 售卖获得美食币
+		restaurant_sale_gear = true, -- 售卖获得齿轮
+	},
+	restaurant_material = { --食材获取
+		item_id = true, -- 获取物品ID
+		restaurant_material_seqid = "ucode", -- 道具变动关联ID，用于关联一次动作产生多条不同类型的日志，如一次获取两件道具情况
+		restaurant_material_start = true, -- 申请获取时间
+		restaurant_material_time = true, -- 申请到领取耗时
+		restaurant_material_num = true, -- 获取物品数量
+	},
+	restaurant_order = { --订单任务 
+		restaurant_order_id = true, -- 订单任务ID
+		restaurant_order_status = true, -- 订单任务状态，接受:0, 拒绝:1, 完成:2
+		restaurant_order_rwd = "json", -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		restaurant_order_lv = true, -- 订单品质等级，普通:0, 稀有:1, 顶级:2, 豪华:3
+	},
+	restaurant_collect = { --餐厅顾客图谱 
+		restaurant_collect_id = true, -- 图谱收集ID
+		restaurant_collect_rwd = "json", -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		restaurant_collect_plan = true, -- 收集进度，即解锁顾客，数字表示
+	},
+	achievement = { --成就达成
+		achievement_id = true, -- 成就id
+		achievement_type = true, -- 成就类型，具体枚举表中成就类型枚举表
+		achievement_reward = "json", -- 达成成就奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+	},
+	get_gift = { --礼包兑换
+		gift_id = true, -- 礼包ID
+		gift_key = true, -- 礼包key
+		gift_reward = "json", -- 礼包奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		gift_name = true, -- 礼包名称
+		gift_reason = true, -- 礼包发放原因，见发放原因枚举表
+	},
 }
  
 local function printError(info)
@@ -77,138 +413,119 @@ local function printError(info)
 	print(debug.traceback())
 end
  
-local function checkType(logType, field, value, ctype)
-	local typecheckfunc = {
-		keyword = function()
-			--长度不超过256
-			if type(value) ~= "string" then
-				value = tostring(value)
-				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [keyword], value : %s", logType, field, value))
-			else
-				if #value > 256 then
-					printError(string.format("LOG ERROR: logType [%s] field [%s] [keyword] type to long. value : %s", logType, field, value))
-				end
-			end
-			return value
-		end,
-		text = function()
-			if type(value) ~= "string" then
-				value = tostring(value)
-				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [text], value : %s", logType, field, value))
-			end
-			return value
-		end,
-		integer = function()
-			if type(value) ~= "number" then
-				value = tonumber(value)
-				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [integer], value : %s", logType, field, value))
-			end
-			if value then
-				if math.type(value) ~= "integer" then
-					local oldValue = value
-					value = math.floor(value)
-					if value ~= oldValue then
-						printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [integer], is float, value : %s", logType, field, value))
-					end
-				end
-				if -2147483648 > value or value > 2147483647 then
-					printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [integer], too big, value : %s", logType, field, value))
-					value = nil
-				end
-			end 
-			return value
-		end,
-		short = function()
-			if type(value) ~= "number" then
-				value = tonumber(value)
-				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [short], value : %s", logType, field, value))
-			end
-			if value then
-				if math.type(value) ~= "integer" then
-					local oldValue = value
-					value = math.floor(value)
-					if value ~= oldValue then
-						printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [short], is float, value : %s", logType, field, value))
-					end
-				end
+local function jsonEncode(tab)
+	local newTab = {}
+	for k , v in pairs(tab) do
+		newTab[tostring(k)] = v
+	end
+	return json.encode(newTab)
+end
  
-				if -32768 > value or value > 32768 then
-					printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [short], too big, value : %s", logType, field, value))
-					value = nil
-				end
-			end 
-			return value
-		end,
-		long = function()
-			if type(value) ~= "number" then
-				value = tonumber(value)
-				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [long], value : %s", logType, field, value))
-			end
-			if value then
-				if math.type(value) ~= "integer" then
-					local oldValue = value
-					value = math.floor(value)
-					if type(value) ~= "integer" then
-						printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [long], too big, value : %s", logType, field, value))
-						value = nil
-					elseif value ~= oldValue then
-						printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [long], is float, value : %s", logType, field, value))
-					end
-				end
-			end 
-			return value
-		end,
-		float = function()
-			if type(value) ~= "number" then
-				value = tonumber(value)
-				printError(string.format("LOG ERROR: logType [%s] field [%s] isn't [float], value : %s", logType, field, value))
-			end
-			return value
-		end,
-	}
+local function isIos(self)
+	local sid = self:getProperty("sid")
+	return sid == 2
+end
  
-	if typecheckfunc[ctype] then
-		return typecheckfunc[ctype]()
-	else
-		printError(string.format("LOG ERROR: logType [%s] field [%s] have a new type [%s] need add check.", logType, field, ctype))
-		return nil
+local appid, sdkId
+local function getBaseLog(self)
+	local uid = self:getProperty("uid")
+	if not appid then
+		appid, sdkId = string.match(uid, "(.*)_(.*)")
+		if not appid then
+			sdkId = uid
+			appid = 0
+		end
 	end
+	local log = {
+		server_id = server_id,
+		timestamp = skynet.timex(),
+		app_id = appid,
+		plat_id = isIos(self) and 0 or 1,
+		sdk_uid = sdkId,
+		account_id = uid,
+		role_id = self:getProperty("id"),
+		role_name = self:getProperty("name"),
+		level = self:getProperty("level"),
+		vip = 0,
+		device_id = self:getProperty("device"),
+		device_model = self:getProperty("dmode"),
+		version = "v2.0.1",
+		client_version = self.clientVersion or "1.0.0",
+		sys_version = self.sysVersion or "unknow",
+		ip = self.ip or "0.0.0.0",
+		network = self.network or "unknow",
+		record_date = os.date("%Y%m%d"),
+	}
+	return log
 end
  
+
+
 local RoleLog = {}
 function RoleLog.bind(Role)
 	function Role:log(logType, contents)
 		contents = contents or {}
-		local _logType = LogType[logType]
-		if not _logType then 
-			printError(string.format("LOG ERROR: new logType [%s] need Add Maping.", logType))
+		local schema = MethodType[logType]
+		if not schema then 
+			printError(string.format("LOG ERROR: new logType [%s].", logType))
 			return 
 		end
-		local doc = {}
-		for field, ctype in pairs(commonRoleField) do
-			if contents[field] then
-				printError(string.format("LOG ERROR: logType [%s] had field [%s] overwrite default.", logType, field))
-			end
-			doc[field] = checkType("commonRoleField", field, self:getProperty(field), ctype)
-		end
-
-		local mapping = Mapping[_logType]
-		if mapping["ucode"] and not contents["ucode"] then
-			contents["ucode"] = self:getActionUcode()
-		end
+		local doc = getBaseLog(self)
  
+		doc["method"] = logType
 		for field, value in pairs(contents) do
-			local ftype = mapping[field]
-			if ftype then
-				doc[field] = checkType(logType, field, value, ftype)
+			if not schema[field] then
+				printError(string.format("LOG ERROR: logType [%s] have new field [%s], call.", logType, field))
 			else
-				printError(string.format("LOG ERROR: logType [%s] have new field [%s] no type in mapping.", logType, field))
+				if schema[field] == 'json' then
+					value = jsonEncode(value)
+				end
+				doc[field] = value
+			end
+		end
+
+		for field, tag in pairs(schema) do
+			if not contents[field] then
+				if tag == "ucode" then
+					contents[field] = self:getActionUcode()
+				else
+					printError(string.format("LOG ERROR: logType [%s] lose field [%s].", logType, field))
+				end
 			end
 		end
 		if not logd then return end
-		pcall(skynet.send, logd, "lua", "log", logType, doc, _logType)
+		pcall(skynet.send, logd, "lua", "log", doc)
+	end
+
+	function Role:logItems(itemId, before, after, log)
+		if not log then
+			print("logItems no log ", debug.traceback())
+		end
+		local reason = log.desc
+		local subreason = log.int1 or 0
+		local other = log.int2 or 0
+
+		local reasonType =  ItemReason[reason]
+		if not reasonType then
+			printError(string.format("LOG ERROR: onItems no reasonType [%s].", reason))
+		end
+		local itemData = csvdb["itemCsv"][itemId]
+		if not itemData then return end
+		self:log("onItems", {
+			item_id = itemId, -- 道具id
+			item_type = itemData.type, -- 道具类型，具体见枚举表中道具类型枚举表
+			item_level = 0, -- 道具等级
+			item_number = math.abs(after - before), -- 道具变化数量的绝对值
+			action_type = after - before > 0 and 1 or 0, -- 变化类型（玩家获取：1，玩家消耗：0）
+			item_before = before, -- 道具变化前的数量
+			item_after = after, -- 道具变化后的数量
+			item_reason = reasonType, -- 道具流动一级原因，如抽卡、装备强化、副本掉落，可参考道具动作类型枚举表
+			item_subreason = subreason, -- 道具流动二级原因，抽卡：卡池ID，装备强化：装备ID，副本掉落：副本ID
+			item_other = other, -- 其他（可包含阶数，强化等级，随机属性）
+		})
 	end
  
+
 	function Role:startActionUcode()
 		if not self._uniqueCount then
 			self._uniqueCount = 0
@@ -225,7 +542,8 @@ function RoleLog.bind(Role)
  
 	function Role:getActionUcode()
 		return self._actionUcode
-	end
+ 	end
+
  
 end
 return RoleLog
 \ No newline at end of file
@@ -207,6 +207,7 @@ function RolePlugin.bind(Role)
  
 	function Role:addPlayExp(addExp, params)
 		local level = self:getProperty("level")
+		local oldLevel = level
 		if not csvdb["player_expCsv"][level + 1] then
 			return
 		end
@@ -217,24 +218,24 @@ function RolePlugin.bind(Role)
 			if csvdb["player_expCsv"][level + 1] then -- 有下一级
 				newExp = newExp - csvdb["player_expCsv"][level].exp
 				level = level + 1
+				self:checkTaskEnter("RoleLevelUp", {level = level})
 			else
 				newExp = csvdb["player_expCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
 			end
 		end
-
-		if params.log then
-			local log = clone(params.log)
-			if log["cint1"] or log["cint2"] then
-				print("addPlayExp error log have cint1 or cint2  or cint3", debug.traceback())
+		if level > oldLevel then
+			if params.log then
+				local log = params.log
+				self:log("setLevel", {
+					level_before = oldLevel, 
+					level_changemain = log.desc,
+					level_changedetail = log.sub or "",
+					level_reward = {},
+				})
+			else
+				print("addPlayExp no log ", debug.traceback())
 			end
-
-			log["cint1"] = addExp
-			log["cint2"] = newExp
-			log["cint3"] = level
-
-			self:log("player_exp", log)
-		else
-			print("addPlayExp no log ", debug.traceback())
+			
 		end
  
 		self:updateProperties({level = level, exp = newExp})
@@ -257,21 +258,7 @@ function RolePlugin.bind(Role)
 			items = items:incrv(params.itemId, params.count)
 		end
  
-		if params.log then
-			local log = clone(params.log)
-			if log["cint1"] or log["cint2"] then
-				print("addItem error log have cint1 or cint2  ", debug.traceback())
-			end
-			log["cint1"] = params.itemId
-			log["cint2"] = math.abs(params.count)
-			if params.count <= 0 then
-				self:log("out_item", log)
-			else
-				self:log("in_item", log)
-			end
-		else
-			print("addItem no log ", debug.traceback())
-		end
+		self:logItems(params.itemId, origin, nums, params.log)
  
 		self:setProperty("items", items)
 		if not params.notNotify then
@@ -341,22 +328,12 @@ function RolePlugin.bind(Role)
 			self:incrProperty("diamond", count)
 		end
  
-		if params.log then
-			local log = clone(params.log)
-			if log["cint1"] or log["cint2"] or log["cint3"] then
-				print("costDiamond error log have cint1 or cint2 or cint3 ", debug.traceback())
-			end
-			log["cint1"] = origin
-			log["cint2"] = count
-			self:log("in_diamond", log)
-		else
-			print("gainDiamond no log ", debug.traceback())
-		end
-
+		self:logItems(ItemId.Diamond, origin, count, params.log)
 		self:notifyUpdateProperty("diamond", self:getAllDiamond())
 		return true
 	end
  
+
 	function Role:costDiamond(params)
 		if not params or type(params) ~= "table" then return false end
 		local count = tonum(params.count)
@@ -389,17 +366,8 @@ function RolePlugin.bind(Role)
 			self:incrProperty(costFirst[2], -last)
 		end
  
-		if params.log then
-			local log = clone(params.log)
-			if log["cint1"] or log["cint2"] or log["cint3"] then
-				print("costDiamond error log have cint1 or cint2 or cint3 ", debug.traceback())
-			end
-			log["cint1"] = origin
-			log["cint2"] = count
-			self:log("out_diamond", log)
-		else
-			print("costDiamond no log ", debug.traceback())
-		end
+
+		self:logItems(ItemId.Diamond, origin, count, params.log)
  
 		self:notifyUpdateProperty("diamond", self:getAllDiamond())
 		return true
@@ -435,17 +403,9 @@ function RolePlugin.bind(Role)
 			local bin = MsgPack.pack(heroResponse)
 			SendPacket(actionCodes.Hero_loadInfos, bin)
 		end
-		if params.log then
-			local log = clone(params.log)
-			if log["cint1"] or log["cint2"] or log["cint3"] then
-				print("addHero error log have cint1 or cint2 or cint3 ", debug.traceback())
-			end
-			log["cint1"] = heroId
-			log["cint2"] = heroType
-			self:log("in_hero", log)
-		else
-			print("addHero no log ", debug.traceback())
-		end
+
+		self:logItems(heroType + ItemStartId.Hero, 0, 1, params.log)
+
 		return true, newHero
 	end
  
@@ -458,33 +418,6 @@ function RolePlugin.bind(Role)
 		end
 	end
  
-	function Role:delHero(heroId, params)
-		params = params or {}
-		local roleId = self:getProperty('id')
-		local hero = self.heros[heroId]
-		local heroType = hero:getProperty("type")
-		if not hero then return end
-
-		self.heros[heroId] = nil
-		redisproxy:pipelining(function (red)
-			red:del(string.format(R_HERO, roleId, heroId))
-			red:srem(string.format(R_HEROS, roleId), heroId)
-		end)
-
-		if params.log then
-			local log = clone(params.log)
-			if log["cint1"] or log["cint2"] or log["cint3"] then
-				print("delHero error log have cint1 or cint2 or cint3 ", debug.traceback())
-			end
-			log["cint1"] = heroId
-			log["cint2"] = heroType
-			self:log("out_hero", log)
-		else
-			print("delHero no log ", debug.traceback())
-		end
-
-		SendPacket(actionCodes.Hero_loadInfos, MsgPack.pack({{id = heroId, bDel = true}}))
-	end
  
 	function Role:loadHeros()
 		local roleId = self:getProperty("id")
@@ -563,7 +496,8 @@ function RolePlugin.bind(Role)
 		if not equipCsv then return end
 		local equips = self:getProperty("equips")
 		local curTypeEquips = equips[equipType] or {}
-		local curCount = (curTypeEquips[equipLv] or 0) + count
+		local oldCount = curTypeEquips[equipLv] or 0
+		local curCount = oldCount + count
  
 		-- 是否足够上层判断
 		if curCount < 0 then
@@ -581,22 +515,7 @@ function RolePlugin.bind(Role)
  
 		self:setProperty("equips", equips)
  
-		if pms.log then
-			local log = clone(pms.log)
-			if log["cint1"] or log["cint2"] or log["cint3"] then
-				print("addEquip error log have cint1 or cint2 or cint3 ", debug.traceback())
-			end
-			log["cint1"] = equipType
-			log["cint2"] = equipLv
-			log["cint3"] = math.abs(count)
-			if count < 0 then
-				self:log("out_equip", log)
-			else
-				self:log("in_equip", log)
-			end
-		else
-			print("addEquip no log ", debug.traceback())
-		end
+		self:logItems(equipCsv.id, oldCount, curCount, pms.log)
  
 		if not pms.notNotify then
 			self:changeUpdates({{type = "equips", field = {equipType, equipLv}, value = curCount, isOnlyToC = true}}) -- 通知客户端
@@ -656,20 +575,7 @@ function RolePlugin.bind(Role)
 			end
 			self:checkTaskEnter("AddRune", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
  
-			if params.log then
-				local log = clone(params.log)
-				if log["cint1"] or log["cint2"] or log["cint3"] then
-					print("addRune error log have cint1 or cint2 or cint3 ", debug.traceback())
-				end
-
-				log["cint1"] = runeUid
-				log["cint2"] = params.type
-				log["cint3"] = params.id
-
-				self:log("in_rune", log)
-			else
-				print("addRune no log ", debug.traceback())
-			end
+			self:logItems(params.id, 0, 1, params.log)
  
 			return 0, newRune
 		else
@@ -685,20 +591,7 @@ function RolePlugin.bind(Role)
 			local rune = self.runeBag[runeId]
 			if rune and rune:getProperty("refer") == 0 then
  
-				if params.log then
-					local log = clone(params.log)
-					if log["cint1"] or log["cint2"] or log["cint3"] then
-						print("delRunes error log have cint1 or cint2 or cint3 ", debug.traceback())
-					end
-
-					log["cint1"] = runeId
-					log["cint2"] = rune:getProperty("type")
-					log["cint3"] = rune:getProperty("id")
-
-					self:log("out_rune", log)
-				else
-					print("delRunes no log ", debug.traceback())
-				end
+				self:logItems(rune:getProperty("id"), 1, 0, params.log)
  
 				self.runeBag[runeId] = nil
 				table.insert(bDel, runeId)
@@ -944,19 +837,7 @@ function RolePlugin.bind(Role)
  
 		count = count or 1
  
-		if params.log then
-			local log = clone(params.log)
-			if log["cint1"] or log["cint2"] or log["cint3"] then
-				print("funcOpen error log have cint1 or cint2 or cint3 ", debug.traceback())
-			end
-
-			log["cint1"] = func
-			log["cint2"] = count
-
-			self:log("func_open", log)
-		else
-			print("funcOpen no log ", debug.traceback())
-		end
+		self:logItems(func, 0, count, params.log)
  
 		if csvdb["itemCsv"][func] and csvdb["itemCsv"][func].type == ItemType.FuncOpen then
 			local unlockData = csvdb["unlockCsv"][func]
@@ -1467,15 +1348,6 @@ function RolePlugin.bind(Role)
 		return RANK_ADV[idx]
 	end
  
-	-- 是否需要进行引导
-	function Role:checkOverGuide(guideId)
-		local funcGuide = self:getProperty("funcGuide")
-		if funcGuide:getv(guideId, 0) > 0 then
-			return true
-		end
-		return false
-	end
-
 	-- 消除指定tag 红点
 	function Role:clearRedPTag(tag)
 		local redp = self:getProperty("redp")
@@ -1510,8 +1382,8 @@ function RolePlugin.bind(Role)
 			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ result = "handled" }))
 			return
 		end
-
-		local rechargeData = csvdb["shop_rechargeCsv"][orderObject:getProperty("rechargeId")]
+		local rechargeId = orderObject:getProperty("rechargeId")
+		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
 		if rechargeData.rmb ~= tonumber(params.amount) then
 			skynet.error(string.format("fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
 				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
@@ -1519,16 +1391,34 @@ function RolePlugin.bind(Role)
 			return
 		end
  
-		local reward = self:recharge({ 
-			id = orderObject:getProperty("rechargeId"),
-			transactionId = params.transactionId,
-			pay_time = params.pay_time,
-			order = partnerOrderStr
+		local order_type = self:getProperty("rmbC") > 0 and 0 or 1
+		local status, reward = self:recharge({ 
+			id = rechargeId
 		})
 		orderObject:setProperty("finishTime", skynet.time())
 		orderObject:setProperty("status", "finish")
  
 		redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
+
+		if not status then
+			status = 200
+		else
+			status = 1000 + status
+		end
+		self:log("setOrder", {
+			order_status = status, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
+			item_id = rechargeId, -- 道具id
+			item_type = rechargeData.type, -- 购买的道具类型，具体见"onItems"方法中道具类型枚举表
+			item_name = rechargeData.title, -- 购买的道具名
+			item_number = 1, -- 购买的道具数量
+			item_level = 1, -- 购买的道具等级
+			order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
+			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
+			order_type = order_type, -- 订单类型，首充记录为1，否则为0
+			order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
+		})
+		if status ~= 200 then return end
+		
 		SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
 			result = "success", reward = reward}))
  
@@ -1541,11 +1431,11 @@ function RolePlugin.bind(Role)
 		local rechargeData = csvdb["shop_rechargeCsv"][id]
 		if not rechargeData then
 			skynet.error("recharge id not exist", id)
-			return
+			return 1
 		end
  
 		if not self.storeData:checkRechargeRecord(rechargeData.limit, id) then
-			return 1
+			return 2
 		end
  
 		local diamondCount = 0
@@ -1560,13 +1450,13 @@ function RolePlugin.bind(Role)
 			end
 			self:gainDiamond({count = diamondCount, isRecharge = true, log = {desc = "recharge", int1 = id}})
 		elseif rechargeData.shop == 2 then  --通行证商店
-			reward, _ = self:award(rechargeData.itemFirst, {log = {desc = "recharge", int1 = id}})
+			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
 			self.storeData:onBuyCard(rechargeData.type, rechargeData.time)
 		elseif rechargeData.shop == 3 then  -- 礼包商店
-			reward, _ = self:award(rechargeData.itemFirst, {log = {desc = "recharge", int1 = id}})
+			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
 		else
 			skynet.error("invalid recharge shop type " .. id)
-			return
+			return 3
 		end
  
 		if diamondCount > 0 then
@@ -1576,10 +1466,8 @@ function RolePlugin.bind(Role)
 		-- 累充
 		local rmb = rechargeData.rmb
 		self:updateProperty({field = "rmbC", delta = rmb})
-		
-		self:log("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = params.pay_time})
  
-		return reward
+		return nil, reward
 	end
  
 	--直接给玩家发送邮件，立即推送小红点
@@ -1600,6 +1488,50 @@ function RolePlugin.bind(Role)
 		self.sendMailFlag = true
 	end
  
+	-- 是否需要进行引导
+	function Role:checkOverGuide(guideId,slave)
+		local funcGuide = self:getProperty("funcGuide")
+		if funcGuide:getv(guideId * 1000 + (slave or 0), 0) > 0 then
+			return true
+		end
+		return false
+	end
+
+	-- 保存引导步骤
+	function Role:saveGuide(master,slave,force)
+		local newerGuide = self:getProperty("newerGuide")
+		local guide = newerGuide:toArray(true,"=")
+		local sMaster, sSlave = guide[1], guide[2]
+
+		if not force and master < sMaster then return end
+		if not force and master <= sMaster and slave < sSlave then return end
+
+		local funcGuide = self:getProperty("funcGuide")
+		funcGuide = funcGuide:setv(master * 1000 + slave, 1)
+		if funcGuide:getv(master * 1000,0) == 0 then
+			funcGuide = funcGuide:setv(master * 1000, 1)
+		end
+		self:updateProperty({field = "funcGuide", value = funcGuide})
+		self:log("onGuidePoint", {guild_type = 0, guild_id = master, guild_point = slave, guild_pass = 0})
+
+		newerGuide = string.format("%d=%d",master,slave)
+		self:updateProperty({field = "newerGuide", value = newerGuide})
+	end
+
+	-- 引导大步骤结束
+	function Role:finishGuide(master)
+		local newerGuide = self:getProperty("newerGuide")
+		local guide = newerGuide:toArray(true,"=")
+		if guide[1] > master then return end
+		
+		local guideCsv = csvdb["guide_mainCsv"]
+		local lastStep = guideCsv[master][#guideCsv[master]]
+		if guideCsv[master + 1] then
+			self:updateProperty({field = "newerGuide", value = string.format("%d=%d",master + 1,1)})
+		else
+			self:updateProperty({field = "newerGuide", value = "9999=1"})
+		end
+	end
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -500,7 +500,7 @@ function Role:setCrossServerPvpBet(idx)
 	local ok, result = pcall(skynet.call, pvpd, "lua", "setBet", idx, self:getProperty("id"), costNum)
 	if ok then
 		if result then
-			self:costItems(cost, {log = {desc = "crossPvpBet", short1 = day}})
+			self:costItems(cost, {log = {desc = "crossPvpBet", int1 = day}})
 			pvpBet[day] = {idx, cost[ItemId.Gold]}
 			self:setProperty("pvpBet", pvpBet)
 		end
@@ -76,6 +76,9 @@ local TaskType = {
 	AddFriend = 802,			-- 加入一个好友		- count
 	GetFriendP = 803,			-- 获得友情点 		- count
  
+	-- 角色相关 
+	RoleLevelUp = 901,			-- 角色升级			- curlevel
+
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
 	UnionBoss = 1004,			-- 工会boss
@@ -209,13 +212,22 @@ local Activity = require(&quot;models.Activity&quot;)
 local ActivityListener = {
 	func = "checkActivityTask",
 	listen = {
-		[TaskType.DrawHero] = {{Activity.ActivityType.DrawHero, f("count")}},
+		[TaskType.DrawHero] = {{Activity.ActivityType.DrawHero, f("count"), f("pool")}},
 		[TaskType.FoodSell] = {{Activity.ActivityType.FoodSell, f("count")}},
 		[TaskType.AdvDraw] = {{Activity.ActivityType.AdvDraw, f("count")}},
 		[TaskType.OpenBox] = {{Activity.ActivityType.OpenBox, f("count")}},
 	}
 }
  
+local StoreListener = {
+	func = "checkStoreTask",
+	listen = {
+		[TaskType.HangPass] = {{TriggerEventType.HangPass, f("id")}},
+		[TaskType.RoleLevelUp] = {{TriggerEventType.LevelUp, f("level")}},
+		[TaskType.TowerPass] = {{TriggerEventType.TowerPass, f("level")}},
+	}
+}
+
  
 local TaskListeners = {
 	StoryListener,
@@ -223,6 +235,7 @@ local TaskListeners = {
 	AchievListener,
 	SudokuListener,
 	ActivityListener,
+	StoreListener,
 }
  
 local RoleTask = {}
@@ -533,6 +546,10 @@ function RoleTask.bind(Role)
 		self.activity:checkActivity(notNotify, activityType, ...)
 	end
  
+	function Role:checkStoreTask(notNotify, triggerType, param)
+		self.storeData:OnTriggerLimitTimePack(triggerType, param)
+	end
+
 end
  
 return RoleTask
 \ No newline at end of file
@@ -13,6 +13,7 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 	self.storeData:onCrossDay()
  
 	self:setProperty("dTask", {})
+	self:incrProperty("lday", 1)
 	self:advRandomSupportEffect(not notify)
  
 	self:checkExpireItem(not notify)
@@ -27,15 +27,15 @@ function Rune:notifyUpdateProperty(field, newValue, oldValue)
 end
  
 function Rune:log(contents)
-	contents = contents or {}
-	if contents["cint1"] or contents["cint2"] or contents["cint3"] then
-		print("heroLog error log have cint1 or cint2 or cint3 ", debug.traceback())
-	end
-	contents["cint1"] = self:getProperty("uid")
-	contents["cint2"] = self:getProperty("type")
-	contents["cint3"] = self:getProperty("id")
+	-- contents = contents or {}
+	-- if contents["cint1"] or contents["cint2"] or contents["cint3"] then
+	-- 	print("heroLog error log have cint1 or cint2 or cint3 ", debug.traceback())
+	-- end
+	-- contents["cint1"] = self:getProperty("uid")
+	-- contents["cint2"] = self:getProperty("type")
+	-- contents["cint3"] = self:getProperty("id")
  
-	self.owner:log("rune_action", contents)
+	-- self.owner:log("rune_action", contents)
 end
  
 function Rune:notifyUpdateProperties(params)
@@ -20,6 +20,7 @@ Store.schema = {
     privCardEx = {"number", 0},          -- 特权卡过期时间戳
     getMailT1 = {"number",0},       -- 上次发送月卡福利邮件的时间
     getMailT2 = {"number",0},       -- 上次发送超级月卡福利邮件的时间
+    packTrigger = {"table", {}}     -- 礼包触发记录 {关卡难度1={id, 通关关卡数，升级数，爬塔层数}, ...}
 }
  
 function Store:updateProperty(params)
@@ -60,7 +61,7 @@ end
 -- 发送月卡邮件
 function Store:sendMonthCardEmail()
     local timeNow = skynet.timex()
-    local tabs = {{ex="monthCardEx", t="getMailT1", mail=MailId.MonthCard, alert=MailId.MonthCardEx}, 
+    local tabs = {{ex="monthCardEx", t="getMailT1", mail=MailId.MonthCard, alert=MailId.MonthCardEx},
     {ex="smonthCardEx", t="getMailT2", mail=MailId.SuperMonthCard, alert=MailId.SuperMonthCardEx}}
     for _, v in ipairs(tabs) do
         local ex  = self:getProperty(v.ex)
@@ -216,7 +217,7 @@ function Store:onBattleCardReset()
         if config then
             local freeFlag = string.char(string.getbit(battleCardFreeRecord, id))
             local limitFlag = string.char(string.getbit(battleCardLimitRecord, id))
-            
+
             if battlePoint < config.point then
                 break
             end
@@ -227,7 +228,7 @@ function Store:onBattleCardReset()
                 concatGift(config.giftLimit)
             end
         end
-    end	
+    end
     self.owner:sendMail(MailId.BattleCardAward, nil, gift)
     -- 计算剩余奖励
     self:updateProperty({field = "battleCard", value=0})
@@ -266,6 +267,69 @@ function Store:resetStoreReored(resetId)
     self:updateProperty({field = "buyR", value = buyRecord})
 end
  
+--触发限时礼包
+function Store:OnTriggerLimitTimePack(eventType, param)
+    local limitPack = self:getProperty("limitTPack")
+    local payRecord = self:getProperty("payR")
+    local timeNow = skynet.timex()
+    local find = false
+    -- 有未过期的限时礼包不再推送
+    for k, v in pairs(limitPack) do
+        if v > timeNow and not payRecord[k] then
+            find = true
+            break
+        end
+    end
+    if find == true then
+        return
+    end
+    limitPack = {}
+    local hangPass = self.owner:getProperty("hangPass")
+    local triggerRecord = self:getProperty("packTrigger")
+    local result = {}
+    local maxDiff = 0
+    -- 取满足限时礼包关卡要求的对应数据
+    for diff, maxCarbonId in pairs(hangPass) do
+        for id, cfg in pairs(csvdb["shop_packCsv"]) do
+            local range = cfg.showRange:toArray(true, "=")
+            local beginRange = range[1] or 0
+            local endRange = range[2] or 0
+            if maxCarbonId > beginRange and maxCarbonId <= endRange and cfg.type == eventType then
+                result[diff] = cfg
+                maxDiff = math.max(maxDiff, diff)
+                break
+            end
+        end
+    end
+    local shopGoodsId = 0
+    for diff, cfg in pairs(result) do
+        if diff == maxDiff then
+            local record = triggerRecord[diff] or {}
+            if (record[0] or 0) ~= cfg.id and next(record) then
+                record = {}
+            end
+            record[0] = cfg.id
+            record[eventType] = (record[eventType] or 0) + 1
+            if record[eventType] > 0 and record[eventType] % 10 == 0 then
+                local pool = cfg.packId:toArray(true, "=")
+                local idx = math.random(1, #pool)
+                shopGoodsId = pool[idx]
+            end
+            triggerRecord[diff] = record
+        end
+    end
+    if shopGoodsId ~= 0 then
+        local rechargeCfg = csvdb["shop_rechargeCsv"][shopGoodsId]
+        if rechargeCfg then
+            limitPack[rechargeCfg.id] = timeNow + rechargeCfg.time
+            self:updateProperty({field = "limitTPack", value = limitPack})
+        end
+    end
+    if next(result) then
+        self:updateProperty({field = "packTrigger", value = triggerRecord})
+    end
+end
+
 function Store:data()
 	return {
         buyR		= self:getProperty("buyR"),
@@ -279,6 +343,7 @@ function Store:data()
         battleLR  = self:getProperty("battleLR"),
         limitTPack = self:getProperty("limitTPack"),
         privCardEx = self:getProperty("privCardEx"),
+        packTrigger = self:getProperty("packTrigger")
 	}
 end
  
@@ -128,7 +128,7 @@ function _M:check_agent_status()
 		next_log_time = now + 60
 		local count = table_nums(self.u2f)
 		datacenter.set("onlineCount", count)
-		pcall(skynet.send, logd, "lua", "log", "online", {count = count}, "online")
+		-- pcall(skynet.send, logd, "lua", "log", "online", {count = count}, "online")
 	end
 end
  
@@ -60,25 +60,25 @@ local function mailQuene()
 		if email.mid then
 			redisproxy:hmset(string_format("globalEmail:%s", gid), 
 				"id", gid,
-				"createtime", email.endTime,
+				"createtime", email.startTime,
 				"title", email.title,
 				"stitle", email.stitle,
 				"content", email.content,
 				"attachments", email.attachments,
 				"endtime", email.endTime,
 				"mid", email.mid,
-				"timestamp", email.startTime
+				"timestamp", now
 			)
 		else
 			redisproxy:hmset(string_format("globalEmail:%s", gid), 
 				"id", gid,
-				"createtime", email.endTime,
+				"createtime", email.startTime,
 				"title", email.title,
 				"stitle", email.stitle,
 				"content", email.content,
 				"attachments", email.attachments,
 				"endtime", email.endTime,
-				"timestamp", email.startTime
+				"timestamp", now
 			)
 		end
 	end
@@ -55,44 +55,17 @@ skynet.register_protocol {
 	end
 }
  
-
-
--- 日志 index 不包含 日期的 index_suffix
-local IndexNoDate = {
-	online = true,
-}
--- 不走 role log 的日志都要自行注意 mapping 设置【重要】
--- index_suffix index 后缀 默认为 common
-function CMD.log(logType, doc, index_suffix)
-	index_suffix = index_suffix or "common"
-	if index_suffix == "common" then
-		doc["@type"] = logType
-	else
-		if logType ~= index_suffix then -- 定制后缀 不一定有type 不相等时才有type
-			doc["@type"] = logType
-		end
-	end
-
-	local now = skynet.timex()
-	doc["timestamp"] = now
-	doc["timestamp_f"] = os.date("%Y-%m-%d %H:%M:%S", now)
-	doc["server"] = serverId
-
-	-- 自己加好 index
-	if IndexNoDate[index_suffix] then
-		doc["@index"] = string.format("gamelog-%s", index_suffix)
-	else
-		doc["@index"] = string.format("gamelog-%s-%s", os.date("%Y%m%d", now), index_suffix)
-	end
+function CMD.log(doc)
 	if not socketdriver.send(log_fd, json.encode(doc) .. "\n") then
 		if not connecting then
 			CMD.open() -- 连一下试试
+			socketdriver.send(log_fd, json.encode(doc) .. "\n")
 		end
 	end
 end
  
 function CMD.open()
-	log_fd = socketdriver.connect("127.0.0.1", 5170)
+	log_fd = socketdriver.connect("127.0.0.1", 13001)
 	connecting = true
 end
  
@@ -13,7 +13,7 @@ local strh = require &quot;strh&quot;
 function string.setv(str, k, v, delimiter)
 	delimiter = delimiter or " "
 	-- 若存在则替换，若无则append
-	return strh.modify(str, {[tonumber(k)]=tonumber(v)}, false, delimiter)
+	return strh.modify(str, {[tonumber(k)]=math.floor(tonumber(v))}, false, delimiter)
 end
  
 function string.msetv(str, vs, delimiter)
@@ -24,7 +24,7 @@ end
  
 function string.incrv(str, k, delta, delimiter)
 	delimiter = delimiter or " "
-	return strh.modify(str, {[tonumber(k)]=tonumber(delta)}, true, delimiter)
+	return strh.modify(str, {[tonumber(k)]=math.floor(tonumber(delta))}, true, delimiter)
 end
  
 function string.mincrv(str, ds, delimiter)
@@ -331,4 +331,20 @@ function string.setbit(str, pos, yes)
 	else
 		return str:sub(1, pos-1) .. yes .. str:sub(pos+1, -1)
 	end
+end
+
+--[[
+from: 1=2 3=4
+to: {["1"]="2" or 2,["3"]="4" or 4}
+]]
+function string.toMap(str, tonum, sep)
+	local str_vec = string.split(str, " ")
+	local tab = {}
+	for _, v in pairs(str_vec) do
+		local vec = string.split(v, sep)
+		if #vec == 2 then
+			tab[vec[1]] = tonum and tonumber(vec[2]) or vec[2]
+		end
+	end
+	return tab
 end
 \ No newline at end of file