Commit 8e524d4112f02f8b3f2a5ba4dcf235fe563beb08
1 parent
d92cda58
优化
Showing
2 changed files
with
16 additions
and
7 deletions
Show diff stats
src/models/RoleLog.lua
| @@ -62,6 +62,7 @@ local ItemReason = { | @@ -62,6 +62,7 @@ local ItemReason = { | ||
| 62 | finishTask = 403, -- 任务 | 62 | finishTask = 403, -- 任务 |
| 63 | taskActive = 404, -- 完成活跃任务 | 63 | taskActive = 404, -- 完成活跃任务 |
| 64 | advMainTask = 405, -- 拾荒主线 | 64 | advMainTask = 405, -- 拾荒主线 |
| 65 | + chatline = 406, --查看chatline | ||
| 65 | 66 | ||
| 66 | finishAchive = 601, -- 完成成就 | 67 | finishAchive = 601, -- 完成成就 |
| 67 | advAchiev = 602, -- 拾荒成就 | 68 | advAchiev = 602, -- 拾荒成就 |
| @@ -92,7 +93,8 @@ local ItemReason = { | @@ -92,7 +93,8 @@ local ItemReason = { | ||
| 92 | dinerBuildUp = 1108, -- 建筑升级 | 93 | dinerBuildUp = 1108, -- 建筑升级 |
| 93 | removeSell = 1109, -- 移除售卖 | 94 | removeSell = 1109, -- 移除售卖 |
| 94 | dinerSell = 1110, -- 餐饮售卖 | 95 | dinerSell = 1110, -- 餐饮售卖 |
| 95 | - | 96 | + dinerShop = 1111, -- 餐厅商店 |
| 97 | + dinerSellQ = 1112, -- 餐厅快速 | ||
| 96 | -- 英雄 | 98 | -- 英雄 |
| 97 | heroLevelUp = 1201, -- 英雄升级 | 99 | heroLevelUp = 1201, -- 英雄升级 |
| 98 | heroBreak = 1202, -- 英雄突破 | 100 | heroBreak = 1202, -- 英雄突破 |
| @@ -104,6 +106,13 @@ local ItemReason = { | @@ -104,6 +106,13 @@ local ItemReason = { | ||
| 104 | unlockPool = 1208, -- 解锁英雄定向抽卡池 | 106 | unlockPool = 1208, -- 解锁英雄定向抽卡池 |
| 105 | downloadCv = 1209, -- 下载 cv包奖励 | 107 | downloadCv = 1209, -- 下载 cv包奖励 |
| 106 | refer = 1210, -- 穿戴 | 108 | refer = 1210, -- 穿戴 |
| 109 | + | ||
| 110 | + -- pvp | ||
| 111 | + pvpCHead = 1301, -- pvp 跨服竞技场头像 | ||
| 112 | + | ||
| 113 | + --adv | ||
| 114 | + chooseEvent = 1351, -- 冒险选择 | ||
| 115 | + clickTrader = 1352, -- 冒险商店 | ||
| 107 | } | 116 | } |
| 108 | 117 | ||
| 109 | 118 | ||
| @@ -699,7 +708,7 @@ function RoleLog.bind(Role) | @@ -699,7 +708,7 @@ function RoleLog.bind(Role) | ||
| 699 | action_type = after - before > 0 and 1 or 0, -- 变化类型（玩家获取：1，玩家消耗：0） | 708 | action_type = after - before > 0 and 1 or 0, -- 变化类型（玩家获取：1，玩家消耗：0） |
| 700 | item_before = before, -- 道具变化前的数量 | 709 | item_before = before, -- 道具变化前的数量 |
| 701 | item_after = after, -- 道具变化后的数量 | 710 | item_after = after, -- 道具变化后的数量 |
| 702 | - item_reason = reasonType, -- 道具流动一级原因，如抽卡、装备强化、副本掉落，可参考道具动作类型枚举表 | 711 | + item_reason = reasonType or 0, -- 道具流动一级原因，如抽卡、装备强化、副本掉落，可参考道具动作类型枚举表 |
| 703 | item_subreason = subreason, -- 道具流动二级原因，抽卡：卡池ID，装备强化：装备ID，副本掉落：副本ID | 712 | item_subreason = subreason, -- 道具流动二级原因，抽卡：卡池ID，装备强化：装备ID，副本掉落：副本ID |
| 704 | item_other = other, -- 其他（可包含阶数，强化等级，随机属性） | 713 | item_other = other, -- 其他（可包含阶数，强化等级，随机属性） |
| 705 | }) | 714 | }) |
src/models/RolePlugin.lua
| @@ -203,7 +203,7 @@ function RolePlugin.bind(Role) | @@ -203,7 +203,7 @@ function RolePlugin.bind(Role) | ||
| 203 | function Role:changeHead(id, notNotify) | 203 | function Role:changeHead(id, notNotify) |
| 204 | self:updateProperty({field = "headId" ,value = id, notNotify = notNotify}) | 204 | self:updateProperty({field = "headId" ,value = id, notNotify = notNotify}) |
| 205 | self:changeCrossServerPvpSelfInfo("headId") | 205 | self:changeCrossServerPvpSelfInfo("headId") |
| 206 | - self:log("role_action", {desc = "changeHead", int1 = id}) | 206 | + self:mylog("role_action", {desc = "changeHead", int1 = id}) |
| 207 | end | 207 | end |
| 208 | 208 | ||
| 209 | function Role:addPlayExp(addExp, params) | 209 | function Role:addPlayExp(addExp, params) |
| @@ -761,7 +761,7 @@ function RolePlugin.bind(Role) | @@ -761,7 +761,7 @@ function RolePlugin.bind(Role) | ||
| 761 | end | 761 | end |
| 762 | if heartWarning < 50 and heartWarning % 5 == 0 then | 762 | if heartWarning < 50 and heartWarning % 5 == 0 then |
| 763 | self:sendGmMsg("server_accountBanned_warning") | 763 | self:sendGmMsg("server_accountBanned_warning") |
| 764 | - self:log("role_action",{desc = "heartWarning", int1 = heartWarning}) | 764 | + self:mylog("role_action",{desc = "heartWarning", int1 = heartWarning}) |
| 765 | end | 765 | end |
| 766 | end | 766 | end |
| 767 | 767 | ||
| @@ -774,11 +774,11 @@ function RolePlugin.bind(Role) | @@ -774,11 +774,11 @@ function RolePlugin.bind(Role) | ||
| 774 | self:setProperty("banType", 0) | 774 | self:setProperty("banType", 0) |
| 775 | self:setProperty("heartWarning", 0) | 775 | self:setProperty("heartWarning", 0) |
| 776 | 776 | ||
| 777 | - self:log("role_action", {desc = "ban_rm"}) | 777 | + self:mylog("role_action", {desc = "ban_rm"}) |
| 778 | else | 778 | else |
| 779 | self:setProperty("banTime", now + 86400 * time) | 779 | self:setProperty("banTime", now + 86400 * time) |
| 780 | self:setProperty("banType", banType) | 780 | self:setProperty("banType", banType) |
| 781 | - self:log("role_action", {desc = "ban", int1 = time, int2 = banType}) | 781 | + self:mylog("role_action", {desc = "ban", int1 = time, int2 = banType}) |
| 782 | end | 782 | end |
| 783 | end | 783 | end |
| 784 | 784 | ||
| @@ -1595,7 +1595,7 @@ function RolePlugin.bind(Role) | @@ -1595,7 +1595,7 @@ function RolePlugin.bind(Role) | ||
| 1595 | self:updateProperty({field = "rmbC", delta = rmb}) | 1595 | self:updateProperty({field = "rmbC", delta = rmb}) |
| 1596 | self:updateProperty({field = "twdC", delta = rechargeData.twd}) | 1596 | self:updateProperty({field = "twdC", delta = rechargeData.twd}) |
| 1597 | 1597 | ||
| 1598 | - self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = params.pay_time}) | 1598 | + self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = tonum(params.pay_time, 0)}) |
| 1599 | 1599 | ||
| 1600 | return nil, reward | 1600 | return nil, reward |
| 1601 | end | 1601 | end |