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

🐞 fix(gvg): 添加确认队伍

Browse Source
This commit is contained in:
luying
2023-03-15 16:11:54 +08:00
parent e488e1f4db
commit 899cb3162e
4 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
game-server/app/servers/guild/handler/gvgBattleHandler.ts
View File

@@ -44,9 +44,10 @@ export class GVGBattleHandler {
// 获取我的编队信息
async getTeams(msg: {}, session: BackendSession) {
const roleId = session.get('roleId');
const teams = await GVGTeamModel.findByRole(roleId, '-_id teamCode index head frame spine lineup')
return resResult(STATUS.SUCCESS, { teams: teams.map(team => new MyTeamSimpleInfo(team)) });
let { configId } = getGVGConfig();
const teams = await GVGTeamModel.findByRole(roleId, '-_id teamCode index head frame spine lineup confirmConfigId')
return resResult(STATUS.SUCCESS, { teams: teams.map(team => new MyTeamSimpleInfo(team, configId)) });
}
// 保存队伍
@@ -96,7 +97,23 @@ export class GVGBattleHandler {
let teamObj = getGVGBattleData(groupKey);
teamObj.enterCity(team);
}
return resResult(STATUS.SUCCESS, { curTeam: new MyTeamSimpleInfo(team) });
return resResult(STATUS.SUCCESS, { curTeam: new MyTeamSimpleInfo(team, configId) });
}
// 确认我的编队信息
async confirmTeam(msg: {}, session: BackendSession) {
const roleId = session.get('roleId');
const guildCode = session.get('guildCode');
const serverId = session.get('serverId');
let { configId, period } = getGVGPeriodData();
if (period != GVG_PERIOD.BATTLE) return resResult(STATUS.GVG_NOT_BATTLE_PERIOD);
let groupKey = await getGroupKey(serverId);
let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode);
if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST);
let teams = await refreshTeams(configId, groupKey, roleId, myLeague, true);
return resResult(STATUS.SUCCESS, { teams: teams.map(team => new MyTeamSimpleInfo(team, configId)) });
}
// 获取城池信息
@@ -146,7 +163,7 @@ export class GVGBattleHandler {
if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST);
let groupKey = await getGroupKey(serverId);
let teams = await refreshTeams(configId, groupKey, roleId, myLeague);
let teams = await refreshTeams(configId, groupKey, roleId, myLeague, false);
// 玩家队伍信息中城池id不一致，说明玩家已经进入了其他城池
for(let { cityId: teamCityId } of teams) {
if(teamCityId > 0 && teamCityId != cityId) {
@@ -180,7 +197,7 @@ export class GVGBattleHandler {
// 初始化本城池的守擂机器人
await initRobots(configId, groupKey, city||{ cityId, guardLeague: '' });
// 每赛季初自己的几支队伍恢复耐久、城市、顺便更新一下自己的玩家名、联军
let teams = await refreshTeams(configId, groupKey, roleId, myLeague);
let teams = await refreshTeams(configId, groupKey, roleId, myLeague, true);
if(await GVGTeamModel.checkLockTeam(roleId, cityId)) return resResult(STATUS.GVG_BATTLE_TEAM_LOCK_ENTERY_CITY);
let gvgUserData = await GVGUserDataModel.findByRole(configId, myLeague.leagueCode, roleId);

7
game-server/app/services/gvg/gvgBattleService.ts
View File

@@ -166,16 +166,17 @@ export function calBattleScoreByCe(isSuccess: boolean, lineupCe: number) {
return isSuccess? winScore: 0;
}
export async function refreshTeams(configId: number, groupKey: string, roleId: string, myLeague: GVGLeagueType) {
export async function refreshTeams(configId: number, groupKey: string, roleId: string, myLeague: GVGLeagueType, hasConfirm: boolean) {
let oldTeams = await GVGTeamModel.findByRole(roleId, '-_id');
let teams: GVGTeamType[] = [];
for(let team of oldTeams) {
if(team.configId != configId) {
if(team.configId != configId || (hasConfirm && team.confirmConfigId != configId)) {
let { teamCode, maxDurability, lineup } = team;
let { lv, roleName, guildCode } = await RoleModel.findByRoleId(roleId, 'lv roleName guildCode');
let heroes = await HeroModel.findByHidRange(lineup.map(hero => hero.actorId), roleId);
let { newLineup, newLineupCe } = await generNewLineup(roleId, heroes, lineup.map(({ actorId, dataId, outIndex }) => ({ actorId, dataId, order: outIndex })));
let newTeam = await GVGTeamModel.refreshByConfig(teamCode, { configId, lv, durability: maxDurability, cityId: 0, areaId: 0, pointId: 0, roleName, guildCode, leagueCode: myLeague.leagueCode, leagueName: myLeague.name, groupKey, lineup: newLineup, lineupCe: newLineupCe });
let addUpdate = hasConfirm? { confirmConfigId: configId }: {};
let newTeam = await GVGTeamModel.refreshByConfig(teamCode, { configId, lv, durability: maxDurability, cityId: 0, areaId: 0, pointId: 0, roleName, guildCode, leagueCode: myLeague.leagueCode, leagueName: myLeague.name, groupKey, lineup: newLineup, lineupCe: newLineupCe, ...addUpdate });
teams.push(newTeam);
} else {
teams.push(team);

3
shared/db/GVGTeam.ts
View File

@@ -17,6 +17,9 @@ export default class GVGTeam extends BaseModel {
@prop({ required: true })
configId: number; // 赛季，每赛季在enterCity的时候检测，如果不一样就更新durability那些东西
@prop({ required: true })
confirmConfigId: number; // 是否确认过
@prop({ required: true })
roleId: string; // 玩家id

4
shared/domain/gvgField/returnData.ts
View File

@@ -770,14 +770,16 @@ export class MyTeamSimpleInfo {
dataId: number; // 出兵表上的位置
order: number; // 行动
}[];
hasConfirm: boolean;
constructor(team: GVGTeamType) {
constructor(team: GVGTeamType, configId: number) {
this.teamCode = team.teamCode;
this.index = team.index;
this.head = team.head;
this.frame = team.frame;
this.spine = team.spine;
this.lineup = team.lineup.map(({ actorId, dataId, outIndex }) => ({ actorId, dataId, order: outIndex }));
this.hasConfirm = team.confirmConfigId == configId;
}
}