From 4b637e4a45a504d8332290af14858b0d4d7cb1db Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 25 Dec 2020 16:47:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=A4=A9=E6=96=B0=E5=A2=9E=E6=AD=A6?=
 =?UTF-8?q?=E5=B0=86=E7=BB=8F=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gm-server/app/service/users.ts | 8 ++++++--
 shared/db/Hero.ts              | 2 +-
 shared/db/Role.ts              | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gm-server/app/service/users.ts b/gm-server/app/service/users.ts
index 5b26dbb18..68f84ec06 100644
--- a/gm-server/app/service/users.ts
+++ b/gm-server/app/service/users.ts
@@ -24,8 +24,10 @@ import { STATUS, HERO_SYSTEM_TYPE } from '@consts';
 import { ITID, COUNTER } from '@consts';
 import Actor from '@pubUtils/actor';
 import { ItemModel } from '@db/Item';
-import { gameData } from '@pubUtils/data';
+import { gameData, getHeroExpByLv } from '@pubUtils/data';
 import { calPlayerCeAndSave } from '@pubUtils/playerCe';
+import { SchoolModel } from '@db/School';
+import { ComBattleTeamModel } from '@db/ComBattleTeam';
 
 /**
  * Test Service
@@ -114,6 +116,8 @@ export default class GMUsers extends Service {
     await TowerTaskRecModel.deleteAccount(roleId);
     await TowerRecordModel.deleteAccount(roleId);
     await PvpDefenseModel.deleteAccount(roleId);
+    await ItemModel.deleteAccount(roleId);
+    await SchoolModel.deleteAccount(roleId);
 
     return ctx.service.utils.resResult(STATUS.SUCCESS);
   }
@@ -200,7 +204,7 @@ export default class GMUsers extends Service {
                 let {quality, initialStars: star, jobid: job, name: hName, initialSkin} = dicHero;
                 const heroInfo = {
                     roleId, roleName: role.roleName, hid, hName, star, quality, job, serverId: role.serverId,
-                    lv: hlv,
+                    lv: hlv, exp: getHeroExpByLv(hlv - 1)||0,
                     skins:[{id: initialSkin, enable: true}],
                 }
                 heroInfos.push(heroInfo);
diff --git a/shared/db/Hero.ts b/shared/db/Hero.ts
index 9c411122c..596a72b94 100644
--- a/shared/db/Hero.ts
+++ b/shared/db/Hero.ts
@@ -173,7 +173,7 @@ export default class Hero extends BaseModel {
         return hero;
     }
 
-    public static async createHero(heroInfo: {roleId: string, serverId: number, roleName: string, hid: number, hName: string, star: number, quality: number, job: number, lv?: number, skins:Skin[]}, lean = true) {
+    public static async createHero(heroInfo: {roleId: string, serverId: number, roleName: string, hid: number, hName: string, star: number, quality: number, job: number, lv?: number, exp?: number, skins:Skin[]}, lean = true) {
         const doc = new HeroModel();
         const seqId = await CounterModel.getNewCounter(COUNTER.HID)||-1;
         const update = Object.assign(doc.toJSON(), heroInfo, {seqId});
diff --git a/shared/db/Role.ts b/shared/db/Role.ts
index 418711fbb..5955d53a1 100644
--- a/shared/db/Role.ts
+++ b/shared/db/Role.ts
@@ -222,7 +222,7 @@ export default class Role extends BaseModel {
         return role;
     }
 
-    public static async createRole(uid: number, serverId: number, roleInfo: {roleId: string; roleName: string; seqId: number; code: string}, lean = true) {
+    public static async createRole(uid: number, serverId: number, roleInfo: {roleId: string; roleName: string; seqId: number; code: string, lv?:number, exp?: number}, lean = true) {
         const user = await User.findUserByUid(uid);
         if (!user) return null;
         const doc = new RoleModel();