✨ feat(校验): 添加战场伤害统计伤害

2023-06-27 13:46:01 +08:00
parent d75101a730
commit 70af186564
10 changed files with 72 additions and 35 deletions
@@ -12,7 +12,7 @@ import { addItems } from '../../../services/role/rewardService';
 import { getAp, setAp } from '../../../services/actionPointService';
 import { STATUS } from '../../../consts/statusCode';
 import { resResult } from '../../../pubUtils/util';
-import { calculateWarStar, checkBattleHeroes, roleLevelup } from '../../../services/normalBattleService';
+import { calculateWarStar, checkBattleHeroes, getBattleRecordParam, roleLevelup } from '../../../services/normalBattleService';
 import { checkTask, checkTaskInBattleEnd, checkTaskInBattleStart, checkTaskInSkipExpedition } from '../../../services/task/taskService';
 import { gameData } from '../../../pubUtils/data';
 import * as dicParam from '../../../pubUtils/dicParam';
@@ -21,6 +21,7 @@ import { reportTAEvent } from '../../../services/sdkService';
 import { getSumCe } from '../../../services/playerCeService';
 import { vipCanSkipExpedition } from '../../../services/activity/monthlyTicketService';
 import { isHeroHidden } from '../../../services/dataService';
+import { pvpEndParamInter } from '../../../pubUtils/interface';

 export default function (app: Application) {
    new HandlerService(app, {});
@@ -256,9 +257,9 @@ export class ExpeditionBattleHandler {
     * 战斗结算
     * 结算战斗奖励，更新远征状态
     */
-    async battleEnd(msg: { expeditionCode: string, expeditionId: number, battleCode: string, battleId: number, isSuccess: boolean, heroes: Array<{ dataId: number, hp: number, ap: number, shield: number }>, enemies: Array<{ dataId: number, hp: number, ap: number }>, star: number, stars: number[] }, session: BackendSession) {
+    async battleEnd(msg: { expeditionCode: string, expeditionId: number, battleCode: string, battleId: number, isSuccess: boolean, heroes: Array<{ dataId: number, hp: number, ap: number, shield: number }>, enemies: Array<{ dataId: number, hp: number, ap: number }>, star: number, stars: number[], damageRecords: pvpEndParamInter[], round: number }, session: BackendSession) {

-        const { expeditionCode, battleCode, battleId, expeditionId, isSuccess, heroes = [], star, stars = [], enemies } = msg;
+        const { expeditionCode, battleCode, battleId, expeditionId, isSuccess, heroes = [], star, stars = [], enemies, damageRecords, round } = msg;
        let roleId = session.get('roleId');
        let roleName = session.get('roleName');
        const serverId = session.get('serverId');
@@ -303,7 +304,7 @@ export class ExpeditionBattleHandler {
        expeditionWarRecord = await ExpeditionWarRecordModel.updateEnemiesStatus(expeditionCode, expeditionId, battleStatus, enemies);
        // 更新battleRecord状态
        await BattleRecordModel.updateBattleRecordByCode(battleCode, {
-            $set: { status: isSuccess ? 1 : 2, star }
+            $set: { status: isSuccess ? 1 : 2, star, ...getBattleRecordParam(damageRecords, round) }
        }, true);
        // 更新点数
        role = await RoleModel.increaseExpeditionPoint(roleId, isSuccess ? dicParam.EXPEDITION_CONST.EXPEDITION_CONST_POINTS : 0);
@@ -13,7 +13,7 @@ import { HeroModel } from '../../../db/Hero';
 import { LADDER } from '../../../pubUtils/dicParam';
 import { handleCost } from '../../../services/role/rewardService';
 import { DEBUG_MAGIC_WORD, ITEM_CHANGE_REASON, LADDER_OPP_STATUS, LADDER_STATUS, REDIS_KEY, WAR_TYPE } from '../../../consts';
-import { checkBattleHeroesByHid } from '../../../services/normalBattleService';
+import { checkBattleHeroesByHid, getBattleRecordParam } from '../../../services/normalBattleService';
 import { ServerlistModel } from '../../../db/Serverlist';
 import { saveLadderDefCeByData } from '../../../services/redisService';
 import { pushLadderTopChangeMsg } from '../../../services/sysChatService';
@@ -21,6 +21,7 @@ import { checkTaskInLadderEnd, checkTaskInLadderStart, checkTaskInLadderSweep }
 import { BattleRecordModel } from '../../../db/BattleRecord';
 import { isHeroHidden } from '../../../services/dataService';
 import { getRemoteRplFilePath, getRemoteRplPrefix } from '../../../pubUtils/battleUtils';
+import { pvpEndParamInter } from '../../../pubUtils/interface';

 export default function (app: Application) {
    new HandlerService(app, {});
@@ -184,12 +185,12 @@ export class LadderHandler {
    }

    // 7. 挑战结算
-    async battleEnd(msg: { battleCode: string, isSuccess: boolean }, session: BackendSession) {
+    async battleEnd(msg: { battleCode: string, isSuccess: boolean, damageRecords: pvpEndParamInter[], round: number }, session: BackendSession) {
        let roleId = session.get('roleId');
        let roleName = session.get('roleName');
        let serverId = session.get('serverId');
        let sid = session.get('sid');
-        let { battleCode, isSuccess } = msg;
+        let { battleCode, isSuccess, damageRecords, round } = msg;

        let rec = await LadderMatchRecModel.findByBattleCode(battleCode);
        if(!rec || rec.roleId1 != roleId) return resResult(STATUS.LADDER_REC_NOT_FOUND);
@@ -218,7 +219,7 @@ export class LadderHandler {
            let oppPlayers = await getLadderEnemies(atkLadderMatch);
            result.setOppPlayers(oppPlayers);
        }
-        await BattleRecordModel.updateBattleRecordByCode(battleCode, { $set: { status: isSuccess? 1: 2 } });
+        await BattleRecordModel.updateBattleRecordByCode(battleCode, { $set: { status: isSuccess? 1: 2, ...getBattleRecordParam(damageRecords, round) } });
        if(defLadderMatch) {
            await LadderMatchModel.unlock(defLadderMatch.serverId, defLadderMatch.roleId);
        }
@@ -13,7 +13,7 @@ import { STATUS } from '../../../consts/statusCode';
 import { resResult } from '../../../pubUtils/util';
 import { RoleModel } from '../../../db/Role';
 import { RScriptRecordModel } from '../../../db/RScriptRecord';
-import { checkBattleHeroes, roleLevelup, calculateWarStar, getBattleListOfTypes, getMainChapter, getStarOfChapter, checkWarCountAndInc } from '../../../services/normalBattleService';
+import { checkBattleHeroes, roleLevelup, calculateWarStar, getBattleListOfTypes, getMainChapter, getStarOfChapter, checkWarCountAndInc, getBattleRecordParam } from '../../../services/normalBattleService';
 import { checkDungeonNum, checkDungeonAndIncrease, saveDungeonFirst } from '../../../services/dungeonService';
 // import { switchOnFunc } from '../../../services/funcSwitchService';
 import { gameData } from '../../../pubUtils/data';
@@ -28,7 +28,7 @@ import { challengeNewHeroGK } from '../../../services/activity/newHeroService';
 import { reportTAEvent } from '../../../services/sdkService';
 import { getVipRegretCnt } from '../../../services/activity/monthlyTicketService';
 import { isArray, isNumber } from 'underscore';
-import { RewardInter } from '../../../pubUtils/interface';
+import { RewardInter, pvpEndParamInter } from '../../../pubUtils/interface';
 import { addItems } from '../../../services/role/rewardService';
 import { treasureHuntChallengeConsume } from '../../../services/activity/treasureHuntService';
 import { combineItems } from '../../../services/role/util';
@@ -144,8 +144,8 @@ export class NormalBattleHandler {
    }

    // 关卡结算，记录使用的武将，获得奖励
-    async battleEnd(msg: { battleCode: string, battleId: number, isSuccess: boolean, stars: number[], heroes: number[], activityId: number }, session: BackendSession) {
-        const { battleCode, battleId, isSuccess, heroes = [], stars = [], activityId } = msg;
+    async battleEnd(msg: { battleCode: string, battleId: number, isSuccess: boolean, stars: number[], heroes: number[], activityId: number, damageRecords: pvpEndParamInter[], round: number }, session: BackendSession) {
+        const { battleCode, battleId, isSuccess, heroes = [], stars = [], activityId, damageRecords = [], round = 0 } = msg;
        let roleId = session.get('roleId');
        let roleName = session.get('roleName');
        let sid = session.get('sid');
@@ -293,7 +293,7 @@ export class NormalBattleHandler {
        let reward = await warReward.saveReward(1);

        const updateResult = await BattleRecordModel.updateBattleRecordByCode(battleCode, {
-            $set: { status: isSuccess ? 1 : 2, star: newStar, stars, record: { heroes } }
+            $set: { status: isSuccess ? 1 : 2, star: newStar, stars, ...getBattleRecordParam(damageRecords, round, heroes) }
        }, true);
        let { status } = updateResult;

@@ -30,6 +30,7 @@ import { getAllServerName, getServerName } from '../../../services/redisService'
 import { RoleRankInfo } from '../../../domain/rank';
 import { isHeroHidden } from '../../../services/dataService';
 import { getPVPGroupIdOfServer } from '../../../services/serverService';
+import { getBattleRecordParam } from '../../../services/normalBattleService';

 export default function (app: Application) {
    new HandlerService(app, {});
@@ -236,7 +237,7 @@ export class PvpHandler {
    }

    // 结算
-    async pvpEnd(msg: { battleCode: string, isSuccess: boolean, myHeroes: pvpEndParamInter[], oppHeroes: pvpEndParamInter[] }, session: BackendSession) {
+    async pvpEnd(msg: { battleCode: string, isSuccess: boolean, myHeroes: pvpEndParamInter[], oppHeroes: pvpEndParamInter[], round: number }, session: BackendSession) {

        let roleId = session.get('roleId');
        let roleName = session.get('roleName');
@@ -244,7 +245,7 @@ export class PvpHandler {

        const serverId = session.get('serverId');

-        const { battleCode, isSuccess, myHeroes, oppHeroes } = msg;
+        const { battleCode, isSuccess, myHeroes, oppHeroes, round } = msg;

        const BattleRecord = await BattleRecordModel.getBattleRecordByCode(battleCode, true);
        if (!BattleRecord || BattleRecord.status != 0) {
@@ -282,7 +283,7 @@ export class PvpHandler {

        // 更新battleRecord
        await BattleRecordModel.updateBattleRecordByCode(battleCode, {
-            $set: { status: isSuccess ? 1 : 2 }
+            $set: { status: isSuccess ? 1 : 2, ...getBattleRecordParam(myHeroes, round) }
        }, true);

        if(seasonNum == pvpSeasonNum) {