日志新一批

zhouhaihai
1 parent c59e058b
Showing 16 changed files with 107 additions and 238 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/CarAction.lua
src/actions/DinerAction.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/TowerAction.lua
src/adv/Adv.lua
src/models/Activity.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RolePvp.lua
@@ -68,7 +68,7 @@ function _M.sudokuRpc(agent, data)
 	role:log("activity", {
 		activity_id = id, -- 活动ID（或活动指定任务的ID）
 		activity_type = 0, -- 活动类型，见活动类型枚举表
-		activity_reward = json.encode(reward), -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
 	SendPacket(actionCodes.Activity_sudokuRpc, MsgPack.pack({task = role:packReward(task, tchange), reward = role:packReward(reward, rchange), rId = rId}))
@@ -107,7 +107,7 @@ function _M.sudokuRewardRpc(agent, data)
 	role:log("activity", {
 		activity_id = 10000 + phase, -- 活动ID（或活动指定任务的ID）
 		activity_type = 0, -- 活动类型，见活动类型枚举表
-		activity_reward = json.encode(reward), -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
 	SendPacket(actionCodes.Activity_sudokuRewardRpc, MsgPack.pack(role:packReward(reward, change)))
@@ -170,7 +170,7 @@ function _M.actSignRpc(agent, data)
 	role:log("activity", {
 		activity_id = curData[0], -- 活动ID（或活动指定任务的ID）
 		activity_type = role.activity.ActivityType.Sign, -- 活动类型，见活动类型枚举表
-		activity_reward = json.encode(reward), -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
 	SendPacket(actionCodes.Activity_actSignRpc, MsgPack.pack(role:packReward(reward, change)))
@@ -254,7 +254,6 @@ function _M.startHangRpc(agent, data)
 	role:changeAdvCount(adv_idle_energy)
 	role:checkTaskEnter("AdvStart", {id = chapterId})
-	role:log("adv_action", {desc = "startHang", int1 = chapterId})
 	SendPacket(actionCodes.Adv_startHangRpc, '')
 	return true
@@ -294,8 +293,6 @@ function _M.quickHangRpc(agent, data)
 	info.time = 0
 	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
-	role:log("adv_action", {desc = "advQuickHang", int1 = chapterId})
-
 	SendPacket(actionCodes.Adv_quickHangRpc, '')
 	return true
 end
@@ -376,8 +373,6 @@ function _M.endHangRpc(agent, data)
 	role:changeUpdates({{type = "advHang", field = chapterId, value = nil}})
-	role:log("adv_action", {desc = "endHang", int1 = chapterId, short1 = cancel and 1 or 0})
-
 	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull}))
 	return true
 end
@@ -399,7 +394,7 @@ function _M.buyAdvCountRpc(agent , data)
 	if not role:checkItemEnough(cost) then return end
-	role:costItems(cost, {log = {desc = "buyAdvCount", short1 = isEl and 1 or 0, int1 = count}})
+	role:costItems(cost, {log = {desc = "buyAdvCount", int1 = isEl and 1 or 0, int2 = count}})
 	if isEl then
 		role.dailyData:updateProperty({field = "advElC", delta = -count})
 		role.dailyData:updateProperty({field = "advElBC", delta = count})
@@ -407,7 +402,6 @@ function _M.buyAdvCountRpc(agent , data)
 		role:changeAdvCount(-count * globalCsv.adv_daily_buy_num)
 		role.dailyData:updateProperty({field = "advBC", delta = count})
 	end
-	role:log("adv_action", {desc = "buyAdvCount", short1 = isEl and 1 or 0, int1 = count})
 	SendPacket(actionCodes.Adv_buyAdvCountRpc, '')
 	return true
@@ -432,8 +426,6 @@ function _M.finishTaskRpc(agent, data)
 	if not status then return end
 	role:checkTaskEnter("AdvOverTask", {id = taskId})
-	adv:log({desc = "finishTask", int1 = taskId})
-
 	SendPacket(actionCodes.Adv_finishTaskRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -455,8 +447,6 @@ function _M.clickBlockRpc(agent, data)
 	if adv:isWaitChooseArtifact() then return returnFail() end
-	adv:log({desc = "clickBlock", int1 = msg.roomId, int2 = msg.blockId})
-
 	local status, errorCode = adv:clickBlock(msg.roomId, msg.blockId, msg)
 	if not status then return returnFail(errorCode) end
@@ -494,7 +484,6 @@ function _M.useItemRpc(agent, data)
 	end
 	adv:checkAchievement(adv.AchievType.UseItem, count, itemId)
-	adv:log({desc = "useItem", int1 = itemId, int2 = count})
 	for i = 1, count do
 		adv:doActive(itemData.effect, target) -- target
@@ -530,7 +519,6 @@ function _M.usePotionRpc(agent, data)
 	local adv = role:getAdvData()
 	if adv:isWaitChooseArtifact() then return end
-	adv:log({desc = "usePotion", int1 = potionId})
 	local status = adv:doActive(potionData.effect, target) -- target
 	if not status then return end
@@ -631,7 +619,6 @@ function _M.exitAdvRpc(agent, data)
 		role:saveGuide(57,1,true)
 	end
 	local adv = role:getAdvData()
-	adv:log({desc = "exit"})
 	local status = adv:exit() -- target {roomId = 1, blockId = 1} 选择的目标
 	SendPacket(actionCodes.Adv_exitAdvRpc, MsgPack.pack({events = adv:popBackEvents()}))
 	return true
@@ -703,7 +690,6 @@ function _M.endBattleRpc(agent, data)
 		end
 	end
-	adv:log({desc = "endBattle"})
 	local status = adv:clickBlock(roomId, blockId, {player = player, bySkill = bySkill})
 	if not status then return end
@@ -787,7 +773,6 @@ function _M.wheelSurfRpc(agent, data)
 	role:award(reward, {log = {desc = "advWheelSurf", int1 = ptype}})
 	role:finishGuide(58)
 	role:checkTaskEnter("AdvDraw", {count = count, ptype = ptype})
-	role:log("adv_action", {desc = "advWheelSurf", int1 = ptype, int2 = count})
 	SendPacket(actionCodes.Adv_wheelSurfRpc, MsgPack.pack({reward = backReward}))
 	return true
@@ -816,7 +801,6 @@ function _M.repayWheelSurfRpc(agent, data)
 	local gift = drawData["pool3"]:randWeight(true)
 	local reward, change = {[gift[1]] = gift[2]}
 	reward, change = role:award(reward, {log = {desc = "advRepayWheelSurf", int1 = ptype}})
-	role:log("adv_action", {desc = "advRepayWheelSurf", int1 = ptype})
 	SendPacket(actionCodes.Adv_repayWheelSurfRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -839,7 +823,6 @@ function _M.finishAchievRpc(agent, data)
 	end
 	if not status then return end
 	adv:updateAchievement()
-	role:log("adv_action", {desc = "finishAchiev", short1 = ctype, int1 = chapterId, int2 = taskId})
 	role:finishGuide(57)
 	SendPacket(actionCodes.Adv_finishAchievRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -896,7 +879,6 @@ function _M.refreshSupportRpc(agent, data)
 	end
 	role:advRandomSupportEffect()
-	role:log("adv_action", {desc = "advSupRe", short1 = cr < al and 0 or 1})
 	SendPacket(actionCodes.Adv_refreshSupportRpc, '')
 	return true
@@ -40,13 +40,12 @@ function _M.makePotionRpc( agent, data )
 	role:updateProperty({field = "potionBag", value = potionBag})
 	role:checkTaskEnter("PotionMake", {count = count, id = potionId})
-	role:log("role_action", {desc = "makePotion", int1 = potionId, int2 = count})
 	role:log("carriage_cook", {
 		item_id = potionId, -- 道具id
 		item_level = potionLv, -- 道具等级
 		item_type = 0, -- 道具类型，具体见枚举表中道具类型枚举表
 		carriage_cook_amount = count, -- 制作总量
-		carriage_cook_cost = json.encode(cost), -- 制作消耗道具，json格式记录，{'itemid1':10,'itemid2':5,…………..}
+		carriage_cook_cost = cost, -- 制作消耗道具，json格式记录，{'itemid1':10,'itemid2':5,…………..}
 	})
 	SendPacket(actionCodes.Car_makePotionRpc, MsgPack.pack({potionBag = potionBag}))
 	return true
@@ -104,7 +103,7 @@ function _M.equipUpRpc( agent, data )
 		equip_upgrade_amount = count, -- 升级获取的装备数量
 		equip_upgrade_usedid = lv, -- 升级消耗的装备ID
 		equip_upgrade_cost = costCount, -- 升级操作消耗装备数量
-		equip_upgrade_current = json.encode(cost), -- 升级消耗的货币类型
+		equip_upgrade_current = cost, -- 升级消耗的货币类型
 	})
 	SendPacket(actionCodes.Car_equipUpRpc, '')
@@ -181,8 +180,6 @@ function _M.saleEquipRpc(agent, data )
 	role:checkTaskEnter("SaleEquip", {count = allCount})
 	reward, change = role:award(reward, {log = {desc = "saleEquip"}})
-	role:log("role_action", {desc = "saleEquip", int1 = allCount})
-
 	SendPacket(actionCodes.Car_saleEquipRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -105,7 +105,6 @@ function _M.addSellRpc( agent, data )
 		role.dinerData:updateProperty({field = "customer", value = customer})
 	end
 	role:finishGuide(28)
-	role:log("diner_action", {desc = "addSell", int1 = dish, int2 = count})
 	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
 	SendPacket(actionCodes.Diner_addSellRpc, "")
@@ -312,8 +311,6 @@ function _M.expediteSellRpc( agent, data )
 	end
 	role:checkTaskEnter("FoodSellQuick")
-	role:log("diner_action", {desc = "sellQ"})
-
 	SendPacket(actionCodes.Diner_expediteSellRpc, MsgPack.pack({reward = reward, change = change, popular = popular}))
 	return true
 end
@@ -442,7 +439,6 @@ function _M.talentUpRpc( agent, data )
 	role:checkTaskEnter("DinerTalentUp", {type = talentData.effect:toArray(true,"=")[1], level = dishLevel + 1})
 	role:finishGuide(27)
-	role:log("diner_action", {desc = "talentUp", int1 = dish, int2 = dishLevel + 1})
 	role:log("carriage_logistics", {
 		carriage_logistics_type = typ, -- 后勤室制作类型ID，变异:0，通常:1，魔法:2
 		carriage_logistics_itemid = dish, -- 后勤室升级物品或技能ID
@@ -483,7 +479,6 @@ function _M.skillUpRpc( agent, data )
 	role:costItems(cost, {log = {desc = "dinerSkillUp", int1 = skill, int2 = skillLevel + 1}})
 	role.dinerData:updateProperty({field = "skillTree", value = skillTree:setv(skill, skillLevel + 1)})
-	role:log("diner_action", {desc = "skillUp", int1 = skill, int2 = skillLevel + 1})
 	SendPacket(actionCodes.Diner_skillUpRpc, '')
 	return true
@@ -511,8 +506,6 @@ function _M.lockTaskRpc( agent, data )
 	end
 	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
-	role:log("diner_action", {desc = "lockTask", int1 = order.id})
-
 	SendPacket(actionCodes.Diner_lockTaskRpc, MsgPack.pack({lock = order.lock}))
 	return true
 end
@@ -576,7 +569,7 @@ 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 = json.encode(reward), -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		restaurant_order_rwd = reward, -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 		restaurant_order_lv = taskSet.rarity, -- 订单品质等级，普通:0, 稀有:1, 顶级:2, 豪华:3
 	})
@@ -654,7 +647,6 @@ function _M.refreshTaskRpc( agent, data )
 		end
 	end
-	role:log("diner_action", {desc = "reTask"})
 	role:finishGuide(41)
 	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
@@ -695,7 +687,6 @@ function _M.addWantFoodRpc(agent , data)
 		gfood[slot] = {id = itemId, st = skynet.timex()}
 	end
-	role:log("diner_action", {desc = "wantFood"})
 	role:finishGuide(36)
 	role.dinerData:updateProperty({field = "gfood", value = gfood})
@@ -880,8 +871,6 @@ function _M.entrustRpc(agent , data)
 	end
 	role.dinerData:updateProperty({field = "entrust", value = entrust})
-	role:log("diner_action", {desc = "entrus", short1 = ctype, int1 = entrustId})
-
 	role:finishGuide(26)
 	SendPacket(actionCodes.Diner_entrustRpc, MsgPack.pack({reward = reward, change = change}))
@@ -916,7 +905,7 @@ function _M.collectRpc(agent , data)
 	role:log("restaurant_collect", {
 		restaurant_collect_id = id, -- 图谱收集ID
-		restaurant_collect_rwd = json.encode(reward), -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		restaurant_collect_rwd = reward, -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 		restaurant_collect_plan = count, -- 收集进度，即解锁顾客，数字表示
 	})
@@ -948,8 +937,6 @@ function _M.comboRewardRpc(agent , data)
 	role.dinerData:updateProperty({field = "comboStatus", value = comboStatus}) -- 解锁了
-	role:log("diner_action", {desc = "combo", int1 = id})
-
 	SendPacket(actionCodes.Diner_comboRewardRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -111,7 +111,6 @@ function _M.searchRpc(agent, data)
 		}))
 	end
-	role:log("role_action", {desc = "searchFriend"})
 	SendPacket(actionCodes.Friend_searchRpc, MsgPack.pack({searchList = searchList}))
 	return true
 end
@@ -178,8 +177,6 @@ function _M.applyRpc(agent, data)
 		myInfo.online = true
 		myInfo.hadApply = true
-		role:log("role_action", {desc = "addFriend", int1 = 1})
-
 		rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newApply = 1, info = {myInfo}})) 	-- 通知对方
 	end
@@ -350,8 +347,6 @@ function _M.handleApplyRpc(agent, data)
 			rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newFriend = 1, info = {myInfo}}))	-- 通知对方
 		end
 		if next(needAdd) then
-			role:log("role_action", {desc = "addFriend", int1 = #needAdd})
-
 			SendPacket(actionCodes.Friend_updateProperty, MsgPack.pack({newFriend = 1, info = needAddInfo}))
 		else
 			result = 1
@@ -558,8 +553,6 @@ function _M.pointRpc(agent, data)
 			role.dailyData:updateProperty({field = "giveFP", value = giveP})
 			role:checkTaskEnter("GiveFriendP", {count = 1})
 			rpcRole(objId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newPoint = 1, roleId = roleId}))
-
-			role:log("role_action", {desc = "giveFPoint", int1 = 1})
 		end
 	elseif cmd == 2 then -- 领取
 		local objId = msg.roleId
@@ -579,7 +572,6 @@ function _M.pointRpc(agent, data)
 			role.dailyData:updateProperty({field = "getFP", value = getP})
 			role:checkTaskEnter("GetFriendP", {count = 1})
-			role:log("role_action", {desc = "getFPoint", int1 = 1})
 		end
 	elseif cmd == 3 then -- 一键赠送领取
 		-- 赠送
@@ -601,8 +593,6 @@ function _M.pointRpc(agent, data)
 			role.dailyData:updateProperty({field = "giveFP", value = giveP})
 			role:checkTaskEnter("GiveFriendP", {count = change})
-			role:log("role_action", {desc = "giveFPoint", int1 = change})
-
 		else
 			result = 1
 		end
@@ -627,7 +617,6 @@ function _M.pointRpc(agent, data)
 				reward = role:award({[ItemId.FriendPoint] = getCount}, {log = {desc = "friendPoint"}})
 				role.dailyData:updateProperty({field = "getFP", value = getP})
 				role:checkTaskEnter("GetFriendP", {count = getCount})
-				role:log("role_action", {desc = "getFPoint", int1 = getCount})
 			else
 				result = (result or 0) + 2
 			end
@@ -27,7 +27,6 @@ function _M.ignoreout(role, pms)
 	else  -- 解除
 		role:updateProperty({field = "ignoreMt", value = 0})
 	end
-	role:log("gm_action", {desc = "ignoreout", key1 = pms.sender})
 	return "指令生效"
 end
@@ -47,17 +46,11 @@ function _M.ban(role, pms)
 			end)
 		end
 	end
-
-	role:log("gm_action", {desc = "ban", int1 = time, int2 = ctype, key1 = pms.sender})
-
 	return isBan and "解封杀成功" or "封杀成功"
 end
 function _M.unban(role, pms)
 	role:setBan(0, 0)
-
-	role:log("gm_action", {desc = "unban", key1 = pms.sender})
-
 	return "解封杀成功"
 end
@@ -70,8 +63,6 @@ function _M.gmmsg(role, pms)
 			skynet.call(agent.gate_serv, "lua", "forcekick", agent.fd)
 		end)
 	end
-	role:log("gm_action", {desc = "gmmsg", text1 = pms.pm1, key1 = pms.sender})
-
 	return "指令成功"
 end
@@ -82,8 +73,6 @@ function _M.silent(role, pms)
 		return "解禁言成功"
 	end
 	role:updateProperty({field = "silent", value = specTime({hour = 0}, skynet.timex()) + pm1 * 86400})
-
-	role:log("gm_action", {desc = "silent", int1 = pms.pm1, key1 = pms.sender})
 	return "禁言成功"
 end
@@ -101,8 +90,6 @@ function _M.hero(role, pms)
 	if not role:addHero({type = heroType, log = {desc = "gm"}}) then
 		return "失败"
 	end
-
-	role:log("gm_action", {desc = "hero", int1 = heroType, key1 = pms.sender})
 	return "成功"
 end
@@ -135,8 +122,6 @@ function _M.herol(role, pms)
 	hero:updateProperty({field = "level", delta = addLevel})
 	role:checkTaskEnter("HeroLevelUp", {level = hero:getProperty("level")})
-	role:log("gm_action", {desc = "herol", int1 = heroType, int2 = addLevel, key1 = pms.sender})
-
 	return "成功"
 end
@@ -148,8 +133,6 @@ function _M.herola(role, pms)
 		_M.herol(role, {pm1 = hero:getProperty("type"), pm2 = addLevel})
 	end
-	role:log("gm_action", {desc = "herola", int1 = addLevel, key1 = pms.sender})
-
 	return "成功"
 end
@@ -160,7 +143,6 @@ function _M.equip(role, pms)
 	local level = tonum(pms.pm2)
 	local count = tonum(pms.pm3)
 	role:addEquip(typ, level, count, {log = {desc = "gm"}})
-	role:log("gm_action", {desc = "equip", int1 = typ, int2 = level, long1 = count, key1 = pms.sender})
 	return "成功"
 end
@@ -169,7 +151,6 @@ function _M.rune(role, pms)
 	local typ = tonum(pms.pm1)
 	local id = tonum(pms.pm2)
 	local result = role:addRune({type = typ,id = id, log = {desc = "gm"}})
-	role:log("gm_action", {desc = "rune", int1 = typ, int2 = id, key1 = pms.sender})
 	return result
 end
@@ -190,8 +171,6 @@ function _M.fb(role, pms) -- 直接通关
 	role:hangFinish(carbonId)
 	addPre(carbonId)
-	role:log("gm_action", {desc = "fb", int1 = carbonId, key1 = pms.sender})
-
 	role:checkTaskEnter("HangPass", {id = carbonId})
 	return "成功"
 end
@@ -212,8 +191,6 @@ function _M.fbc(role, pms) -- 直接通关
 	end
 	role:updateProperty({field = "hangPass", value = {}})
 	addPre(carbonId)
-	
-	role:log("gm_action", {desc = "fbc", int1 = carbonId, key1 = pms.sender})
 	return "成功"
 end
@@ -247,8 +224,6 @@ function _M.exp(role, pms)
 	exp = math.floor(math.max(exp, 0))
 	role:addPlayExp(exp, {log = {desc = "gm"}})
-	role:log("gm_action", {desc = "exp", int1 = exp, key1 = pms.sender})
-
 	return "成功"
 end
@@ -305,7 +280,6 @@ function _M.get(role, pms)
 		end
 		local count = tonum(pms.pm2, 1)
 		role:award({[itemId] = count}, {log = {desc = "gm"}})
-		role:log("gm_action", {desc = "get", int1 = itemId, int2 = count, key1 = pms.sender})
 	end
 	return "成功"
 end
@@ -329,9 +303,6 @@ function _M.advc(role, pms)
 		advAFWear = {},
 	}, notNotify)
 	role.advData = nil
-
-	role:log("gm_action", {desc = "advc", key1 = pms.sender})
-
 	return "成功"
 end
@@ -340,8 +311,6 @@ function _M.advf(role, pms)
 	role:updateProperty({field = "advC", value = 0})
 	role.dailyData:updateProperty({field = "advElC", value = 0})
-	role:log("gm_action", {desc = "advf", key1 = pms.sender})
-
 	return "成功"
 end
@@ -361,7 +330,6 @@ function _M.adv(role, pms)
 		advPass[chapterId] = layer
 		role:updateProperty({field = "advPass", value = advPass})
 	end
-	role:log("gm_action", {desc = "adv", int1 = chapterId, int2 = layer, key1 = pms.sender})
 	return "成功"
 end
@@ -388,7 +356,6 @@ function _M.advt(role, pms)
 		isEnter = true,
 		debugMapId = mapId,
 	})
-	role:log("gm_action", {desc = "advt", int1 = chapterId, int2 = layer, key1 = pms.sender})
 	return "成功"
 end
@@ -397,8 +364,6 @@ function _M.advl(role, pms)
 	local exp = tonum(pms.pm1)
 	role:addAdvLvExp(math.max(0, exp))
-	role:log("gm_action", {desc = "advl", int1 = exp, key1 = pms.sender})
-
 	return "成功"
 end
@@ -412,7 +377,6 @@ function _M.advcl(role, pms)
 	end
 	advData.battle.player:addExp(exp)
 	advData:saveDB()
-	role:log("gm_action", {desc = "advcl", int1 = exp, key1 = pms.sender})
 	return "成功"
 end
@@ -422,7 +386,6 @@ function _M.idlec(role, pms)
 	role:updateProperty({field = "hangTeam", value = {}})
 	role:updateProperty({field = "hangInfo", value = {}})
 	role:updateProperty({field = "hangBag", value = {}})
-	role:log("gm_action", {desc = "idlec", key1 = pms.sender})
 	role.advData = nil
 	return "成功"
@@ -447,8 +410,6 @@ function _M.advit(role, pms)
 		local itemId = tonum(pms.pm1)
 		local count = tonum(pms.pm2)
 		reward[itemId] = count
-
-		role:log("gm_action", {desc = "advit", int1 = itemId, int2 = count, key1 = pms.sender})
 	end
@@ -464,8 +425,6 @@ function _M.tower(role, pms)
 	if not csvdb["tower_battleCsv"][level] then return  "不存在" end
 	role:updateProperty({field = "towerInfo", value = {c = globalCsv.tower_count_limit, l = level}})
-	role:log("gm_action", {desc = "tower", int1 = level, key1 = pms.sender})
-
 	return "成功"
 end
@@ -484,8 +443,6 @@ function _M.email(role, pms)
 		rewardPms = id ~= 0 and reward or nil,
 	})
-	role:log("gm_action", {desc = "email", int1 = id, key1 = pms.sender})
-
 	return "成功"
 end
@@ -503,7 +460,6 @@ function _M.cguide(role, pms)
 		role:updateProperty({field = "funcGuide", value = ""})
 	end
-	role:log("gm_action", {desc = "cguide", int1 = id, key1 = pms.sender})
 	return "成功"
 end
@@ -156,8 +156,6 @@ function _M.startRpc( agent, data )
 	end
 	role:updateProperty({field = "hangInfo", value = hangInfo})
-	role:log("hang_action", {desc = "startHang", int1 = carbonId})
-
 	SendPacket(actionCodes.Hang_startRpc, '')
 	return true
 end
@@ -248,7 +246,6 @@ function _M.endBattleRpc(agent, data)
 	role:updateProperty({field = "hangInfo", value = hangInfo})
 	local team = role:getProperty("pvpTC")
-	role:log("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), cint1 = role:getHerosCamp(team.heros)})
 	-- 引导
 	if carbonId == 10101 then
@@ -500,7 +497,7 @@ function _M.buyBonusCountRpc(agent, data)
 	if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}) then return 2 end
-	role:costItems({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}, {log = {desc = "buyBonusCount", short1 = btype, int1 = count}})
+	role:costItems({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}, {log = {desc = "buyBonusCount", int1 = btype, int2 = count}})
 	bonusC[btype]["b"] = bonusC[btype]["b"] + count
 	bonusC[btype]["c"] = bonusC[btype]["c"] - count
@@ -571,8 +568,6 @@ function _M.endBonusBattleRpc(agent, data)
  		role:checkTaskEnter("BonusPass", {id = id})
  	end
-	role:log("hang_action", {desc = "bonusBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
-
 	SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({
 		starNum = starNum, 
 		reward = reward,
@@ -593,7 +588,6 @@ function _M.hangGiftRpc(agent, data)
 	if hangGift[id] then return 2 end
 	local reward, change = role:award(carbonData.item_clear_special, {log = {desc = "hangGift", int1 = id}})
-	role:log("hang_action", {desc = "hangGift",  int1 = id})
 	role:changeUpdates({{type = "hangGift", field = id, value = 1}})
@@ -25,7 +25,7 @@ local function getChangeAttrJson(oldAttr, newAttr)
 			change[k] = nil
 		end
 	end
-	return json.encode(change)
+	return change
 end
 function _M.levelUpRpc( agent, data )
@@ -47,7 +47,7 @@ function _M.levelUpRpc( agent, data )
 	role:log("hero_upgrade", {
 		hero_id = hero:getProperty("type"), --英雄ID
-		hero_upgrade_cost = json.encode(cost), -- 英雄升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_upgrade_cost = cost, -- 英雄升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		hero_upgrade_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄升级效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 		hero_upgrade_type = 0, -- 英雄升级方式，连续升级：1，单击升级：0
 		hero_upgrade_score = hero:getProperty("battleV"), -- 英雄升级后评分
@@ -80,7 +80,7 @@ function _M.breakRpc( agent, data )
 	role:log("hero_break", {
 		hero_id = hero:getProperty("type"), --英雄ID
-		hero_break_cost = json.encode(cost), -- 英雄突破消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_break_cost = cost, -- 英雄突破消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		hero_break_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), -- 英雄突破效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 		hero_break_level = hero:getMaxLevel(), -- 英雄突破后等级上限
 	})
@@ -117,7 +117,7 @@ function _M.wakeRpc(agent, data)
 	role:log("hero_rise", {
 		hero_id = typ, --英雄ID
-		hero_rise_cost = json.encode(cost), --英雄觉醒消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_rise_cost = cost, --英雄觉醒消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		hero_rise_score = hero:getProperty("battleV"), --英雄觉醒后评分提升
 		hero_rise_result = getChangeAttrJson(oldAttr, hero:getTotalAttrs()), --英雄觉醒效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 	})
@@ -195,7 +195,7 @@ function _M.talentRpc(agent, data)
 	role:log("hero_talent", {
 		hero_id = hero:getProperty("type"), --英雄ID
-		hero_talent_cost = json.encode(cost), -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_talent_cost = cost, -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		hero_talent_levelbef = oldSkillLv, -- 英雄技能升级前等级
 		hero_talent_level = hero:getSkillLevel(1), -- 英雄技能升级后等级
 	})
@@ -683,7 +683,7 @@ function _M.getResetRewardRpc(agent, data)
 	role:log("hero_recycle", {
 		hero_recycle_list = hero:getProperty("type"), -- 回收的英雄id列表，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
-		hero_recycle_reward = json.encode(reward), -- 回收后获得的奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		hero_recycle_reward = reward, -- 回收后获得的奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 		hero_recycle_cnt = 1, -- 总回收英雄量
 	})
 	SendPacket(actionCodes.Hero_getResetRewardRpc, MsgPack.pack(role:packReward(reward, change)))
@@ -862,8 +862,8 @@ function _M.drawHeroRpc(agent, data)
 		gacha_type = btype, -- 卡池类型
 		gacha_up = 0, -- 卡池UP角色
 		gacha_times = drawCount[drawType], -- 抽卡次数
-		gacha_reward = json.encode(reward), -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
-		currency = json.encode(cost), -- 购买道具消耗的货币
+		gacha_reward = reward, -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		currency = cost, -- 购买道具消耗的货币
 	})
 	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
 	return true
@@ -287,7 +287,7 @@ function _M.startBattleRpc(agent, data)
 		if pvpFree >= globalCsv.pvp_battle_free_count then
 			local cost = {[ItemId.PvpKey] = 1}
 			if not role:checkItemEnough(cost) then return 5 end
-			role:costItems(cost, {log = {desc = "startPvp", short1 = 1}})
+			role:costItems(cost, {log = {desc = "startPvp", int1 = 1}})
 		else
 			role.dailyData:updateProperty({field = "pvpFree", delta = 1})
 		end
@@ -296,9 +296,6 @@ function _M.startBattleRpc(agent, data)
 		_pvpStartBattleCacheC = {idx = idx, key = key, revenge = revenge}
 		role:checkTaskEnter("PvpBattle")
-
-
-		role:log("pvp_action", {desc = "startBattle", short1 = 1, int1 = revenge and 1 or 0})
 	end
 	SendPacket(actionCodes.Pvp_startBattleRpc, MsgPack.pack({matchInfo = matchInfo, key = key, result = result, wait = wait}))
@@ -391,8 +388,6 @@ function _M.endBattleRpc(agent, data)
 	if isWin then
 		role:checkTaskEnter("PvpWin", {score = myScore})
 	end
-
-	role:log("pvp_action", {desc = "battleEnd", short1 = 1, int1 = isWin and 1 or 0, int2 = revenge and 1 or 0})
 	SendPacket(actionCodes.Pvp_endBattleRpc, MsgPack.pack({
 		reward = reward,
@@ -494,7 +489,7 @@ function _M.startBattleHRpc(agent, data)
 		if pvpFreeH >= globalCsv.pvp_battle_free_count_high then
 			local cost = {[ItemId.PvpKey] = globalCsv.pvp_battle_high_cost}
 			if not role:checkItemEnough(cost) then return 5 end
-			role:costItems(cost, {log = {desc = "startPvp", short1 = 2}})
+			role:costItems(cost, {log = {desc = "startPvp", int1 = 2}})
 		else
 			role.dailyData:updateProperty({field = "pvpFreeH", delta = 1})
 		end
@@ -520,8 +515,6 @@ function _M.startBattleHRpc(agent, data)
 		role:checkTaskEnter("PvpBattle")
-		role:log("pvp_action", {desc = "startBattle", short1 = 2, int1 = revenge and 1 or 0})
-
 	end
 	SendPacket(actionCodes.Pvp_startBattleHRpc, MsgPack.pack({
@@ -693,7 +686,6 @@ function _M.endBattleHRpc(agent, data)
 	if isWin then
 		role:checkTaskEnter("PvpWin", {score = myScore})
 	end
-	role:log("pvp_action", {desc = "battleEnd", short1 = 2, int1 = isWin and 1 or 0, int2 = revenge and 1 or 0})
 	SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({
 		reward = reward,
@@ -842,7 +834,6 @@ function _M.highDivisionGiftRpc(agent, data)
 	})
 	local reward, change = role:award(newReward, {log = {desc = "pvpDivisionH"}})
-	role:log("pvp_action", {desc = "pvpDivisionH"})
 	SendPacket(actionCodes.Pvp_highDivisionGiftRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -877,8 +868,6 @@ function _M.shopBuyRpc(agent, data)
 	end
 	local reward, change = role:award(gift, {log = {desc = "pvpShop", int1 = id, int2 = count}})
-	role:log("pvp_action", {desc = "pvpShop", int1 = id, int2 = count})
-
 	SendPacket(actionCodes.Pvp_shopBuyRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -970,7 +959,6 @@ function _M.crossBetRpc(agent, data)
 	local result, code = role:setCrossServerPvpBet(msg.idx)
 	if not result then return 10 + code end
-	role:log("pvp_action", {desc = "crossBet"})
 	SendPacket(actionCodes.Pvp_crossBetRpc, MsgPack.pack(result))
 	return true
 end
@@ -586,7 +586,7 @@ function _M.openTimeBoxRpc(agent, data)
 			carriage_dismantle_type = quick and 1 or 0, -- 拆解方式，时间到期:0，钥匙开启:1
 			carriage_dismantle_time = costTime, -- 拆解耗时，填写实际耗时
 			carriage_dismantle_cost = costKey, -- 拆解花费钥匙数量，未使用填写0
-			carriage_dismantle_rwd = json.encode(reward), -- 拆解获得物资，json格式记录，{'itemid1':2,'itemid2':3,…………..}
+			carriage_dismantle_rwd = reward, -- 拆解获得物资，json格式记录，{'itemid1':2,'itemid2':3,…………..}
 		})
 	else
 		return
@@ -681,7 +681,7 @@ function _M.storyBookRewardRpc(agent, data)
 		carriage_video_id = storyId, --放映室片段ID
 		carriage_video_coinid = reward[ItemId.Gold] and ItemId.Gold or 0, --放映奖励货币类型，无奖励则填写0
 		carriage_video_coinnum = reward[ItemId.Gold] or 0, --放映奖励货币数量，无奖励则填写0
-		carriage_video_item = json.encode(reward), --放映奖励其他物品数量，json格式记录，{'itemid1':10,'itemid2':5,…………..}，无奖励则填写0
+		carriage_video_item = reward, --放映奖励其他物品数量，json格式记录，{'itemid1':10,'itemid2':5,…………..}，无奖励则填写0
 	})
 	SendPacket(actionCodes.Role_storyBookRewardRpc, MsgPack.pack(role:packReward(reward, change)))
@@ -749,7 +749,7 @@ function _M.taskRpc(agent, data)
 	role:log("task_reward", {
 		task_reward_id = taskId, --任务奖励ID
 		task_reward_type = taskType, --任务奖励类型，见 任务奖励类型枚举表
-		task_reward_detail = json.encode(reward), --任务奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+		task_reward_detail = reward, --任务奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
 	SendPacket(actionCodes.Role_taskRpc, MsgPack.pack(role:packReward(reward, change)))
@@ -844,7 +844,7 @@ function _M.achiveRpc(agent, data)
 	role:log("achievement", {
 		achievement_id = taskId, -- 成就id
 		achievement_type = achiveTask.type, -- 成就类型，具体枚举表中成就类型枚举表
-		achievement_reward = json.encode(reward), -- 达成成就奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		achievement_reward = reward, -- 达成成就奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 	})
 	SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack(role:packReward(reward, change)))
@@ -1000,8 +1000,6 @@ function _M.changeSettingRpc(agent, data)
 	setting[id] = status
 	role:updateProperty({field = "setting", value = setting})
-	role:log("role_action", {desc = "changeSetting", int1 = id, int2 = status})
-
 	SendPacket(actionCodes.Role_changeSettingRpc,  '')
 	return true
 end
@@ -1035,7 +1033,7 @@ function _M.drawCodeRpc(agent, data)
 			role:log("get_gift", {
 				gift_id = giftId, -- 礼包ID
 				gift_key = code, -- 礼包key
-				gift_reward = json.encode(reward), -- 礼包奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+				gift_reward = reward, -- 礼包奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 				gift_name = "", -- 礼包名称
 				gift_reason = 0, -- 礼包发放原因，见发放原因枚举表
 			})
@@ -76,8 +76,6 @@ function _M.startBattleRpc(agent, data)
 	role:updateProperty({field = "towerInfo", value = towerInfo})
 	role:checkTaskEnter("TowerBattle", {level = towerInfo.l})
-	role:log("tower_action", {desc = "startBattle", int1 = id})
-
 	SendPacket(actionCodes.Tower_startBattleRpc, '')
 	return true
 end
@@ -116,8 +114,6 @@ function _M.endBattleRpc(agent, data)
 	towerInfo.k = nil
 	role:updateProperty({field = "towerInfo", value = towerInfo})
-	role:log("tower_action", {desc = "endBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
-
 	SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -140,7 +136,6 @@ function _M.bugCountRpc(agent, data)
 	towerInfo.c = curCount
 	towerInfo.t = nextTime
 	role:updateProperty({field = "towerInfo", value = towerInfo})
-	role:log("tower_action", {desc = "bugCount"})
 	SendPacket(actionCodes.Tower_bugCountRpc, '')
 	return true
@@ -24,17 +24,6 @@ function Adv:ctor(owner)
 	self:initByInfo(self.owner:getProperty("advInfo"))
 end
-function Adv:log(contents)
-	contents = contents or {}
-	if contents["cint1"] or contents["cint2"] or contents["cint3"] then
-		print("advLog error log have cint1 or cint2 or cint3 ", debug.traceback())
-	end
-	contents["cint1"] = self.chapterId
-	contents["cint2"] = self.level
-
-	self.owner:log("adv_action", contents)
-end
-
 --初始化adv 信息
 function Adv:initByInfo(advInfo)
 	if not next(advInfo) then return end --还没有 开始新地图
@@ -509,18 +498,18 @@ function Adv:awardArtifact(id, params)
 	self:checkAchievement(Adv.AchievType.GetMWeapon, 1, id)
-	if params.log then
-		local log = clone(params.log)
-		if log["cint1"] or log["cint2"] or log["cint3"] then
-			print("awardArtifact error log have cint1 or cint2 or cint3 ", debug.traceback())
-		end
-		log["cint1"] = self.chapterId
-		log["cint2"] = self.level
-		log["cint3"] = id
-		self.owner:log("in_artifact", log)
-	else
-		print("awardArtifact no log ", debug.traceback())
-	end
+	-- if params.log then
+	-- 	local log = clone(params.log)
+	-- 	if log["cint1"] or log["cint2"] or log["cint3"] then
+	-- 		print("awardArtifact error log have cint1 or cint2 or cint3 ", debug.traceback())
+	-- 	end
+	-- 	log["cint1"] = self.chapterId
+	-- 	log["cint2"] = self.level
+	-- 	log["cint3"] = id
+	-- 	self.owner:log("in_artifact", log)
+	-- else
+	-- 	print("awardArtifact no log ", debug.traceback())
+	-- end
 	if not params.isChoose then
 		self:pushBackEvent(AdvBackEventType.Artifact, {id = id})
 	end
@@ -609,7 +598,6 @@ function Adv:wearArtifact(slot, id)
 	else
 		id = nil
 	end
-	self:log({desc = "wearArtifact", int1 = id})
 	self.owner:changeUpdates({{type = "advAFWear", field = slot, value = id}})
 	return true
@@ -668,9 +656,6 @@ function Adv:artifactLevelUp(id, level)
 	end
 	if newLv == advAFGet[id] then return end
-	self:log({desc = "artifactLevelUp", int1 = id, int2 = level})
-
-
 	local status = 0
 	if curWear[id] then -- 穿着呢
 		local oldData = csvdb["adv_artifactCsv"][id][advAFGet[id]]
@@ -715,8 +700,6 @@ function Adv:chooseArtifact(index)
 	if not self.waitArtifact or not self.waitArtifact[index] then return end
 	self:award({[self.waitArtifact[index]] = 1}, {log = {desc = "chooseArtifact"}, isChoose = true})
-	self:log({desc = "chooseArtifact", int1 = self.waitArtifact[index]})
-
 	self.waitArtifact = nil
 	-- 支援效果继续选择
@@ -809,8 +792,6 @@ function Adv:over(success, rewardRatio, overType)
 	end
 	self:clearAdvUnlockCache()
-	self:log({desc = "over", short1 = success and 1 or 0, int1 = overType})
-
 	local chapterId = self.chapterId
 	self:clear()
 	self.owner:checkTaskEnter("AdvScore", {score = score})
@@ -911,23 +892,23 @@ function Adv:award(gift, params)
 				items = items:setv(itemId, nums)
 			end
-			if params.log then
-				local log = clone(params.log)
-				if log["cint1"] or log["cint2"] or log["cint3"] or log["long1"] then
-					print("addAdvItem error log have cint1 or cint2 or cint3 ", debug.traceback())
-				end
-				log["cint1"] = itemId
-				log["cint2"] = math.abs(count)
-				log["cint3"] = self.chapterId
-				log["long1"] = self.level
-				if count >= 0 then
-					self.owner:log("in_adv", log)
-				else
-					self.owner:log("out_adv", log)
-				end
-			else
-				print("addAdvItem no log ", debug.traceback())
-			end
+			-- if params.log then
+			-- 	local log = clone(params.log)
+			-- 	if log["cint1"] or log["cint2"] or log["cint3"] or log["long1"] then
+			-- 		print("addAdvItem error log have cint1 or cint2 or cint3 ", debug.traceback())
+			-- 	end
+			-- 	log["cint1"] = itemId
+			-- 	log["cint2"] = math.abs(count)
+			-- 	log["cint3"] = self.chapterId
+			-- 	log["long1"] = self.level
+			-- 	if count >= 0 then
+			-- 		self.owner:log("in_adv", log)
+			-- 	else
+			-- 		self.owner:log("out_adv", log)
+			-- 	end
+			-- else
+			-- 	print("addAdvItem no log ", debug.traceback())
+			-- end
 		end
 	end
 	if items ~= oldItems then
@@ -1021,7 +1002,6 @@ local function clickOut(self, room, block, params, isExit)
 						isRelay = true,
 					})
 				else
-					self:log({desc = "pass"})
 					self:initByChapter({
 						chapterId = self.chapterId, 
 						level = self.level + 1, 
@@ -219,7 +219,7 @@ function Activity:checkWeeklyAct(actType, notify, count, pool)
 					self.owner:log("activity", {
 						activity_id = cfg.id, -- 活动ID（或活动指定任务的ID）
 						activity_type = actType, -- 活动类型，见活动类型枚举表
-						activity_reward = json.encode(cfg.reward:toNumMap()), -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+						activity_reward = cfg.reward:toNumMap(), -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 					})
 					self.owner:sendMail(info.mailId, nil, cfg.reward, {cfg.condition1})
@@ -123,7 +123,7 @@ local MethodType = {
 		level_before = true, -- 变动前的等级，可以跳级
 		level_changemain = true, -- 等级变动原因，副本通关：mission，领取奖励：reward
 		level_changedetail = true, -- 等级变动原因明细，副本通关则记录关卡ID，领取奖励则记录奖励ID
-		level_reward = true, -- 等级变动奖励，json格式记录，{道具ID1：道具数量，道具ID2：道具数量}
+		level_reward = "json", -- 等级变动奖励，json格式记录，{道具ID1：道具数量，道具ID2：道具数量}
 	},
 	onGuidePoint = { --游戏引导
 		guild_type = true, --引导类型，新手引导:0，系统引导:1，弱引导:2
@@ -180,7 +180,7 @@ local MethodType = {
 		mission_enemylist = true, -- 地方英雄ID，排序以玩家出战设置为准，PVP多个队伍则记录多个列表。示例：[[1,2,3],[456]]
 		mission_damage = true, -- 英雄输出值。示例：{'heroid1':1000,'heroid2':2000,………..}
 		mission_ultskill = true, -- 大招使用情况。示例：{'heroid1':1000,'heroid2':2000,………..}
-		mission_reward = true, -- 获得奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		mission_reward = "json", -- 获得奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 		mission_starttime = true, -- 战斗开始时间，格式 unixtime 秒级
 		mission_roundtime = true, -- 对局时长(秒)
 		mission_result = true, -- 战斗结果(0-无效，1-胜利，2-失败)
@@ -191,9 +191,9 @@ local MethodType = {
 		mission_score = true, -- 本局分数，PVP玩法记录为对战后积分，无得分的填0
 		mission_cleartype = true, -- 1正常通关;2代理拾荒
 		mission_rank = true, -- 对战后排名，适用于PVP玩法和电波塔，其他玩法留空
-		misson_monsterkill = true, -- 击杀怪物ID和数量，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
-		misson_teamskill = true, -- 编队支援技能和技能等级情况，json格式记录，{"teamskill1":1,"teamskill2":2,………..}
-		misson_teambond = true, -- 编队羁绊和羁绊等级，json格式记录，{"bondid1":1,"bondid2":2,………..}
+		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 = { --玩家挂机或排名奖励  --TODO
 		mission_threadid = true, --大关卡ID
@@ -201,31 +201,31 @@ local MethodType = {
 		mission_type = true, --关卡类型，见关卡类型枚举表
 		residence_reward_type = true, --领取奖励方式，快速（超前领取）记录为1，正常领取记录为0
 		residence_time = true, --挂机或排名时长
-		residence_reward = true, --获得奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		residence_reward = "json", --获得奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 	},
 	hero_rise = { --英雄觉醒 
 		hero_id = true, --英雄ID
-		hero_rise_cost = true, --英雄觉醒消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_rise_cost = "json", --英雄觉醒消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		hero_rise_score = true, --英雄觉醒后评分提升
-		hero_rise_result = true, --英雄觉醒效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+		hero_rise_result = "json", --英雄觉醒效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 	},
 	hero_upgrade = { --英雄升级
 		hero_id = true, -- 英雄ID
-		hero_upgrade_cost = true, -- 英雄升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
-		hero_upgrade_result = true, -- 英雄升级效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+		hero_upgrade_cost = "json", -- 英雄升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_upgrade_result = "json", -- 英雄升级效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 		hero_upgrade_type = true, -- 英雄升级方式，连续升级：1，单击升级：0
 		hero_upgrade_score = true, -- 英雄升级后评分
 		hero_upgrade_scoreget = true, -- 通过英雄升级提升的评分
 	},
 	hero_break = { --英雄突破
 		hero_id = true, -- 英雄ID
-		hero_break_cost = true, -- 英雄突破消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
-		hero_break_result = true, -- 英雄突破效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+		hero_break_cost = "json", -- 英雄突破消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_break_result = "json", -- 英雄突破效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 		hero_break_level = true, -- 英雄突破后等级上限
 	},
 	hero_talent = { --英雄天赋升级 
 		hero_id = true, -- 英雄ID
-		hero_talent_cost = true, -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		hero_talent_cost = "json", -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		hero_talent_levelbef = true, -- 英雄技能升级前等级
 		hero_talent_level = true, -- 英雄技能升级后等级
 	},
@@ -236,7 +236,7 @@ local MethodType = {
 		hero_jewel_part = true, -- 铭文装备部位
 		hero_jewel_score = true, -- 铭文装备后的英雄分值
 		hero_jewel_scorebefore = true, -- 铭文装备前的英雄分值
-		hero_jewel_result = true, -- 铭文装备后效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
+		hero_jewel_result = "json", -- 铭文装备后效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 	},
 	hero_note = { --英雄评价
 		hero_id = true, -- 英雄ID
@@ -248,8 +248,8 @@ local MethodType = {
 		hero_id = true, -- 英雄ID
 	},
 	hero_recycle = { --英雄回收
-		hero_recycle_list = true, -- 回收的英雄id列表，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
-		hero_recycle_reward = true, -- 回收后获得的奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		hero_recycle_list = "json", -- 回收的英雄id列表，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		hero_recycle_reward = "json", -- 回收后获得的奖励，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
 		hero_recycle_cnt = true, -- 总回收英雄量
 	},
 	gacha = { --英雄招募 
@@ -257,16 +257,16 @@ local MethodType = {
 		gacha_type = true, -- 卡池类型
 		gacha_up = true, -- 卡池UP角色
 		gacha_times = true, -- 抽卡次数
-		gacha_reward = true, -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
-		currency = true, -- 消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		gacha_reward = "json", -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
+		currency = "json", -- 消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 	},
 	equip_wear = { --装备穿戴与卸载
 		hero_id = true, --英雄ID
 		equip_id = true, --装备ID
 		equip_wear_action = true, --装备操作类型：装备：0，卸载：1
 		equip_wear_part = true, --装备部位，记录部位ID
-		equip_wear_result = true, --装备操作后结果，记录属性变化，json格式记录，{“aa”:1234,"bb":4567}
-		equip_wear_change = true, --装备操作变化值，记录属性变化，记录正负值，json格式记录，{“aa”:1234,"bb":-45}
+		equip_wear_result = "json", --装备操作后结果，记录属性变化，json格式记录，{“aa”:1234,"bb":4567}
+		equip_wear_change = "json", --装备操作变化值，记录属性变化，记录正负值，json格式记录，{“aa”:1234,"bb":-45}
 		equip_wear_mode = true, --用以区分自动装备还是手动装备，自动记录为0，手动记录为1
 		equip_wear_seqid = "ucode", --自动穿戴时记录的系列ID，用以关联一次性装备时候产生的多条记录
 	},
@@ -287,7 +287,7 @@ local MethodType = {
 		carriage_dismantle_type = true, -- 拆解方式，时间到期:0，钥匙开启:1
 		carriage_dismantle_time = true, -- 拆解耗时，填写实际耗时
 		carriage_dismantle_cost = true, -- 拆解花费钥匙数量，未使用填写0
-		carriage_dismantle_rwd = true, -- 拆解获得物资，json格式记录，{'itemid1':2,'itemid2':3,…………..}
+		carriage_dismantle_rwd = "json", -- 拆解获得物资，json格式记录，{'itemid1':2,'itemid2':3,…………..}
 	},
 	carriage_logistics = { --后勤室 
 		carriage_logistics_type = true, -- 后勤室制作类型ID，变异:0，通常:1，魔法:2
@@ -310,24 +310,24 @@ local MethodType = {
 		carriage_video_id = true, --放映室片段ID
 		carriage_video_coinid = true, --放映奖励货币类型，无奖励则填写0
 		carriage_video_coinnum = true, --放映奖励货币数量，无奖励则填写0
-		carriage_video_item = true, --放映奖励其他物品数量，json格式记录，{'itemid1':10,'itemid2':5,…………..}，无奖励则填写0
+		carriage_video_item = "json", --放映奖励其他物品数量，json格式记录，{'itemid1':10,'itemid2':5,…………..}，无奖励则填写0
 	},
 	carriage_cook = { --调理室
 		item_id = true, -- 道具id
 		item_level = true, -- 道具等级
 		item_type = true, -- 道具类型，具体见枚举表中道具类型枚举表
 		carriage_cook_amount = true, -- 制作总量
-		carriage_cook_cost = true, -- 制作消耗道具，json格式记录，{'itemid1':10,'itemid2':5,…………..}
+		carriage_cook_cost = "json", -- 制作消耗道具，json格式记录，{'itemid1':10,'itemid2':5,…………..}
 	},
 	activity = { --活动或指南奖励
 		activity_id = true, -- 活动ID（或活动指定任务的ID）
 		activity_type = true, -- 活动类型，见活动类型枚举表
-		activity_reward = true, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+		activity_reward = "json", -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	},
 	task_reward = { --任务奖励
 		task_reward_id = true, --任务奖励ID
 		task_reward_type = true, --任务奖励类型，见 任务奖励类型枚举表
-		task_reward_detail = true, --任务奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+		task_reward_detail = "json", --任务奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	},
 	shop_purchase = { --商店购买行为 
 		item_id = true, -- 道具id
@@ -351,14 +351,6 @@ local MethodType = {
 		friend_roleid = true, -- 好友账户下的角色id
 		friend_cnt = true, -- 操作后好友数量
 	},
-	friend_list = { --好友列表 --TODO
-		friend_accountid = true, --好友账户id
-		friend_roleid = true, --好友账户下的角色id
-	},
-	friend_black = { --黑名单列表 --TODO
-		friend_accountid = true, -- 好友账户id
-		friend_roleid = true, -- 好友账户下的角色id
-	},
 	communication = { --玩家发言
 		publish_type = true, --发言类型，全部:0，公告:1，世界:2，联盟:3，私聊:4
 		publish_status = true, --发送状态，发送成功:0，发送失败:1，被屏蔽:2，其他:3
@@ -390,28 +382,41 @@ local MethodType = {
 	restaurant_order = { --订单任务 
 		restaurant_order_id = true, -- 订单任务ID
 		restaurant_order_status = true, -- 订单任务状态，接受:0, 拒绝:1, 完成:2
-		restaurant_order_rwd = true, -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		restaurant_order_rwd = "json", -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 		restaurant_order_lv = true, -- 订单品质等级，普通:0, 稀有:1, 顶级:2, 豪华:3
 	},
 	restaurant_collect = { --餐厅顾客图谱 
 		restaurant_collect_id = true, -- 图谱收集ID
-		restaurant_collect_rwd = true, -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		restaurant_collect_rwd = "json", -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 		restaurant_collect_plan = true, -- 收集进度，即解锁顾客，数字表示
 	},
 	achievement = { --成就达成
 		achievement_id = true, -- 成就id
 		achievement_type = true, -- 成就类型，具体枚举表中成就类型枚举表
-		achievement_reward = true, -- 达成成就奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		achievement_reward = "json", -- 达成成就奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 	},
 	get_gift = { --礼包兑换
 		gift_id = true, -- 礼包ID
 		gift_key = true, -- 礼包key
-		gift_reward = true, -- 礼包奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		gift_reward = "json", -- 礼包奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 		gift_name = true, -- 礼包名称
 		gift_reason = true, -- 礼包发放原因，见发放原因枚举表
 	},
 }
+local function printError(info)
+	print(info)
+	print(debug.traceback())
+end
+
+local function jsonEncode(tab)
+	local newTab = {}
+	for k , v in pairs(tab) do
+		newTab[tostring(k)] = v
+	end
+	return json.encode(newTab)
+end
+
 local function isIos(self)
 	local sid = self:getProperty("sid")
 	return sid == 2
@@ -450,18 +455,11 @@ local function getBaseLog(self)
 	return log
 end
-local function printError(info)
-	print(info)
-	print(debug.traceback())
-end
+
 local RoleLog = {}
 function RoleLog.bind(Role)
-
-	function Role:log()
-	end
-
-	function Role:log_new(logType, contents)
+	function Role:log(logType, contents)
 		contents = contents or {}
 		local schema = MethodType[logType]
 		if not schema then 
@@ -472,8 +470,13 @@ function RoleLog.bind(Role)
 		doc["method"] = logType
 		for field, value in pairs(contents) do
-			if not schema[ftype] then
-				printError(string.format("LOG ERROR: logType [%s] have new field [%s], call yunying.", logType, field))
+			if not schema[field] then
+				printError(string.format("LOG ERROR: logType [%s] have new field [%s], call.", logType, field))
+			else
+				if value == 'json' then
+					value = jsonEncode(value)
+				end
+				doc[field] = value
 			end
 		end
@@ -837,7 +837,7 @@ function RolePlugin.bind(Role)
 		count = count or 1
-		self:logItems(equipCsv.id, 0, count, params.log)
+		self:logItems(func, 0, count, params.log)
 		if csvdb["itemCsv"][func] and csvdb["itemCsv"][func].type == ItemType.FuncOpen then
 			local unlockData = csvdb["unlockCsv"][func]
@@ -500,7 +500,7 @@ function Role:setCrossServerPvpBet(idx)
 	local ok, result = pcall(skynet.call, pvpd, "lua", "setBet", idx, self:getProperty("id"), costNum)
 	if ok then
 		if result then
-			self:costItems(cost, {log = {desc = "crossPvpBet", short1 = day}})
+			self:costItems(cost, {log = {desc = "crossPvpBet", int1 = day}})
 			pvpBet[day] = {idx, cost[ItemId.Gold]}
 			self:setProperty("pvpBet", pvpBet)
 		end