✨ feat(gvgBattle): 添加部分保存阵容、进出城池等接口的逻辑

shared/consts/statusCode.ts

@@ -338,6 +338,11 @@ export const STATUS = {
     GVG_BATTLE_TEAM_INVALID: { code: 21332, simStr: '无效的队伍' },
     GVG_CITY_NOT_FOUND: { code: 21333, simStr: '城池不存在' },
     GVG_GUILD_HAS_LEAGUE: { code: 21334, simStr: '需要先退出联军才能解散军团' },
+    GVG_SAVE_TEAM_FAILED: { code: 21335, simStr: '保存队伍失败' },
+    GVG_USER_NOT_FOUND: { code: 21336, simStr: '您的激战期数据不存在' },
+    GVG_RESET_TEAM_LOC_FAILED: { code: 21337, simStr: '切换队伍城池失败' },
+    GVG_USER_NOT_IN_CITY: { code: 21338, simStr: '您不在该城池中' },
+    GVG_NOT_BATTLE_PERIOD: { code: 21339, simStr: '您只能在激战期进行此操作' },
 
     // GVG征战中原
     GVG_VESTIGE_ERR: { code: 21350, simStr: '今日未开放该遗迹' },

shared/db/GVGCity.ts

@@ -34,8 +34,14 @@ export default class GVGCity extends BaseModel {
     }
 
     // 通过 cityId 获取城市
-    public static async getCityByCityId(cityId: number) {
-        const city: GVGCityType | null = await GVGCityModel.findOne({ cityId }).lean();
+    public static async getCityByCityId(configId: number, cityId: number) {
+        const city: GVGCityType | null = await GVGCityModel.findOne({ configId, cityId }).lean();
+        return city;
+    }
+
+    // 更新城市字段
+    public static async updateCityUser(configId: number, cityId: number, userInc: number, teamInc: number) {
+        const city: GVGCityType | null = await GVGCityModel.findOneAndUpdate({ configId, cityId}, { $inc: {userCnt: userInc, teamCnt: teamInc} }, { new: true }).lean();
         return city;
     }
 }
@@ -45,4 +51,7 @@ export const GVGCityModel = getModelForClass(GVGCity);
 
 export interface GVGCityType extends Pick<DocumentType<GVGCity>, keyof GVGCity> {
     id: number;
-};
+};
+
+export type GVGCityUpdate = Partial<GVGCityType>; // 将所有字段变成可选项
+

shared/db/GVGTeam.ts

@@ -2,6 +2,7 @@
 import BaseModel from "./BaseModel";
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { genCode } from "../pubUtils/util";
+import { LineupHero } from './../domain/roleField/hero';
 
 @index({ roleId: 1, teamId: 1 })
 @index({ teamCode: 1 })
@@ -52,20 +53,44 @@ export default class GVGTeam extends BaseModel {
     defenseTime: number; // 防守保护时间
 
     @prop({ required: true })
-    lineup: [{
-        actorId: number;  // 武将id
-        dataId: number;   // 位置
-        order: number;    // 进攻顺序
-    }]
+    lineup: [LineupHero]
 
     // 创建队伍
-    public static async createTeam(roleId: string, leagueCode: string, teamId: number, head: number, spine: number, frame: number, lineup: any) {
+    public static async createTeam(roleId: string, leagueCode: string, teamId: number, head: number, spine: number, frame: number, lineup: [LineupHero]) {
         const doc = new GVGTeamModel();
         const teamCode = genCode(8);
-        let update = Object.assign(doc.toJSON(), { roleId, leagueCode, teamId, teamCode, head, spine, frame, lineup });
+        const update = Object.assign(doc.toJSON(), { roleId, leagueCode, teamId, teamCode, head, spine, frame, lineup });
         const team: GVGTeamType | null = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $setOnInsert: update }, { upsert: true, new: true }).lean();
         return team;
     }
+
+    // 保存队伍
+    public static async saveTeam(roleId: string, leagueCode: string, teamId: number, head: number, spine: number, frame: number, lineup: [LineupHero]) {
+        let team: GVGTeamType = await GVGTeamModel.findOne({ roleId, teamId }).lean();
+        if (!team) {
+            team = await this.createTeam(roleId, leagueCode, teamId, head, spine, frame, lineup);
+            return team;
+        }
+
+        const update = { head, spine, frame };
+        if (lineup && lineup.length > 0) {
+            update['lineup'] = lineup;
+        }
+        team = await GVGTeamModel.findOneAndUpdate({ roleId, teamId }, { update }, { new: true }).lean();
+        return team;
+    }
+
+    // 查找角色队伍数
+    public static async getTeamCnt(roleId: string) {
+        const teams: GVGTeamType[] = await GVGTeamModel.find({ roleId }).select('teamCode').lean();
+        return teams.length;
+    }
+
+    // 玩家切换城池更新队伍信息
+    public static async resetTeamsLoc(roleId: string, cityId: number, areaId: number) {
+        const res = await GVGTeamModel.updateMany({ roleId }, { cityId, areaId, pointId: 0 }).lean();
+        return !!res['ok'];
+    }
 }
 
 export const GVGTeamModel = getModelForClass(GVGTeam);

shared/db/GVGUserData.ts

@@ -76,6 +76,8 @@ export default class GVGUserData extends BaseModel {
     @prop({ required: true, default: 0 })
     protectTime: number;  // 保护期 
 
+    @prop({ required: false })
+    cityId: number;         // 城池id
 
     public static async findByRole(configId: number, leagueCode: string, roleId: string) {
         const result: GVGUserDataType = await GVGUserDataModel.findOneAndUpdate({ configId, leagueCode, roleId }, {}, { new: true, upsert: true}).lean();
@@ -121,6 +123,12 @@ export default class GVGUserData extends BaseModel {
         const result: GVGUserDataType = await GVGUserDataModel.findOneAndUpdate({ configId, leagueCode, roleId }, { $set: { lv }}, { new: true }).lean();
         return result;
     }
+
+    // 更换城池
+    public static async changeCity(configId: number, leagueCode: string, roleId: string, cityId: number) {
+        const result: GVGUserDataType = await GVGUserDataModel.findOneAndUpdate({ configId, leagueCode, roleId }, { $set: { cityId }}, { new: true }).lean();
+        return result;
+    }
 }
 
 export const GVGUserDataModel = getModelForClass(GVGUserData);

shared/domain/battleField/gvgBattle.ts

@@ -0,0 +1,23 @@
+import { GVGTeamType } from "../../db/GVGTeam";
+
+// 积分点分类统计，1-3级积分点代表从小到大
+export interface LeagueCityPoint {
+    // 计分点数
+    pointCnt1: number;
+    pointCnt2: number;
+    pointCnt3: number;
+    // 击杀守卫数
+    guardCnt1: number;
+    // 击杀投石车数
+    catapultCnt1: number;
+}
+
+// 队伍状态
+export interface GVGTeamMem extends GVGTeamType {
+    // 开始移动时间戳
+    startMoveTime: number;
+    // 停止移动时间戳
+    stopMoveTime: number;
+    // 是否正在移动
+    isMoving: boolean;
+}