diff --git a/src/models/RoleLog.lua b/src/models/RoleLog.lua index e6e2033..02a02bc 100644 --- a/src/models/RoleLog.lua +++ b/src/models/RoleLog.lua @@ -62,6 +62,7 @@ local ItemReason = { finishTask = 403, -- 任务 taskActive = 404, -- 完成活跃任务 advMainTask = 405, -- 拾荒主线 + chatline = 406, --查看chatline finishAchive = 601, -- 完成成就 advAchiev = 602, -- 拾荒成就 @@ -92,7 +93,8 @@ local ItemReason = { dinerBuildUp = 1108, -- 建筑升级 removeSell = 1109, -- 移除售卖 dinerSell = 1110, -- 餐饮售卖 - + dinerShop = 1111, -- 餐厅商店 + dinerSellQ = 1112, -- 餐厅快速 -- 英雄 heroLevelUp = 1201, -- 英雄升级 heroBreak = 1202, -- 英雄突破 @@ -104,6 +106,13 @@ local ItemReason = { unlockPool = 1208, -- 解锁英雄定向抽卡池 downloadCv = 1209, -- 下载 cv包奖励 refer = 1210, -- 穿戴 + + -- pvp + pvpCHead = 1301, -- pvp 跨服竞技场头像 + + --adv + chooseEvent = 1351, -- 冒险选择 + clickTrader = 1352, -- 冒险商店 } @@ -699,7 +708,7 @@ function RoleLog.bind(Role) action_type = after - before > 0 and 1 or 0, -- 变化类型(玩家获取:1,玩家消耗:0) item_before = before, -- 道具变化前的数量 item_after = after, -- 道具变化后的数量 - item_reason = reasonType, -- 道具流动一级原因,如抽卡、装备强化、副本掉落,可参考道具动作类型枚举表 + item_reason = reasonType or 0, -- 道具流动一级原因,如抽卡、装备强化、副本掉落,可参考道具动作类型枚举表 item_subreason = subreason, -- 道具流动二级原因,抽卡:卡池ID,装备强化:装备ID,副本掉落:副本ID item_other = other, -- 其他(可包含阶数,强化等级,随机属性) }) diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua index 4cd4507..e1ceb33 100644 --- a/src/models/RolePlugin.lua +++ b/src/models/RolePlugin.lua @@ -203,7 +203,7 @@ function RolePlugin.bind(Role) function Role:changeHead(id, notNotify) self:updateProperty({field = "headId" ,value = id, notNotify = notNotify}) self:changeCrossServerPvpSelfInfo("headId") - self:log("role_action", {desc = "changeHead", int1 = id}) + self:mylog("role_action", {desc = "changeHead", int1 = id}) end function Role:addPlayExp(addExp, params) @@ -761,7 +761,7 @@ function RolePlugin.bind(Role) end if heartWarning < 50 and heartWarning % 5 == 0 then self:sendGmMsg("server_accountBanned_warning") - self:log("role_action",{desc = "heartWarning", int1 = heartWarning}) + self:mylog("role_action",{desc = "heartWarning", int1 = heartWarning}) end end @@ -774,11 +774,11 @@ function RolePlugin.bind(Role) self:setProperty("banType", 0) self:setProperty("heartWarning", 0) - self:log("role_action", {desc = "ban_rm"}) + self:mylog("role_action", {desc = "ban_rm"}) else self:setProperty("banTime", now + 86400 * time) self:setProperty("banType", banType) - self:log("role_action", {desc = "ban", int1 = time, int2 = banType}) + self:mylog("role_action", {desc = "ban", int1 = time, int2 = banType}) end end @@ -1595,7 +1595,7 @@ function RolePlugin.bind(Role) self:updateProperty({field = "rmbC", delta = rmb}) self:updateProperty({field = "twdC", delta = rechargeData.twd}) - self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = params.pay_time}) + self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = tonum(params.pay_time, 0)}) return nil, reward end -- libgit2 0.21.2