diff --git a/game-server/app/servers/activity/handler/luckyTurntableHandler.ts b/game-server/app/servers/activity/handler/luckyTurntableHandler.ts index 36c2bb10f..5b139dbc9 100644 --- a/game-server/app/servers/activity/handler/luckyTurntableHandler.ts +++ b/game-server/app/servers/activity/handler/luckyTurntableHandler.ts @@ -90,7 +90,7 @@ export class LuckyTurntableHandler { let box = playerData.findBox(boxCount); let rewardArray = stringToRewardParam(box.rewards) - let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.BUY_LIMIT_PACKAGE); + let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.ACT_TURNTABLE_RECEIVE_BOX); await ActivityTurntableModel.receiveBox(serverId, activityId, roleId, playerData.roundIndex, boxCount); return resResult(STATUS.SUCCESS, { ...result, box: {...box, isReceived: true} }); diff --git a/game-server/app/servers/activity/handler/taskPassHandler.ts b/game-server/app/servers/activity/handler/taskPassHandler.ts index 26d5c114d..4ac0ef8d1 100644 --- a/game-server/app/servers/activity/handler/taskPassHandler.ts +++ b/game-server/app/servers/activity/handler/taskPassHandler.ts @@ -53,7 +53,7 @@ export class TaskPassHandler { rewards.push(...stringToRewardParam(item.reward)); } await ActivityTaskPassModel.receiveItems(serverId, activityId, roleId, playerData.roundIndex, records); - let result = await addReward(roleId, roleName, sid, serverId, rewards, ITEM_CHANGE_REASON.ACT_DAILY_GK_BATTLE_END); + let result = await addReward(roleId, roleName, sid, serverId, rewards, ITEM_CHANGE_REASON.ACT_TASK_PASS); return resResult(STATUS.SUCCESS, { items, ...result }); } @@ -75,7 +75,7 @@ export class TaskPassHandler { for(let consume of consumeArr) { cost.push({ ...consume, count: consume.count * count }); } - let consumeResult = await handleCost(roleId, sid, cost, ITEM_CHANGE_REASON.ACT_DAILY_GK_BATTLE_END); + let consumeResult = await handleCost(roleId, sid, cost, ITEM_CHANGE_REASON.ACT_TASK_PASS_SPD_UP); if(!consumeResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH); let addPoint = playerData.spdUp.point * count; diff --git a/game-server/app/servers/role/handler/equipHandler.ts b/game-server/app/servers/role/handler/equipHandler.ts index b4f493b10..4b618dfcd 100644 --- a/game-server/app/servers/role/handler/equipHandler.ts +++ b/game-server/app/servers/role/handler/equipHandler.ts @@ -762,7 +762,7 @@ export class EquipHandler { let consumeResult = await handleCost(roleId, sid, [ { id: originJewel.id, seqId: originJewel.seqId}, ...dicJewel.inheritConsume - ], ITEM_CHANGE_REASON.ACT_DAILY_GK_BATTLE_END); + ], ITEM_CHANGE_REASON.JEWEL_INHERIT); if(!consumeResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH); let newRandSe = getRandSeResult(targetJewel.id, targetJewel.randSe, originJewel.randSe, originJewel.id); diff --git a/shared/consts/constModules/sysConst.ts b/shared/consts/constModules/sysConst.ts index b5f6a18bf..1b3c7f12c 100644 --- a/shared/consts/constModules/sysConst.ts +++ b/shared/consts/constModules/sysConst.ts @@ -992,15 +992,15 @@ export enum ITEM_CHANGE_REASON { MONOPOLY_BANK = 99, // 活动 大富翁活动存钱 MONOPOLY_BUY_GOODS = 100, // 活动 大富翁商店 DAILY_COIN_EXCHANGE = 101, // 活动 每日铜钱活动兑换 - DAILY_CHALLENGE_REWARD = 102, // 活动 每日挑战活动奖励 - BUY_DAILY_GIFTS = 103, // 活动 购买每日特惠礼包 + DAILY_CHALLENGE_REWARD = 102, // 活动 七天乐 每日挑战活动奖励 + BUY_DAILY_GIFTS = 103, // 活动 七天乐 购买每日特惠礼包 DAILY_MEAL_RECEIVE_REPAIRE = 104, // 活动 午餐晚餐补领 DAILY_MEAL_RECEIVE = 105, // 活动 午餐晚餐 DAILY_RMB_GIFT = 106, // 活动 每日特惠礼包 FIRST_GIFT = 107, // 活动 首充礼包 GROWTH_FUND = 108, // 活动 成长基金奖励 GROWTH_REWARD = 109, // 活动 成长任务奖励 - GROWTH_DAY_EXCHANGE = 110, // 活动 成长任务奖章兑换 + GROWTH_DAY_EXCHANGE = 110, // 活动 七天乐 成长任务奖章兑换 BUY_LIMIT_PACKAGE = 111, // 活动 购买新手限定礼包 NEW_HERO_GACHA_PULL = 112, // 活动 新武将抽卡获得 NEW_HERO_EXCHANGE = 113, // 活动 新将好礼兑换点数 @@ -1015,11 +1015,11 @@ export enum ITEM_CHANGE_REASON { SIGNIN = 122, // 活动 签到 THIRTHDAY_TASK = 123, // 活动 30天任务奖励 THIRTHDAY_EXCHANGE = 124, // 活动 30天点数兑换 - TREASURE_HUNT_FIRST_PAGE_REWARD = 125, // 活动 寻宝骑兵 首页奖励 - TREASURE_HUNT_SHOP_BUY = 126, // 活动 寻宝骑兵商店购买 - TREASURE_HUNT_TASK_REWARD = 127, // 活动 寻宝骑兵任务奖励 - TREASURE_HUNT_CHALLENGE = 128, // 活动 寻宝骑兵大冒险 - TREASURE_HUNT_SP_SHOP_BUY = 129, // 活动 寻宝骑兵天子宝库购买 + TREASURE_HUNT_FIRST_PAGE_REWARD = 125, // 活动 神州探秘 首页奖励 + TREASURE_HUNT_SHOP_BUY = 126, // 活动 神州探秘 商店购买 + TREASURE_HUNT_TASK_REWARD = 127, // 活动 神州探秘 任务奖励 + TREASURE_HUNT_CHALLENGE = 128, // 活动 神州探秘 大冒险 + TREASURE_HUNT_SP_SHOP_BUY = 129, // 活动 神州探秘 天子宝库购买 VIP_RECHARGE_MONEY = 130, // 活动 vip累充奖励 MONTHLY_TICKET_DAILY = 131, // 活动 月卡每日奖励 MONTHLY_TICKET_FIRST = 132, // 活动 月卡首次奖励 @@ -1031,10 +1031,10 @@ export enum ITEM_CHANGE_REASON { EQUIP_STARUP = 138, // 装备升星 COMPOSE_STONE = 139, // 合成地玉石 REBIRTH = 140, // 武将重生 - ACT_TURNTABLE_PULL = 141, // 转盘 - ACT_TASK_PASS = 142, // 活动-战令奖励 - ACT_TASK_PASS_SPD_UP = 143, // 活动-战令加速 - ACT_GUILD_PAY_REWARD = 144, // 活动-军团人数奖励 + ACT_TURNTABLE_PULL = 141, // 活动 幸运转盘抽奖 + ACT_TASK_PASS = 142, // 活动 战令奖励 + ACT_TASK_PASS_SPD_UP = 143, // 活动 战令加速 + ACT_GUILD_PAY_REWARD = 144, // 活动 军团人数奖励 RECEIVE_CHAPTER_BOX = 145, // 领取主线章节宝箱 JEWEL_INHERIT = 146, // 天晶继承 RESET_TALENT = 147, // 洗点 @@ -1044,6 +1044,7 @@ export enum ITEM_CHANGE_REASON { LADDER_BUY_CNT = 151, // 名将擂台购买次数 LADDER_BATTLE_REWARD = 152, // 名将擂台关卡奖励 ACT_GROUP_SHOP_BUY = 153, // 团购 + ACT_TURNTABLE_RECEIVE_BOX = 154, // 活动 幸运转盘领取宝箱 } export enum TA_EVENT {