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

测试：清空账号debug接口

Browse Source
This commit is contained in:
luying
2021-10-11 16:06:09 +08:00
parent 60893cba31
commit 549908eca0
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/role/handler/roleHandler.ts
+21 -4
View File
@@ -1,10 +1,10 @@
import { STATUS } from '../../../consts/statusCode'; import { STATUS } from '../../../consts/statusCode';
import { RoleModel, RoleUpdate } from './../../../db/Role'; import { RoleModel, RoleUpdate } from './../../../db/Role';
import { HeroModel, HeroUpdate } from '../../../db/Hero'; import { HeroModel, HeroUpdate } from '../../../db/Hero';
import { resResult, decodeIdCntArrayStr, parseGoodStr } from '../../../pubUtils/util'; import { resResult, decodeIdCntArrayStr, parseGoodStr, genCode } from '../../../pubUtils/util';
import { Application, BackendSession, pinus, HandlerService, } from 'pinus'; import { Application, BackendSession, pinus, HandlerService, } from 'pinus';
import { handleCost, addItems, createHeroes } from '../../../services/rewardService'; import { handleCost, addItems, createHeroes } from '../../../services/rewardService';
import { getTitle, getTeraph, gameData, getScollByStar, getFriendLvByExp, getHeroExpByLv } from '../../../pubUtils/data'; import { getTitle, getTeraph, gameData, getScollByStar, getFriendLvByExp, getHeroExpByLv, getExpByLv } from '../../../pubUtils/data';
import { SCHOOL, SCROLL, EXTERIOR, SCRIPT } from '../../../pubUtils/dicParam'; import { SCHOOL, SCROLL, EXTERIOR, SCRIPT } from '../../../pubUtils/dicParam';
import { getAtrrNameById } from '../../../consts/constModules/abilityConst' import { getAtrrNameById } from '../../../consts/constModules/abilityConst'
import { findIndex } from 'underscore'; import { findIndex } from 'underscore';
@@ -12,7 +12,7 @@ import { SclResultInter, SclPosInter } from '../../../pubUtils/interface';
import { SchoolModel } from '../../../db/School'; import { SchoolModel } from '../../../db/School';
import { getTeraphStrengthenResult, getSchoolList } from '../../../services/roleService' import { getTeraphStrengthenResult, getSchoolList } from '../../../services/roleService'
import { calPlayerCeAndSave, calAllHeroCe } from '../../../services/playerCeService'; import { calPlayerCeAndSave, calAllHeroCe } from '../../../services/playerCeService';
import { HERO_SYSTEM_TYPE, LINEUP_NUM, ROLE_SELECT, REDIS_KEY, TASK_TYPE, DEFAULT_HEROES, DEFAULT_HERO_LV, DEFAULT_ITEMS, DEFAULT_EQUIPS, DEFAULT_GOLD, DEFAULT_COIN, DEBUG_MAGIC_WORD } from '../../../consts'; import { HERO_SYSTEM_TYPE, LINEUP_NUM, ROLE_SELECT, REDIS_KEY, TASK_TYPE, DEFAULT_HEROES, DEFAULT_HERO_LV, DEFAULT_ITEMS, DEFAULT_EQUIPS, DEFAULT_GOLD, DEFAULT_COIN, DEBUG_MAGIC_WORD, COUNTER, DEFAULT_LV } from '../../../consts';
import { checkBattleHeroesByHid, roleLevelup } from '../../../services/normalBattleService'; import { checkBattleHeroesByHid, roleLevelup } from '../../../services/normalBattleService';
import { Rank } from '../../../services/rankService'; import { Rank } from '../../../services/rankService';
import { updateUserInfo } from '../../../services/redisService'; import { updateUserInfo } from '../../../services/redisService';
@@ -24,6 +24,7 @@ import { CreateHeroes, deletRole } from '../../../pubUtils/roleUtil';
import { Figure } from '../../../domain/dbGeneral'; import { Figure } from '../../../domain/dbGeneral';
import { getActivities } from '../../../services/activity/activityService'; import { getActivities } from '../../../services/activity/activityService';
import * as dicParam from '../../../pubUtils/dicParam'; import * as dicParam from '../../../pubUtils/dicParam';
import Counter from '../../../db/Counter';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -553,8 +554,24 @@ export class RoleHandler {
return resResult(STATUS.TOKEN_ERR); return resResult(STATUS.TOKEN_ERR);
} }
console.log('*************** 1')
let roleId = session.get('roleId'); let roleId = session.get('roleId');
await deletRole(roleId); let role = await RoleModel.findByRoleId(roleId);
console.log('*************** 2')
if(role?.hasInit) {
console.log('*************** 3')
let userInfo = role.userInfo;
let newRoleId = genCode(10);
const seqId = await Counter.getNewCounter(COUNTER.ROLE) || -1;
console.log('*************** 4')
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 });
// await RoleModel.findOneAndUpdate({ roleId }, { $set: { 'userInfo.uid': 0, roleName: 'deletedRole' } });
console.log('*************** 5')
}
session.set('roleId', role.roleId);
session.push('roleId', () => {});
console.log('*************** 6')
return resResult(STATUS.SUCCESS); return resResult(STATUS.SUCCESS);
} }
shared/db/Role.ts
+1
View File
@@ -358,6 +358,7 @@ export default class Role extends BaseModel {
if (!user) return null; if (!user) return null;
const doc = new RoleModel(); const doc = new RoleModel();
const update = Object.assign(doc.toJSON(), roleInfo, { userInfo: user, serverType: user.serverType, serverId }); const update = Object.assign(doc.toJSON(), roleInfo, { userInfo: user, serverType: user.serverType, serverId });
delete update._id;
const role: RoleType = await RoleModel.findOneAndUpdate({ 'userInfo.uid': uid, serverId }, update, { upsert: true, new: true }).lean(lean); const role: RoleType = await RoleModel.findOneAndUpdate({ 'userInfo.uid': uid, serverId }, update, { upsert: true, new: true }).lean(lean);
return role; return role;
} }