From c17afa200e3fae5fa8eb72aec1aaa135027b68c2 Mon Sep 17 00:00:00 2001 From: luying Date: Thu, 19 Aug 2021 12:00:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=87=E5=BF=B5=E5=A1=94=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=8A=A0=E9=80=9F=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/battle/handler/towerBattleHandler.ts | 5 ++--- game-server/app/services/battleService.ts | 4 ++-- shared/db/HangUpRecord.ts | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/game-server/app/servers/battle/handler/towerBattleHandler.ts b/game-server/app/servers/battle/handler/towerBattleHandler.ts index 5902c8122..f4497bbb0 100644 --- a/game-server/app/servers/battle/handler/towerBattleHandler.ts +++ b/game-server/app/servers/battle/handler/towerBattleHandler.ts @@ -111,10 +111,9 @@ export class TowerBattleHandler { } const spdUpRec = await HangUpSpdUpRecModel.updateRec(roleId, roleName, msg.speedUpCnt, endLv, needReceiveGoods); const goods = await addItems(roleId, roleName, sid, timeReward); - let num = getManyHangSpdUpCostGold(spdUpResult.hangUpSpdUpCnt, 1); - let nextCostGold = getHangSpdUpCostGold(num); + let nextCostGold = getManyHangSpdUpCostGold(spdUpResult.hangUpSpdUpCnt, 1); - return resResult(STATUS.SUCCESS, { goods, hangUpSpdUpCnt, nextCostGold, hangUpPassTime: Math.floor(deltaTime/1000), rewardLv: endLv, costGold }); + return resResult(STATUS.SUCCESS, { goods, hangUpSpdUpCnt: spdUpResult.hangUpSpdUpCnt, nextCostGold, hangUpPassTime: Math.floor(deltaTime/1000), rewardLv: endLv, costGold }); } async getTasks(msg: {}, session: BackendSession) { diff --git a/game-server/app/services/battleService.ts b/game-server/app/services/battleService.ts index d096c213d..3235d33e8 100644 --- a/game-server/app/services/battleService.ts +++ b/game-server/app/services/battleService.ts @@ -299,7 +299,7 @@ export async function calcuHangUpReward(roleId: string, speedUp = false, speedUp } if (speedUp) { // 加速，直接收取6小时收益，小数的累积和普通收取独立 - if (hangUpSpdUpCnt < speedUpCnt || !lastSpdUpTime || shouldRefresh(lastSpdUpTime, new Date)) { // 可加速 + if (hangUpSpdUpCnt + speedUpCnt < dicParam.TOWER_BOOST.TOWER_BOOSTTIME || !lastSpdUpTime || shouldRefresh(lastSpdUpTime, new Date)) { // 可加速 let multi = Math.floor(HANG_UP_CONSTS.SPD_UP_REC_TIME / HANG_UP_CONSTS.UNIT_TIME); let spdUpRec = await HangUpSpdUpRecModel.getSpdUpRec(roleId, towerLv - 1); let goods = []; @@ -646,7 +646,7 @@ export function getHangSpdUpCostGold(times:number) { if(times <= dicParam.TOWER_BOOST.TOWER_BOOSTFREETIME) { return 0 } else { - let cost = (times - dicParam.TOWER_BOOST.TOWER_BOOSTFREETIME) * dicParam.TOWER_BOOST.TOWER_BOOSTCAST; // TODO 改成系统参数表 + let cost = (times - dicParam.TOWER_BOOST.TOWER_BOOSTFREETIME) * dicParam.TOWER_BOOST.TOWER_BOOSTCAST; if(cost > dicParam.TOWER_BOOST.TOWER_BOOSTCASTMAX) cost = dicParam.TOWER_BOOST.TOWER_BOOSTCASTMAX; return cost; } diff --git a/shared/db/HangUpRecord.ts b/shared/db/HangUpRecord.ts index 1749b13f0..3271ba61e 100644 --- a/shared/db/HangUpRecord.ts +++ b/shared/db/HangUpRecord.ts @@ -1,4 +1,3 @@ -import { HANG_UP_CONSTS } from './../consts'; import BaseModel from './BaseModel'; import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose'; import * as dicParam from '../pubUtils/dicParam';