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-08 10:47:41 +08:00
parent 0b877150ea
commit 542845af09
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
game-server/app/servers/guild/handler/guildHandler.ts
View File

@@ -718,7 +718,7 @@ export class GuildHandler {
let managerCntInc = topUserGuild.auth == GUILD_AUTH.MANAGER ? -1 : 0; // 管理人数
const guild = await GuildModel.updateInfo(code, { leader: topUser._id }, { managerCnt: managerCntInc }, 'managerCnt name'); // 如果有转让团长设置leader
const guild = await GuildModel.updateInfo(code, { leader: topUser._id }, { managerCnt: managerCntInc }, 'managerCnt name leagueCode'); // 如果有转让团长设置leader
// 添加动态
await addGuildRecord(roleId, code, GUILD_REC_TYPE.IMPEACH, [oldRoleName, topUser.roleName]);
@@ -728,7 +728,8 @@ export class GuildHandler {
await updateUserInfo(REDIS_KEY.GUILD_INFO, code, [{ field: 'leader', value: new GuildLeader(topUser) }]);
await RoleModel.updateRoleInfo(leaderRoleId, { isGuildLeader: false });
await RoleModel.updateRoleInfo(topUser.roleId, { isGuildLeader: true });
let newLeader = await RoleModel.updateRoleInfo(topUser.roleId, { isGuildLeader: true });
await guildAbdicateToLeague(guild, leaderRoleId, newLeader);
reportTAEvent(roleId, TA_EVENT.GUILD_MASTER_CHANGE, { way: GUILD_MASTER_CHANGE_WAY.IMPEACH, change_id_after: topUser.roleId }, ip)
let isOnline = await isRoleOnline(topUser.roleId);

4
game-server/app/servers/guild/handler/gvgManageHandler.ts
View File

@@ -17,6 +17,7 @@ import { createGroupMsg, pushGroupMsgToRoom } from "../../../services/chatServic
import { sendMailByContent, sendMailToGuildByContent } from "../../../services/mailService";
import { getGVGCities } from "../../../services/gvg/gvgBattleService";
import { guildQuitLeagueRecord } from "../../../services/gvg/gvgRecService";
import { LeagueLeader } from "../../../domain/rank";
export default function (app: Application) {
new HandlerService(app, {});
@@ -558,7 +559,7 @@ export class GVGManageHandler {
const checkHisAuth = await checkLeagueAuth(targetRoleId, myLeague, LEAGUE_MANAGE_TYPE.BE_ABDICATED);
if(!checkHisAuth) return resResult(STATUS.GVG_HE_HAS_NO_AUTH);
const targetRole = await RoleModel.findByRoleId(targetRoleId, '_id roleName serverId');
const targetRole = await RoleModel.findByRoleId(targetRoleId, '_id roleName serverId guildName roleId');
let targetRoleServerName = await getServerName(targetRole.serverId);
// 修改联军数据 members，leader
@@ -566,6 +567,7 @@ export class GVGManageHandler {
// 推送
await sendMessageToUserWithSuc(targetRoleId, PUSH_ROUTE.LEAGUE_ABDICATE, { leagueCode: myLeague.leagueCode });
await sendMailByContent(MAIL_TYPE.LEAGUE_ABDICATE, roleId, { params: [ myLeague.name ] });
await updateUserInfo(REDIS_KEY.LEAGUE_INFO, myLeague.leagueCode, [{ field: 'leader', value: new LeagueLeader(targetRole) }]);
let myAuth = getMyAuth(myLeague, roleId);
// 返回