From b27f684e1f22c1503c1d515bd688d18847438a04 Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 14 Dec 2020 14:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=EF=BC=8C=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=97=B6=E6=AD=A6=E5=B0=86lv=E5=92=8Cexp?= =?UTF-8?q?=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gm-server/app/service/users.ts | 4 +++- shared/consts/consts.ts | 5 +++++ shared/db/Hero.ts | 2 +- shared/db/Role.ts | 2 +- web-server/app/service/Auth.ts | 11 ++++++----- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gm-server/app/service/users.ts b/gm-server/app/service/users.ts index 221ccdd61..a5f12ced1 100644 --- a/gm-server/app/service/users.ts +++ b/gm-server/app/service/users.ts @@ -25,6 +25,7 @@ import { STATUS } from '@consts/statusCode'; import { ITID, COUNTER } from '@consts/consts'; import Actor from '@pubUtils/actor'; import { ItemModel } from '@db/Item'; +import { getHeroExpByLv } from '@pubUtils/gamedata'; /** * Test Service @@ -187,6 +188,7 @@ export default class GMUsers extends Service { if(isNaN(hid)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS); } + let exp = getHeroExpByLv(hlv); let heroInfos = new Array(); for(let roleId of uids) { let role = await RoleModel.findByRoleId(roleId); @@ -199,7 +201,7 @@ export default class GMUsers extends Service { let {quality, initialStars: star, jobid: job, name: hName} = dicHero; const heroInfo = { roleId, roleName: role.roleName, hid, hName, star, quality, job, serverId: role.serverId, - lv: hlv + lv: hlv, exp } heroInfos.push(heroInfo); } diff --git a/shared/consts/consts.ts b/shared/consts/consts.ts index 86b521eeb..eb45b94bf 100644 --- a/shared/consts/consts.ts +++ b/shared/consts/consts.ts @@ -229,6 +229,7 @@ export const EXPEDITION_CONST = { export const EVENT_QUIZ_NUM = 3; export const DEFAULT_HEROES = [ 12, 14, 11, 9, 15]; +export const DEFAULT_HEROES_LV = 30; export const DEFAULT_ITEMS = [ {id: 33106, count: 200}, {id: 33107, count: 200}, @@ -334,4 +335,8 @@ export const HERO_GROW_MAX = { export const JOB_TYPE = { PHYSIC: 1, MAGIC: 2 +} + +export const FILENAME = { + DIC_HERO: 'dic_zyz_hero' } \ No newline at end of file diff --git a/shared/db/Hero.ts b/shared/db/Hero.ts index 933962e44..2f5f6fd98 100644 --- a/shared/db/Hero.ts +++ b/shared/db/Hero.ts @@ -123,7 +123,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 }, 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 }, 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 f20ec1c6b..217be83ea 100644 --- a/shared/db/Role.ts +++ b/shared/db/Role.ts @@ -171,7 +171,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(); diff --git a/web-server/app/service/Auth.ts b/web-server/app/service/Auth.ts index 323eef011..7f7259f48 100644 --- a/web-server/app/service/Auth.ts +++ b/web-server/app/service/Auth.ts @@ -1,4 +1,4 @@ -import { FIX_SMS_CODE_TELS, COUNTER, DEFAULT_ITEMS, ITID, DEFAULT_GOLD, DEFAULT_LV } from '@consts/consts'; +import { FIX_SMS_CODE_TELS, COUNTER, DEFAULT_ITEMS, ITID, DEFAULT_GOLD, DEFAULT_LV, DEFAULT_HEROES_LV } from '@consts/consts'; import { DEFAULT_HEROES } from '@consts/consts'; import { HeroModel } from '@db/Hero'; import { RoleModel } from '@db/Role'; @@ -7,7 +7,7 @@ import { STATUS } from '@consts/statusCode'; import { smsModel } from '@db/Sms'; import { Service } from 'egg'; import Counter from '@db/Counter'; -import { getHeroInfoById, getGoodById, getExpByLv } from 'app/pubUtils/gamedata'; +import { getHeroInfoById, getGoodById, getExpByLv, getHeroExpByLv } from 'app/pubUtils/gamedata'; import { ItemModel } from '@db/Item'; const _ = require('underscore'); @@ -132,7 +132,7 @@ export default class Auth extends Service { const code = ctx.service.utils.genCode(6); const seqId = await Counter.getNewCounter(COUNTER.ROLE) || -1; let lv = DEFAULT_LV; - let ge =getExpByLv(lv); + let ge = getExpByLv(lv); const role = await RoleModel.createRole(uid, serverId, { roleId, code, roleName, seqId, lv, exp: ge?ge.sum:0 }); if (role) { for (let hid of DEFAULT_HEROES) { @@ -146,9 +146,10 @@ export default class Auth extends Service { break; } let {quality, initialStars: star, jobid: job, name: hName} = dicHero; - + let lv = DEFAULT_HEROES_LV; + let exp = getHeroExpByLv(lv); hero = await HeroModel.createHero({ - roleId, roleName: role.roleName, hid, hName, star, quality, job, serverId: role.serverId + roleId, roleName: role.roleName, hid, hName, star, quality, job, serverId: role.serverId, lv, exp }); }