🐞 fix(gvg): 投石车定时任务

game-server/app/services/gvg/gvgBattleMemory.ts

@@ -1,7 +1,7 @@
 // 存在激战期的内存数据
 
 import { pinus } from "pinus";
-import { GVG_PERIOD } from "../../consts";
+import { GVG_CATAPULT, GVG_PERIOD } from "../../consts";
 import { GVGTeamModel, GVGTeamType } from "../../db/GVGTeam";
 import { GVGTeamMem } from "../../domain/battleField/gvgBattle";
 import { dispatch } from "../../pubUtils/dispatcher";
@@ -34,6 +34,18 @@ class GVGBattleData {
         return teams.slice(0, 20);
     }
 
+    public findCatapultAttackTeam(areaIds: number[], leagueCode: string) {
+        let teams: string[] = [];
+        for(let areaId of areaIds) {
+            let teamCodes = this.areaToTeams.get(areaId)||new Set();
+            for(let teamCode of teamCodes) {
+                let team = this.teams.get(teamCode);
+                if(team && team.leagueCode != leagueCode && !team.isRobot) teams.push(teamCode);
+            }
+        }
+        return teams;
+    }
+
     public leaveCity(roleId: string) {
         let teamCodes = this.roleToTeam.get(roleId)||[];
         for(let teamCode of teamCodes) {
@@ -117,11 +129,17 @@ class GVGBattleData {
                 this.enterCity(team); continue;
             }
             let { areaId: fromAreaId, pointId: fromPointId } = teamMem;
-            teamMem.battleEnd(team);
+            teamMem.updateTeam(team);
             this.setRolePoints(team.roleId, fromPointId, team.pointId);
             this.setAreaMap(team.teamCode, fromAreaId, team.areaId);
         }
     }
+
+    // 投石车
+    public findCatapult() {
+        let teamCodes = this.roleToTeam.get(GVG_CATAPULT)||[];
+        return teamCodes.map(teamCode => this.teams.get(teamCode));
+    }
 }
 
 export function getGVGBattleData(groupId: number, serverType: number) {
@@ -132,11 +150,15 @@ export function getGVGBattleData(groupId: number, serverType: number) {
     return gvgBattleMap.get(key);
 }
 
+export function getGVGBattleMap() {
+    return gvgBattleMap;
+}
+
 export async function initTeamToMem() {
     let sid = pinus.app.getServerId();
     let servers = pinus.app.getServersByType('guild');
     let { configId, period } = getGVGPeriodData();
-    if(period != GVG_PERIOD.BATTLE) return;
+    // if(period != GVG_PERIOD.BATTLE) return;
     let teams = await GVGTeamModel.findByConfigId(configId);
     for(let team of teams) {
         if(dispatch(team.cityId.toString(), servers)?.id == sid) {

game-server/app/services/gvg/gvgBattleService.ts

@@ -3,14 +3,18 @@ import { GVGLeagueType } from "../../db/GVGLeague";
 import { GVGTeamModel, GVGTeamType, GVGTeamUpdate } from "../../db/GVGTeam";
 import { GVGCityModel, GVGCityType } from "../../db/GVGCity";
 import { gameData } from "../../pubUtils/data";
-import { STATUS } from "../../consts";
+import { GVG_AREA_TYPE, GVG_TECH_TYPE, STATUS } from "../../consts";
 import { nowSeconds } from "../../pubUtils/timeUtil";
 import { DicGVGAreaPoint } from "../../pubUtils/dictionary/DicGVGAreaPoint";
-import { getGVGBattleData } from "./gvgBattleMemory";
+import { getGVGBattleData, getGVGBattleMap } from "./gvgBattleMemory";
 import { GVGCityMapInfo } from "../../domain/gvgField/returnData";
 import { pick } from "underscore";
 import { GVG } from "../../pubUtils/dicParam";
 import { GVGHeroInfo, PvpEnemies, PvpHeroInfo } from "../../domain/dbGeneral";
+import { getGVGConfig } from "./gvgService";
+import { GVGLeaguePrepareModel } from "../../db/GVGLeaguePrepare";
+import { pinus } from "pinus";
+import { dispatch } from "../../pubUtils/dispatcher";
 
 
 /**
@@ -63,6 +67,7 @@ export function getBirthAreaOfCity(city: GVGCityType, leagueCode: string) {
     return isGuard? dicGVGCity.defenseBirth: dicGVGCity.attackBirth;
 }
 
+// guild.gvgBattleHandler.startMove 检测
 export function checkMoveStatus(team: GVGTeamType, cityId: number, areaId: number) {
     if(!team) return STATUS.GVG_BATTLE_TEAM_NOT_FOUND;
     if(team.cityId != cityId) return STATUS.GVG_BATTLE_IS_NOT_IN_CITY;
@@ -122,6 +127,7 @@ export function getGVGWarId(defenseTeam: GVGTeamType) {
     return GVG.GVG_ROBOT_WARJSON; // 据点守卫使用
 }
 
+// guild.gvgBattleHandler.battleStart 里的heroes返回
 export function getOppHeroes(warId: number, isRobot: boolean, lineup: GVGHeroInfo[]) {
     let heroes: PvpEnemies[] = [];
     const dicWar = gameData.war.get(warId);
@@ -147,6 +153,7 @@ export function getOppHeroes(warId: number, isRobot: boolean, lineup: GVGHeroInf
     return heroes
 }
 
+// guild.gvgBattleHandler.battleStart 检测
 export function checkGVGBattleStart(roleId: string, attackTeam: GVGTeamType, defenseTeam: GVGTeamType) {
 
     if(!attackTeam || !defenseTeam) return STATUS.GVG_BATTLE_TEAM_INVALID;
@@ -160,4 +167,58 @@ export function checkGVGBattleStart(roleId: string, attackTeam: GVGTeamType, def
     if(defenseTeam.durability <= 0) return STATUS.GVG_DEFENSE_TEAM_BROKEN;
     
     return STATUS.SUCCESS;
+}
+
+// gvg激战期开始定时器
+export async function gvgBattleStart() {
+    let servers = pinus.app.getServersByType('guild');
+
+    let { configId } = getGVGConfig();
+    let guardCities = await GVGCityModel.findAllGuardCities(configId);
+    for(let { cityId, groupId, serverType, guardLeague, guardLeagueName } of guardCities) {
+        let sid = dispatch(cityId.toString(), servers)?.id;
+        await pinus.app.rpc.guild.guildRemote.initCatapult.toServer(sid, cityId, groupId, serverType, guardLeague, guardLeagueName);
+    }
+}
+
+// 每次活动开始初始化投石车
+export async function initCatapult(cityId: number, groupId: number, serverType: number, leagueCode: string, leagueName: string) {
+    let { configId } = getGVGConfig();
+
+    let leaguePrepare = await GVGLeaguePrepareModel.findByLeague(configId, leagueCode);
+    let activeTech = leaguePrepare?.activeTech||[];
+    let hasCatapult = false, atk = 0, durability = 0;
+    for(let techId of activeTech) {
+        let dicTech = gameData.gvgTech.get(techId);
+        if(dicTech && dicTech.type == GVG_TECH_TYPE.BATTLE_ITEM_CATAPULT) {
+            hasCatapult = true, atk = dicTech.param[0]; durability = dicTech.param[1];
+        }
+    }
+    if(hasCatapult) {
+        let dicCity = gameData.gvgCity.get(cityId);
+        let areaIds = (dicCity?.areaIds||[]).filter(areaId => {
+            let dicArea = gameData.gvgArea.get(areaId);
+            return dicArea && dicArea.areaType == GVG_AREA_TYPE.CATAPULT;
+        });
+        let teams = await GVGTeamModel.initCatapult(configId, groupId, serverType, cityId, leagueCode, leagueName, areaIds, atk, durability);
+        // 处理内存
+        let teamObj = getGVGBattleData(groupId, serverType);
+        teamObj.enterCity(...teams);
+    }
+}
+
+// 投石车投伤害
+export async function catapultHurt() {
+    for(let [_, teamObj] of getGVGBattleMap()) {
+        let teams = teamObj.findCatapult();
+        for(let catapult of teams) {
+            if(catapult.isBroken) continue;
+            let dicArea = gameData.gvgArea.get(catapult.areaId);
+            let relateArea = dicArea?.relateArea||[];
+            let teamCodes = teamObj.findCatapultAttackTeam(relateArea, catapult.leagueCode);
+            let dicGVGCity = gameData.gvgCity.get(catapult.cityId);
+            let teams = await GVGTeamModel.attackByCatapult(teamCodes, catapult.captapultAtk, dicGVGCity.attackBirth)
+            teamObj.battleEnd(teams);
+        }
+    }
 }

game-server/app/services/gvg/gvgFightService.ts

@@ -31,13 +31,13 @@ import { addVestigeLeagueRankRec } from "./gvgRecService";
 import { getGroupIdOfServer, getGVGServerType } from "./gvgService";
 
 // 备战期的遗迹和激战期的开始结束战斗时间
-export function getFightTimeByPeriod(period: GVG_PERIOD) {
+export function getFightTimeByPeriod(period: GVG_PERIOD, time?: number) {
     let dicPeriod = gameData.gvgPeriod.get(period);
     if(!dicPeriod) return { startFightTime: 0, endFightTime: 0 };
 
     return {
-        startFightTime: <number>getTimeFun().getTimeWithHour(dicPeriod.startHour, dicPeriod.startMinute, dicPeriod.startSecond),
-        endFightTime: <number>getTimeFun().getTimeWithHour(dicPeriod.endHour, dicPeriod.endMinute, dicPeriod.endSecond),
+        startFightTime: <number>getTimeFun(time).getTimeWithHour(dicPeriod.startHour, dicPeriod.startMinute, dicPeriod.startSecond),
+        endFightTime: <number>getTimeFun(time).getTimeWithHour(dicPeriod.endHour, dicPeriod.endMinute, dicPeriod.endSecond),
     }
 }
 

game-server/app/services/gvg/gvgService.ts

@@ -32,6 +32,7 @@ export async function createNewGVGConfig() {
         if(!await checkHasCities(league)) needDissmissLeagueId.push(league._id);
     }
     await GVGLeagueModel.dismissByIds(needDissmissLeagueId);
+    await pinus.app.rpc.systimer.systimerRemote.initGVGConfigSchedule.broadcast();
     return config;
 }