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-02-22 14:27:23 +08:00
parent 6cf038b588
commit a3ea2be808
5 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/connector/handler/entryHandler.ts
+2 -2
View File
@@ -224,9 +224,9 @@ export class EntryHandler {
await leaveGVGAreaChannel(roleId, sid);
await leaveGVGAreaTeamChannel(roleId, sid);
await leaveGVGCityTeamChannel(roleId, sid);
await pinus.app.rpc.guild?.guildRemote.leaveCity.broadcast(roleId, true);
await pinus.app.rpc.guild?.guildRemote.leaveCity.broadcast(true, roleId, serverId, guildCode);
} catch(e) {
console.error(e);
console.error(e.stack);
}
RoleModel.updateRoleInfo(roleId, { quitTime: nowSeconds() });
// if(teamCode) { // 如果有寻宝中的队伍，那么等于战败
game-server/app/servers/guild/handler/gvgBattleHandler.ts
+2 -2
View File
@@ -200,7 +200,7 @@ export class GVGBattleHandler {
if (originCityId != cityId) {
let gvgUserData = await GVGUserDataModel.findByRole(configId, myLeague.leagueCode, roleId);
if(gvgUserData?.cityId > 0) { // 如果leaveCity没有退出成功，玩家还遗留在上一座城中，做一下处理
await GVGCityModel.decreasePlayer(configId, groupKey, gvgUserData.cityId, roleId);
await GVGCityModel.decreasePlayerByCity(configId, groupKey, gvgUserData.cityId, roleId);
}
const roleTeamCnt = await GVGTeamModel.getTeamCntByRole(roleId);
let city = await GVGCityModel.increasePlayer(configId, groupKey, cityId, roleId, myLeague.leagueCode, roleTeamCnt);
@@ -250,7 +250,7 @@ export class GVGBattleHandler {
}
// 更新玩家城池和队伍城池
await leaveCity(roleId, false);
await leaveCity(false, roleId, serverId, guildCode, myLeague);
await leaveGVGAreaChannel(roleId, sid);
await leaveGVGAreaTeamChannel(roleId, sid);
game-server/app/servers/guild/remote/guildRemote.ts
+3 -2
View File
@@ -10,6 +10,7 @@ import { getGVGConfig, setGVGConfig, setGVGServerGroup } from '../../../services
import { GVGConfigType } from '../../../db/GVGConfig';
import { catapultHurt, gvgBattleEnd, gvgBattleSeconds, gvgBattleStart, initCatapult, leaveCity } from '../../../services/gvg/gvgBattleService';
import { clearBattleMemory } from '../../../services/gvg/gvgBattleMemory';
import { GVGLeagueType } from '../../../db/GVGLeague';
export default function (app: Application) {
new HandlerService(app, {});
@@ -169,9 +170,9 @@ export class GuildRemote {
}
}
public async leaveCity(roleId: string, isForce: boolean) {
public async leaveCity(isForce: boolean, roleId: string, serverId: number, guildCode: string, myLeague?: GVGLeagueType) {
try {
return leaveCity(roleId, isForce);
return leaveCity(isForce, roleId, serverId, guildCode, myLeague);
} catch(e) {
errlogger.error(`remote ${__filename} \n ${e.stack}`);
}