From 9ae13cbc2b461d432a3026b4e71a2cb52b5475b3 Mon Sep 17 00:00:00 2001 From: luying Date: Thu, 24 Nov 2022 18:59:40 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=90=9E=20fix(=E9=95=87=E5=BF=B5?= =?UTF-8?q?=E5=A1=94):=20=E6=B4=BE=E9=81=A3=E4=BB=BB=E5=8A=A1=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0=EF=BC=9A=E5=88=B7=E6=96=B0=E6=AC=A1?= =?UTF-8?q?=E6=95=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ff10ff4c7d8b72ed25bb277853daeb29bf44125e. --- game-server/app/servers/activity/handler/refreshShopHandler.ts | 2 +- game-server/app/servers/battle/handler/towerBattleHandler.ts | 2 +- game-server/app/services/battleService.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/game-server/app/servers/activity/handler/refreshShopHandler.ts b/game-server/app/servers/activity/handler/refreshShopHandler.ts index e659b8734..789d67a70 100644 --- a/game-server/app/servers/activity/handler/refreshShopHandler.ts +++ b/game-server/app/servers/activity/handler/refreshShopHandler.ts @@ -79,7 +79,7 @@ export class RefreshShopHandler { let rewardArray = stringToRewardParam(item.reward).map(cur => ({...cur, count: cur.count * count })); let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.BUY_REFRESH_SHOP); - await ActivityRefreshShopModel.addRecord(activityId, roleId, roundIndex, pageIndex, id, count); + await ActivityRefreshShopModel.addRecord(activityId, roleId, roundIndex, pageIndex, id); item.buyCount += count; return resResult(STATUS.SUCCESS, Object.assign(result, { diff --git a/game-server/app/servers/battle/handler/towerBattleHandler.ts b/game-server/app/servers/battle/handler/towerBattleHandler.ts index 6299d6c62..f89eba7bc 100644 --- a/game-server/app/servers/battle/handler/towerBattleHandler.ts +++ b/game-server/app/servers/battle/handler/towerBattleHandler.ts @@ -193,7 +193,7 @@ export class TowerBattleHandler { let refRemainTime = getRemainTime(curTime); let nextCostGold = getTowerTaskCostGold(newRole.towerTaskReCnt, newRole.towerTaskRefTime); - return resResult(STATUS.SUCCESS, { curTasks: treatTask(curTasks, curTime), costGold, nextCostGold, refRemainTime, towerTaskReCnt: newRole.towerTaskReCnt }); + return resResult(STATUS.SUCCESS, { curTasks: treatTask(curTasks, curTime), costGold, nextCostGold, refRemainTime}); } async sendTaskHero(msg: {batchCode: string, tasks: {taskCode: string, heroes: number[]}[]}, session: BackendSession) { diff --git a/game-server/app/services/battleService.ts b/game-server/app/services/battleService.ts index 82b6c4371..d2d4d85dd 100644 --- a/game-server/app/services/battleService.ts +++ b/game-server/app/services/battleService.ts @@ -146,7 +146,7 @@ export async function getTasks(roleId: string) { let refRemainTime = getRemainTime(curTime); let nextCostGold = getTowerTaskCostGold(role.towerTaskReCnt, role.towerTaskRefTime); - return { curTasks: treatTask(curTasks, curTime), refRemainTime, nextCostGold, towerTaskReCnt } + return {curTasks: treatTask(curTasks, curTime), refRemainTime, nextCostGold} } function treatPreTasks(tasks: TowerTaskRecType[]) {