diff --git a/game-server/app/servers/role/handler/roleHandler.ts b/game-server/app/servers/role/handler/roleHandler.ts index b498b1b3d..5eb8c3617 100644 --- a/game-server/app/servers/role/handler/roleHandler.ts +++ b/game-server/app/servers/role/handler/roleHandler.ts @@ -29,6 +29,7 @@ import { checkPopUpCondition } from '../../../services/activity/popUpShopService import { isGoodsHidden, isHeroHidden } from '../../../services/dataService'; import { updateGVGBattleRoleInfo, getMyAuth } from '../../../services/gvg/gvgTeamService'; import { GVGLeagueModel } from '../../../db/GVGLeague'; +import { deletRole } from '../../../pubUtils/roleUtil'; export default function (app: Application) { new HandlerService(app, {}); @@ -583,14 +584,7 @@ export class RoleHandler { let role = await RoleModel.findByRoleId(roleId); if(!role) return resResult(STATUS.ROLE_NOT_FOUND); if(role.hasInit) { - let userInfo = role.userInfo; - let newRoleId = genCode(10); - const seqId = await Counter.getNewCounter(COUNTER.ROLE) || -1; - await RoleModel.findOneAndUpdate({ roleId }, { $set: { 'userInfo.uid': 0, roleName: 'deletedRole' } }); - role = await RoleModel.createRole(userInfo.uid, role.serverId, { roleId: newRoleId, code: role.code, roleName: newRoleId, seqId, lv: DEFAULT_LV, exp: (getExpByLv(DEFAULT_LV - 1) || { sum: 0 }).sum || 0 }, ''); - - session.set('roleId', newRoleId); - session.push('roleId', () => {}); + await deletRole(roleId); } return resResult(STATUS.SUCCESS, { roleId: role?.roleId });