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

战力：修复bug

Browse Source
This commit is contained in:
luying
2022-03-31 10:15:50 +08:00
parent af8cb4ec94
commit 134c654115
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app/servers/gm/handler/gmRoleHandler.ts
View File

@@ -94,7 +94,7 @@ export class GmRoleHandler {
param.lv = newLv;
param['exp'] = exp;
}
await calculateCeWithHero(HERO_SYSTEM_TYPE.INIT, roleId, hero.serverId, sid, hid, param);
await calculateCeWithHero(HERO_SYSTEM_TYPE.INIT, roleId, hero.serverId, sid, hid, {...hero, ...param});
// if(param.job > 0) {
// await calculateCe(HERO_SYSTEM_TYPE.STAGEUP, roleId, hero.serverId, sid, param, {}, { hid });

2
game-server/app/servers/role/handler/heroHandler.ts
View File

@@ -580,7 +580,7 @@ export class HeroHandler {
job: dicNewJob.jobid,
ePlace: newEplace
}
let { curHero } = await calculateCeWithHero(HERO_SYSTEM_TYPE.SKIN, roleId, serverId, sid, hero.hid, update);
let { curHero } = await calculateCeWithHero(HERO_SYSTEM_TYPE.SKIN, roleId, serverId, sid, hero.hid, update, { hero });
let resultHero = new HeroParam(curHero);
return resResult(STATUS.SUCCESS, { curHero: {...pick(resultHero, ['hid', 'skins', 'skinId', 'job', 'talent', 'usedTalentPoint']), ePlace: newEplace }});
}

2
game-server/app/servers/role/handler/roleHandler.ts
View File

@@ -44,7 +44,7 @@ export class RoleHandler {
let { roleName } = msg;
let role = await RoleModel.findByRoleId(roleId, 'roleName hasInit title teraphs', true);
let role = await RoleModel.findByRoleId(roleId, 'roleName hasInit title teraphs lv', true);
if (role.hasInit) return resResult(STATUS.ROLE_HAS_INIT);
let checkName = await RoleModel.checkName(roleName, serverId);

3
game-server/app/services/playerCeService.ts
View File

@@ -59,11 +59,12 @@ export async function calculateCes(type: HERO_SYSTEM_TYPE, roleId: string, serve
switch (type) {
case HERO_SYSTEM_TYPE.INIT:
{
for(let [hid, { skinId, lv, quality, star, starStage, colorStar, colorStarStage, job, jobStage, }] of heroUpdates) {
for(let [hid, { skinId, lv, quality, star, starStage, colorStar, colorStarStage, job, jobStage, skins }] of heroUpdates) {
calCe.setHeroBase(hid, skinId);
calCe.setHeroLv(hid, lv);
calCe.setHeroStar(hid, job, quality, star, starStage, colorStar, colorStarStage);
calCe.setJob(hid, job, jobStage);
calCe.setTalent(hid, skins)
}
console.log('####### roleUpdate', param.isInitRole, roleUpdate)
if(param.isInitRole) {

2
game-server/app/services/role/calCe.ts
View File

@@ -214,7 +214,7 @@ export class CalCe {
// 第一次获得皮肤
public setAddSkin(skinId: number) {
let addSkin = gameData.fashion.get(skinId);
for (let { id, number: val } of addSkin.globalAttr) {
for (let { id, number: val } of addSkin.actorAttr) {
let globalAttr = this.data.getGlobalAttrById(id);
globalAttr.skin += val;
}

4
gm-server/app/service/users.ts
View File

@@ -305,8 +305,8 @@ export default class GMUsers extends Service {
}
let list = heroes.map(cur => {
let roleCe = roleMap.get(cur.roleId);
let obj = roleCe.attributes.find(ccur => ccur.hid == cur.hid);
return {...cur, calculatedAttr: obj.attrs, env: ctx.app.config.realEnv}
let obj = roleCe?.attributes?.find(ccur => ccur.hid == cur.hid);
return {...cur, calculatedAttr: obj?.attrs||[], env: ctx.app.config.realEnv}
})
return ctx.service.utils.resResult(STATUS.SUCCESS, { list, total })