diff --git a/game-server/app/servers/battle/handler/normalBattleHandler.ts b/game-server/app/servers/battle/handler/normalBattleHandler.ts index ec10c2e48..f0e781a3c 100644 --- a/game-server/app/servers/battle/handler/normalBattleHandler.ts +++ b/game-server/app/servers/battle/handler/normalBattleHandler.ts @@ -16,7 +16,7 @@ import { checkBattleHeroes, roleLevelup, getBattleList, calculateWarStar, getBat import { checkDungeonNum, checkDungeonAndIncrease, saveDungeonFirst } from '../../../services/dungeonService'; // import { switchOnFunc } from '../../../services/funcSwitchService'; import { gameData } from '../../../pubUtils/data'; -import { pushMysteryFirstMsg, pushTowerMsg, pushVestigeFirstMsg } from '../../../services/chatService'; +import { pushMysteryFirstMsg, pushVestigeFirstMsg } from '../../../services/chatService'; import { getSeconds, nowSeconds } from '../../../pubUtils/timeUtil'; import { Rank } from '../../../services/rankService'; import { checkTaskInBattleEnd, checkTaskInBattleStart, checkTaskInBattleSweep } from '../../../services/task/taskService'; @@ -199,7 +199,6 @@ export class NormalBattleHandler { towerStatus = towerEndResult.data.towerStatus; if (towerEndResult.data.towerReward) warReward.setFixReward(towerEndResult.data.towerReward) - pushTowerMsg(roleId, roleName, serverId, MSG_SOURCE.TOWER_SUC, towerEndResult.data.newRec.lv); } } else if (warInfo.warType == WAR_TYPE.MYSTERY || warInfo.warType == WAR_TYPE.MYSTERY_ELITE) { let checkResult = await checkDungeonAndIncrease(roleId, isSuccess?1:0, false); diff --git a/game-server/app/servers/battle/handler/towerBattleHandler.ts b/game-server/app/servers/battle/handler/towerBattleHandler.ts index c41e49927..24d2d75d4 100644 --- a/game-server/app/servers/battle/handler/towerBattleHandler.ts +++ b/game-server/app/servers/battle/handler/towerBattleHandler.ts @@ -340,7 +340,7 @@ export class TowerBattleHandler { await checkAndStartHungUp(roleId, roleName, role.towerLv); let goods = await addItems(roleId, roleName, sid, dicTower.reward, ITEM_CHANGE_REASON.TOWER_BATTLE_END); - pushTowerMsg(roleId, roleName, serverId, MSG_SOURCE.TOWER_SUC, role.towerLv); + pushTowerMsg(roleId, roleName, serverId, MSG_SOURCE.TOWER_SUC, role.towerLv - 1); let data = await getTowerStatus(role); diff --git a/game-server/app/services/battleService.ts b/game-server/app/services/battleService.ts index 00bddc348..8ab9d9599 100644 --- a/game-server/app/services/battleService.ts +++ b/game-server/app/services/battleService.ts @@ -1,6 +1,6 @@ import { HeroModel } from './../db/Hero'; import { HangUpRecordModel } from './../db/HangUpRecord'; -import { HANG_UP_CONSTS, REDIS_KEY, TASK_TYPE, TOWER_FORBIDDEN_CHARA_TYPE, TOWER_TASK_STATUS, MAIL_TYPE } from './../consts'; +import { HANG_UP_CONSTS, REDIS_KEY, TASK_TYPE, TOWER_FORBIDDEN_CHARA_TYPE, TOWER_TASK_STATUS, MAIL_TYPE, MSG_SOURCE } from './../consts'; import { BattleRecordModel } from './../db/BattleRecord'; import { TowerRecordModel } from './../db/TowerRecord'; import { RoleModel, RoleType } from './../db/Role'; @@ -18,6 +18,7 @@ import { sendMailByContent } from './mailService'; import { DicTowerTask } from '../pubUtils/dictionary/DicTowerTask'; import * as dicParam from '../pubUtils/dicParam'; import { getVipHungupReward } from './activity/monthlyTicketService'; +import { pushTowerMsg } from './sysChatService'; /** * 获取当前镇念塔状态 @@ -239,6 +240,7 @@ export async function towerBattleEnd(sid: string, roleId: string, serverId: numb await checkAndStartHungUp(roleId, roleName, role.towerLv); // 任务 await checkTask(serverId, roleId, sid, TASK_TYPE.BATTLE_TOWER_LV, { towerLv: role.towerLv - 1 }); + pushTowerMsg(roleId, roleName, serverId, MSG_SOURCE.TOWER_SUC, role.towerLv - 1); } return { status: 0, diff --git a/shared/resource/jsons/server_const.json b/shared/resource/jsons/server_const.json index d7483e18b..47886f86e 100644 --- a/shared/resource/jsons/server_const.json +++ b/shared/resource/jsons/server_const.json @@ -17,6 +17,6 @@ { "id": 9, "desc": "碾压镇念塔", "route": "battle.towerBattleHandler.skipTower", "param": {}, "interval": 200 } ], "DEBUG_PAY": 0, - "DEBUG_TIME": 0, + "DEBUG_TIME": 1, "CHECK_WORD": 1 } \ No newline at end of file