Merge branch 'develop' into qa

* develop: (22 commits) 日志bug 修改每日礼包检测开启bug log缺失 ucode nokey 修改引导，抽卡阶段奖励修改 gm增加跳过引导的命令 guide skip 自己的日志自动挂机下一关去除日志拾荒引导拾取探险点后服务器设置当前引导步骤，而不是客户端指定付费签到，抽卡阶段奖励，探索指令自选箱子协议保底日志 quest 增加定制 bug 一些 bug 付费签到，应用市场反馈 twd 拾荒引导结束要设定引导步骤为成就引导返还 ...

Merge branch 'develop' into qa
* develop: (22 commits) 日志bug 修改每日礼包检测开启bug log缺失 ucode nokey 修改引导，抽卡阶段奖励修改 gm增加跳过引导的命令 guide skip 自己的日志自动挂机下一关去除日志拾荒引导拾取探险点后服务器设置当前引导步骤，而不是客户端指定付费签到，抽卡阶段奖励，探索指令自选箱子协议保底日志 quest 增加定制 bug 一些 bug 付费签到，应用市场反馈 twd 拾荒引导结束要设定引导步骤为成就引导返还 ...
zhouhaihai
2 parents 479673cf f49ec714
Showing 34 changed files with 1074 additions and 143 deletions Show diff stats
config/develop.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/AdvBattle.lua
src/adv/AdvMap.lua
src/adv/AdvTask.lua
@@ -15,5 +15,3 @@ redis_host = &quot;127.0.0.1&quot;
 redis_port = 6100
 redis_db = 1
 redis_auth = nil
-
-pay_url = ""
 \ No newline at end of file
@@ -68,6 +68,7 @@ ItemType = {
 	AdvItem						= 14, 	-- 冒险道具
 	FuncOpen					= 15, 	-- 管理功能开放
 	SpeedBox					= 16, 	-- 加速箱子
+	SelectItemBox				= 17, 	-- 自选箱子
 }
  
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
@@ -274,6 +275,8 @@ CardType = {
 	PrivilegeCard = 3, --特权卡
 	GrowFund = 4,	--成长助力
 	BattleCard = 5,	--赛季卡
+	PaySignCard = 6, -- 付费签到卡
+	BattlePassCard = 7, -- 探索指令
 }
  
 HeroQuality = {
@@ -290,6 +293,8 @@ MailId = {
 	SuperMonthCardEx = 204,
 	BattleCardAward = 210,
  
+	PaySignAward = 222,
+
 	ActSellFood = 231,
 	ActDrawCard = 232,
 	ActAdvDraw = 233,
@@ -45,6 +45,8 @@ actionCodes = {
 	Role_getRandomNameRpc = 130,
 	Role_goldBuyRpc = 131,
 	Role_getDownloadCvRewardRpc = 132,
+	Role_updateFeedbackInfoRpc = 133,
+	Role_useSelectItemRpc = 134,		-- 使用多选一礼包
  
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -91,6 +93,7 @@ actionCodes = {
 	Hero_repayHeroRpc = 221,
 	Hero_unlockPoolRpc = 222,
 	Hero_changeCrown = 223,
+	Hero_drawHeroExtraRewardNtf = 224,
  
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -191,6 +194,7 @@ actionCodes = {
 	Store_getFreeChestRpc = 560,
 	Store_getGrowFundRewardRpc = 561,	--成长助力奖励
 	Store_getBattlePassRewardRpc = 562,	--赛季卡奖励
+	Store_getExploreCommandRewardRpc = 563, --探索指令
  
  
 	Email_listRpc = 600,
@@ -203,6 +207,7 @@ actionCodes = {
 	Activity_signRpc = 651,
 	Activity_sudokuRewardRpc = 652,
 	Activity_actSignRpc = 653,
+	Activity_actPaySignRewardNtf = 654,
 }
  
 rpcResponseBegin = 10000
@@ -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
@@ -178,5 +179,46 @@ function _M.actSignRpc(agent, data)
 end
  
  
+function _M.actPaySignRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actGoodsFlag = role.storeData:getProperty("actGoodsFlag")
+	local index = GetActGoodsIndex("paySignIn")
+	local flag = actGoodsFlag[index] or 0
+	if flag == 0 then return 1 end
+
+	if not role.activity:isOpen("PaySignIn") then return 2 end
+
+	local diffDay = diffFromOpen() + 1
+
+	local curData = role.activity:getActData("PaySignIn")
+	local reward, change = {}
+	for day, csvData in ipairs(csvdb["pay_signInCsv"]) do
+		if day <= diffDay then
+			if not curData[day] then
+				curData[day] = 1
+				-- 奖励
+				for itemId, count in pairs(csvData.reward:toNumMap()) do
+					reward[itemId] = (reward[itemId] or 0) + count
+				end
+			end
+		else
+			break
+		end
+	end
+	if next(reward) then
+		role.activity:updateActData("PaySignIn", curData)
+		reward, change = role:award(reward, {log = {desc = "actPaySign"}})
+	end
+
+	role:log("activity", {
+		activity_id = curData[0], -- 活动ID（或活动指定任务的ID）
+		activity_type = role.activity.ActivityType.PaySignIn, -- 活动类型，见活动类型枚举表
+		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	})
+
+	SendPacket(actionCodes.Activity_actPaySignRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
  
 return _M
 \ No newline at end of file
@@ -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
@@ -614,10 +626,12 @@ function _M.exitAdvRpc(agent, data)
 	local role = agent.role
 	-- local msg = MsgPack.unpack(data)
 	if not isCanContinue(role) then return end
+	-- 冒险中途退出的时候要把引导步骤设定到成就引导
 	if not role:checkOverGuide(57) then
 		role:saveGuide(57,1,true)
 	end
 	local adv = role:getAdvData()
+	adv:mylog({desc = "exit"})
 	local status = adv:exit() -- target {roomId = 1, blockId = 1} 选择的目标
 	SendPacket(actionCodes.Adv_exitAdvRpc, MsgPack.pack({events = adv:popBackEvents()}))
 	return true
@@ -688,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
@@ -771,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
@@ -800,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
@@ -823,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
@@ -878,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
@@ -139,7 +141,11 @@ function _M.removeSellRpc( agent, data )
 		return 5
 	end
  
-	local temp = role.dinerData:updateSell(slot)
+	local temp = role.dinerData:updateSell(slot) or {
+		deltaCount = 0,
+		deltaTime = 0,
+		lastCount = 0,
+	}
 	local reward, change = {}
 	local cost = dishData.material:toNumMap()
 	for k, n in pairs(cost) do
@@ -157,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}))
@@ -171,7 +178,11 @@ function _M.getSellRewardRpc( agent, data )
  
 	local deltaTimes = {}
 	for slot, _ in pairs(sells) do
-		local temp = role.dinerData:updateSell(slot)
+		local temp = role.dinerData:updateSell(slot) or {
+			deltaCount = 0,
+			deltaTime = 0,
+			lastCount = 0,
+		}
 		deltaTimes[slot] = temp.deltaTime
 	end
 	sells = json.decode(role.dinerData:getProperty("sells"))
@@ -222,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
@@ -311,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
@@ -357,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
@@ -446,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
@@ -479,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
@@ -506,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
@@ -542,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
@@ -550,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
@@ -557,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
@@ -569,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)})
@@ -648,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, '')
@@ -688,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, '')
@@ -734,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
@@ -872,6 +900,7 @@ 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})
  
 	SendPacket(actionCodes.Diner_entrustRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -908,6 +937,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
@@ -937,6 +967,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
@@ -446,18 +446,33 @@ function _M.email(role, pms)
 	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})
+	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
 	end
  
 	return "成功"
@@ -472,7 +487,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:getNextCarbonId(id))
 	return "成功"
 end
  
@@ -258,6 +258,7 @@ 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
@@ -270,8 +271,15 @@ 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
+			print(hangInfo.bossTime)
+		end
 	end
 	role:updateProperty({field = "hangInfo", value = hangInfo})
  
@@ -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,6 +109,7 @@ 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")
@@ -114,11 +117,13 @@ function _M.wakeRpc(agent, data)
 	if curLevel == 4 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
@@ -499,7 +506,7 @@ function _M.referEquipsRpc(agent, data)
 	local curAttr = hero:getTotalAttrs()
 	local attrChange = getChangeAttrJson(oldAttr, curAttr)
 	for typ, data in pairs(wear) do
-		role:log("hero_jewel", {
+		role:log("equip_wear", {
 			hero_id = hero:getProperty("type"), --英雄ID
 			equip_id = data.id, --装备ID
 			equip_wear_action = data.act, --装备操作类型：装备：0，卸载：1
@@ -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, "")
@@ -671,9 +680,27 @@ function _M.getResetRewardRpc(agent, data)
 		end
 	end
  
-	hero:updateProperty({field = "level", value = level})
-	hero:updateProperty({field = "breakL", value = breakL})
-	hero:updateProperty({field = "talent", value = ""})
+	local equip = hero:getProperty("equip")
+	for k, v in pairs(equip:toNumMap()) do
+		role:addEquip(k, v, 1, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
+	end
+
+	local rune = hero:getProperty("rune")
+	for _, id in pairs(rune:toNumMap()) do
+		local curRune = role.runeBag[id]
+		if curRune then
+			curRune:updateProperty({field = "refer", value = 0})
+		end
+	end
+
+	hero:updateProperties({
+		level = level,
+		breakL = breakL,
+		talent = "",
+		equip = "",
+		rune = "",
+	})
+	hero:mylog({desc = "resetHero"})
  
 	for itemId, count in pairs(reward) do
 		reward[itemId] = math.floor(count * globalCsv.unit_back_discount)
@@ -682,7 +709,7 @@ function _M.getResetRewardRpc(agent, data)
 	reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
  
 	role:log("hero_recycle", {
-		hero_recycle_list = hero:getProperty("type"), -- 回收的英雄id列表，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		hero_recycle_list = {[hero:getProperty("type")] = 1}, -- 回收的英雄id列表，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 		hero_recycle_reward = reward, -- 回收后获得的奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 		hero_recycle_cnt = 1, -- 总回收英雄量
 	})
@@ -813,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
@@ -843,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
@@ -856,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
  
@@ -905,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
@@ -936,12 +990,12 @@ 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
  
-function _M.changeCrown(agnet, data)
+function _M.changeCrown(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
  
@@ -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
@@ -173,6 +173,7 @@ function _M.loginRpc( agent, data )
 	response.role = role:data()
 	response.result = "SUCCESS"
 	response.serverTime = now
+	--response.openTime = getServerOpenTs()
  
 	local modules = {}
  
@@ -548,7 +549,6 @@ 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, "=")
@@ -559,6 +559,7 @@ function _M.openTimeBoxRpc(agent, data)
 		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
@@ -683,7 +684,7 @@ 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
@@ -1194,4 +1195,43 @@ function _M.getDownloadCvRewardRpc(agent, data)
 	return true
 end
  
+function _M.updateFeedbackInfoRpc(agent, data)
+	local role = agent.role
+	local info = role:getProperty("feedback") or {}
+	local msg = MsgPack.unpack(data)
+	info["flag"] = msg.flag
+	info["count"] = msg.count
+	info["ts"] = skynet.timex()
+	role:updateProperty({field="feedback", value=info})
+	SendPacket(actionCodes.Role_updateFeedbackInfoRpc, MsgPack.pack({}))
+	return true
+end
+
+function _M.useSelectItemRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local itemId = msg.itemId
+	local index = msg.index
+	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 i = 1
+	local reward, change = {}
+	for k, v in pairs(itemMap) do
+		if i == index then
+			reward[k] = v * count
+			break
+		end
+		i = i + 1
+	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)))
+end
+
 return _M
 \ No newline at end of file
@@ -2,7 +2,6 @@ local _M = {}
  
 local serverId = tonumber(skynet.getenv("servId"))
 local md5 = require "md5"
-local pay_url = skynet.getenv("pay_url") or ""
  
 local function makeOrder(roleId, rechargeId)
 	local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
@@ -86,7 +85,7 @@ function _M.googleRechargeRpc(agent, data)
 		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
 		product_id = dataSet.productId,
-		notify_url = pay_url .. "/pay/google"
+		notify_url = msg.notifyUrl
 	}
 	local sign = signPms(need, secret_key)
  
@@ -112,7 +111,7 @@ function _M.myCardRechargeRpc(agent, data)
 		out_trade_no = partnerOrderId,
 		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
-		notify_url = pay_url .. "/pay/mycard"
+		notify_url = msg.notifyUrl
 	}
 	local sign = signPms(need, secret_key)
  
@@ -139,7 +138,7 @@ function _M.iosRechargeRpc(agent, data)
 		money = dataSet.rmb * 100,
 		game_money = dataSet.diamond,
 		product_id = dataSet.iap_product_id,
-		notify_url = pay_url .. "/pay/ios"
+		notify_url = msg.notifyUrl
 	}
 	local sign = signPms(need, secret_key)
  
@@ -178,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'
 		})
  
@@ -206,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
@@ -261,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
@@ -323,6 +323,7 @@ function _M.getGrowFundRewardRpc(agent, data)
 	return true
 end
  
+-- 赛季卡
 function _M.getBattlePassRewardRpc(agent, data)	
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -377,4 +378,65 @@ function _M.getBattlePassRewardRpc(agent, data)
 	return true
 end
  
+-- 探索指令奖励
+function _M.getExploreCommandRewardRpc(agent, data)	
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id		-- 探索id
+	local subId = msg.subId		-- 领取的阶段id
+
+	local tab_name = "reward_levelpass" .. id .. "Csv"
+	local config = csvdb[tab_name][id]
+	if not config then return end
+
+    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
+
+	local freeRecord = info["fr"] or ""
+	local buyRecord = info["br"] or ""
+
+	local freeFlag = string.char(string.getbit(freeRecord, subId))
+	local limitFlag = string.char(string.getbit(buyRecord, subId))
+
+	if freeFlag == "1" and limitFlag == "1" then
+		skynet.error("user already get explore command reward")
+		return 2
+	end
+
+	if flag == 1 and limitFlag == "1" then
+		return 3
+	end
+
+	if not role:checkHangPass(config.level) then
+		return 4
+	end
+
+	local gift = ""
+	if  freeFlag == "0" then
+		gift = config.giftFree
+
+		freeRecord = string.setbit(freeRecord, id)
+		info["fr"] = freeRecord
+	end
+
+	if flag == 1 and limitFlag == "0" then
+		if gift ~= "" then
+			gift = gift .. " "
+		end
+		gift = gift .. config.giftLimit
+
+		buyRecord = string.setbit(buyRecord, id)
+		info["br"] = buyRecord
+	end
+
+	role.storeData:updateProperty({field = "bpInfo", value = info})
+	
+	local reward, _ = role:award(gift, {log = {desc = "exploreCommand", int1 = id, int2 = subId}})
+
+	SendPacket(actionCodes.Store_getExploreCommandRewardRpc, MsgPack.pack({reward = reward}))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -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
  
 	-- 支援效果继续选择
@@ -789,9 +806,15 @@ function Adv:over(success, rewardRatio, overType)
 				red:hset(RANK_ADV_INFO, roleId,  MsgPack.pack(curInfo))
 			end)
 		end
+		-- 通关的时候要把引导步骤设定到成就引导
+		if not self.owner:checkOverGuide(57) then
+			self.owner:saveGuide(57,1,true)
+		end
 	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})
@@ -895,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
@@ -1005,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, 
@@ -14,7 +14,6 @@ function Battle:ctor(adv)
 	self:initAfter()
 	if self.isNewPlayer then
 		self.player:triggerPassive(Passive.BORN_ONCE)
-		self.player:addExp((self.adv.level - 1) * 40)
 	end
 end
  
@@ -523,7 +523,7 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 		--开放出口
 		randomFunc[AdvEventType.Diner] = function() 
 			-- if not self.adv.isRelay or isEnter or isNewRelay then return false end
-			if not self.adv.isRelay or isEnter then return false end
+			-- if not self.adv.isRelay or isEnter then return false end
 		end
  
 		--boss
@@ -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
  
 		--选择点
@@ -567,7 +571,7 @@ createMap = function(self, mapId, isEnter, isNewRelay)
 		end
 		--建筑
 		randomFunc[AdvEventType.Build] = function()
-			if self.adv.isRelay and isEnter then return false end
+			-- if self.adv.isRelay and isEnter then return false end
 			return randomCommon()
 		end
 		--陷阱
@@ -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)
@@ -53,6 +53,8 @@ end
  
 local _pipelinings = {}  --可同时多个序列  栈的形式保证嵌套不出错
 function SendPacket(actionCode, bin, client_fd)
+	--print(actionHandlers[actionCode])
+	--dump(MsgPack.unpack(bin))
 	-- 内部消息不扩散出去
 	if actionCode == actionCodes.Sys_endlessSeason then
 		if agentInfo.role then
@@ -283,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 2de1748bed665c9220f68eeb23a8ce3d1f810bda
+Subproject commit 2cd316b4df0f855713b9457114a97714df4d55f1
@@ -8,6 +8,7 @@ Activity.ActivityType = {
 	DrawHero = 4,	--抽卡周 招募
 	AdvDraw = 5,	--拾荒抽周 资助
 	OpenBox = 6,	--拆解周 时钟箱
+	PaySignIn = 7,	--付费签到
  
 	SsrUpPoolChange = 10,	-- 特定英雄活动，切卡池
 }
@@ -36,6 +37,7 @@ Activity.schema = {
 	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} == 付费签到活动
 }
  
 function Activity:data()
@@ -47,6 +49,7 @@ function Activity:data()
 		act4 = self:getProperty("act4"),
 		act5 = self:getProperty("act5"),
 		act6 = self:getProperty("act6"),
+		act7 = self:getProperty("act7"),
 	}
 end
  
@@ -257,7 +260,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,
 }
@@ -275,7 +277,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,
 }
@@ -310,11 +311,19 @@ 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,
 }
  
+-- 付费签到
+activityFunc[Activity.ActivityType.PaySignIn] = {
+	["init"] = function(self, actType, isCrossDay, notify)
+		self:updateActData(actType, {}, not notify)
+	end,
+	-- ["close"] = function(self, actType, notify)
+	-- end,
+}
+
 function Activity:initActivity(actType, isCrossDay, notify)
 	if activityFunc[actType] and activityFunc[actType]['close'] then
 		activityFunc[actType]["init"](self, actType, isCrossDay, notify)
@@ -384,5 +393,46 @@ function Activity:getActivityPool(mainType, subType)
 	return 0
 end
  
+-- 付费签到可领奖励
+function Activity:getPaySignReward()
+	local actGoodsFlag = self.owner.storeData:getProperty("actGoodsFlag")
+	local index = GetActGoodsIndex("paySignIn")
+	local flag = actGoodsFlag[index] or 0
+	if flag == 0 then return {} end
+
+	if not self.owner.activity:isOpen("PaySignIn") then return {} end
+
+	local diffDay = diffFromOpen() + 1
+
+	local curData = self:getActData("PaySignIn")
+	local reward, change = {}
+	for day, csvData in pairs(csvdb["pay_signInCsv"]) do
+		if day <= diffDay then
+			if not curData[day] then
+				curData[day] = 1
+				-- 奖励
+				for itemId, count in pairs(csvData.reward:toNumMap()) do
+					reward[itemId] = (reward[itemId] or 0) + count
+				end
+			end
+		else
+			break
+		end
+	end
+	return reward, curData
+	--if next(reward) then
+		--role.activity:updateActData("PaySignIn", curData)
+		--reward, change = role:award(reward, {log = {desc = "actPaySign"}})
+	--end
+
+	--role:log("activity", {
+	--	activity_id = curData[0], -- 活动ID（或活动指定任务的ID）
+	--	activity_type = role.activity.ActivityType.PaySignIn, -- 活动类型，见活动类型枚举表
+	--	activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	--})
+
+	--SendPacket(actionCodes.Activity_actPaySignRpc, MsgPack.pack(role:packReward(reward, change)))
+end
+
  
 return Activity
@@ -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()
@@ -165,6 +165,7 @@ Role.schema = {
 	chatline			= {"table", {}}, -- 奖励发放 id=时间
  
 	downCvR				= {"number", 0}, -- 下载cv扩展包奖励 
+	feedback			= {"table", {}}, -- 反馈相关信息  {flag = false, count = 0} 	flag是否评论过，count 提示次数
 }
  
  
@@ -383,6 +384,7 @@ function Role:data()
 		chatline = self:getProperty("chatline"),
  
 		downCvR	= self:getProperty("downCvR"), -- 下载cv扩展包奖励 
+		feedback = self:getProperty("feedback")
 	}
 end
  
@@ -80,7 +80,7 @@ function Role:checkBattle(battleType, params)
 			for slot , one in pairs(self:getTeamBattleInfo(bTeam).supports) do
 				teamskill[one[1]] = one[2]
 			end
-			local carbonData = csvdb["tower_battleCsv"][params.id]
+			local carbonData = csvdb["bonus_battleCsv"][params.id]
 			local monsterData = csvdb[carbonData.monster:match("/([^/]*)$") .. "Csv"]
 			for slot, one in pairs(monsterData[1]) do
 				enemylist[#enemylist + 1] = one["unitType"]
@@ -97,7 +97,7 @@ function Role:checkBattle(battleType, params)
 			if params.robotId then
 				local carbonData = csvdb["pvp_robotCsv"][params.robotId]
 				local monsterData = csvdb[carbonData.monster:match("/([^/]*)$") .. "Csv"]
-				for slot, one in pairs(monsterData[1]) do
+				for slot, one in pairs(monsterData) do
 					enemylist[#enemylist + 1] = one["unitType"]
 				end
 			else
@@ -127,7 +127,7 @@ function Role:checkBattle(battleType, params)
 				for idx = 1, 3 do
 					enemylist[idx] = enemylist[idx] or {}
 					local monsterData = csvdb[carbonData["monster" .. idx]:match("/([^/]*)$") .. "Csv"]
-					for slot, one in pairs(monsterData[1]) do
+					for slot, one in pairs(monsterData) do
 						enemylist[idx][#enemylist + 1] = one["unitType"]
 					end
 				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	购买/兑换行为			
@@ -38,6 +39,9 @@ local ItemReason = {
 	startPvp = 124, -- 开始pvp
 	unlockStory = 125, -- 解锁剧情
 	towerCount = 126, -- 电波塔次数
+	freeGift = 127, -- 免费礼包
+	exploreCommand = 128, -- 探索指令
+	drawHeroExtraReward = 129, -- 抽卡阶段奖励
  
  
 	advHang = 301, -- 拾荒挂机
@@ -75,6 +79,7 @@ local ItemReason = {
 	friendPoint = 1005, -- 友情
 	birth = 1006, -- 出生奖励
 	actSign = 1007, -- 活动签到
+	actPaySign = 1008, -- 活动付费签到
  
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得
@@ -98,6 +103,7 @@ local ItemReason = {
 	resetHero = 1207, -- 重置养成
 	unlockPool = 1208, -- 解锁英雄定向抽卡池
 	downloadCv = 1209, -- 下载 cv包奖励
+	refer = 1210, -- 穿戴
 }
  
  
@@ -193,10 +199,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
@@ -210,6 +215,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 = { --英雄升级
@@ -231,6 +237,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
@@ -262,6 +269,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
@@ -279,7 +287,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
@@ -459,6 +467,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)
@@ -486,14 +666,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)
@@ -524,6 +705,38 @@ function RoleLog.bind(Role)
 		})
 	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
@@ -544,5 +757,6 @@ function RoleLog.bind(Role)
  	end
  
  
+
 end
 return RoleLog
 \ No newline at end of file
@@ -229,13 +229,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 = 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})
@@ -259,6 +274,21 @@ function RolePlugin.bind(Role)
 		end
  
 		self:logItems(params.itemId, origin, nums, params.log)
+		if params.log then
+			local log = 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
@@ -329,11 +359,22 @@ function RolePlugin.bind(Role)
 		end
  
 		self:logItems(ItemId.Diamond, origin, count, params.log)
+		if params.log then
+			local log = 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 +409,17 @@ function RolePlugin.bind(Role)
  
  
 		self:logItems(ItemId.Diamond, origin, count, params.log)
+		if params.log then
+			local log = 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
@@ -406,6 +458,17 @@ function RolePlugin.bind(Role)
  
 		self:logItems(heroType + ItemStartId.Hero, 0, 1, params.log)
  
+		if params.log then
+			local log = 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 +579,22 @@ function RolePlugin.bind(Role)
 		self:setProperty("equips", equips)
  
 		self:logItems(equipCsv.id, oldCount, curCount, pms.log)
+		if pms.log then
+			local log = 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 +655,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 = 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 +685,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 = 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)
@@ -838,6 +945,19 @@ function RolePlugin.bind(Role)
 		count = count or 1
  
 		self:logItems(func, 0, count, params.log)
+		if params.log then
+			local log = 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 +1513,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 +1536,7 @@ function RolePlugin.bind(Role)
 			item_number = 1, -- 购买的道具数量
 			item_level = 1, -- 购买的道具等级
 			order_cost = rechargeData.rmb * 100, -- 此次消费的现金金额（单位：分），如 51800即未518元，对应客户端SDK传入的'total_fee'
-			order_currency = "CNY", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
+			order_currency = "TWD", -- 货币类型，默认为"CNY"（人民币），遵循ISO 4217规范
 			order_type = order_type, -- 订单类型，首充记录为1，否则为0
 			order_id = params.transactionId, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
 		})
@@ -1451,7 +1574,7 @@ 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}})
 		else
@@ -1466,6 +1589,8 @@ function RolePlugin.bind(Role)
 		-- 累充
 		local rmb = rechargeData.rmb
 		self:updateProperty({field = "rmbC", delta = rmb})
+		
+		self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = params.pay_time})
  
 		return nil, reward
 	end
@@ -1513,6 +1638,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})
@@ -1532,6 +1658,43 @@ 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
+
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -34,7 +34,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,7 +26,7 @@ function Rune:notifyUpdateProperty(field, newValue, oldValue)
 	self:notifyUpdateProperties(datas)
 end
  
-function Rune:log(contents)
+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())
@@ -35,7 +35,7 @@ function Rune:log(contents)
 	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)
@@ -6,21 +6,33 @@ function Store:ctor(properties)
 	Store.super.ctor(self, properties)
 end
  
+ActGoodsType = {
+    paySignIn = 1,  -- 付费签到
+}
+
 Store.schema = {
 	buyR		= {"table", {}},		-- 购买商品记录 {id=count}
 	payR	= {"table", {}},		-- 充值记录 {id=count}
 	growFund		= {"number", 0},		-- 成长基金
-	growFundR  = {"string", ""},        -- 成长基金领取记录
+    growFundR  = {"string", ""},        -- 成长基金领取记录
+
 	monthCardEx	= {"number", 0},		-- 月卡过期时间戳
-	smonthCardEx	= {"number", 0},		-- 超级月卡过期时间戳
+    smonthCardEx	= {"number", 0},		-- 超级月卡过期时间戳
+
 	battleCard	= {"number", 0},		-- 赛季卡
 	battleFR = {"string", ""},		-- 免费赛季卡领取记录
     battleLR = {"string", ""},		-- 付费赛季卡领取记录
+
     limitTPack = {"table", {}},      -- 限时礼包 {id=expire_ts}
     privCardEx = {"number", 0},          -- 特权卡过期时间戳
     getMailT1 = {"number",0},       -- 上次发送月卡福利邮件的时间
     getMailT2 = {"number",0},       -- 上次发送超级月卡福利邮件的时间
-    packTrigger = {"table", {}}     -- 礼包触发记录 {关卡难度1={id, 通关关卡数，升级数，爬塔层数}, ...}
+    packTrigger = {"table", {}},     -- 礼包触发记录 {关卡难度1={id, 通关关卡数，升级数，爬塔层数}, ...}
+    
+    -- 活动商品购买记录
+    actGoodsFlag = {"table", {}},       -- ActGoodsType  1购买，0未购买
+
+    bpInfo = {"table", {}},         -- battle pass 探索指令  1={flag=0 为1表示买了，br=""付费领取记录, fr=""免费领取记录},2,3,4
 }
  
 function Store:updateProperty(params)
@@ -45,6 +57,7 @@ end
 function Store:onCrossDay()
     self:sendMonthCardEmail()
     self:deleteExpireLimitGoods()
+    self:checkPaySignReward()
 end
  
 -- 删除过期商品
@@ -150,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
@@ -176,6 +189,15 @@ 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.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
+        bpInfo[index] = info
+        self:updateProperty({field = "bpInfo", value = bpInfo})
     end
 end
  
@@ -330,6 +352,46 @@ function Store:OnTriggerLimitTimePack(eventType, param)
     end
 end
  
+function GetActGoodsIndex(goodsType)
+    return ActGoodsType[goodsType] or 0
+end
+
+-- 购买付费签到 按开服时间算奖励
+function Store:onBuyPaySignCard(dur)
+    local curTs = skynet.timex()
+    local actGoodsFlag = self:getProperty("actGoodsFlag") or {}
+    local goodsIndex = GetActGoodsIndex("paySignIn")
+    if goodsIndex == 0 then
+        print("get act goods index fail :paySignIn")
+        return
+    end
+    actGoodsFlag[goodsIndex] = 1
+    self:updateProperty({field = "actGoodsFlag", value = actGoodsFlag})
+    -- 发钱
+    local change
+    local reward, curData = self.owner.activity:getPaySignReward()
+	if next(reward) then
+        self.owner.activity:updateActData("PaySignIn", curData)
+        reward, change = self.owner:award(reward, {log = {desc = "actPaySign"}})
+	end
+
+	self.owner:log("activity", {
+		activity_id = 0, -- 活动ID（或活动指定任务的ID）
+		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)))
+end
+
+function Store:checkPaySignReward()
+    local reward, curData  = self.owner.activity:getPaySignReward()
+    if next(reward) then
+        self.owner.activity:updateActData("PaySignIn", curData)
+        self.owner:sendMail(MailId.PaySignAward, nil, reward)
+	end
+end
+
 function Store:data()
 	return {
         buyR		= self:getProperty("buyR"),
@@ -343,7 +405,9 @@ function Store:data()
         battleLR  = self:getProperty("battleLR"),
         limitTPack = self:getProperty("limitTPack"),
         privCardEx = self:getProperty("privCardEx"),
-        packTrigger = self:getProperty("packTrigger")
+        packTrigger = self:getProperty("packTrigger"),
+        actGoodsFlag = self:getProperty("actGoodsFlag"),
+        bpInfo = self:getProperty("bpInfo"),
 	}
 end
  
@@ -128,7 +128,7 @@ function _M:check_agent_status()
 		next_log_time = now + 60
 		local count = table_nums(self.u2f)
 		datacenter.set("onlineCount", count)
-		-- pcall(skynet.send, logd, "lua", "log", "online", {count = count}, "online")
+		pcall(skynet.send, logd, "lua", "log", {["@type"] = "online", count = count}, "log")
 	end
 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()
@@ -146,6 +146,31 @@ function crossDayFromOpen(now)
 	return crossDay(openTime, now)
 end
  
+function diffFromOpen()
+	now = now or skynet.timex()
+	local openTime = os.time{
+		year = tonum(SERV_OPEN:sub(1,4)),
+		month = tonum(SERV_OPEN:sub(5,6)),
+		day = tonum(SERV_OPEN:sub(7,8)),
+		hour = RESET_TIME,
+	}
+	if now < openTime then
+		return 0
+	end
+
+	return math.floor((now - openTime) / DAY_SEC)
+end
+
+function getServerOpenTs()
+	local openTime = os.time{
+		year = tonum(SERV_OPEN:sub(1,4)),
+		month = tonum(SERV_OPEN:sub(5,6)),
+		day = tonum(SERV_OPEN:sub(7,8)),
+		hour = RESET_TIME,
+	}
+	return openTime
+end
+
 -- 30*86400 = 2592000
 function monthLater(now)
 	now = now or skynet.timex()