✨ feat(副将): pvp相关副将设置

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

@@ -30,6 +30,7 @@ import { ArtifactModel } from "../../db/Artifact";
 import { getHeroesAttributes } from "../playerCeService";
 import { CounterModel } from "../../db/Counter";
 import { getGroupIdOfServer } from "../serverService";
+import { LineupHero } from "../../domain/roleField/hero";
 
 /**
  * 获取本联军上周占领的城池
@@ -200,16 +201,18 @@ export async function refreshTeams(configId: number, groupKey: string, roleId: s
     return teams
 }
 
-export async function generNewLineup(roleId: string, heroes: HeroType[], lineup: { actorId: number, dataId: number, order: number }[]) {
+export async function generNewLineup(roleId: string, heroes: HeroType[], lineup: { actorId: number, dataId: number, order: number, subHid?: number }[]) {
     let attrByHid = await getHeroesAttributes(roleId);
     let newLineup: GVGHeroInfo[] = [], newLineupCe = 0;
-    for(let { actorId, dataId, order } of lineup) {
+    for(let { actorId, dataId, order, subHid } of lineup) {
         let hero = heroes.find(cur => cur.hid == actorId);
         if(hero) {
             let artifact = hero.artifact? await ArtifactModel.findbySeqId(roleId, hero.artifact): null;
             let heroInfo = new GVGHeroInfo();
             heroInfo.setHeroInfo(hero, artifact, []);
             heroInfo.setDataId(dataId, order);
+            let subHero = heroes.find(cur => cur.hid == subHid);
+            if(subHero) heroInfo.setSubHero(subHero);
 
             let attr = attrByHid.get(actorId);
             if(!attr) continue;
@@ -860,4 +863,36 @@ async function dispatchTeam(groupKey: string, cityId: number) {
     let servers = pinus.app.getServersByType('guild');
     let sid = (await dispatch(redisClient(), `${groupId}_${cityId}`, servers, 'guild'))?.id;
     return sid;
+}
+
+/**
+ * 查询队伍中的武将是否可以使用
+ * @param roleId 
+ * @param index 
+ * @param lineup 
+ * @returns 
+ */
+export async function checkGVGLineupWhenSave(roleId: string, index: number, lineup: LineupHero[]) {
+    const teams = await GVGTeamModel.findByRole(roleId, '-_id index lineup');
+    for(let { actorId, subHid } of lineup) {
+        let dicHero = gameData.hero.get(actorId);
+        if(!dicHero || dicHero.urType != 1) return STATUS.HERO_CAN_NOT_SET_SUB;
+
+        for(let team of teams) {
+            // 查actorId没有在其他队伍中使用
+            if(team.index != index) {
+                let hasActor = team.lineup.find(hero => hero.actorId == actorId);
+                if(hasActor) return STATUS.GVG_TEAM_HERO_DUPLICATE;
+            }
+            // 查actorId没有在其他队伍作为副将
+            let hasActorIsSubHero = team.lineup.find(hero => hero.subHid == actorId);
+            if(hasActorIsSubHero) return STATUS.GVG_TEAM_HERO_USED_AS_SUB_HERO;
+            // 查副将
+            if(subHid) {
+                let hasSubHero = team.lineup.find(hero => hero.actorId == subHid);
+                if(hasSubHero) return STATUS.GVG_TEAM_SUB_HERO_DUPLICATE;
+            }
+        }
+    }
+    return STATUS.SUCCESS
 }

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

@@ -156,10 +156,14 @@ export async function getVestigeUsedHeroes(roleId: string, curVestigeId: number)
 }
 
 // 是否在其他遗迹中使用过这个武将
-export async function checkHeroIsUsedInOtherVestige(roleId: string, curVestigeId: number, heroes: { actorId: number }[]) {
+export async function checkHeroIsUsedInOtherVestige(roleId: string, curVestigeId: number, heroes: { actorId: number, subHid: number }[]) {
     let usedHeroes = await getVestigeUsedHeroes(roleId, curVestigeId);
-    for(let { actorId } of heroes) {
+    for(let { actorId, subHid } of heroes) {
         if(usedHeroes.indexOf(actorId) != -1) return true;
+        // 查副将
+        if(subHid) {
+            if(usedHeroes.indexOf(subHid) != -1) return true;
+        }
     }
     return false;
 }
@@ -251,7 +255,7 @@ export async function generateAttackInfo(roleId: string, league: GVGLeagueType,
     return info;
 }
 
-export async function generateAttackHeroInfo(lineup: { actorId: number, dataId: number, order: number }[], dbHeroes: HeroType[]) {
+export async function generateAttackHeroInfo(lineup: { actorId: number, dataId: number, order: number, subHid: number }[], dbHeroes: HeroType[]) {
     let info = new OppPlayerInfo();
     info.setPlayerHeroes(dbHeroes, lineup);
     return info;
@@ -265,7 +269,11 @@ export async function getOppDetailData(rec: GVGVestigeRecType) {
         const dicWar = gameData.war.get(dicLadderDifficultRatio.gkId);
         const dicWarJson = gameData.warJson.get(dicWar.dispatchJsonId);
         const defenseInfo = rec.defenseInfo.heroes||[];
-        const hids = defenseInfo.map(cur => cur.hid);
+        const hids: number[] = [];
+        for(let { hid, subHid } of defenseInfo) {
+            hids.push(hid);
+            if(subHid) hids.push(subHid);
+        }
         const heroes = await HeroModel.findByHidRange(hids, rec.defenseRoleId, 'hid lv quality star colorStar skins ce skinId');
         const artifactSeids = heroes.map(hero => hero.artifact);
         const artifacts = await ArtifactModel.findbySeqIds(rec.defenseRoleId, artifactSeids);
@@ -299,7 +307,7 @@ export async function updateMyVestigeRank(isChange: boolean, atkData: GVGVestige
     if(isChange) {
         if(atkData && !atkData.hasDefense) { // 只有第一次挑战且自己没有主动保存过阵容的时候才会这么保存
             let heroes = rec.attackInfo.heroes||[];
-            let lineup = heroes.map(hero => ({ actorId: hero.hid, dataId: hero.dataId, order: hero.order, ce: hero.ce }));
+            let lineup = heroes.map(hero => ({ actorId: hero.hid, dataId: hero.dataId, order: hero.order, ce: hero.ce, subHid: hero.subHid }));
             update.lineup = lineup;
             update.hasDefense = true;
             needUpdate = true;