xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ feat(gvg): 激战期接口详细返回

Browse Source
This commit is contained in:
luying
2023-02-17 10:59:38 +08:00
parent ab0b7aa9ae
commit 26832196b6
14 changed files with 917 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/consts/statusCode.ts
+2
View File
@@ -367,6 +367,8 @@ export const STATUS = {
GVG_TEAM_ATTACKING: { code: 21405, simStr: '您的编队正在攻击冷却中' },
GVG_TEAM_DEFENSEING: { code: 21406, simStr: '选择的编队正在防守冷却中' },
GVG_BATTLEREC_NOT_FOUND: { code: 21407, simStr: '未找到该记录' },
GVG_AREA_NOT_IN_CITY: { code: 21408, simStr: '选择区域不在这座城池中' },
GVG_TEAM_NOT_FOUND: { code: 21409, simStr: '未找到这个队伍' },
// 通用 30000 - 30099
DIC_DATA_NOT_FOUND: { code: 30000, simStr: '数据表未找到' },
shared/db/GVGCity.ts
+14 -3
View File
@@ -6,6 +6,8 @@ class Player {
leagueCode: string;
@prop({ required: true })
roleId: string;
@prop({ required: true })
teamCnt: number;
}
@@ -27,6 +29,9 @@ export default class GVGCity extends BaseModel {
@prop({ required: true, default: [], type: Player, _id: false })
players: Player[]; // 联军
@prop({ required: false })
hasGuard: boolean; // 是否有联军占领
@prop({ required: false })
guardLeague: string; // 占领的联军
@@ -42,7 +47,7 @@ export default class GVGCity extends BaseModel {
// 创建城市
public static async createCity(configId: number, groupId: number, serverType: number, cityId: number) {
let doc = new GVGCityModel();
let update = Object.assign(doc.toJSON(), { configId, cityId});
let update = Object.assign(doc.toJSON(), { configId, cityId, groupId, serverType});
const city: GVGCityType = await GVGCityModel.findOneAndUpdate({ configId, cityId, groupId, serverType }, { $setOnInsert: update }, { upsert: true, new: true }).lean();
return city;
}
@@ -54,8 +59,8 @@ export default class GVGCity extends BaseModel {
}
// 添加人数
public static async increasePlayer(configId: number, groupId: number, serverType: number, cityId: number, roleId: string, leagueCode: string) {
const city: GVGCityType = await GVGCityModel.findOneAndUpdate({ configId, groupId, serverType, cityId, userCnt: { $lt: 200 } }, { $inc: { userCnt: 1 }, $push: { players: { roleId, leagueCode } }}, { new: true, upsert: true }).lean();
public static async increasePlayer(configId: number, groupId: number, serverType: number, cityId: number, roleId: string, leagueCode: string, teamCnt: number) {
const city: GVGCityType = await GVGCityModel.findOneAndUpdate({ configId, groupId, serverType, cityId, userCnt: { $lt: 200 } }, { $inc: { userCnt: 1 }, $push: { players: { roleId, leagueCode, teamCnt } }}, { new: true, upsert: true }).lean();
return city;
}
@@ -64,6 +69,12 @@ export default class GVGCity extends BaseModel {
const city: GVGCityType = await GVGCityModel.findOneAndUpdate({ configId, groupId, serverType, cityId, 'players.roleId': roleId }, { $inc: { userCnt: -1 }, $pull: { players: { roleId } }}, { new: true, upsert: true }).lean();
return city;
}
// 查询联军驻守情况
public static async findGuardCityByLeague(configId: number, groupId: number, serverType: number, ) {
const cities: GVGCityType[] = await GVGCityModel.find({ configId, groupId, serverType, hasGuard: true }).lean();
return cities
}
}
shared/db/GVGTeam.ts
+35 -9
View File
@@ -15,6 +15,12 @@ export default class GVGTeam extends BaseModel {
@prop({ required: true })
roleId: string; // 玩家id
@prop({ required: true })
roleName: string; // 玩家名
@prop({ required: true })
serverId: number; // 小区id
@prop({ required: true })
teamCode: string; // 玩家队伍唯一标识
@@ -24,6 +30,9 @@ export default class GVGTeam extends BaseModel {
@prop({ required: true })
leagueCode: string; // 联军
@prop({ required: true })
leagueName: string; // 联军
@prop({ required: true })
guildCode: string; // 军团
@@ -48,12 +57,18 @@ export default class GVGTeam extends BaseModel {
@prop({ required: true, default: 0 })
durability: number; // 耐久
@prop({ required: true, default: 0 })
maxDurability: number; // 耐久
@prop({ required: true, default: 0 })
restartTime: number; // 修整期倒计时
@prop({ required: true, default: 0 })
attackTime: number; // 进攻冷却时间
@prop({ required: true, default: 0 })
fromAreaId: number; // 从那个区域移动
@prop({ required: true, default: 0 })
startMoveTime: number;
@@ -82,19 +97,19 @@ export default class GVGTeam extends BaseModel {
isRobot: boolean; // 是否是机器人
// 创建队伍
public static async createTeam(roleId: string, leagueCode: string, teamId: number, head: number, spine: number, frame: number, lineup: [LineupHero]) {
public static async createTeam(roleId: string, roleName: string, serverId: number, leagueCode: string, leagueName: string, teamId: number, head: number, spine: number, frame: number, durability: number, lineup: [LineupHero], lineupCe: number) {
const doc = new GVGTeamModel();
const teamCode = genCode(8);
const update = Object.assign(doc.toJSON(), { roleId, leagueCode, teamId, teamCode, head, spine, frame, lineup });
const update = Object.assign(doc.toJSON(), { roleId, roleName, serverId, leagueCode, leagueName, teamId, teamCode, head, spine, frame, lineup, durability, maxDurability: durability, lineupCe });
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]) {
public static async saveTeam(roleId: string, roleName: string, serverId: number, leagueCode: string, leagueName: string, teamId: number, head: number, spine: number, frame: number, durability: number, lineup: [LineupHero], lineupCe: number) {
let team: GVGTeamType = await GVGTeamModel.findOne({ roleId, teamId }).lean();
if (!team) {
team = await this.createTeam(roleId, leagueCode, teamId, head, spine, frame, lineup);
team = await this.createTeam(roleId, roleName, serverId, leagueCode, leagueName, teamId, head, spine, frame, durability, lineup, lineupCe);
return team;
}
@@ -122,6 +137,10 @@ export default class GVGTeam extends BaseModel {
return teams.length;
}
public static async checkCity(roleId: string, cityId: number, groupId: number, serverType: number) {
return await GVGTeamModel.exists({ roleId, cityId, groupId, serverType });
}
// 玩家切换城池更新队伍信息
public static async enterCity(roleId: string, cityId: number, areaId: number, groupId: number, serverType: number) {
const res = await GVGTeamModel.updateMany({ roleId }, { cityId, areaId, pointId: 0, groupId, serverType }).lean();
@@ -141,13 +160,13 @@ export default class GVGTeam extends BaseModel {
}
// 移动
public static async startMove(teamCode: string, areaId: number) {
const res: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $set: { areaId, stopMoveTime: nowSeconds() + GVG.GVG_DEFAULT_MOVE_CD } }).lean();
public static async startMove(teamCode: string, areaId: number, fromAreaId: number) {
const res: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $set: { areaId, fromAreaId, stopMoveTime: nowSeconds() + GVG.GVG_DEFAULT_MOVE_CD } }).lean();
return res;
}
public static async stopMove(teamCode: string, areaId: number) {
const res: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $set: { areaId, stopMoveTime: nowSeconds() } }).lean();
const res: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $set: { areaId, fromAreaId: 0, stopMoveTime: nowSeconds() } }).lean();
return res;
}
@@ -161,7 +180,7 @@ export default class GVGTeam extends BaseModel {
}
return { attackTeam, defenseTeam }
}
public static async checkRobot(groupId: number, serverType: number, cityId: number) {
return await GVGTeamModel.exists({ groupId, serverType, cityId, isRobot: true });
}
@@ -171,10 +190,12 @@ export default class GVGTeam extends BaseModel {
return {
updateOne: {
filter: { groupId, serverType, cityId, pointId: dic.pointId },
update: { $setOnInsert: { teamCode: `robot${dic.pointId}`, ...dic, isRobot: true } }, upsert: true
update: { $setOnInsert: { teamCode: `robot${dic.pointId}`, ...dic, roleName: dic.name, isRobot: true } }, upsert: true
}
}
}));
const team: GVGTeamType[] = await GVGTeamModel.find({ groupId, serverType, cityId, isRobot: true }).lean();
return team;
}
// 攻击方攻击cd
@@ -188,6 +209,11 @@ export default class GVGTeam extends BaseModel {
const team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $set: { attackTime: nowSeconds() + GVG.GVG_DEFAULT_DEFENSE_CD, groupId, serverType } }, { new: true }).lean();
return team;
}
public static async findByAreaId(groupId: number, serverType: number, cityId: number, areaId: number) {
const team: GVGTeamType[] = await GVGTeamModel.find({ groupId, serverType, cityId, areaId, stopMoveTime: { $lte: nowSeconds() } }).lean();
return team;
}
}
shared/domain/battleField/gvgBattle.ts
+28 -27
View File
@@ -1,4 +1,4 @@
import { GVGTeamType, GVGTeamUpdate } from "../../db/GVGTeam";
import GVGTeam, { GVGTeamType } from "../../db/GVGTeam";
// 积分点分类统计，1-3级积分点代表从小到大
export class LeagueCityPoint {
@@ -20,42 +20,43 @@ export class LeagueCityPoint {
}
// 队伍状态
export class GVGTeamMem implements GVGTeamUpdate {
roleId: string; // 玩家id
id: number;
teamCode: string;
teamId: number;
leagueCode: string;
guildCode: string;
areaId: number;
cityId: number;
pointId: number;
head: number;
spine: number;
frame: number;
durability: number;
restartTime: number;
attackTime: number;
defenseTime: number;
startMoveTime: number;
stopMoveTime: number;
export class GVGTeamMem extends GVGTeam {
isMoving: boolean;
point: number;
constructor(team: GVGTeamType) {
for(let key in team) {
this[key] = team[key];
}
super();
this.roleId = team.roleId;
this.roleName = team.roleName;
this.serverId = team.serverId;
this.teamCode = team.teamCode;
this.teamId = team.teamId;
this.leagueCode = team.leagueCode;
this.guildCode = team.guildCode;
this.areaId = team.areaId;
this.fromAreaId = team.fromAreaId;
this.cityId = team.cityId;
this.pointId = team.pointId;
this.head = team.head;
this.spine = team.spine;
this.frame = team.frame;
this.durability = team.durability;
this.restartTime = team.restartTime;
this.attackTime = team.attackTime;
this.defenseTime = team.defenseTime;
this.startMoveTime = team.startMoveTime;
this.stopMoveTime = team.stopMoveTime;
this.point = team.point;
}
public setCity(cityId: number, areaId = 0) {
public setCity(cityId: number, areaId = 0, pointId = 0) {
this.cityId = cityId;
this.areaId = areaId;
this.pointId = 0;
this.pointId = pointId;
}
public moveToArea(areaId: number, startMoveTime: number, stopMoveTime: number) {
public moveToArea(areaId: number, fromAreaId: number, startMoveTime: number, stopMoveTime: number) {
this.areaId = areaId;
this.fromAreaId = fromAreaId;
this.startMoveTime = startMoveTime;
this.stopMoveTime = stopMoveTime;
}
shared/domain/gvgField/returnData.ts
+91 -1
View File
@@ -11,6 +11,9 @@ import { DicWarJson } from "../../pubUtils/dictionary/DicWarJson";
import { gameData } from "../../pubUtils/data";
import { HeroType } from "../../db/Hero";
import { RoleRankInfo } from "../rank";
import { GVGCityType } from "../../db/GVGCity";
import { GVGTeamMem } from "../battleField/gvgBattle";
import { GVGTeamType } from "../../db/GVGTeam";
class LeagueLeaderInfo {
name: string; // 盟主名
@@ -257,7 +260,6 @@ export class LeagueMemberListInfo {
this.serverName = serverNames[role.serverId];
this.ce = role.ce;
this.quitTime = role.quitTime;
this.isOnline = role.quitTime == role.loginTime;
}
setByUserData(data: GVGUserDataType) {
@@ -269,6 +271,10 @@ export class LeagueMemberListInfo {
setAuth(auth: number) {
this.auth = auth;
}
setOnline(isOnline: boolean) {
this.isOnline = isOnline;
}
}
export class LeagueMemberContributeInfo extends LeagueMemberListInfo{
@@ -588,4 +594,88 @@ export class VestigeRank {
this.lineupCe = 0;
this.score = 0;
}
}
// 大地图上城池占林
export class GVGCityMapInfo {
cityId: number; // 城池id
guardLeagueCode: string; // 驻守城池的联军id
guardLeagueName: string; // 驻守这个城池的联军
guardLeagueIcon: number; // 驻守这个城池的联军的icon
teamCnt: number; // 我方队伍数量
constructor(city: GVGCityType, teamCnt: number) {
if(!city) return;
this.cityId = city.cityId;
this.guardLeagueCode = city.guardLeague;
this.guardLeagueName = city.guardLeagueName;
this.guardLeagueIcon = city.guardLeagueIcon;
this.teamCnt = teamCnt;
}
}
export class GVGTeamSpineInMap {
spine: number = 0;
roleName: string = '';
serverName: string = '';
startMoveTime: number = 0;
stopMoveTime: number = 0;
isMoving: boolean = false;
pointId: number = 0;
fromAreaId: number = 0;
constructor(obj: GVGTeamMem, serverNames: {[serverId: string]: string}) {
this.spine = obj.spine;
this.roleName = obj.roleName;
if(obj.serverId) this.serverName = serverNames[obj.serverId];
this.startMoveTime = obj.startMoveTime;
this.stopMoveTime = obj.stopMoveTime;
this.isMoving = nowSeconds() < this.stopMoveTime;
this.pointId = obj.pointId;
this.fromAreaId = obj.fromAreaId;
}
}
export class GVGAreaInMap {
areaId: number;
spines: GVGTeamSpineInMap[] = [];
}
// 地图右边列表上的队伍信息
export class GVGTeamInList {
teamCode: string;
roleName: string;
head: number;
frame: number;
lineupCe: number;
leagueCode: string;
leagueName: string;
durability: number; // 耐久
maxDurability: number; // 最大耐久
constructor(team: GVGTeamType) {
if(!team) return;
this.teamCode = team.teamCode;
this.roleName = team.roleName;
this.head = team.head;
this.frame = team.frame;
this.lineupCe = team.lineupCe;
this.leagueCode = team.leagueCode;
this.leagueName = team.leagueName;
this.durability = team.durability;
this.maxDurability = team.maxDurability;
}
}
export class GVGTeamInListOnPoint extends GVGTeamInList {
pointId: number; // 积分点
hasTeam: boolean; // 是否有队伍占领
isRobot: boolean; // 这个队伍是不是擂台守卫者
constructor(pointId: number, hasTeam: boolean, team?: GVGTeamType) {
super(team);
this.pointId = pointId;
this.hasTeam = hasTeam;
if(team) this.isRobot = team.isRobot;
}
}
shared/pubUtils/data.ts
+12 -1
View File
@@ -131,7 +131,7 @@ import { dicGVGVestigeByType, dicGVGVestigeName, loadGVGVestigeType } from './di
import { dicGVGVestige, loadGVGVestige } from './dictionary/DicGVGVestige';
import { DicGVGVestigeRange, dicGVGVestigeRange, loadGVGVestigeRange } from './dictionary/DicGVGVestigeRange';
import { DicGVGVestigeLeagueRank, dicGVGVestigeLeagueRank, loadGVGVestigeLeagueRank } from "./dictionary/DicGVGVestigeLeagueRank";
import { dicGVGAreaPoint, loadGVGAreaPoint } from "./dictionary/DicGVGAreaPoint";
import { dicGVGAreaPoint, loadGVGAreaPoint, dicGVGPointsByAreaId } from "./dictionary/DicGVGAreaPoint";
import { DicGVGBattleRankReward, dicGVGBattleRankReward, loadGVGBattleRankReward } from './dictionary/DicGVGBattleRankReward';
export const gameData = {
@@ -335,6 +335,8 @@ export const gameData = {
gvgAreaPoint: dicGVGAreaPoint,
gvgBattleRankReward: dicGVGBattleRankReward,
gvgBattleDurabilityMinus: { win: 0, fail: 0 },
gvgTeamDurability: new Map<number, number>(),
gvgPointByAreaId: dicGVGPointsByAreaId,
};
// 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -1220,6 +1222,14 @@ function parseGVGDurabilityMinus() {
gameData.gvgBattleDurabilityMinus.fail = range[0];
}
function parseGVGTeamDurability() {
let arr = decodeArrayListStr(param.GVG.GVG_TEAM_NUMBER);
for(let [index, _lv, durability] of arr) {
gameData.gvgTeamDurability.set(parseInt(index), parseInt(durability));
}
}
// 初始加载
function initDatas() {
parseDicParam();
@@ -1244,6 +1254,7 @@ function parseDicParam() {
parseGVGFieldAdd();
parseGVGVestigeCnt();
parseGVGDurabilityMinus();
parseGVGTeamDurability();
}
/**
shared/pubUtils/dictionary/DicGVGAreaPoint.ts
+6
View File
@@ -24,12 +24,18 @@ export interface DicGVGAreaPoint {
}
export const dicGVGAreaPoint = new Map<number, DicGVGAreaPoint>();
export const dicGVGPointsByAreaId = new Map<number, number[]>();
export function loadGVGAreaPoint() {
dicGVGAreaPoint.clear();
dicGVGPointsByAreaId.clear();
let arr = readFileAndParse(FILENAME.DIC_GVG_AREA_POINT);
arr.forEach(o => {
dicGVGAreaPoint.set(o.pointId, o);
if(!dicGVGPointsByAreaId.has(o.areaId)) {
dicGVGPointsByAreaId.set(o.areaId, []);
}
dicGVGPointsByAreaId.get(o.areaId).push(o.pointId);
});
arr = undefined;
}
shared/resource/jsons/dic_zyz_GVGAreaPoint.json
+570 -114
View File
File diff suppressed because it is too large Load Diff