Merge branch 'bugfix' into player

* bugfix: (53 commits) 成就参数错误 3星解锁 cg 增加神器标签初始化冒险重置时间被动新扣层数被动取消引导用到的剧情的奖励可以直接领调整顺序签到成就充值返利邮件内容优化奖励关卡活动未开启导致Bug 每周循环任务bug 运营需要屏蔽字优化优化充值返利邮件档位排序伤害错误反的判断返利邮件拼接充值档位 ...

Merge branch 'bugfix' into player
* bugfix: (53 commits) 成就参数错误 3星解锁 cg 增加神器标签初始化冒险重置时间被动新扣层数被动取消引导用到的剧情的奖励可以直接领调整顺序签到成就充值返利邮件内容优化奖励关卡活动未开启导致Bug 每周循环任务bug 运营需要屏蔽字优化优化充值返利邮件档位排序伤害错误反的判断返利邮件拼接充值档位 ...
熊润斐
2 parents 91bf6546 3ed95697
Showing 43 changed files with 1425 additions and 280 deletions Show diff stats
robot/robot.lua
robot/start.lua
robot/unitTest/hero.lua
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/AdvBuff.lua
@@ -34,6 +34,9 @@ local ignoreListener = {
 	["Role.changeUpdate"] = true,
 	["Role.loadRunes"] = true,
 	["Hero.loadInfos"] = true,
+	["Store.updateproperty"] = true,
+	["Sys.maintainNotice"] = true,
+	["Hero.drawHeroExtraRewardNtf"] = true,
 	["Sys.innerErrorMsg"] = function(data)
 		local msg = MsgPack.unpack(data)
 		log("innerErrorMsg: " .. msg.id)
@@ -123,11 +126,6 @@ local function startUnit(unit)
 	unitTest.new(client):startTest()
 end
  
-local function handle_timeout10000()
-	rpcServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 1, pm2 = 500}))
-	rpcServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 2, pm2 = 500}))
-	skynet.timeout(10000, handle_timeout6000)
-end
  
 -- 登录成功开始任务
 function CMD.task()
@@ -155,6 +153,9 @@ end
  
 -- 退出
 function CMD.exit()
+	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "gmmsg", pm1 = "123"}))
+	skynet.sleep(50)
+	skynet.ret(skynet.pack())
 	skynet.exit()
 end
  
@@ -19,9 +19,9 @@ function MSG.open( ... )
 end
  
 function MSG.close(fd)
-	if fd2serv[fd] then
-		skynet.send(fd2serv[fd].agent, "lua", "exit")
-
+	if fd2serv[fd] and not fd2serv[fd].closing then
+		fd2serv[fd].closing = true
+		skynet.call(fd2serv[fd].agent, "lua", "exit")
 		log(string_format("logout %s", fd2serv[fd].id))
  
 		id2fd[fd2serv[fd].id] = nil
@@ -94,8 +94,8 @@ local function add_robot()
  
 	-- 定时下线
 	skynet.timeout(math.randomInt(config.online_time[1], config.online_time[2]) * 100, function()
-		socketdriver.close(fd)
 		MSG.close(fd)
+		socketdriver.close(fd)
 	end)
 end
  
@@ -26,7 +26,7 @@ end
  
 function _M:drawHero()
 	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 3, pm2 = 400}))
-	requestServer(actionCodes.Hero_drawHeroRpc, MsgPack.pack({pool = 1, type = 1}))
+	requestServer(actionCodes.Hero_drawHeroRpc, MsgPack.pack({pool = 2, type = 1}))
 end
  
 function _M:drawHero10()
@@ -68,6 +68,7 @@ ItemType = {
 	AdvItem						= 14, 	-- 冒险道具
 	FuncOpen					= 15, 	-- 管理功能开放
 	SpeedBox					= 16, 	-- 加速箱子
+	SelectItemBox				= 17, 	-- 自选箱子
 }
  
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
@@ -274,10 +275,8 @@ CardType = {
 	PrivilegeCard = 3, --特权卡
 	GrowFund = 4,	--成长助力
 	BattleCard = 5,	--赛季卡
-	BattlePassCard_1 = 6, -- 探索指令1
-	BattlePassCard_2 = 7, -- 探索指令2
-	BattlePassCard_3 = 8, -- 探索指令3
-	BattlePassCard_4 = 9, -- 探索指令4
+	PaySignCard = 6, -- 付费签到卡
+	BattlePassCard = 7, -- 探索指令
 }
  
 HeroQuality = {
@@ -294,8 +293,6 @@ MailId = {
 	SuperMonthCardEx = 204,
 	BattleCardAward = 210,
  
-	PaySignAward = 222,
-
 	ActSellFood = 231,
 	ActDrawCard = 232,
 	ActAdvDraw = 233,
@@ -304,6 +301,9 @@ MailId = {
 	ActDrawCardReward = 222,
 	ActAdvDrawReward = 223,
 	ActOpenBoxReward = 224,
+
+	PaySignAward = 241,
+	PayBackAward = 242,
 }
  
 TriggerEventType = {
@@ -46,6 +46,7 @@ actionCodes = {
 	Role_goldBuyRpc = 131,
 	Role_getDownloadCvRewardRpc = 132,
 	Role_updateFeedbackInfoRpc = 133,
+	Role_useSelectItemRpc = 134,		-- 使用多选一礼包
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -92,6 +93,7 @@ actionCodes = {
 	Hero_repayHeroRpc = 221,
 	Hero_unlockPoolRpc = 222,
 	Hero_changeCrown = 223,
+	Hero_drawHeroExtraRewardNtf = 224,
  
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -70,6 +70,7 @@ function _M.sudokuRpc(agent, data)
 		activity_type = 0, -- 活动类型，见活动类型枚举表
 		activity_reward = reward or {}, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
+	role:mylog("act_action", {desc = "sudoku", int1 = id, int2 = phase})
  
 	SendPacket(actionCodes.Activity_sudokuRpc, MsgPack.pack({task = role:packReward(task, tchange), reward = role:packReward(reward, rchange), rId = rId}))
 	return true
@@ -137,6 +138,7 @@ function _M.signRpc(agent, data)
  
 	local reward, change = role:award(monthData[curDay].item, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}})
 	role:changeUpdates({{type = "sign", field = curDay, value = yearMonth}})
+	role:checkTaskEnter("SignIn")
  
 	SendPacket(actionCodes.Activity_signRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -174,6 +174,7 @@ function _M.startAdvRpc( agent, data )
 	role:checkTaskEnter("AdvStart", {id = chapterId})
 	role:checkTaskEnter("AdvStartSelf", {id = chapterId})
 	role:getAdvData():popBackEvents() -- 清一下事件
+	role:getAdvData():mylog({desc = "start", int1 = supportIdx})
  
 	SendPacket(actionCodes.Adv_startAdvRpc, '')
 	return true
@@ -254,6 +255,7 @@ function _M.startHangRpc(agent, data)
  
 	role:changeAdvCount(adv_idle_energy)
 	role:checkTaskEnter("AdvStart", {id = chapterId})
+	role:mylog("adv_action", {desc = "startHang", int1 = chapterId})
  
 	SendPacket(actionCodes.Adv_startHangRpc, '')
 	return true
@@ -293,6 +295,8 @@ function _M.quickHangRpc(agent, data)
 	info.time = 0
 	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
  
+	role:mylog("adv_action", {desc = "advQuickHang", int1 = chapterId})
+
 	SendPacket(actionCodes.Adv_quickHangRpc, '')
 	return true
 end
@@ -374,6 +378,8 @@ function _M.endHangRpc(agent, data)
  
 	role:changeUpdates({{type = "advHang", field = chapterId, value = nil}})
  
+	role:mylog("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
@@ -403,6 +409,7 @@ function _M.buyAdvCountRpc(agent , data)
 		role:changeAdvCount(-count * globalCsv.adv_daily_buy_num)
 		role.dailyData:updateProperty({field = "advBC", delta = count})
 	end
+	role:mylog("adv_action", {desc = "buyAdvCount", short1 = isEl and 1 or 0, int1 = count})
  
 	SendPacket(actionCodes.Adv_buyAdvCountRpc, '')
 	return true
@@ -427,6 +434,8 @@ function _M.finishTaskRpc(agent, data)
 	if not status then return end
 	role:checkTaskEnter("AdvOverTask", {id = taskId})
  
+	adv:mylog({desc = "finishTask", int1 = taskId})
+
 	SendPacket(actionCodes.Adv_finishTaskRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -448,6 +457,8 @@ function _M.clickBlockRpc(agent, data)
  
 	if adv:isWaitChooseArtifact() then return returnFail() end
  
+	adv:mylog({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
  
@@ -483,8 +494,8 @@ function _M.useItemRpc(agent, data)
 	if itemId == 5020 then
 		role:finishGuide(53)
 	end
-
 	adv:checkAchievement(adv.AchievType.UseItem, count, itemId)
+	adv:mylog({desc = "useItem", int1 = itemId, int2 = count})
  
 	for i = 1, count do
 		adv:doActive(itemData.effect, target) -- target
@@ -520,6 +531,7 @@ function _M.usePotionRpc(agent, data)
 	local adv = role:getAdvData()
 	if adv:isWaitChooseArtifact() then return end
  
+	adv:mylog({desc = "usePotion", int1 = potionId})
  
 	local status = adv:doActive(potionData.effect, target) -- target
 	if not status then return end
@@ -619,6 +631,7 @@ function _M.exitAdvRpc(agent, data)
 		role:saveGuide(57,1,true)
 	end
 	local adv = role:getAdvData()
+	adv:mylog({desc = "exit"})
 	local status = adv:exit() -- target {roomId = 1, blockId = 1} 选择的目标
 	SendPacket(actionCodes.Adv_exitAdvRpc, MsgPack.pack({events = adv:popBackEvents()}))
 	return true
@@ -689,7 +702,7 @@ function _M.endBattleRpc(agent, data)
 			role:saveGuide(61,1,true)
 		end
 	end
-
+	adv:mylog({desc = "endBattle"})
 	local status = adv:clickBlock(roomId, blockId, {player = player, bySkill = bySkill})
  
 	if not status then return end
@@ -772,7 +785,9 @@ function _M.wheelSurfRpc(agent, data)
 	end
 	role:award(reward, {log = {desc = "advWheelSurf", int1 = ptype}})
 	role:finishGuide(58)
+
 	role:checkTaskEnter("AdvDraw", {count = count, ptype = ptype})
+	role:mylog("adv_action", {desc = "advWheelSurf", int1 = ptype, int2 = count})
  
 	SendPacket(actionCodes.Adv_wheelSurfRpc, MsgPack.pack({reward = backReward}))
 	return true
@@ -801,6 +816,7 @@ 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:mylog("adv_action", {desc = "advRepayWheelSurf", int1 = ptype})
  
 	SendPacket(actionCodes.Adv_repayWheelSurfRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -824,6 +840,8 @@ function _M.finishAchievRpc(agent, data)
 	if not status then return end
 	adv:updateAchievement()
 	role:finishGuide(57)
+	role:mylog("adv_action", {desc = "finishAchiev", short1 = ctype, int1 = chapterId, int2 = taskId})
+
 	SendPacket(actionCodes.Adv_finishAchievRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -879,6 +897,7 @@ function _M.refreshSupportRpc(agent, data)
 	end
  
 	role:advRandomSupportEffect()
+	role:mylog("adv_action", {desc = "advSupRe", short1 = cr < al and 0 or 1})
  
 	SendPacket(actionCodes.Adv_refreshSupportRpc, '')
 	return true
@@ -47,6 +47,8 @@ function _M.makePotionRpc( agent, data )
 		carriage_cook_amount = count, -- 制作总量
 		carriage_cook_cost = cost, -- 制作消耗道具，json格式记录，{'itemid1':10,'itemid2':5,…………..}
 	})
+	role:mylog("role_action", {desc = "makePotion", int1 = potionId, int2 = count})
+
 	SendPacket(actionCodes.Car_makePotionRpc, MsgPack.pack({potionBag = potionBag}))
 	return true
 end
@@ -105,7 +107,7 @@ function _M.equipUpRpc( agent, data )
 		equip_upgrade_cost = costCount, -- 升级操作消耗装备数量
 		equip_upgrade_current = cost, -- 升级消耗的货币类型
 	})
-
+	role:mylog("role_action", {desc = "equipUp", int1 = id, int2 = count})
 	SendPacket(actionCodes.Car_equipUpRpc, '')
 	return true
 end
@@ -145,7 +147,7 @@ function _M.runeUpRpc( agent, data )
 			hero:updateProperty({field = "battleV", value = hero:getBattleValue()})
 		end
 	end
-	ownRune:log({desc = "runeUp", int1 = level + 1})
+	ownRune:mylog({desc = "runeUp", int1 = level + 1})
  
 	SendPacket(actionCodes.Car_runeUpRpc, '')
 	return true
@@ -179,7 +181,8 @@ function _M.saleEquipRpc(agent, data )
 	end
 	role:checkTaskEnter("SaleEquip", {count = allCount})
 	reward, change = role:award(reward, {log = {desc = "saleEquip"}})
-
+	role:mylog("role_action", {desc = "saleEquip", int1 = allCount})
+	
 	SendPacket(actionCodes.Car_saleEquipRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -106,6 +106,8 @@ function _M.addSellRpc( agent, data )
 	end
 	role:finishGuide(28)
  
+	role:mylog("diner_action", {desc = "addSell", int1 = dish, int2 = count})
+
 	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
 	SendPacket(actionCodes.Diner_addSellRpc, "")
 	return true
@@ -161,6 +163,7 @@ function _M.removeSellRpc( agent, data )
 		restaurant_sale_coin = reward[ItemId.DinerCoin] or 0, -- 售卖获得美食币
 		restaurant_sale_gear = reward[ItemId.Gold] or 0, -- 售卖获得齿轮
 	})
+	role:mylog("diner_action", {desc = "removeSell", int1 = dish})
  
 	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
 	SendPacket(actionCodes.Diner_removeSellRpc, MsgPack.pack({reward = reward, change = change}))
@@ -230,7 +233,7 @@ function _M.getSellRewardRpc( agent, data )
 		role.dinerData:notifyUpdateProperty("order", role.dinerData:getProperty("order"))
 	end
  
-
+	role:mylog("diner_action", {desc = "sell"})
  
 	SendPacket(actionCodes.Diner_getSellRewardRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -319,6 +322,8 @@ function _M.expediteSellRpc( agent, data )
 	end
 	role:checkTaskEnter("FoodSellQuick")
  
+	role:mylog("diner_action", {desc = "sellQ"})
+
 	SendPacket(actionCodes.Diner_expediteSellRpc, MsgPack.pack({reward = reward, change = change, popular = popular}))
 	return true
 end
@@ -365,6 +370,7 @@ function _M.levelUpRpc( agent, data )
 		restaurant_up_effectbef = curLevel, --升级前加成
 		restaurant_up_effect = curLevel + 1, --升级后加成
 	})
+	role:mylog("diner_action", {desc = "buildUp", int1 = index, int2 = curLevel + 1})
  
 	SendPacket(actionCodes.Diner_levelUpRpc, '')
 	return true
@@ -454,6 +460,8 @@ function _M.talentUpRpc( agent, data )
 		carriage_logistics_gear = cost[ItemId.Gold] or 0, -- 后勤室升级花费齿轮数量
 		carriage_logistics_coin = cost[ItemId.DinerCoin] or 0, -- 后勤室升级花费美食币数量
 	})
+	role:mylog("diner_action", {desc = "talentUp", int1 = dish, int2 = dishLevel + 1})
+
 	SendPacket(actionCodes.Diner_talentUpRpc, '')
 	return true
 end
@@ -487,6 +495,7 @@ 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:mylog("diner_action", {desc = "skillUp", int1 = skill, int2 = skillLevel + 1})
  
 	SendPacket(actionCodes.Diner_skillUpRpc, '')
 	return true
@@ -514,6 +523,8 @@ function _M.lockTaskRpc( agent, data )
 	end
 	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
  
+	role:mylog("diner_action", {desc = "lockTask", int1 = order.id})
+
 	SendPacket(actionCodes.Diner_lockTaskRpc, MsgPack.pack({lock = order.lock}))
 	return true
 end
@@ -550,7 +561,8 @@ function _M.updateTaskRpc( agent, data )
 		orders[index].status = 1
 		orders[index].lock = 1
  
-		role:checkTaskEnter("GetOderTask", {rarity = taskSet.rarity})
+		role:checkTaskEnter("GetOderTask", {rarity = taskData.rarity})
+		role:mylog("diner_action", {desc = "getTask", int1 = order.id})
 	elseif cmd == 1 then
 		if order.status ~= 1 then
 			return 31
@@ -558,6 +570,8 @@ function _M.updateTaskRpc( agent, data )
 		orders[index].status = 0
 		orders[index].lock = 0
  
+		role:mylog("diner_action", {desc = "deleteTask", int1 = order.id})
+
 	elseif cmd == 2 then
 		if order.status ~= 1 then
 			return 32
@@ -565,10 +579,11 @@ function _M.updateTaskRpc( agent, data )
 		if order.n < taskData.value then
 			return 6
 		end
+		role:mylog("diner_action", {desc = "finishTask", int1 = order.id})
  
 		reward, change = role:award(taskData.reward, {log = {desc = "dinerFinishTask", int1 = order.id}})
 		table.remove(orders,index)
-		role:checkTaskEnter("OverOderTask", {rarity = taskSet.rarity})
+		role:checkTaskEnter("OverOderTask", {rarity = taskData.rarity})
 	else
 		return 33
 	end
@@ -577,8 +592,8 @@ function _M.updateTaskRpc( agent, data )
 	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
+		restaurant_order_rwd = reward or {}, -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		restaurant_order_lv = taskData.rarity, -- 订单品质等级，普通:0, 稀有:1, 顶级:2, 豪华:3
 	})
  
 	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
@@ -656,6 +671,8 @@ function _M.refreshTaskRpc( agent, data )
 	end
  
 	role:finishGuide(41)
+	role:mylog("diner_action", {desc = "reTask"})
+
 	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
  
 	SendPacket(actionCodes.Diner_refreshTaskRpc, '')
@@ -696,6 +713,8 @@ function _M.addWantFoodRpc(agent , data)
 	end
  
 	role:finishGuide(36)
+	role:mylog("diner_action", {desc = "wantFood"})
+
 	role.dinerData:updateProperty({field = "gfood", value = gfood})
  
 	SendPacket(actionCodes.Diner_addWantFoodRpc, '')
@@ -742,6 +761,7 @@ function _M.getGreenhouseRpc( agent, data )
 	local reward, change = role:award(reward, {log = {desc = "greenHourse", int1 = level}})
 	role:checkTaskEnter("FoodMGet")
  
+	role:mylog("diner_action", {desc = "greenHourse"})
  
 	SendPacket(actionCodes.Diner_getGreenhouseRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -880,6 +900,8 @@ function _M.entrustRpc(agent , data)
 	role.dinerData:updateProperty({field = "entrust", value = entrust})
  
 	role:finishGuide(26)
+	role:mylog("diner_action", {desc = "entrus", short1 = ctype, int1 = entrustId})
+	role:checkTaskEnter("VillageApply", {})
  
 	SendPacket(actionCodes.Diner_entrustRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -916,6 +938,7 @@ function _M.collectRpc(agent , data)
 		restaurant_collect_rwd = reward, -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 		restaurant_collect_plan = count, -- 收集进度，即解锁顾客，数字表示
 	})
+	role:mylog("diner_action", {desc = "collect", int1 = id})
  
 	SendPacket(actionCodes.Diner_collectRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -945,6 +968,8 @@ function _M.comboRewardRpc(agent , data)
  
 	role.dinerData:updateProperty({field = "comboStatus", value = comboStatus}) -- 解锁了
  
+	role:mylog("diner_action", {desc = "combo", int1 = id})
+
 	SendPacket(actionCodes.Diner_comboRewardRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -53,6 +53,7 @@ function _M.listRpc(agent, data)
 					content = email.content, 
 					attachments = email.attachments
 				})
+				role:mylog("mail_action", {desc = "get_global", key1 = email.title, key2 = email.attachments})
 			end
 		end
 	end
@@ -98,6 +99,7 @@ function _M.drawAllAttachRpc(agent, data)
 			for key, v in pairs(attachments:toNumMap()) do
 				reward[key] = (reward[key] or 0) + v
 			end
+			role:mylog("mail_action", {desc = "draw_attach", int1 = email:getProperty("emailId"), key1 = email:getProperty("title"), key2 = attachments})
 		end
 	end
 	reward, change = role:award(reward, {log = {desc = "draw_attach"}})
@@ -123,7 +125,7 @@ function _M.drawAttachRpc(agent, data)
 	email:setProperty("status", 2)
 	email:log(role, 2)
 	SendPacket(actionCodes.Email_drawAttachRpc, MsgPack.pack({reward = reward, change = change}))
-
+	role:mylog("mail_action", {desc = "draw_attach", int1 = id, key1 = email:getProperty("title"), key2 = attachments})
 	return true
 end
  
@@ -140,6 +142,7 @@ function _M.checkRpc(agent, data)
  
 	email:setProperty("status", 1)
 	email:log(role, 1)
+	role:mylog("mail_action", {desc = "check_mail", int1 = id})
  
 	SendPacket(actionCodes.Email_checkRpc, '')
 	return true
@@ -175,6 +178,9 @@ function _M.delRpc(agent, data)
 			end
 		end
 	end)
+	for delId, _ in ipairs(result) do
+		role:mylog("mail_action", {desc = "del_mail", int1 = delId})
+	end
 	SendPacket(actionCodes.Email_delRpc, MsgPack.pack({result = result}))
 	return true
 end
@@ -111,6 +111,7 @@ function _M.searchRpc(agent, data)
 		}))
 	end
  
+	role:mylog("role_action", {desc = "searchFriend"})
 	SendPacket(actionCodes.Friend_searchRpc, MsgPack.pack({searchList = searchList}))
 	return true
 end
@@ -177,6 +178,8 @@ function _M.applyRpc(agent, data)
 		myInfo.online = true
 		myInfo.hadApply = true
  
+		role:mylog("role_action", {desc = "addFriend", int1 = 1})
+
 		rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newApply = 1, info = {myInfo}})) 	-- 通知对方
 	end
  
@@ -283,6 +286,8 @@ function _M.handleApplyRpc(agent, data)
 				friend_roleid = objectId, -- 好友账户下的角色id
 				friend_cnt = curCount + 1, -- 操作后好友数量
 			})
+			role:mylog("role_action", {desc = "addFriend", int1 = 1})
+
 		end
  
 	elseif cmd == 0 then	-- 不同意
@@ -347,6 +352,8 @@ function _M.handleApplyRpc(agent, data)
 			rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newFriend = 1, info = {myInfo}}))	-- 通知对方
 		end
 		if next(needAdd) then
+			role:mylog("role_action", {desc = "addFriend", int1 = #needAdd})
+
 			SendPacket(actionCodes.Friend_updateProperty, MsgPack.pack({newFriend = 1, info = needAddInfo}))
 		else
 			result = 1
@@ -553,6 +560,8 @@ 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:mylog("role_action", {desc = "giveFPoint", int1 = 1})
 		end
 	elseif cmd == 2 then -- 领取
 		local objId = msg.roleId
@@ -572,6 +581,7 @@ function _M.pointRpc(agent, data)
 			role.dailyData:updateProperty({field = "getFP", value = getP})
 			role:checkTaskEnter("GetFriendP", {count = 1})
  
+			role:mylog("role_action", {desc = "getFPoint", int1 = 1})
 		end
 	elseif cmd == 3 then -- 一键赠送领取
 		-- 赠送
@@ -593,6 +603,8 @@ function _M.pointRpc(agent, data)
 			role.dailyData:updateProperty({field = "giveFP", value = giveP})
 			role:checkTaskEnter("GiveFriendP", {count = change})
  
+			role:mylog("role_action", {desc = "giveFPoint", int1 = change})
+
 		else
 			result = 1
 		end
@@ -617,6 +629,7 @@ 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:mylog("role_action", {desc = "getFPoint", int1 = getCount})
 			else
 				result = (result or 0) + 2
 			end
@@ -27,6 +27,7 @@ function _M.ignoreout(role, pms)
 	else  -- 解除
 		role:updateProperty({field = "ignoreMt", value = 0})
 	end
+	role:mylog("gm_action", {desc = "ignoreout", key1 = pms.sender})
 	return "指令生效"
 end
  
@@ -46,11 +47,17 @@ function _M.ban(role, pms)
 			end)
 		end
 	end
+
+	role:mylog("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:mylog("gm_action", {desc = "unban", key1 = pms.sender})
+
 	return "解封杀成功"
 end
  
@@ -63,6 +70,8 @@ function _M.gmmsg(role, pms)
 			skynet.call(agent.gate_serv, "lua", "forcekick", agent.fd)
 		end)
 	end
+	role:mylog("gm_action", {desc = "gmmsg", text1 = pms.pm1, key1 = pms.sender})
+
 	return "指令成功"
 end
  
@@ -73,6 +82,8 @@ function _M.silent(role, pms)
 		return "解禁言成功"
 	end
 	role:updateProperty({field = "silent", value = specTime({hour = 0}, skynet.timex()) + pm1 * 86400})
+
+	role:mylog("gm_action", {desc = "silent", int1 = pms.pm1, key1 = pms.sender})
 	return "禁言成功"
 end
  
@@ -90,6 +101,8 @@ function _M.hero(role, pms)
 	if not role:addHero({type = heroType, log = {desc = "gm"}}) then
 		return "失败"
 	end
+
+	role:mylog("gm_action", {desc = "hero", int1 = heroType, key1 = pms.sender})
 	return "成功"
 end
  
@@ -122,6 +135,8 @@ function _M.herol(role, pms)
 	hero:updateProperty({field = "level", delta = addLevel})
 	role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
  
+	role:mylog("gm_action", {desc = "herol", int1 = heroType, int2 = addLevel, key1 = pms.sender})
+
 	return "成功"
 end
  
@@ -133,6 +148,8 @@ function _M.herola(role, pms)
 		_M.herol(role, {pm1 = hero:getProperty("type"), pm2 = addLevel})
 	end
  
+	role:mylog("gm_action", {desc = "herola", int1 = addLevel, key1 = pms.sender})
+
 	return "成功"
 end
  
@@ -143,6 +160,7 @@ function _M.equip(role, pms)
 	local level = tonum(pms.pm2)
 	local count = tonum(pms.pm3)
 	role:addEquip(typ, level, count, {log = {desc = "gm"}})
+	role:mylog("gm_action", {desc = "equip", int1 = typ, int2 = level, long1 = count, key1 = pms.sender})
 	return "成功"
 end
  
@@ -151,6 +169,7 @@ 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:mylog("gm_action", {desc = "rune", int1 = typ, int2 = id, key1 = pms.sender})
  
 	return result
 end
@@ -171,6 +190,8 @@ function _M.fb(role, pms) -- 直接通关
 	role:hangFinish(carbonId)
 	addPre(carbonId)
  
+	role:mylog("gm_action", {desc = "fb", int1 = carbonId, key1 = pms.sender})
+
 	role:checkTaskEnter("HangPass", {id = carbonId})
 	return "成功"
 end
@@ -191,6 +212,8 @@ function _M.fbc(role, pms) -- 直接通关
 	end
 	role:updateProperty({field = "hangPass", value = {}})
 	addPre(carbonId)
+	
+	role:mylog("gm_action", {desc = "fbc", int1 = carbonId, key1 = pms.sender})
  
 	return "成功"
 end
@@ -224,6 +247,8 @@ function _M.exp(role, pms)
 	exp = math.floor(math.max(exp, 0))
 	role:addPlayExp(exp, {log = {desc = "gm"}})
  
+	role:mylog("gm_action", {desc = "exp", int1 = exp, key1 = pms.sender})
+
 	return "成功"
 end
  
@@ -280,6 +305,7 @@ function _M.get(role, pms)
 		end
 		local count = tonum(pms.pm2, 1)
 		role:award({[itemId] = count}, {log = {desc = "gm"}})
+		role:mylog("gm_action", {desc = "get", int1 = itemId, int2 = count, key1 = pms.sender})
 	end
 	return "成功"
 end
@@ -303,6 +329,9 @@ function _M.advc(role, pms)
 		advAFWear = {},
 	}, notNotify)
 	role.advData = nil
+
+	role:mylog("gm_action", {desc = "advc", key1 = pms.sender})
+
 	return "成功"
 end
  
@@ -311,6 +340,8 @@ function _M.advf(role, pms)
 	role:updateProperty({field = "advC", value = 0})
 	role.dailyData:updateProperty({field = "advElC", value = 0})
  
+	role:mylog("gm_action", {desc = "advf", key1 = pms.sender})
+
 	return "成功"
 end
  
@@ -330,6 +361,7 @@ function _M.adv(role, pms)
 		advPass[chapterId] = layer
 		role:updateProperty({field = "advPass", value = advPass})
 	end
+	role:mylog("gm_action", {desc = "adv", int1 = chapterId, int2 = layer, key1 = pms.sender})
  
 	return "成功"
 end
@@ -356,6 +388,7 @@ function _M.advt(role, pms)
 		isEnter = true,
 		debugMapId = mapId,
 	})
+	role:mylog("gm_action", {desc = "advt", int1 = chapterId, int2 = layer, key1 = pms.sender})
 	return "成功"
 end
  
@@ -364,6 +397,8 @@ function _M.advl(role, pms)
 	local exp = tonum(pms.pm1)
 	role:addAdvLvExp(math.max(0, exp))
  
+	role:mylog("gm_action", {desc = "advl", int1 = exp, key1 = pms.sender})
+
 	return "成功"
 end
  
@@ -377,6 +412,7 @@ function _M.advcl(role, pms)
 	end
 	advData.battle.player:addExp(exp)
 	advData:saveDB()
+	role:mylog("gm_action", {desc = "advcl", int1 = exp, key1 = pms.sender})
  
 	return "成功"
 end
@@ -386,6 +422,7 @@ function _M.idlec(role, pms)
 	role:updateProperty({field = "hangTeam", value = {}})
 	role:updateProperty({field = "hangInfo", value = {}})
 	role:updateProperty({field = "hangBag", value = {}})
+	role:mylog("gm_action", {desc = "idlec", key1 = pms.sender})
  
 	role.advData = nil
 	return "成功"
@@ -410,6 +447,8 @@ function _M.advit(role, pms)
 		local itemId = tonum(pms.pm1)
 		local count = tonum(pms.pm2)
 		reward[itemId] = count
+
+		role:mylog("gm_action", {desc = "advit", int1 = itemId, int2 = count, key1 = pms.sender})
 	end
  
  
@@ -425,6 +464,8 @@ 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:mylog("gm_action", {desc = "tower", int1 = level, key1 = pms.sender})
+
 	return "成功"
 end
  
@@ -443,21 +484,42 @@ function _M.email(role, pms)
 		rewardPms = id ~= 0 and reward or nil,
 	})
  
+	role:mylog("gm_action", {desc = "email", int1 = id, key1 = pms.sender})
+
 	return "成功"
 end
  
-table.insert(helpDes, {"清除引导", "cguide", "0全/1强/2弱"})
-function _M.cguide(role, pms)
-	local id = tonum(pms.pm1, 0)
-	if id == 0 then
-		role:updateProperties({
-			newerGuide = "1=1",
-			funcGuide = "",
-		}, notNotify)
-	elseif id == 1 then
-		role:updateProperty({field = "newerGuide", value = "1=1"})
-	elseif id == 2 then
-		role:updateProperty({field = "funcGuide", value = ""})
+table.insert(helpDes, {"引导", "guide", "skip/reset"})
+function _M.guide(role, pms)
+	local cmd = pms.pm1 or "un"
+	if cmd == "SKIP" then
+		role:updateProperty({field = "newerGuide", value = "9999=1"})
+		local str = ""
+		for _, set in pairs(csvdb["guide_mainCsv"]) do
+			str = str:setv(set[1].major * 1000,1)
+			for _,data in ipairs(set) do
+				if data["break"] ~= 0 then
+					str = str:setv(data.major * 1000 + data.minor,1)
+				end
+			end
+		end
+		role:updateProperty({field = "funcGuide", value = str})
+		role:mylog("gm_action", {desc = "sguide", key1 = pms.sender})
+
+	elseif cmd == "RESET" then
+		local id = tonum(pms.pm2, 0)
+		if id == 0 then
+			role:updateProperties({
+				newerGuide = "1=1",
+				funcGuide = "",
+			}, notNotify)
+		elseif id == 1 then
+			role:updateProperty({field = "newerGuide", value = "1=1"})
+		elseif id == 2 then
+			role:updateProperty({field = "funcGuide", value = ""})
+		end
+		role:mylog("gm_action", {desc = "cguide", int1 = id, key1 = pms.sender})
+
 	end
  
 	return "成功"
@@ -472,7 +534,7 @@ function _M.test(role, pms)
 	local id = tonum(pms.pm1, 0)
 	--local hero = require ("actions.HeroAction")
 	--hero.unlockPoolRpc({role = role}, MsgPack.pack({type = id}))
-	role.storeData:onBattleCardReset()
+	print(role:getPaybackReward(0, 10000))
 	return "成功"
 end
  
@@ -481,4 +543,21 @@ function _M.ayncPurchase(role, params)
 	return role:handlePurchase(params) or ""
 end
  
+function _M.cz(role, pms)
+	local id = tonum(pms.pm1)
+	local csvData = csvdb["shop_rechargeCsv"][id]
+	if not csvData then
+		return "充值id错误, 查看shop_recharge.csv"
+	end
+	role:recharge({
+		id = id,
+		transactionId = "GM",
+		order = "GM",
+		pay_time = skynet.timex(),
+	})
+	role:mylog("gm_action", {desc = "recharge", int1 = id, key1 = pms.sender})
+	return "指令成功"
+end
+
+
 return _M
 \ No newline at end of file
@@ -166,7 +166,7 @@ function _M.startRpc( agent, data )
 	elseif carbonId == 10220 then
 		role:saveGuide(22,1)
 	end
-
+	role:mylog("hang_action", {desc = "startHang", int1 = carbonId})
 	SendPacket(actionCodes.Hang_startRpc, '')
 	return true
 end
@@ -258,9 +258,10 @@ function _M.endBattleRpc(agent, data)
 			role:finishGuide(5)
 		elseif carbonId == 10102 then
 			role:finishGuide(8)
+			role:saveGuide(9, 2)
 		elseif carbonId == 10103 then
 			role:finishGuide(9)
-		elseif carbonId == 10220 then
+		elseif carbonId == 20101 then
 			role:finishGuide(22)
 		end
 		for _, guideData in pairs(csvdb["guide_unlockCsv"]) do
@@ -270,8 +271,14 @@ function _M.endBattleRpc(agent, data)
 			end
 		end
 	end
-	if hangInfo.carbonId < carbonId then
-		hangInfo.carbonId = carbonId
+	local nextCarbonId = role:getNextCarbonId(carbonId)
+	-- 设置挂机关卡
+	if isWin and hangInfo.carbonId < nextCarbonId then
+		hangInfo.carbonId = nextCarbonId
+		local cfg = csvdb["idle_battleCsv"][nextCarbonId]
+		if cfg then
+			hangInfo.bossTime = skynet.timex() + cfg.idle_time
+		end
 	end
 	role:updateProperty({field = "hangInfo", value = hangInfo})
  
@@ -282,6 +289,9 @@ function _M.endBattleRpc(agent, data)
 		reward = reward,
 	})
  
+	local team = role:getProperty("pvpTC")
+	role:mylog("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), cint1 = role:getHerosCamp(team.heros)})
+
 	SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({
 		starNum = msg.starNum, 
 		reward = reward,
@@ -324,6 +334,7 @@ function _M.roleFormatRpc(agent , data)
 	hangTeam.leader = msg.leader
 	hangTeam.supports = supports
 	role:saveHangTeam(hangTeam)
+	role:saveGuide(5,8)
 	SendPacket(actionCodes.Hang_roleFormatRpc, '')
 	return true
 end
@@ -401,10 +412,9 @@ function _M.quickRpc(agent , data)
 	end
  
 	local doubleCoef = role.activity:isOpen("DoubleDrop") and 2 or 1
-
 	-- 特权卡获取加速获得额外道具
 	local coef = role.storeData:getProduceItemSpeedCoef()
-	if coef > 1 then
+	if coef > 1 or doubleCoef > 1 then
 		for k, cnt in pairs(reward) do
 			reward[k] = math.floor(cnt * coef * doubleCoef)
 		end
@@ -471,10 +481,17 @@ function _M.buyBonusCountRpc(agent, data)
 	local btype = msg.type
  
 	if not TimeReset["DailyBattle" .. btype] then return end
+	local open, actId = role.activity:isOpen("BonusDouble")
+	local actData = csvdb["activity_ctrlCsv"][actId]
+
+	local coef = 1
+	if open and actData then
+		coef= tonumber(actData.condition2)
+	end
  
 	local bonusC = role.dailyData:getProperty("bonusC")
 	bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
-	local lastCount = globalCsv.bonus_daily_buy_count - bonusC[btype]["b"]
+	local lastCount = globalCsv.bonus_daily_buy_count * coef - bonusC[btype]["b"]
 	if math.illegalNum(count, 1, lastCount)  then return 1 end
  
 	if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}) then return 2 end
@@ -494,20 +511,32 @@ function _M.startBonusBattleRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
  
-	if not role:isFuncUnlock(FuncUnlock.BonusBattle) then return end
+	local open, actId = role.activity:isOpen("BonusDouble")
+
+	if not role:isFuncUnlock(FuncUnlock.BonusBattle) then return 1 end
  
 	local bonusData = csvdb["bonus_battleCsv"][id]
  
-	if not role:isTimeResetOpen(TimeReset["DailyBattle" .. bonusData.type]) then return end
+	if not open then
+		if not role:isTimeResetOpen(TimeReset["DailyBattle" .. bonusData.type]) then return 2 end
+	end
  
-	if not bonusData then return 1 end
-	if not role:checkHangPass(bonusData.unlock) then return 2 end
+	if not bonusData then return 3 end
+	if not role:checkHangPass(bonusData.unlock) then return 4 end
  
-	if not next(role:getProperty("bTeam")) then return 3 end
+	if not next(role:getProperty("bTeam")) then return 5 end
  
 	local bonusC = role.dailyData:getProperty("bonusC")
 	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
-	if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 4 end
+
+	local actData = csvdb["activity_ctrlCsv"][actId]
+
+	local coef = 1
+	if open and actData then
+		coef = tonumber(actData.condition2)
+	end
+
+	if globalCsv.bonus_daily_count * coef - bonusC[bonusData.type]["c"] <= 0 then return 7 end
  
  
 	role.__bonusBattleCache = {
@@ -525,6 +554,13 @@ function _M.endBonusBattleRpc(agent, data)
 	local key = msg.key
 	local starNum = msg.starNum
 	if not role.__bonusBattleCache then return 1 end
+	local open, actId = role.activity:isOpen("BonusDouble")
+	local actData = csvdb["activity_ctrlCsv"][actId]
+
+	local coef = 1
+	if open and actData then
+		coef = tonumber(actData.condition2)
+	end
  
 	if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then 
 		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
@@ -537,7 +573,7 @@ function _M.endBonusBattleRpc(agent, data)
  		-- 胜利扣除次数
  		local bonusC = role.dailyData:getProperty("bonusC")
 		bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
-		if globalCsv.bonus_daily_count - bonusC[bonusData.type]["c"] <= 0 then return 3 end
+		if globalCsv.bonus_daily_count * coef - bonusC[bonusData.type]["c"] <= 0 then return 3 end
 		bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + 1
 		role.dailyData:updateProperty({field = "bonusC", value = bonusC})
  
@@ -546,6 +582,9 @@ function _M.endBonusBattleRpc(agent, data)
 		if chance[1] ~= 0 then
 			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
 		end
+		for k, v  in pairs(reward) do
+			reward[k] = v * (coef > 1 and actData.condition or 1)
+		end
  		reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
  		role:checkTaskEnter("BonusPass", {id = id})
  	end
@@ -556,6 +595,8 @@ function _M.endBonusBattleRpc(agent, data)
 		info = msg.info,
 		reward = reward,
 	})
+	role:mylog("hang_action", {desc = "bonusBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
+
 	SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({
 		starNum = starNum, 
 		reward = reward,
@@ -578,6 +619,7 @@ function _M.hangGiftRpc(agent, data)
 	local reward, change = role:award(carbonData.item_clear_special, {log = {desc = "hangGift", int1 = id}})
  
 	role:changeUpdates({{type = "hangGift", field = id, value = 1}})
+	role:mylog("hang_action", {desc = "hangGift",  int1 = id})
  
 	SendPacket(actionCodes.Hang_hangGiftRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -57,6 +57,7 @@ function _M.levelUpRpc( agent, data )
 	if hero:getProperty("type") == 103 then
 		role:finishGuide(7)
 	end
+	hero:mylog({desc = "levelUp", int1 = hero:getProperty("level")})
  
 	role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
 	SendPacket(actionCodes.Hero_levelUpRpc, '')
@@ -84,6 +85,7 @@ function _M.breakRpc( agent, data )
 		hero_break_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄突破效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 		hero_break_level = hero:getMaxLevel(), -- 英雄突破后等级上限
 	})
+	hero:mylog({desc = "break", int1 = hero:getProperty("breakL")})
  
 	SendPacket(actionCodes.Hero_breakRpc, '')
 	return true
@@ -107,18 +109,21 @@ function _M.wakeRpc(agent, data)
 	role:costItems(cost, {log = {desc = "heroWake", int1 = msg.id, int2 = hero:getProperty("type")}})
  
 	local oldAttr = hero:getTotalAttrs()
+	local oldBattleV = hero:getProperty("battleV")
 	hero:updateProperty({field = "wakeL", delta = 1})
  
 	local curLevel = hero:getProperty("wakeL")
 	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
-	if curLevel == 4 then -- 解锁cg
+	if curLevel == 3 then -- 解锁cg
 		role:checkTaskEnter("WakeCG", {heroType = typ})
 	end
+	hero:mylog({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_scoreget = hero:getProperty("battleV") - oldBattleV, --英雄觉醒后评分提升
 		hero_rise_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), --英雄觉醒效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 	})
  
@@ -195,10 +200,12 @@ function _M.talentRpc(agent, data)
  
 	role:log("hero_talent", {
 		hero_id = hero:getProperty("type"), --英雄ID
+		hero_talent_id = index, --天赋ID
 		hero_talent_cost = cost, -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		hero_talent_levelbef = oldSkillLv, -- 英雄技能升级前等级
 		hero_talent_level = hero:getSkillLevel(1), -- 英雄技能升级后等级
 	})
+	hero:mylog({desc = "talent", int1 = index, int2 = talent:getv(index, 0)})
  
 	SendPacket(actionCodes.Hero_talentRpc, '')
 	return true
@@ -577,14 +584,16 @@ function _M.referRunesRpc(agent, data)
 	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,……..}
-		})
+		if ownRune then
+			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
 	end
  
 	SendPacket(actionCodes.Hero_referRunesRpc, "")
@@ -691,6 +700,7 @@ function _M.getResetRewardRpc(agent, data)
 		equip = "",
 		rune = "",
 	})
+	hero:mylog({desc = "resetHero"})
  
 	for itemId, count in pairs(reward) do
 		reward[itemId] = math.floor(count * globalCsv.unit_back_discount)
@@ -711,7 +721,7 @@ function _M.drawHeroRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
  
-	if not role:isFuncUnlock(FuncUnlock.GetHero) then return end
+	if not role:isFuncUnlock(FuncUnlock.GetHero) then return 1 end
 	local btype = msg.pool	-- 1 2 3	卡池类型
 	local subType = msg.subType	or 1-- 定向卡池需要传 子类型
 	local drawType = msg.type -- 1 单抽 2 十连
@@ -720,10 +730,10 @@ function _M.drawHeroRpc(agent, data)
 	end
  
 	local buildTypeData = csvdb["build_typeCsv"][btype]
-	if not buildTypeData then return 1 end
+	if not buildTypeData then return 2 end
  
 	local drawCount = {1, 10} -- 抽取次数
-	if not drawCount[drawType] then return 2 end
+	if not drawCount[drawType] then return 3 end
  
 	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
 	local floorHeroCount = role:getProperty("floorHero")[btype] or 0
@@ -747,20 +757,20 @@ function _M.drawHeroRpc(agent, data)
 		end
 	end
 	if lastCount > 0 then -- 钱不够
-		return 3
+		return 4
 	end
  
 	-- 抽取的池子
 	local poolMap = buildTypeData["pool"]:toNumMap()
 	local poolId = poolMap[subType]
-	if not poolId then return end
+	if not poolId then return 5 end
  
 	--判断定向卡池是否开启
 	if btype == 1 then
 			if not role:isTimeResetOpen(TimeReset["DrawType" .. subType]) then
 				local unlockPool = role.dailyData:getProperty("unlockPool")
 				if not unlockPool[subType] then
-					return 1
+					return 6
 				end
 			end
 	end
@@ -772,12 +782,12 @@ function _M.drawHeroRpc(agent, data)
 	end
  
 	local unitPool = csvdb["build_unitCsv"][poolId]
-	if not unitPool then return 4 end
+	if not unitPool then return 7 end
  
 	-- 开始抽
 	local resultPool = {}
 	local function fillDrawPool(isFloorBack)
-		local condition = {"rare", "camp"}
+		local condition = {"rare"}
 		local values = {}
  
  
@@ -830,6 +840,7 @@ function _M.drawHeroRpc(agent, data)
  
 	local ssrCount = 0
 	local reward = {}
+	local logReward = {}
 	for i = 1, drawCount[drawType] do
 		floorHeroCount = floorHeroCount + 1
 		local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
@@ -837,7 +848,7 @@ function _M.drawHeroRpc(agent, data)
 		fillDrawPool(isFloorBack)
 		if not next(resultPool) then
 			skynet.error("random pool error, poolId:" .. poolId)
-			return
+			return 8
 		end
  
 		local itemId = math.randWeight(resultPool, 1)
@@ -860,9 +871,11 @@ function _M.drawHeroRpc(agent, data)
 			local heroData = csvdb["unitCsv"][fragId]
 			local count = globalCsv.draw_unit_tofragment[heroData.rare]
 			role:award({[fragId] = count}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+			logReward[fragId] = (logReward[fragId] or 0) + count
 			table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
 		else
 			role:award({[itemId] = 1}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+			logReward[itemId] = (logReward[itemId] or 0) + 1
 			table.insert(reward, {id = itemId, count = 1})
 		end
 	end
@@ -873,27 +886,50 @@ function _M.drawHeroRpc(agent, data)
 		role:setProperty("floorHero", floorHero)
 	end
  
-	if btype == 1 or btype == 2 then
-		local repayHero = role:getProperty("repayHero") or 0
-		repayHero = 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: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"}
+		gacha_reward = logReward, -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 		currency = cost, -- 购买道具消耗的货币
+		gacha_cnt = floorHeroCount,
 	})
 	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
+
+	if btype == 1 or btype == 2 then
+		-- 达到一定次数，给响应奖励
+		local oldVal = role:getProperty("repayHero") or 0
+		local newVal = oldVal + drawCount[drawType]
+		local drawCardReward, val = role:getDrawCardExtraReward(oldVal, newVal)
+		-- 空字符穿代表直接给英雄  走以前repayHeroRpc
+		if drawCardReward == "" then
+			local id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+
+			local r,change = {}
+			local itemData = csvdb["itemCsv"][id]
+			--if itemData.type == ItemType.Hero and 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]
+			--	r, change = role:award({[fragId] = count}, {log = {desc = "drawHeroExtraReward"}})
+			--	--r = {id = fragId, count = count, from = id, fcount = 1}
+			--else
+			r, change = role:award({[id] = 1}, {log = {desc = "drawHeroExtraReward"}})
+			--end
+			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
+		elseif drawCardReward and drawCardReward ~= "" then
+			role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
+			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack({reward = drawCardReward:toNumMap()}))
+		end
+		role:updateProperty({field = "repayHero", value = val})
+	end
 	return true
 end
  
@@ -922,6 +958,7 @@ function _M.repayHeroRpc(agent, data)
 		role:award({[id] = 1}, {log = {desc = "heroRepay"}})
 		reward = {id = id, count = 1}
 	end
+	role:mylog("hero_action", {desc = "heroRepay", int1=result})
 	SendPacket(actionCodes.Hero_repayHeroRpc, MsgPack.pack({reward = reward}))
 	return true
 end
@@ -953,7 +990,7 @@ 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", int1=type})
+	role:mylog("hero_action", {desc = "unlockPool", int1=type})
 	SendPacket(actionCodes.Hero_unlockPoolRpc, MsgPack.pack({}))
 	return true
 end
@@ -296,6 +296,9 @@ function _M.startBattleRpc(agent, data)
 		_pvpStartBattleCacheC = {idx = idx, key = key, revenge = revenge}
  
 		role:checkTaskEnter("PvpBattle")
+
+
+		role:mylog("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}))
@@ -393,6 +396,7 @@ function _M.endBattleRpc(agent, data)
 		reward = reward,
 		rank = myRank,
 	})
+	role:mylog("pvp_action", {desc = "battleEnd", short1 = 1, int1 = isWin and 1 or 0, int2 = revenge and 1 or 0})
  
 	_pvpBattleInfoCacheC = {}  --重新发阵容了 没毛病
 	_pvpRecordInfoCacheC = {} -- 记录刷新了
@@ -525,6 +529,8 @@ function _M.startBattleHRpc(agent, data)
  
 		role:checkTaskEnter("PvpBattle")
  
+		role:mylog("pvp_action", {desc = "startBattle", short1 = 2, int1 = revenge and 1 or 0})
+
 	end
  
 	SendPacket(actionCodes.Pvp_startBattleHRpc, MsgPack.pack({
@@ -707,7 +713,8 @@ function _M.endBattleHRpc(agent, data)
 	if isWin then
 		role:checkTaskEnter("PvpWin", {score = myScore})
 	end
-
+	role:mylog("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,
@@ -855,6 +862,7 @@ function _M.highDivisionGiftRpc(agent, data)
 	})
  
 	local reward, change = role:award(newReward, {log = {desc = "pvpDivisionH"}})
+	role:mylog("pvp_action", {desc = "pvpDivisionH"})
  
 	SendPacket(actionCodes.Pvp_highDivisionGiftRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -889,6 +897,8 @@ function _M.shopBuyRpc(agent, data)
 	end
 	local reward, change = role:award(gift, {log = {desc = "pvpShop", int1 = id, int2 = count}})
  
+	role:mylog("pvp_action", {desc = "pvpShop", int1 = id, int2 = count})
+
 	SendPacket(actionCodes.Pvp_shopBuyRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -980,6 +990,7 @@ function _M.crossBetRpc(agent, data)
 	local result, code = role:setCrossServerPvpBet(msg.idx)
 	if not result then return 10 + code end
  
+	role:mylog("pvp_action", {desc = "crossBet"})
 	SendPacket(actionCodes.Pvp_crossBetRpc, MsgPack.pack(result))
 	return true
 end
@@ -160,6 +160,7 @@ function _M.loginRpc( agent, data )
 	local resetMode = role:updateTimeReset(now)
 	if not resetMode or not resetMode["CrossDay"] then -- 没有跨天
 		role.activity:checkActivityStatus(now, false, false)
+		role:log("onLogin")
 	end
  
 	redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
@@ -173,7 +174,7 @@ function _M.loginRpc( agent, data )
 	response.role = role:data()
 	response.result = "SUCCESS"
 	response.serverTime = now
-	response.openTime = getServerOpenTs()
+	--response.openTime = getServerOpenTs()
  
 	local modules = {}
  
@@ -291,8 +292,10 @@ function _M.loginRpc( agent, data )
 	role:savePvpHTeam()
  
 	local hangPass = role:getProperty("hangPass")
-	role:log("onLogin")
-	
+	role:mylog("login", {key1 = agent.ip:toArray(false, ":")[1], int1 = hangPass[1] or 0})
+	if msg.newdevice then
+		role:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
+	end
 	return true
 end
  
@@ -359,7 +362,10 @@ function _M.createRpc(agent, data)
 		newRole:log("onCreateAccount")
 	end
 	newRole:log("onCreateRole")
-
+	newRole:mylog("create", {key1 = agent.ip:toArray(false, ":")[1]})
+	if msg.newdevice then
+		newRole:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
+	end
  
 	SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
 	return true
@@ -549,17 +555,17 @@ function _M.openTimeBoxRpc(agent, data)
 		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 costKey = math.ceil((boxL[slot].time - skynet.timex()) / (cost_pre[1] * 60)) * cost_pre[2]
+			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]
 		local randomData = csvdb["item_randomCsv"][itemData.id]
+		local costTime = skynet.timex() - (boxL[slot].time - randomData.openTime)
 		-- 随机奖励
 		reward = {}
 		for i = 1, 10 do
@@ -584,7 +590,7 @@ 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:checkTaskEnter("OpenBox", {id = boxId, count=1, quality=itemData.quality})
  
 		role:log("carriage_dismantle", {
 			item_id = boxId, -- 道具id
@@ -673,7 +679,7 @@ function _M.storyBookRewardRpc(agent, data)
 	if status == -1 then return end
  
 	if not status or status ~= 1 then 
-		if storyBookData.unlockType == 1 and role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) then  -- 挂机剧情正在挂机也可以领奖
+		if storyBookData.unlockType == 1 and (role:getProperty("hangInfo").carbonId == tonumber(storyBookData.unlockData) or storyId == 1 or storyId == 2) then  -- 挂机剧情正在挂机也可以领奖
 		else
 			return 
 		end
@@ -684,11 +690,11 @@ function _M.storyBookRewardRpc(agent, data)
 	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", {
+	role:log("carriage_video", {
 		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_coinid = reward[ItemId.Diamond] and ItemId.Diamond or 0, --放映奖励货币类型，无奖励则填写0
+		carriage_video_coinnum = reward[ItemId.Diamond] or 0, --放映奖励货币数量，无奖励则填写0
 		carriage_video_item = reward, --放映奖励其他物品数量，json格式记录，{'itemid1':10,'itemid2':5,…………..}，无奖励则填写0
 	})
  
@@ -977,7 +983,7 @@ function _M.chatRpc(agent, data)
 	role:log("communication", {
 		publish_type = cmd, --发言类型，1，世界  2私聊 
 		publish_status = 0, --发送状态，发送成功:0，发送失败:1，被屏蔽:2，其他:3
-		publish_receive_roleid = msg.roleId, --接收者角色ID
+		publish_receive_roleid = msg.roleId or 0, --接收者角色ID
 		publish_text = content, --发言内容
 	})
 	SendPacket(actionCodes.Role_chatRpc, MsgPack.pack({result = result, waitTime = waitTime}))
@@ -1007,7 +1013,7 @@ function _M.changeSettingRpc(agent, data)
 	local setting = role:getProperty("setting")
 	setting[id] = status
 	role:updateProperty({field = "setting", value = setting})
-
+	role:mylog("role_action", {desc = "changeSetting", int1 = id, int2 = status})
 	SendPacket(actionCodes.Role_changeSettingRpc,  '')
 	return true
 end
@@ -1045,6 +1051,7 @@ function _M.drawCodeRpc(agent, data)
 				gift_name = "", -- 礼包名称
 				gift_reason = 0, -- 礼包发放原因，见发放原因枚举表
 			})
+			role:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code})
 			SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
 				result = ret,
 				reward = reward,
@@ -1119,6 +1126,7 @@ function _M.guideRpc(agent, data)
 		if msg.funcType then
 			funcGuide = funcGuide:setv(msg.funcType, 1)
 			role:log("onGuidePoint", {guild_type = 2, guild_id = msg.funcType, guild_point = 0, guild_pass = 0})
+			role:mylog("guide", {desc = "guide_weak", int1 = msg.funcType})
 		end
 		role:updateProperty({field = "funcGuide", value = funcGuide})
 	elseif cmdType == 3 then
@@ -1128,6 +1136,7 @@ function _M.guideRpc(agent, data)
 			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})
+			role:mylog("guide", {desc = "guide_sys", int1 = msg.funcType})
 		end
 	elseif cmdType == 4 then
 		-- 弹出一个tips（进入功能界面也许要自动弹说明，value要区分1、2）
@@ -1135,6 +1144,7 @@ function _M.guideRpc(agent, data)
 			local value = msg.value or 1
 			for _, funcIdx in pairs(msg.funcType:toArray(true,"=")) do
 				role:log("onGuidePoint", {guild_type = 3, guild_id = funcIdx, guild_point = 0, guild_pass = 0})
+				role:mylog("guide", {desc = "guide_tips", int1 = funcIdx})
 				funcGuide = funcGuide:setv(funcIdx, value)
 			end
 			role:updateProperty({field = "funcGuide", value = funcGuide})
@@ -1207,4 +1217,30 @@ function _M.updateFeedbackInfoRpc(agent, data)
 	return true
 end
  
+function _M.useSelectItemRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local itemId = msg.itemId
+	local subId = msg.subId
+	local count = msg.count
+	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
+	local itemData = csvdb["itemCsv"][itemId]
+	if itemData.type ~= ItemType.SelectItemBox then return end
+	local itemMap = itemData.use_effect:toNumMap()
+	local reward, change = {}
+	for k, v in pairs(itemMap) do
+		if k == subId then
+			reward[k] = v * count
+			break
+		end
+	end
+
+	if next(reward) then
+		reward, change = role:award(reward, {log = {desc = "openItem", int1 = itemId, int2 = count}})
+		role:costItems({[itemId] = count}, {log = {desc = "openItem"}})
+	end
+	SendPacket(actionCodes.Role_useSelectItemRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -177,7 +177,7 @@ function _M.purchaseOrderResult(agent, data)
 			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_type = role:getProperty("rmbC") > 0 and 0 or 1, -- 订单类型，首充记录为1，否则为0
 			order_id = msg.platformOrder, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
 		})
  
@@ -205,7 +205,7 @@ function _M.shopBuyRpc(agent , data)
 	if not dataSet then return end
  
 	if dataSet.unlock ~= "" then
-		if not role:checkHangPass(tonumber(config.unlock)) then
+		if not role:checkHangPass(tonumber(dataSet.unlock)) then
 			skynet.error(string.format("shopBuyRpc,user do not finish hang pass, user_id:%d", role:getProperty("id")))
 			return 1
 		end
@@ -260,6 +260,7 @@ function _M.shopBuyRpc(agent , data)
 		shop_purchase_current = costCount or 0, -- 购买道具消耗的货币数量
 		shop_id = dataSet.shop, -- 商店ID
 	})
+	role:mylog("role_action", {desc = desc, int1 = id, int2 = count})
 	SendPacket(actionCodes.Store_shopBuyRpc, MsgPack.pack({reward = reward}))
 	return true
 end
@@ -384,14 +385,14 @@ function _M.getExploreCommandRewardRpc(agent, data)
 	local id = msg.id		-- 探索id
 	local subId = msg.subId		-- 领取的阶段id
  
-	local tab_name = "reward_battlepass_" .. id .. "Csv"
-	local config = csvdb[tab_name][id]
+	local tab_name = "reward_levelpass" .. id .. "Csv"
+	local config = csvdb[tab_name][subId]
 	if not config then return end
  
-    local bpInfo = role.storeData:getProperty("bpInfo") or {}
+	local bpInfo = role.storeData:getProperty("bpInfo") or {}
 	local info = bpInfo[id] or {}
 	local flag = info["flag"] or 0
-	if flag == 0 then return 1 end
+	--if flag == 0 then return 1 end
  
 	local freeRecord = info["fr"] or ""
 	local buyRecord = info["br"] or ""
@@ -408,7 +409,7 @@ function _M.getExploreCommandRewardRpc(agent, data)
 		return 3
 	end
  
-	if not role:checkHangPass(config.carbonId) then
+	if not role:checkHangPass(config.level) then
 		return 4
 	end
  
@@ -416,7 +417,7 @@ function _M.getExploreCommandRewardRpc(agent, data)
 	if  freeFlag == "0" then
 		gift = config.giftFree
  
-		freeRecord = string.setbit(freeRecord, id)
+		freeRecord = string.setbit(freeRecord, subId)
 		info["fr"] = freeRecord
 	end
  
@@ -426,11 +427,12 @@ function _M.getExploreCommandRewardRpc(agent, data)
 		end
 		gift = gift .. config.giftLimit
  
-		buyRecord = string.setbit(buyRecord, id)
+		buyRecord = string.setbit(buyRecord, subId)
 		info["br"] = buyRecord
 	end
  
-	role.storeData:updateProperty({field = "bpInfo", value = info})
+	bpInfo[id] = info
+	role.storeData:updateProperty({field = "bpInfo", value = bpInfo})
  
 	local reward, _ = role:award(gift, {log = {desc = "exploreCommand", int1 = id, int2 = subId}})
  
@@ -75,7 +75,7 @@ function _M.startBattleRpc(agent, data)
  
 	role:updateProperty({field = "towerInfo", value = towerInfo})
 	role:checkTaskEnter("TowerBattle", {level = towerInfo.l})
-
+	role:mylog("tower_action", {desc = "startBattle", int1 = id})
 	SendPacket(actionCodes.Tower_startBattleRpc, '')
 	return true
 end
@@ -128,6 +128,7 @@ function _M.endBattleRpc(agent, data)
 		reward = reward,
 		rank = rank,
 	})
+	role:mylog("tower_action", {desc = "endBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
  
 	SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -151,7 +152,7 @@ function _M.bugCountRpc(agent, data)
 	towerInfo.c = curCount
 	towerInfo.t = nextTime
 	role:updateProperty({field = "towerInfo", value = towerInfo})
-
+	role:mylog("tower_action", {desc = "bugCount"})
 	SendPacket(actionCodes.Tower_bugCountRpc, '')
 	return true
 end
@@ -24,6 +24,17 @@ function Adv:ctor(owner)
 	self:initByInfo(self.owner:getProperty("advInfo"))
 end
  
+function Adv:mylog(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:mylog("adv_action", contents)
+end
+
 --初始化adv 信息
 function Adv:initByInfo(advInfo)
 	if not next(advInfo) then return end --还没有 开始新地图
@@ -498,18 +509,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:mylog("in_artifact", log)
+	else
+		print("awardArtifact no log ", debug.traceback())
+	end
 	if not params.isChoose then
 		self:pushBackEvent(AdvBackEventType.Artifact, {id = id})
 	end
@@ -598,6 +609,7 @@ function Adv:wearArtifact(slot, id)
 	else
 		id = nil
 	end
+	self:mylog({desc = "wearArtifact", int1 = id})
  
 	self.owner:changeUpdates({{type = "advAFWear", field = slot, value = id}})
 	return true
@@ -656,6 +668,9 @@ function Adv:artifactLevelUp(id, level)
 	end
 	if newLv == advAFGet[id] then return end
  
+	self:mylog({desc = "artifactLevelUp", int1 = id, int2 = level})
+
+
 	local status = 0
 	if curWear[id] then -- 穿着呢
 		local oldData = csvdb["adv_artifactCsv"][id][advAFGet[id]]
@@ -700,6 +715,8 @@ 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:mylog({desc = "chooseArtifact", int1 = self.waitArtifact[index]})
+
 	self.waitArtifact = nil
  
 	-- 支援效果继续选择
@@ -796,6 +813,8 @@ function Adv:over(success, rewardRatio, overType)
 	end
 	self:clearAdvUnlockCache()
  
+	self:mylog({desc = "over", short1 = success and 1 or 0, int1 = overType})
+
 	local chapterId = self.chapterId
 	self:clear()
 	self.owner:checkTaskEnter("AdvScore", {score = score})
@@ -899,23 +918,26 @@ 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 itemId == 16 and not self.owner:checkOverGuide(51,4) then
+				self.owner:saveGuide(51,4)
+			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:mylog("in_adv", log)
+				else
+					self.owner:mylog("out_adv", log)
+				end
+			else
+				print("addAdvItem no log ", debug.traceback())
+			end
 		end
 	end
 	if items ~= oldItems then
@@ -1009,6 +1031,7 @@ local function clickOut(self, room, block, params, isExit)
 						isRelay = true,
 					})
 				else
+					self:mylog({desc = "pass"})
 					self:initByChapter({
 						chapterId = self.chapterId, 
 						level = self.level + 1, 
@@ -434,6 +434,9 @@ function Buff:initNew(release, data)
 	if self.buffData.effectTime > 0 then
 		self.count = self.buffData.effectTime
 	end
+	if self.buffData.mapLock == 1 then
+		self.mapId = self.owner.battle.adv:getCurMap().mapId
+	end
 end
  
 function Buff:createAfter()
@@ -456,6 +459,9 @@ function Buff:initByDB(data)
 	if data.count then
 		self.count = data.count
 	end
+	if data.mapId then
+		self.mapId = data.mapId
+	end
 	self.layer = data.layer or 1
 	if self._initDB then
 		self:_initDB(data)
@@ -464,7 +470,7 @@ end
  
  
 function Buff:afterRound()
-	if self.isDel or self.owner.isDead then return end
+	if self.owner.isDead or self:isHide() then return end
  
 	-- keepTerm 检查
 	if not self:checkKeep() then 
@@ -533,7 +539,7 @@ function Buff:checkKeep()
 	end
 	checkFunc[5] = function(_, buffId)
 		local buff = self.owner:getBuffById(buffId)
-		if buff and not buff.isDel then
+		if buff then
 			return true
 		end
 		return false
@@ -574,6 +580,18 @@ function Buff:effect()
 		return self:_effectValue()
 	end
 end
+
+-- 在当前阶段不可用 小透明 < 不会回合遍历  不会查找遍历  可以删除遍历  可以下层遍历 >
+function Buff:isHide()
+	if self.isDel then
+		return true
+	end
+	if self.buffData.mapLock == 1 and self.mapId and self.owner.battle.adv:getCurMap().mapId ~= self.mapId  then
+		return true
+	end
+	return false
+end
+
 --删除buff 时调用
 function Buff:endBuff()
 	if self._endBuff then
@@ -678,6 +696,9 @@ function Buff:getDB()
 	if self.count ~= -1 then
 		db.count = self.count
 	end
+	if self.mapId then
+		db.mapId = self.mapId
+	end
 	db.layer = self.layer
 	if self.buffData.keepTerm:toArray(true, "=")[1] == 1 then
 		db.releId = self.releaseId
@@ -553,7 +553,11 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 			if randomCommon() == false then
 				return false
 			end
-			table.insert(monsterEvents, event)
+			local curData = csvdb["event_monsterCsv"][event.id]
+			if curData.noKey and curData.noKey == 1 then
+			else
+				table.insert(monsterEvents, event)
+			end
 		end
  
 		--选择点
@@ -119,6 +119,7 @@ Passive.AFTER_ROUND = 27 --经过 x回合时
 Passive.GET_BUFF = 28 --获得指定buff
 Passive.OPEN_BLOCK = 29 --翻开格子
 Passive.OPEN_MONSTER = 30 --翻开怪物
+Passive.PLAYER_BUFF = 31 --玩家获得buff
  
  
 -- 不同的开启条件
@@ -180,6 +181,7 @@ PassiveCondFactory[Passive.GET_BUFF] = function(_Passive)
 		end
 	end
 end
+PassiveCondFactory[Passive.PLAYER_BUFF] = PassiveCondFactory[Passive.GET_BUFF]
  
  
 PassiveCondFactory[Passive.BORN_ONCE] = function(_Passive)
@@ -265,6 +267,9 @@ function Passive:ctor(owner, data)
 	self.round = data.round or 0	--触发剩余回合数
 	self.count = data.count or self.passiveData.count	--触发剩余次数
 	self.delay = data.delay or self.passiveData.delayRound    --触发延迟回合数
+	if self.passiveData.mapLock == 1 and not self.mapId then
+		self.mapId = self.owner.battle.adv:getCurMap().mapId
+	end
  
 	self.effects = self.passiveData.effect:toTableArray(true)
 	self.filters = {}
@@ -301,7 +306,8 @@ function Passive:canEffect(effType, effValue)
 	end
 	--禁用被动技
 	local count = self.owner:getDisablePassiveCount()
-	if count and (count == 0 or self.owner:getPassiveIdx(self) <= count) then
+	local idx = self.owner:getPassiveIdx(self)
+	if count and idx and (count == 0 or idx <= count) then
 		return
 	end
 	return true
@@ -331,7 +337,7 @@ function Passive:effect(triggerPms)
 end
  
 function Passive:afterRound()
-	if self.isDel or self.owner.isDead or self.owner.lock then return end
+	if self.isDel or self.owner.isDead or self.owner.lock or self:isHide() then return end
 	if self.round > 0 then  --回合触发的
 		self.round = self.round - 1
 	end
@@ -349,9 +355,20 @@ function Passive:afterLayer()
 	end
 end
  
+-- 在当前阶段不可用 小透明 < 不会回合遍历  不会查找遍历  可以删除遍历  可以下层遍历 >
+function Passive:isHide()
+	if self.isDel then
+		return true
+	end
+	if self.passiveData.mapLock == 1 and self.mapId and self.owner.battle.adv:getCurMap().mapId ~= self.mapId  then
+		return true
+	end
+	return false
+end
+
 -- 可以触发
 function  Passive:canTrigger( )
-	return self.count > 0 and self.delay <= 0
+	return self.count > 0 and self.delay <= 0 and not self:isHide()
 end
  
 function Passive:trigger(condType, params) --触发检查
@@ -393,6 +410,9 @@ function Passive:getDB()
 	db.round = self.round
 	db.count = self.count
 	db.delay = self.delay
+	if self.mapId then
+		db.mapId = self.mapId
+	end
 	return db
 end
  
@@ -115,16 +115,19 @@ end
 function BaseObject:getPassiveIdx(passive)
 	for idx, passive_ in ipairs(self.passives) do
 		if passive_ == passive then
-			return idx
+			if passive.passiveData.dispel ~= 1 then
+				return idx
+			end
+			return
 		end
 	end
-	return 999
+	return
 end
  
 function BaseObject:getDisablePassiveCount()
 	local count
 	for _, buff in ipairs(self.buffs) do
-		if not buff.isDel and buff:getType() == Buff.DISABLE_BUFF then
+		if not buff:isHide() and buff:getType() == Buff.DISABLE_BUFF then
 			if buff:effect() == 0 then
 				return 0
 			end
@@ -138,7 +141,7 @@ function BaseObject:addBuff(buffId, releaser)
 	local buffData = csvdb["adv_map_buffCsv"][buffId]
 	if not buffData then return end
 	for _, buff in ipairs(self.buffs) do
-		if not buff.isDel and (buff:getType() == Buff.CLEAR_BUFF or buff:getType() == Buff.IMMNUE_BUFF) then
+		if not buff:isHide() and (buff:getType() == Buff.CLEAR_BUFF or buff:getType() == Buff.IMMNUE_BUFF) then
 			if buff:canEffect(buffId) then
 				buff:effect()
 				return
@@ -166,7 +169,7 @@ end
  
 function BaseObject:getBuffById(bId)
 	for idx, buff in ipairs(self.buffs) do
-		if buff.id == bId then
+		if buff.id == bId and not buff:isHide() then
 			return buff
 		end
 	end
@@ -196,7 +199,7 @@ end
  
 function BaseObject:hadBuff(bType)
 	for _, buff in ipairs(self.buffs) do
-		if not buff.isDel and buff:getType() == bType then
+		if not buff:isHide() and buff:getType() == bType then
 			return buff
 		end
 	end
@@ -204,7 +207,7 @@ end
  
 function BaseObject:hadBuffById(bId)
 	for _, buff in ipairs(self.buffs) do
-		if not buff.isDel and buff.id == bId then
+		if not buff:isHide() and buff.id == bId then
 			return buff
 		end
 	end
@@ -218,7 +221,7 @@ end
 function BaseObject:getCommonBuffEffect(bType, otherCond)
 	local effect, count = {[0] = 0, [1] = 0}, 0
 	for _, buff in ipairs(self.buffs) do
-		if not buff.isDel and buff:getType() == bType then
+		if not buff:isHide() and buff:getType() == bType then
 			local cType, value, cond = buff:effect()
 			if cType and (not otherCond or otherCond == cond) then
 				effect[cType] = effect[cType] + value
@@ -233,7 +236,7 @@ end
 function BaseObject:getBackHurtBuff()
 	local effect = {[0] = 0, [1] = 0}
 	for _, buff in ipairs(self.buffs) do
-		if not buff.isDel and buff:getType() == Buff.BACK_HURT then
+		if not buff:isHide() and buff:getType() == Buff.BACK_HURT then
 			local cType, value = buff:effect()  --  aType 0 全部  1 普通攻击
 			if cType then
 				effect[cType] = effect[cType] + value
@@ -268,7 +271,7 @@ function BaseObject:getBuffEffectChange(classify)
 	end
 	local effect = 0
 	for _, buff in ipairs(self.buffs) do
-		if not buff.isDel and buff:getType() == Buff.Buff_EFFECT_CHANGE then
+		if not buff:isHide() and buff:getType() == Buff.Buff_EFFECT_CHANGE then
 			local cType, value = buff:effect()
 			if cType and had[cType] then
 				effect = effect + value
@@ -286,7 +289,7 @@ function BaseObject:getAttrBuffChange(attr)
 	}
 	local effect, count = {[0] = 0, [1] = 0}, 0
 	for _, buff in ipairs(self.buffs) do
-		if not buff.isDel and AttrBuff[buff:getType()] then
+		if not buff:isHide() and AttrBuff[buff:getType()] then
 			local cType, value, attrName = buff:effect()
 			if cType and attr == attrName then
 				effect[cType] = effect[cType] + value
@@ -310,7 +313,7 @@ end
 function BaseObject:reSetHpMax()
 	self.hpMax = self._hpMax
 	for _, buff in ipairs(self.buffs) do
-		if not buff.isDel and buff:getType() == Buff.HP_MAX_CHANGE then
+		if not buff:isHide() and buff:getType() == Buff.HP_MAX_CHANGE then
 			local cv = buff:effect()
 			if cv then
 				self.hpMax = self.hpMax + cv
@@ -332,7 +335,7 @@ end
 --计算自己伤害减免后的值
 function BaseObject:getInjuredValue(value)
 	local injuredChange = self:getInjuredChange()
-	return math.max(0, (value - self.def + injuredChange[0]) * (1 + injuredChange[1]))
+	return math.max(0, (value + injuredChange[0]) * (1 + injuredChange[1]))
 end
  
 --最终伤害 = [ (敌方攻击 - 己方防御) * （1+伤害增加百分比-伤害减少百分比）*（1+受伤增加百分比-受伤减少百分比）+（伤害增加固定值-伤害增加固定值+受伤增加固定值-受伤增加固定值）]*（1+侍宠百分比）-侍宠固定值
@@ -348,10 +351,11 @@ function BaseObject:hurt(value, releaser, params)
 		end
 	end
  
-	if params.hurtType ~= 5 and params.hurtType ~= 6 then
-		if not params.hurtType or params.hurtType ~= 4 then
-			value = self:getInjuredValue(value) --减伤计算
+	if params.hurtType ~= 5 then
+		if params.hurtType ~= 6 and params.hurtType ~= 4 then
+			value = math.max(0, value - self.def)
 		end
+		value = self:getInjuredValue(value) --减伤计算
 		if value == 0 then return end
  
 		-- 舍身和恃宠
@@ -664,8 +668,11 @@ end
 --战斗结束了扣战斗buff次数
 function Player:effectBattleBuff()
 	for _, buff in ipairs(self.buffs) do
-		if not buff.isDel and (buff:getType() == Buff.BATTLE_BUFF or buff:getType() == Buff.BATTLE_PASSIVE) then
+		if not buff:isHide() and (buff:getType() == Buff.BATTLE_BUFF or buff:getType() == Buff.BATTLE_PASSIVE) then
 			buff:effect()
+			if not buff.buffData.classify:sismember(7, " ") then -- 神器buff 不会清除
+				buff:uncover()
+			end
 		end
 	end
 end
@@ -691,6 +698,7 @@ function Player:addBuff(buffId, releaser)
 		self.battle.player:attrChangeCondBuffCheck(2, buffId)
 		self.battle.adv:checkAchievement(self.battle.adv.AchievType.GetBuff, 1, buffId)
 		self.battle.adv:pushBackEvent(AdvBackEventType.Buff, {buffId = buffId})
+		self.battle:triggerPassive(Passive.PLAYER_BUFF, {buffId = buffId})
 	end
 	return status
 end
@@ -698,7 +706,7 @@ end
 function Player:attrChangeCondBuffCheck(etype, cond)
 	local effect = {}
 	for _, buff in ipairs(self.buffs) do
-		if not buff.isDel and (buff:getType() == Buff.ATTR_CHANGE_COND) then
+		if not buff:isHide() and (buff:getType() == Buff.ATTR_CHANGE_COND) then
 			local _et, _attr, _co = buff:getEffectBy()
 			if etype == _et and (not _co or _co == cond) then
 				effect[_attr] = 1
@@ -132,10 +132,21 @@ function AdvTask.bind(Adv)
 		end
 		local advEventOpenStatus = self.owner:advEventOpenStatus()
 		local pool = {}
-		for id, data in pairs(csvdb["event_questCsv"]) do
-			if data.levelchapter == chapterId and (data.unlockType == 0 or (advEventOpenStatus[etype] or {})[data.unlockType]) then
-				if AdvCommon.checkIsIn(level, data.leveltype, data.levellimit) then
-					pool[id] = {showup = data.showup}
+
+		local mapData = self:getCurMap():getMapInfoCsv()
+		for _, id in ipairs(mapData.quest:toArray(true, "=")) do
+			local data = csvdb["event_questCsv"][taskId]
+			if data then
+				pool[id] = {showup = data.showup}
+			end
+		end
+
+		if not next(pool) then
+			for id, data in pairs(csvdb["event_questCsv"]) do
+				if data.levelchapter == chapterId and (data.unlockType == 0 or (advEventOpenStatus[etype] or {})[data.unlockType]) then
+					if AdvCommon.checkIsIn(level, data.leveltype, data.levellimit) then
+						pool[id] = {showup = data.showup}
+					end
 				end
 			end
 		end
@@ -365,6 +376,7 @@ function AdvTask.bind(Adv)
 				else
 					if (status or -1) >= data.value1 then
 						status = -1
+						self.owner:mylog("adv_action", {desc = "finishAchiev", short1 = 1, int1 = self.chapterId, int2 = taskId})
 					end
 					if status and status ~= oldStatus then
 						insertChange(self, self.chapterId, taskId, status)
@@ -285,6 +285,7 @@ function CMD.close()
 	local role = agentInfo.role
 	if not role then return end
 	role:log("onLogout", {logtime = skynet.timex()-role:getProperty("ltime")})
+	role:mylog("logout", {int1 = skynet.timex()-role:getProperty("ltime")})
 	role:onOfflineEvent()
 end
  
-Subproject commit 15cca1cea5a190b9ed014890efdf3343dd28c2b8
+Subproject commit 9bb26cfdb11f81dbfe6abbc468b44ca9f814deb2
 local Activity = class("Activity", require("shared.ModelBase"))
 local string_format = string.format
  
+-- activity_ctr showType
 Activity.ActivityType = {
-	Sign = 1,  -- 签到
+	SsrUpPoolChange = 1,	-- 特定英雄活动，切卡池
 	DoubleDrop = 2, -- 双倍掉落
-	FoodSell = 3,	--贩卖周 料理
-	DrawHero = 4,	--抽卡周 招募
-	AdvDraw = 5,	--拾荒抽周 资助
-	OpenBox = 6,	--拆解周 时钟箱
-	PaySignIn = 7,	--付费签到
-
-	SsrUpPoolChange = 10,	-- 特定英雄活动，切卡池
+	Sign = 4,  -- 签到
+	ChangeCG = 5,	-- 客户端使用，切换抽卡界面
+	PaySignIn = 6,	--付费签到
+	ExploreCommand = 7,	-- 探索指令
+	PayBack = 8,	--返利
+
+	BonusDouble = 9,	-- 奖励关卡翻倍
+	CalendaTask = 10,	-- 日历任务
+
+	FoodSell = 11,	--贩卖周 料理
+	DrawHero = 12,	--抽卡周 招募
+	AdvDraw = 13,	--拾荒抽周 资助
+	OpenBox = 14,	--拆解周 时钟箱
 }
  
  
@@ -32,24 +39,27 @@ end
 Activity.schema = {
 	actime 		= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
 	round		= {"table", {}},  -- 记录活动到了第几轮  {id = roundnum}
-	act1		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
-	act3		= {"table", {}},  -- {0 = 抽卡次数, 1=1, 2=1}  抽卡周活动  1表示领取过该档位的奖励
-	act4		= {"table", {}},  -- {0 = 贩卖数量, 1=1, 2=1}  贩卖周活动  1表示领取过该档位的奖励
-	act5		= {"table", {}},  -- {0 = 拆解数量, 1=1, 2=1}  拆解周活动  1表示领取过该档位的奖励
-	act6		= {"table", {}},  -- {0 = 拾荒消耗远古金币数量, 1=1, 2=1}  拾荒周活动  1表示领取过该档位的奖励
-	act7		= {"table", {}},  -- {1 = 1, 2 = 1} == 付费签到活动
+	act4		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
+	act6		= {"table", {}},  -- {1 = 1, 2 = 1} == 付费签到活动
+	act8		= {"number", 0},  -- 充值返利 
+
+	act11		= {"table", {}},  -- {0 = 贩卖数量, 1=1, 2=1}  贩卖周活动  1表示领取过该档位的奖励
+	act12		= {"table", {}},  -- {0 = 抽卡次数, 1=1, 2=1}  抽卡周活动  1表示领取过该档位的奖励
+	act13		= {"table", {}},  -- {0 = 拾荒消耗远古金币数量, 1=1, 2=1}  拾荒周活动  1表示领取过该档位的奖励
+	act14		= {"table", {}},  -- {0 = 拆解数量, 1=1, 2=1}  拆解周活动  1表示领取过该档位的奖励
 }
  
 function Activity:data()
 	return {
 		actime = self:getProperty("actime"),
 		round = self:getProperty("round"),
-		act1 = self:getProperty("act1"),
-		act3 = self:getProperty("act3"),
 		act4 = self:getProperty("act4"),
-		act5 = self:getProperty("act5"),
 		act6 = self:getProperty("act6"),
-		act7 = self:getProperty("act7"),
+		act8 = self:getProperty("act8"),
+		act11 = self:getProperty("act11"),
+		act12 = self:getProperty("act12"),
+		act13 = self:getProperty("act13"),
+		act14 = self:getProperty("act14"),
 	}
 end
  
@@ -74,10 +84,9 @@ function Activity:updateProperty(params)
 	return false
 end
  
-
-function Activity:isOpenRaw(activityType, now)
-	activityType = checkActivityType(activityType)
-	local actData = csvdb["activity_ctrlCsv"][activityType]
+function Activity:isOpenRaw(activityId, now)
+	activityId = checkActivityType(activityId)
+	local actData = csvdb["activity_ctrlCsv"][activityId]
 	if not actData then return end
  
 	if actData.time == "" then -- 关闭
@@ -86,7 +95,7 @@ function Activity:isOpenRaw(activityType, now)
  
 	local st = 0
 	local et = 0
-	local now = skynet.timex()
+	--local now = skynet.timex()
  
 	if actData.ttype == 0 then -- 时间开放
 		local openTimes = actData.time:toArray(false, "=")
@@ -115,7 +124,17 @@ end
 -- 缓存开放
 function Activity:isOpen(activityType)
 	activityType = checkActivityType(activityType)
-	return self._isOpen[activityType]
+	--return self._isOpen[activityType]
+	local open = false
+	for id, data in pairs(csvdb["activity_ctrlCsv"]) do
+		if data.showType == activityType then
+			open = self._isOpen[data.id]
+			if open then
+				return true, data.id
+			end
+		end
+	end
+	return false
 end
  
 function Activity:getActData(actType)
@@ -134,22 +153,22 @@ function Activity:checkActivityStatus(now, isCrossDay, notify)
 	self._isOpen = {}
 	local actime = self:getProperty("actime")
 	local change = false
-	for actType, actData in pairs(csvdb["activity_ctrlCsv"]) do
-		local isOpen, startTime = self:isOpenRaw(actType, now)
-		self._isOpen[actType] = isOpen
+	for actId, actData in pairs(csvdb["activity_ctrlCsv"]) do
+		local isOpen, startTime = self:isOpenRaw(actId, now)
+		self._isOpen[actId] = isOpen
  
 		if isOpen then
-			if actime[actType] and actime[actType] == startTime then -- 还是之前的状态 开放中
+			if actime[actId] and actime[actId] == startTime then -- 还是之前的状态 开放中
 			else  -- 重置
-				actime[actType] = startTime
-				self:closeActivity(actType, notify, true)
-				self:initActivity(actType, isCrossDay, notify)
+				actime[actId] = startTime
+				self:closeActivity(actId, notify, true)
+				self:initActivity(actId, isCrossDay, notify)
 				change = true
 			end
 		else
-			if actime[actType] then
-				self:closeActivity(actType, notify)
-				actime[actType] = nil
+			if actime[actId] then
+				self:closeActivity(actId, notify)
+				actime[actId] = nil
 				change = true
 			end
 		end
@@ -199,10 +218,15 @@ function Activity:checkWeeklyAct(actType, notify, count, pool)
 		local info = actInfoMap[actType]
 		if not info then return end
  
+		local open, actId = self:isOpen(actType)
+		if not open then
+			return
+		end
+
 		local curData = self:getActData(actType)
 		local roundData = self:getProperty("round")
 		local curRound = roundData[actType] or 0
-		local ctrlData = csvdb["activity_ctrlCsv"][actType]
+		local ctrlData = csvdb["activity_ctrlCsv"][actId]
 		if not ctrlData then return end
 		if curRound >= ctrlData.condition then
 			return
@@ -260,7 +284,6 @@ activityFunc[Activity.ActivityType.DrawHero] = {
 	-- ["close"] = function(self, actType, notify)
 	-- end,
 	["crossDay"] = function(self, actType, notify)
-		print("cross day draw card")
 		self.owner:sendMail(MailId.ActDrawCard)
 	end,
 }
@@ -278,7 +301,6 @@ activityFunc[Activity.ActivityType.FoodSell] = {
 	-- ["close"] = function(self, actType, notify)
 	-- end,
 	["crossDay"] = function(self, actType, notify)
-		print("cross day sell food")
 		self.owner:sendMail(MailId.ActSellFood)
 	end,
 }
@@ -313,7 +335,6 @@ activityFunc[Activity.ActivityType.OpenBox] = {
 	-- ["close"] = function(self, actType, notify)
 	-- end,
 	["crossDay"] = function(self, actType, notify)
-		print("cross day open box")
 		self.owner:sendMail(MailId.ActOpenBox)
 	end,
 }
@@ -327,13 +348,38 @@ activityFunc[Activity.ActivityType.PaySignIn] = {
 	-- end,
 }
  
-function Activity:initActivity(actType, isCrossDay, notify)
+-- 充值反馈
+activityFunc[Activity.ActivityType.PayBack] = {
+	["check"] = function(self, actType, notify, twd) -- 检查
+		local oldVal = self:getActData(actType) or 0
+		local newVal = oldVal + twd
+		local gift, checkPoint = self.owner:getPaybackReward(oldVal, newVal)
+		if gift ~= "" then
+			local strCp = table.concat(checkPoint ,"、")
+			self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal, strCp})
+		end
+		self:updateActData(actType, newVal, not notify)
+	end,
+	["init"] = function(self, actType, isCrossDay, notify)
+		self:updateActData(actType, {}, not notify)
+	end,
+	-- ["close"] = function(self, actType, notify)
+	-- end,
+}
+
+function Activity:initActivity(actId, isCrossDay, notify)
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not actData then return end
+	local actType = actData.showType
 	if activityFunc[actType] and activityFunc[actType]['close'] then
 		activityFunc[actType]["init"](self, actType, isCrossDay, notify)
 	end
 end
  
-function Activity:closeActivity(actType, notify, notUpdateAct)
+function Activity:closeActivity(actId, notify, notUpdateAct)
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not actData then return end
+	local actType = actData.showType
 	if activityFunc[actType] and activityFunc[actType]['close'] then
 		activityFunc[actType]["close"](self, actType, notify)
 	end
@@ -343,8 +389,10 @@ function Activity:closeActivity(actType, notify, notUpdateAct)
 end
  
 function Activity:refreshDailyData(notify)
-	for actType, status in pairs(self._isOpen) do
-		if status then
+	for actId, status in pairs(self._isOpen) do
+		local actData = csvdb["activity_ctrlCsv"][actId]
+		if status and actData then
+			local actType = actData.showType
 			if activityFunc[actType] and activityFunc[actType]['crossDay'] then
 				activityFunc[actType]["crossDay"](self, actType, notify)
 			end
@@ -380,10 +428,12 @@ end
  
 -- 获取活动卡池id
 function Activity:getActivityPool(mainType, subType)
-	if not self:isOpen(Activity.ActivityType.SsrUpPoolChange) then	
+	local open, actId = self:isOpen(Activity.ActivityType.SsrUpPoolChange)
+	if not open then
+	--if not self:isOpen(Activity.ActivityType.SsrUpPoolChange) then	
 		return 0
 	end
-	local actData = csvdb["activity_ctrlCsv"][Activity.ActivityType.SsrUpPoolChange]
+	local actData = csvdb["activity_ctrlCsv"][actId]
 	if not actData then return 0 end
  
 	local poolMap = actData.condition2:toMap(true, "=")
@@ -407,9 +457,9 @@ function Activity:getPaySignReward()
  
 	local diffDay = diffFromOpen() + 1
  
-	local curData = self.activity:getActData("PaySignIn")
+	local curData = self:getActData("PaySignIn")
 	local reward, change = {}
-	for day, csvData in ipairs(csvdb["pay_signInCsv"]) do
+	for day, csvData in pairs(csvdb["pay_signInCsv"]) do
 		if day <= diffDay then
 			if not curData[day] then
 				curData[day] = 1
@@ -49,7 +49,7 @@ function Email:data()
 	if emailData then
 		-- 如果内容是直接插入到数据库
 		if content == "" and emailData.body ~= "" then
-			content = io.readfile("src/" .. emailData.body)
+			content = io.readfile("src/" .. emailData.body) or ""
 			content = content:format(table.unpack(contentPms))
 		end
  
@@ -3,7 +3,7 @@ local HeroPlugin = {}
  
 function HeroPlugin.bind(Hero)
  
-	function Hero:log(contents)
+	function Hero:mylog(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())
@@ -11,7 +11,7 @@ function HeroPlugin.bind(Hero)
 		contents["cint1"] = self:getProperty("id")
 		contents["cint2"] = self:getProperty("type")
  
-		self.owner:log("hero_action", contents)
+		self.owner:mylog("hero_action", contents)
 	end
  
 	function Hero:getMaxLevel()
@@ -29,6 +29,13 @@ function Role:ctor( properties )
 	self.activity = nil
 	self.advElChapter = tonum(redisproxy:hget("adv_season", "chapter"), globalCsv.adv_endless_default_chapter) -- 无尽模式记录的赛季对应章节
 	self.advOverTime = tonum(redisproxy:hget("adv_season", "overTime")) -- 无尽模式关闭时间戳
+	if self.advOverTime == 0 then
+		local now = skynet.timex()
+		if math.floor(now / (3600 * 24 * 7)) % 2 == 1 then
+			self.advOverTime = 3600 * 24 * 7
+		end
+		self.advOverTime = self.advOverTime + specMonday(now) + 3600 * 24 * 6
+	end
 	self.sendMailFlag = false		--发送邮件标识
 end
  
@@ -149,6 +156,7 @@ Role.schema = {
 	battlePoint			= {"number", 0}, -- 赛季卡使用的活跃点
  
 	rmbC				= {"number", 0}, -- 人民币重置额
+	twdC				= {"number", 0}, -- 台币总充值金额
  
 	emailSync			= {"number", 0}, -- 已经同步到的邮件Id
  
@@ -373,6 +381,7 @@ function Role:data()
 		battlePoint = self:getProperty("battlePoint"),
  
 		rmbC = self:getProperty("rmbC"),
+		twdC = self:getProperty("twdC"),
 		repayHero = self:getProperty("repayHero"),
 		newerDraw = self:getProperty("newerDraw"),
 		floorHero = self:getProperty("floorHero"),
@@ -384,7 +393,8 @@ function Role:data()
 		chatline = self:getProperty("chatline"),
  
 		downCvR	= self:getProperty("downCvR"), -- 下载cv扩展包奖励 
-		feedback = self:getProperty("feedback")
+		feedback = self:getProperty("feedback"),
+		ctime = self:getProperty("ctime"),
 	}
 end
  
-local server_id = (skynet.getenv("serverType") or "localtest") .. "_" .. skynet.getenv("servId")
+local serverId = skynet.getenv("servId")
+local server_id = (skynet.getenv("serverType") or "localtest") .. "_" .. serverId
  
 --[[
 	100	购买/兑换行为			
@@ -40,6 +41,7 @@ local ItemReason = {
 	towerCount = 126, -- 电波塔次数
 	freeGift = 127, -- 免费礼包
 	exploreCommand = 128, -- 探索指令
+	drawHeroExtraReward = 129, -- 抽卡阶段奖励
  
  
 	advHang = 301, -- 拾荒挂机
@@ -60,6 +62,7 @@ local ItemReason = {
 	finishTask = 403, -- 任务
 	taskActive = 404, -- 完成活跃任务
 	advMainTask = 405, -- 拾荒主线
+	chatline = 406, --查看chatline
  
 	finishAchive = 601, -- 完成成就
 	advAchiev = 602, -- 拾荒成就
@@ -90,7 +93,8 @@ local ItemReason = {
 	dinerBuildUp = 1108, -- 建筑升级
 	removeSell = 1109, -- 移除售卖
 	dinerSell = 1110, -- 餐饮售卖
-
+	dinerShop = 1111, -- 餐厅商店
+	dinerSellQ = 1112, -- 餐厅快速
 	-- 英雄
 	heroLevelUp = 1201, -- 英雄升级
 	heroBreak = 1202, -- 英雄突破
@@ -102,6 +106,13 @@ local ItemReason = {
 	unlockPool = 1208, -- 解锁英雄定向抽卡池
 	downloadCv = 1209, -- 下载 cv包奖励
 	refer = 1210, -- 穿戴
+
+	-- pvp 
+	pvpCHead = 1301, -- pvp 跨服竞技场头像
+
+	--adv
+	chooseEvent = 1351, -- 冒险选择
+	clickTrader = 1352, -- 冒险商店
 }
  
  
@@ -197,10 +208,9 @@ local MethodType = {
 		mission_strength = true, -- 消耗的体力或次数
 		mission_score = true, -- 本局分数，PVP玩法记录为对战后积分，无得分的填0
 		mission_cleartype = true, -- 1正常通关;2代理拾荒
-		mission_rank = true, -- 对战后排名，适用于PVP玩法和电波塔，其他玩法留空
+		mission_rank = "auto", -- 对战后排名，适用于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
@@ -214,6 +224,7 @@ local MethodType = {
 		hero_id = true, --英雄ID
 		hero_rise_cost = "json", --英雄觉醒消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		hero_rise_score = true, --英雄觉醒后评分提升
+		hero_rise_scoreget = true, --  提升的评分
 		hero_rise_result = "json", --英雄觉醒效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 	},
 	hero_upgrade = { --英雄升级
@@ -235,6 +246,7 @@ local MethodType = {
 		hero_talent_cost = "json", -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		hero_talent_levelbef = true, -- 英雄技能升级前等级
 		hero_talent_level = true, -- 英雄技能升级后等级
+		hero_talent_id = true, -- 天赋id
 	},
 	hero_jewel = { --英雄铭文
 		hero_id = true, -- 英雄ID
@@ -266,6 +278,7 @@ local MethodType = {
 		gacha_times = true, -- 抽卡次数
 		gacha_reward = "json", -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 		currency = "json", -- 消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		gacha_cnt = true, -- 保底计数
 	},
 	equip_wear = { --装备穿戴与卸载
 		hero_id = true, --英雄ID
@@ -283,7 +296,7 @@ local MethodType = {
 		equip_upgrade_amount = true, -- 升级获取的装备数量
 		equip_upgrade_usedid = true, -- 升级消耗的装备ID
 		equip_upgrade_cost = true, -- 升级操作消耗装备数量
-		equip_upgrade_current = true, -- 升级操作消耗货币数量
+		equip_upgrade_current = "json", -- 升级操作消耗货币数量
 	},
 	carriage_dismantle = { --物资拆解
 		item_id = true, -- 道具id
@@ -354,7 +367,6 @@ local MethodType = {
 	--]]
 	friend_opt = { --好友操作
 		friend_opt_type = true, -- 好友操作类型，见枚举表中 好友操作类型枚举表
-		friend_accountid = true, -- 好友账户id
 		friend_roleid = true, -- 好友账户下的角色id
 		friend_cnt = true, -- 操作后好友数量
 	},
@@ -463,6 +475,178 @@ local function getBaseLog(self)
 end
  
  
+-- logType
+local LogType = {
+	create = "common",
+	login = "common",
+	logout = "common",
+	guide = "common",
+	
+	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",
+}
+
+-- 如要修改 要提前修改 _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",
+	}
+}
+
+-- 所有的日志都包括的部分 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 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
+
+				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,
+	}
+
+	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
+	end
+end
+
+
  
 local RoleLog = {}
 function RoleLog.bind(Role)
@@ -490,14 +674,15 @@ function RoleLog.bind(Role)
 		for field, tag in pairs(schema) do
 			if not contents[field] then
 				if tag == "ucode" then
-					contents[field] = self:getActionUcode()
+					doc[field] = self:getActionUcode()
+				elseif tag == "auto" then
 				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", doc)
+		pcall(skynet.send, logd, "lua", "log", doc, "bi")
 	end
  
 	function Role:logItems(itemId, before, after, log)
@@ -522,12 +707,44 @@ function RoleLog.bind(Role)
 			action_type = after - before > 0 and 1 or 0, -- 变化类型（玩家获取：1，玩家消耗：0）
 			item_before = before, -- 道具变化前的数量
 			item_after = after, -- 道具变化后的数量
-			item_reason = reasonType, -- 道具流动一级原因，如抽卡、装备强化、副本掉落，可参考道具动作类型枚举表
+			item_reason = reasonType or 0, -- 道具流动一级原因，如抽卡、装备强化、副本掉落，可参考道具动作类型枚举表
 			item_subreason = subreason, -- 道具流动二级原因，抽卡：卡池ID，装备强化：装备ID，副本掉落：副本ID
 			item_other = other, -- 其他（可包含阶数，强化等级，随机属性）
 		})
 	end
  
+	function Role:mylog(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))
+			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
+		for field, value in pairs(contents) do
+			local ftype = mapping[field]
+			if ftype then
+				doc[field] = checkType(logType, field, value, ftype)
+			else
+				printError(string.format("LOG ERROR: logType [%s] have new field [%s] no type in mapping.", logType, field))
+			end
+		end
+		doc["@type"] = logType
+		if not logd then return end
+		pcall(skynet.send, logd, "lua", "log", doc, "log")
+	end
+
  
 	function Role:startActionUcode()
 		if not self._uniqueCount then
@@ -548,5 +765,6 @@ function RoleLog.bind(Role)
  	end
  
  
+
 end
 return RoleLog
 \ No newline at end of file
@@ -51,6 +51,7 @@ function RolePlugin.bind(Role)
 	end
  
 	local function _award(self, itemId, count, params)
+		local count = math.floor(count)
 		local pms = clone(params)
 		local itemData = csvdb["itemCsv"][itemId]
 		if not itemData then  -- 加一层保护
@@ -202,7 +203,7 @@ function RolePlugin.bind(Role)
 	function Role:changeHead(id, notNotify)
 		self:updateProperty({field = "headId" ,value = id, notNotify = notNotify})
 		self:changeCrossServerPvpSelfInfo("headId")
-		self:log("role_action", {desc = "changeHead", int1 = id})
+		self:mylog("role_action", {desc = "changeHead", int1 = id})
 	end
  
 	function Role:addPlayExp(addExp, params)
@@ -229,13 +230,28 @@ function RolePlugin.bind(Role)
 				self:log("setLevel", {
 					level_before = oldLevel, 
 					level_changemain = log.desc,
-					level_changedetail = log.sub or "",
+					level_changedetail = log.int1 or 0,
 					level_reward = {},
 				})
 			else
 				print("addPlayExp no log ", debug.traceback())
 			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())
+			end
  
+
+			log["cint1"] = addExp
+			log["cint2"] = newExp
+			log["cint3"] = level
+
+			self:mylog("player_exp", log)
+		else
+			print("addPlayExp no log ", debug.traceback())
 		end
  
 		self:updateProperties({level = level, exp = newExp})
@@ -244,6 +260,7 @@ function RolePlugin.bind(Role)
  
 	function Role:addItem(params)
 		params = params or {}
+		params.count = math.floor(params.count or 0)
 		if params.itemId ==  ItemId.Diamond then
 			self:gainDiamond(params)
 			return
@@ -259,6 +276,21 @@ function RolePlugin.bind(Role)
 		end
  
 		self:logItems(params.itemId, origin, nums, params.log)
+		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:mylog("out_item", log)
+			else
+				self:mylog("in_item", log)
+			end
+		else
+			print("addItem no log ", debug.traceback())
+		end
  
 		self:setProperty("items", items)
 		if not params.notNotify then
@@ -269,7 +301,7 @@ function RolePlugin.bind(Role)
 	function Role:checkItemEnough(itemCountT)
 		local less = {}
 		if not next(itemCountT) then
-			return false, less
+			return true, less
 		end
 		for itemId, count in pairs(itemCountT) do
 			if count <= 0 then
@@ -329,11 +361,22 @@ function RolePlugin.bind(Role)
 		end
  
 		self:logItems(ItemId.Diamond, origin, count, params.log)
+		if params.log then
+			local log = clone(params.log)
+			if log["cint1"] or log["cint2"] or log["cint3"] then
+				print("costDiamond error log have cint1 or cint2 or cint3 ", debug.traceback())
+			end
+			log["cint1"] = origin
+			log["cint2"] = count
+			self:mylog("in_diamond", log)
+		else
+			print("gainDiamond no log ", debug.traceback())
+		end
+
 		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)
@@ -368,6 +411,17 @@ function RolePlugin.bind(Role)
  
  
 		self:logItems(ItemId.Diamond, origin, count, params.log)
+		if params.log then
+			local log = clone(params.log)
+			if log["cint1"] or log["cint2"] or log["cint3"] then
+				print("costDiamond error log have cint1 or cint2 or cint3 ", debug.traceback())
+			end
+			log["cint1"] = origin
+			log["cint2"] = count
+			self:mylog("out_diamond", log)
+		else
+			print("costDiamond no log ", debug.traceback())
+		end
  
 		self:notifyUpdateProperty("diamond", self:getAllDiamond())
 		return true
@@ -390,7 +444,9 @@ function RolePlugin.bind(Role)
 			type= heroType,
 			wakeL = globalCsv.unit_wake_initLevel[unitData.rare],
 		}
-
+		if heroInfo.wakeL == 3 then
+			self:checkTaskEnter("WakeCG", {heroType = heroType})
+		end
 		local newHero = require("models.Hero").new(heroInfo)
 		newHero:create()
 		newHero.owner = self
@@ -406,6 +462,17 @@ function RolePlugin.bind(Role)
  
 		self:logItems(heroType + ItemStartId.Hero, 0, 1, params.log)
  
+		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:mylog("in_hero", log)
+		else
+			print("addHero no log ", debug.traceback())
+		end
 		return true, newHero
 	end
  
@@ -516,6 +583,22 @@ function RolePlugin.bind(Role)
 		self:setProperty("equips", equips)
  
 		self:logItems(equipCsv.id, oldCount, curCount, pms.log)
+		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:mylog("out_equip", log)
+			else
+				self:mylog("in_equip", log)
+			end
+		else
+			print("addEquip no log ", debug.traceback())
+		end
  
 		if not pms.notNotify then
 			self:changeUpdates({{type = "equips", field = {equipType, equipLv}, value = curCount, isOnlyToC = true}}) -- 通知客户端
@@ -576,6 +659,20 @@ function RolePlugin.bind(Role)
 			self:checkTaskEnter("AddRune", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
  
 			self:logItems(params.id, 0, 1, params.log)
+			if params.log then
+				local log = clone(params.log)
+				if log["cint1"] or log["cint2"] or log["cint3"] then
+					print("addRune error log have cint1 or cint2 or cint3 ", debug.traceback())
+				end
+
+				log["cint1"] = runeUid
+				log["cint2"] = params.type
+				log["cint3"] = params.id
+
+				self:mylog("in_rune", log)
+			else
+				print("addRune no log ", debug.traceback())
+			end
  
 			return 0, newRune
 		else
@@ -592,6 +689,20 @@ function RolePlugin.bind(Role)
 			if rune and rune:getProperty("refer") == 0 then
  
 				self:logItems(rune:getProperty("id"), 1, 0, params.log)
+				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:mylog("out_rune", log)
+				else
+					print("delRunes no log ", debug.traceback())
+				end
  
 				self.runeBag[runeId] = nil
 				table.insert(bDel, runeId)
@@ -652,7 +763,7 @@ function RolePlugin.bind(Role)
 		end
 		if heartWarning < 50 and heartWarning % 5 == 0 then
 			self:sendGmMsg("server_accountBanned_warning")
-			self:log("role_action",{desc = "heartWarning", int1 = heartWarning})
+			self:mylog("role_action",{desc = "heartWarning", int1 = heartWarning})
 		end
 	end
  
@@ -665,11 +776,11 @@ function RolePlugin.bind(Role)
 			self:setProperty("banType", 0)
 			self:setProperty("heartWarning", 0)
  
-			self:log("role_action", {desc = "ban_rm"})
+			self:mylog("role_action", {desc = "ban_rm"})
 		else
 			self:setProperty("banTime", now + 86400 * time)
 			self:setProperty("banType", banType)
-			self:log("role_action", {desc = "ban", int1 = time, int2 = banType})
+			self:mylog("role_action", {desc = "ban", int1 = time, int2 = banType})
 		end
 	end
  
@@ -838,6 +949,19 @@ function RolePlugin.bind(Role)
 		count = count or 1
  
 		self:logItems(func, 0, count, params.log)
+		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:mylog("func_open", log)
+		else
+			print("funcOpen no log ", debug.traceback())
+		end
  
 		if csvdb["itemCsv"][func] and csvdb["itemCsv"][func].type == ItemType.FuncOpen then
 			local unlockData = csvdb["unlockCsv"][func]
@@ -1393,7 +1517,10 @@ function RolePlugin.bind(Role)
  
 		local order_type = self:getProperty("rmbC") > 0 and 0 or 1
 		local status, reward = self:recharge({ 
-			id = rechargeId
+			id = rechargeId,
+			transactionId = params.transactionId,
+			pay_time = params.pay_time,
+			order = partnerOrderStr,
 		})
 		orderObject:setProperty("finishTime", skynet.time())
 		orderObject:setProperty("status", "finish")
@@ -1413,7 +1540,7 @@ function RolePlugin.bind(Role)
 			item_number = 1, -- 购买的道具数量
 			item_level = 1, -- 购买的道具等级
 			order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
-			order_currency = "TWD", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
+			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
 			order_type = order_type, -- 订单类型，首充记录为1，否则为0
 			order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
 		})
@@ -1451,12 +1578,9 @@ function RolePlugin.bind(Role)
 			self:gainDiamond({count = diamondCount, isRecharge = true, log = {desc = "recharge", int1 = id}})
 		elseif rechargeData.shop == 2 then  --通行证商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
-			self.storeData:onBuyCard(rechargeData.type, rechargeData.time)
+			self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id)
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
-		elseif rechargeData.shop == 4 then  -- 付费签到
-			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
-			self.storeData:onBuyPaySignCard(rechargeData.time)
 		else
 			skynet.error("invalid recharge shop type " .. id)
 			return 3
@@ -1466,9 +1590,14 @@ function RolePlugin.bind(Role)
 			reward[ItemId.Diamond] = (reward[ItemId.Diamond] or 0) + diamondCount
 		end
  
+		self:checkTaskEnter("Pay", {rmb = rechargeData.rmb, twd = rechargeData.twd})
+
 		-- 累充
 		local rmb = rechargeData.rmb
 		self:updateProperty({field = "rmbC", delta = rmb})
+		self:updateProperty({field = "twdC", delta = rechargeData.twd})
+
+		self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = tonum(params.pay_time, 0)})
  
 		return nil, reward
 	end
@@ -1516,6 +1645,7 @@ function RolePlugin.bind(Role)
 		end
 		self:updateProperty({field = "funcGuide", value = funcGuide})
 		self:log("onGuidePoint", {guild_type = 0, guild_id = master, guild_point = slave, guild_pass = 0})
+		self:mylog("guide", {desc = "guide_new",int1 = master*1000+slave})
  
 		newerGuide = string.format("%d=%d",master,slave)
 		self:updateProperty({field = "newerGuide", value = newerGuide})
@@ -1535,6 +1665,84 @@ function RolePlugin.bind(Role)
 			self:updateProperty({field = "newerGuide", value = "9999=1"})
 		end
 	end
+
+	-- 抽卡阶段奖励
+	function Role:getDrawCardExtraReward(oldVal, newVal)
+		local reward = nil
+		local maxCount = 0
+		for k, v in pairs(csvdb["build_extraRewardCsv"]) do
+			if oldVal < k and newVal >= k then
+				reward = v["reward"] or ""
+			end
+			maxCount = k > maxCount and k or maxCount
+		end
+
+		return reward, (newVal >= maxCount and newVal - maxCount or newVal)
+	end
+
+	-- 获取下一个挂机关卡id
+	function Role:getNextCarbonId(curId)
+		local diff = math.floor(curId / 10000)
+		local chapterId = math.floor((curId / 100) % 100)
+		local subId = curId % 100
+		local nextId = curId + 1
+		local function makeCarbonId(diff, chapterId, subId)
+			return diff * 10000 + chapterId * 100 + subId
+		end
+		if not csvdb["idle_battleCsv"][nextId] then
+			nextId = makeCarbonId(diff, chapterId + 1, 1)
+			if not csvdb["idle_battleCsv"][nextId] then
+				nextId = makeCarbonId(diff + 1, 1, 1)
+				if not csvdb["idle_battleCsv"][nextId] then
+					nextId = 0
+				end
+			end
+		end
+
+		return nextId
+	end
+
+	-- 根据累计充值金额计算奖励档位
+	function Role:getPaybackReward(oldVal, newVal)
+		local maxVal, diff, extraReward = 0, 0, ""
+		local gift = ""
+		local checkPoint = {}
+		for k, v in pairs(csvdb["rebateCsv"]) do
+			if k > maxVal then
+				maxVal = k
+			end
+			if v.isLoop > diff then
+				diff = v.isLoop
+				extraReward = v.reward
+			end
+			if oldVal < k and newVal > k then
+				gift = gift .. v.reward .. " "
+
+				table.insert(checkPoint, k)
+			end
+		end
+		if newVal > maxVal then
+			local cnt = 0
+			local oldCheckPoint = 0
+			if oldVal < maxVal then
+				cnt = math.floor((newVal - maxVal) / diff)
+				oldCheckPoint = maxVal
+			else
+				cnt = math.floor((newVal - maxVal) / diff) - math.floor((oldVal - maxVal) / diff)
+				oldCheckPoint = maxVal + math.floor((oldVal - maxVal) / diff) * diff
+			end
+			for i = 1, cnt do
+				gift = gift .. extraReward .. " "
+
+				table.insert(checkPoint, oldCheckPoint + i * diff)
+			end
+		end
+		table.sort(checkPoint, function(a, b)
+			return a < b
+		end)
+		return gift, checkPoint
+	end
+
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -12,6 +12,9 @@ local TaskType = {
 	WakeCG = 7,					-- 觉醒到解锁CG		- heroType
 	HeroTalent = 8,				-- 天赋升级			- heroType	alv
 	DrawSSR = 9,				-- 抽到SSR			- count
+	HeroLvlCollect = 10,		-- 英雄等级收集进度
+	HeroQualityCollect = 11,	-- 英雄品质收集进度
+	HeroStarCollect = 12,		-- 英雄星级收集进度
  
 	--装备相关
 	AddEquip = 101,				-- 获得装备			- equipId	rarity
@@ -44,6 +47,7 @@ local TaskType = {
 	AdvStartSelf = 409,			-- 手动冒险			- id	
 	AdvScore = 410, 			-- 冒险分数			- score		
 	AdvDraw = 411, 				-- 冒险资助			- count		ptype
+	AdvHang	= 412,				-- 代理拾荒次数
  
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -60,6 +64,7 @@ local TaskType = {
 	DinerPopular = 608,			-- 人气值			- count
 	DinerLevelUp = 609,			-- 餐厅升级			- level type
 	DinerTalentUp = 610,		-- 天赋升级			- type level
+	VillageApply = 611,			-- 餐厅委托个数
  
 	-- 车厢相关
 	PotionMake = 701, 			-- 营养剂制作			- id	count
@@ -77,7 +82,13 @@ local TaskType = {
 	GetFriendP = 803,			-- 获得友情点 		- count
  
 	-- 角色相关 
-	RoleLevelUp = 901,			-- 角色升级			- curlevel
+	RoleLevelUp = 851,			-- 角色升级			- curlevel
+	RuneQualityCollect	= 852,	-- 铭文品质收集进度
+
+	-- 其他相关
+	SignIn = 901,				-- 签到
+	Pay	= 902,					-- 充值
+	ShopAll = 903,				-- 在任意商店购买 	
  
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -87,8 +98,6 @@ local TaskType = {
 	BindPhone = 1008,			-- 绑定手机
 	WeChat = 1009,				-- 关注微信
 	WeBlog = 1010,				-- 关注微博
-	SignIn = 1011,				-- 签到
-	ShopAll = 1013,				-- 在任意商店购买 	
 }
  
 local function f(field, func)
@@ -216,6 +225,7 @@ local ActivityListener = {
 		[TaskType.FoodSell] = {{Activity.ActivityType.FoodSell, f("count")}},
 		[TaskType.AdvDraw] = {{Activity.ActivityType.AdvDraw, f("count")}},
 		[TaskType.OpenBox] = {{Activity.ActivityType.OpenBox, f("count")}},
+		[TaskType.Pay] = {{Activity.ActivityType.PayBack, f("twd")}},
 	}
 }
  
@@ -228,6 +238,32 @@ local StoreListener = {
 	}
 }
  
+local CalendaTaskListener = {
+	func = "checkCalendaTask",
+	listen = {
+		[TaskType.DrawHero] = {{1, 1, f("count")}},
+		[TaskType.BonusPass]= {{2, 1}},
+		[TaskType.AdvPass]= {{3, 1}},
+		[TaskType.DinerLevelUp]= {{4, 2, f("level")}},
+		[TaskType.HeroLvlCollect]= {{5, 3}},		-- x名y级英雄
+		[TaskType.AdvHang]= {{6, 1}},			----
+		[TaskType.HeroQualityCollect]= {{7, 3}},
+		[TaskType.OverOderTask]= {{8, 1}},
+		[TaskType.VillageApply]= {{9, 1}},
+		[TaskType.PvpWin]= {{10, 2, f("score")}},
+		[TaskType.DinerPopular]= {{11, 2, f("count")}},
+		[TaskType.RoleLevelUp]= {{12, 2, f("level")}},
+		[TaskType.TowerPass]= {{13, 2, f("level")}},
+		[TaskType.HeroTalent]= {{14, 1}},
+		[TaskType.HangPass]= {{15, 2, f("id")}},
+		[TaskType.HeroStarCollect]= {{16, 3}},
+		[TaskType.FoodSell]= {{17, 1, f("count")}},
+		[TaskType.HangGet]= {{18, 3, f("reward")}},
+		[TaskType.RuneQualityCollect]= {{19, 3, f("id")}},
+		[TaskType.OpenBox]= {{20, 3, f("count"), f("quality")}},
+	}
+}
+
  
 local TaskListeners = {
 	StoryListener,
@@ -550,6 +586,33 @@ function RoleTask.bind(Role)
 		self.storeData:OnTriggerLimitTimePack(triggerType, param)
 	end
  
+	function Role:checkCalendaTask(notNotify, mainType, subType, param1, param2)
+		local open, actId = self.activity:isOpen("CalendaTask")
+		local actData = csvdb["activity_ctrlCsv"][actId]
+		if not actData then return end
+		if not open then return end
+
+		local change = false
+		local calTask = self:getProperty("calTask") or {}
+		param1 = param1 or 1
+
+		local cid = actData.condition
+		for k, taskList in pairs(csvdb["activity_taskCsv"]) do
+			if k == cid then
+				for id, cfg in pairs(taskList) do
+					if cfg.type == mainType then
+						if subType == 1 then	-- 增加数值
+							calTask[id] = (calTask[id] or 0) + param1
+						elseif subType == 2 then	-- 直接赋值
+							calTask[id] = param1
+						elseif subType == 3 then	-- 自定义类型
+						end
+					end
+				end
+			end
+		end
+	end
+
 end
  
 return RoleTask
 \ No newline at end of file
@@ -20,6 +20,7 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
  
 	response.dTask = {}
 	response.advSup = self:getProperty("advSup")
+	self:log("onLogin")
 end
  
 ResetFunc["CrossWeek"] = function(self, notify, response)
@@ -34,7 +35,6 @@ end
 ResetFunc["CrossMonth"] = function(self, notify, response)
 	local ltime = self:getProperty("ltime")
 	if isCrossMonth(ltime, skynet.timex()) then
-		print("cross month")
 		self.storeData:resetStoreReored(3)		--商店跨月重置 time_reset表关联id
 	end
 end
@@ -26,16 +26,16 @@ function Rune:notifyUpdateProperty(field, newValue, oldValue)
 	self:notifyUpdateProperties(datas)
 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")
+function Rune:mylog(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")
  
-	-- self.owner:log("rune_action", contents)
+	self.owner:mylog("rune_action", contents)
 end
  
 function Rune:notifyUpdateProperties(params)
@@ -163,7 +163,7 @@ function Store:getGearExchangeCoef()
 end
  
 -- 购买通行证
-function Store:onBuyCard(type, duration)
+function Store:onBuyCard(type, duration, id)
     local timeNow = skynet.timex()
     if type == CardType.NormalMonthCard then
         if self:isMonthCardExpire() then
@@ -189,9 +189,10 @@ function Store:onBuyCard(type, duration)
         self:updateProperty({field = "growFund", value = 1})
     elseif type == CardType.BattleCard then
         self:updateProperty({field = "battleCard", value = 1})
-    elseif type == CardType.BattlePassCard_1 or type == CardType.BattlePassCard_2 or 
-         type == CardType.BattlePassCard_3 or type == CardType.BattlePassCard_4 then
-        local index = type - CardType.BattlePassCard_1 + 1
+    elseif type == CardType.PaySignCard then
+        self:onBuyPaySignCard(duration)
+    elseif type == CardType.BattlePassCard then
+        local index = id - 400          -- 401:初级 402:中级 403:高级 404:终极
         local bpInfo = self:getProperty("bpInfo") or {}
         local info = bpInfo[index] or {}
         info["flag"] = 1
@@ -365,6 +366,7 @@ function Store:onBuyPaySignCard(dur)
         return
     end
     actGoodsFlag[goodsIndex] = 1
+    self:updateProperty({field = "actGoodsFlag", value = actGoodsFlag})
     -- 发钱
     local change
     local reward, curData = self.owner.activity:getPaySignReward()
@@ -375,13 +377,11 @@ function Store:onBuyPaySignCard(dur)
  
 	self.owner:log("activity", {
 		activity_id = 0, -- 活动ID（或活动指定任务的ID）
-		activity_type = self.onwer.activity.ActivityType.PaySignIn, -- 活动类型，见活动类型枚举表
+		activity_type = self.owner.activity.ActivityType.PaySignIn, -- 活动类型，见活动类型枚举表
 		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
  
 	SendPacket(actionCodes.Activity_actPaySignRewardNtf, MsgPack.pack(self.owner:packReward(reward, change)))
-
-    self.owner:updateProperty({field = "actGoodsFlag", value = actGoodsFlag})
 end
  
 function Store:checkPaySignReward()
@@ -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", {["@type"] = "online", count = count}, "log")
 	end
 end
  
@@ -5,6 +5,8 @@ local crab = require &quot;crab.c&quot;
 local table_insert = table.insert
 local table_unpack = table.unpack
 local mode, id, dict = ...
+local hideCode = utf8.codepoint("*")
+
  
 local function toutf8(name)
 	local t = {}
@@ -14,6 +16,16 @@ local function toutf8(name)
 	return t
 end
  
+local function fix(a, b)
+	for i, v in pairs(a) do
+		if b[i] == hideCode then
+			a[i] = hideCode
+		end
+	end
+	return utf8.char(table_unpack(a))
+end
+
+
 if mode == "sub" then
 	local CMD = {}
 	dict = tonumber(dict)
@@ -23,8 +35,9 @@ if mode == &quot;sub&quot; then
 			return false
 		end
 		local utftb = toutf8(name)
-		if crab.filter(dict, utftb) then
-			return false, utf8.char(table_unpack(utftb))
+		local utftbU = toutf8(string.upper(name))
+		if crab.filter(dict, utftbU) then
+			return false, fix(utftb, utftbU)
 		end
 		return true
 	end
@@ -45,7 +58,7 @@ else
  
 		local words = {}
 		for _, data in ipairs(forbidNames) do
-			local ok, utftb = pcall(toutf8, data.name)
+			local ok, utftb = pcall(toutf8, string.upper(data.name))
 			if ok then table.insert(words, utftb) end
 		end
 		local d = crab.open(words)
@@ -0,0 +1,145 @@
+
+local skynet = require "skynet"
+local socketdriver = require "skynet.socketdriver"
+local serverId = tonumber(skynet.getenv("servId"))
+
+require "shared.init"
+require "skynet.manager"
+
+local table_insert = table.insert
+local pairs = pairs
+local ipairs = ipairs
+local string_format = string.format
+
+local logHandle = {
+	log = {
+		host = "127.0.0.1",
+		port = 13003,
+		handle = function(doc, address, msg)
+			-- 注入字段
+			local now = skynet.timex()
+			doc["time"] = now
+			doc["timestamp"] = now
+			doc["instance_id"] = serverId
+			doc["game_name"] = "wasteland"
+			doc["env"] = "cb"
+			doc["app_name"] = "gs"
+			doc["app_id"] = "game.wasteland.gs"
+			--FATAL、ERROR、WARN、INFO、DEBUG
+			doc["level"] = "ERROR"
+			doc["log"] = msg
+			doc["address"] = string_format(":%08x", address)
+		end
+	},
+}
+
+local connect_relation = {}
+local function getConInfo(fd)
+	return logHandle[connect_relation[fd] or ""]
+end
+
+
+
+local socket_message = {}
+-- read skynet_socket.h for these macro
+-- SKYNET_SOCKET_TYPE_DATA = 1
+socket_message[1] = function(id, size, data)
+	skynet.error(string.format("LOG SOCKET: data: ", skynet.tostring(data, size)))
+	socketdriver.drop(data, size)
+end
+
+-- SKYNET_SOCKET_TYPE_CONNECT = 2
+socket_message[2] = function(id, _ , addr)
+	local cur = getConInfo(id)
+	skynet.error("LOG SOCKET: connect: ", addr)
+	cur.connected = true
+	cur.connecting = false
+end
+
+-- SKYNET_SOCKET_TYPE_CLOSE = 3
+socket_message[3] = function(id)
+	skynet.error("LOG SOCKET: closed")
+	local cur = getConInfo(id)
+	if not cur then return end
+	cur.connected = false
+	cur.connecting = false
+	connect_relation[id] = nil
+end
+
+-- SKYNET_SOCKET_TYPE_ERROR = 5
+socket_message[5] = function(id, _, err)
+	skynet.error("LOG SOCKET: error: ", err)
+	local cur = getConInfo(id)
+	if not cur then return end
+	cur.connected = false
+	cur.connecting = false
+	connect_relation[id] = nil
+end
+
+
+
+local function open()
+	for logTo, data in pairs(logHandle) do
+		if not data.connecting  and not data.connected then
+			data.connecting = true
+			data.fd = socketdriver.connect(data.host, data.port)
+			connect_relation[data.fd] = logTo
+		end
+	end
+end
+
+local function log(address, msg, logTo)
+	logTo = logTo or "log"
+	-- print(string.format(":%08x(%.2f): %s", address, skynet.time(), msg))
+	local cur = logHandle[logTo] 
+	if not cur then
+		print("error log to ", logTo)
+	end
+	local doc = {}
+	if cur.handle then
+		cur.handle(doc, address, msg)
+	end
+	if cur.connected and cur.fd then
+		socketdriver.send(cur.fd, json.encode(doc) .. "\n")
+	else
+		-- 断线会丢失一部分日志
+		if not cur.connecting then
+			open() -- 连一下
+		end
+	end
+end
+
+
+skynet.register_protocol {
+	name = "socket",
+	id = skynet.PTYPE_SOCKET,	-- PTYPE_SOCKET = 6
+	unpack = socketdriver.unpack,
+	dispatch = function (_, _, t, ...)
+		if socket_message[t] then
+			socket_message[t](...)
+		end
+	end
+}
+
+-- register protocol text before skynet.start would be better.
+skynet.register_protocol {
+	name = "text",
+	id = skynet.PTYPE_TEXT,
+	unpack = skynet.tostring,
+	dispatch = function(_, address, msg)
+		log(address, msg)
+	end
+}
+
+skynet.register_protocol {
+	name = "SYSTEM",
+	id = skynet.PTYPE_SYSTEM,
+	unpack = function(...) return ... end,
+	dispatch = function()
+		-- reopen signal
+		print("SIGHUP")
+	end
+}
+
+open()
+skynet.start(function()end)
@@ -13,8 +13,37 @@ local pairs = pairs
 local ipairs = ipairs
 local string_format = string.format
  
+local logId = 0
 local CMD, cs = {}
-local log_fd, connecting = nil , false
+
+local logHandle = {
+	bi = {
+		host = "127.0.0.1",
+		port = 13001,
+	},
+	log = {
+		host = "127.0.0.1",
+		port = 13002,
+		handle = function(doc)
+			-- 注入字段
+			local now = skynet.timex()
+			doc["time"] = now
+			doc["timestamp"] = now
+			doc["server"] = serverId
+			doc["game_name"] = "wasteland"
+			doc["env"] = "cb"
+			doc["game_name_type"] = "guaji"
+			doc["log_id"] = "wastelandC" .. logId .. "S" .. serverId .. "T" ..  now
+			logId = (logId + 1) % 10000000
+		end
+	},
+}
+
+local connect_relation = {}
+local function getConInfo(fd)
+	return logHandle[connect_relation[fd] or ""]
+end
+
  
  
 local socket_message = {}
@@ -27,20 +56,30 @@ end
  
 -- SKYNET_SOCKET_TYPE_CONNECT = 2
 socket_message[2] = function(id, _ , addr)
+	local cur = getConInfo(id)
 	skynet.error("LOG SOCKET: connect: ", addr)
-	connecting = false
+	cur.connected = true
+	cur.connecting = false
 end
  
 -- SKYNET_SOCKET_TYPE_CLOSE = 3
 socket_message[3] = function(id)
 	skynet.error("LOG SOCKET: closed")
-	connecting = false
+	local cur = getConInfo(id)
+	if not cur then return end
+	cur.connected = false
+	cur.connecting = false
+	connect_relation[id] = nil
 end
  
 -- SKYNET_SOCKET_TYPE_ERROR = 5
 socket_message[5] = function(id, _, err)
 	skynet.error("LOG SOCKET: error: ", err)
-	connecting = false
+	local cur = getConInfo(id)
+	if not cur then return end
+	cur.connected = false
+	cur.connecting = false
+	connect_relation[id] = nil
 end
  
  
@@ -55,18 +94,33 @@ skynet.register_protocol {
 	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")
+function CMD.log(doc, logTo)
+	logTo = logTo or "log"
+	local cur = logHandle[logTo] 
+	if not cur then
+		print("error log to ", logTo)
+	end
+	if cur.handle then
+		cur.handle(doc)
+	end
+	if cur.connected and cur.fd then
+		socketdriver.send(cur.fd, json.encode(doc) .. "\n")
+	else
+		-- 断线会丢失一部分日志
+		if not cur.connecting then
+			CMD.open() -- 连一下
 		end
 	end
 end
  
 function CMD.open()
-	log_fd = socketdriver.connect("127.0.0.1", 13001)
-	connecting = true
+	for logTo, data in pairs(logHandle) do
+		if not data.connecting  and not data.connected then
+			data.connecting = true
+			data.fd = socketdriver.connect(data.host, data.port)
+			connect_relation[data.fd] = logTo
+		end
+	end
 end
  
 local function __init__()
@@ -75,8 +129,8 @@ local function __init__()
 		if command == "open" then
 			skynet.ret(skynet.pack(f(...)))
 		else
-			local logType, doc, index_suffix = ...
-			cs(function() f(logType, doc, index_suffix) end)
+			local doc, logTo = ...
+			cs(function() f(doc, logTo) end)
 		end
 	end)
 	cs = queue()
@@ -5,6 +5,8 @@ local crab = require &quot;crab.c&quot;
 local table_insert = table.insert
 local table_unpack = table.unpack
 local mode, id, dict = ...
+local hideCode = utf8.codepoint("*")
+
  
 local function toutf8(name)
 	local t = {}
@@ -14,6 +16,16 @@ local function toutf8(name)
 	return t
 end
  
+local function fix(a, b)
+	for i, v in pairs(a) do
+		if b[i] == hideCode then
+			a[i] = hideCode
+		end
+	end
+	return utf8.char(table_unpack(a))
+end
+
+
 if mode == "sub" then
 	local CMD = {}
 	dict = tonumber(dict)
@@ -23,8 +35,9 @@ if mode == &quot;sub&quot; then
 			return false
 		end
 		local utftb = toutf8(name)
-		if crab.filter(dict, utftb) then
-			return false, utf8.char(table_unpack(utftb))
+		local utftbU = toutf8(string.upper(name))
+		if crab.filter(dict, utftbU) then
+			return false, fix(utftb, utftbU)
 		end
 		return true
 	end
@@ -45,7 +58,7 @@ else
  
 		local words = {}
 		for _, data in ipairs(forbidNames) do
-			local ok, utftb = pcall(toutf8, data.name)
+			local ok, utftb = pcall(toutf8, string.upper(data.name))
 			if ok then table.insert(words, utftb) end
 		end
 		local d = crab.open(words)
@@ -24,5 +24,8 @@ skynet.start(function()
 			skynet.ret(skynet.pack(db[string.lower(cmd)](db, ...)))
 		end
 	end)
+	skynet.info_func(function()
+		skynet.ret(skynet.pack(skynet.call(skynet.self(), "debug", "STAT")))
+	end)
 	skynet.register ".redis"
 end)
 \ No newline at end of file
@@ -155,7 +155,7 @@ function diffFromOpen()
 		hour = RESET_TIME,
 	}
 	if now < openTime then
-		return 0
+		return -1
 	end
  
 	return math.floor((now - openTime) / DAY_SEC)
@@ -219,7 +219,7 @@ function specMonday(now)
 	local wday = (tm.wday + 6) % 7
 	if wday == 0 then wday = 7 end
  
-	local time = os.time({year = tm.year, month = tm.month, day = tm.day})
+	local time = os.time({year = tm.year, month = tm.month, day = tm.day, hour = RESET_TIME})
 	return time - (wday - 1) * 86400
 end