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

聊天：修复部分系统消息推送触发

Browse Source
This commit is contained in:
luying
2021-03-29 13:16:40 +08:00
parent 2ea59fc3a3
commit c2e563b607
5 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
game-server/app/servers/role/handler/equipHandler.ts
View File

@@ -535,6 +535,7 @@ export class EquipHandler {
let { count, consumes, jewel, type } = msg;
let roleId: string = session.get('roleId');
let roleName: string = session.get('roleName');
let serverId: number = session.get('serverId');
let sid: string = session.get('sid');
let goodInfo = getGoodById(jewel);
let good = ITID.get(goodInfo.itid);
@@ -549,6 +550,10 @@ export class EquipHandler {
let result = await addItems(roleId, roleName, sid, [{ id: jewel, count: count }]);
if (type == 1)
return resResult(STATUS.SUCCESS, { goods: result });
if (goodInfo.lvLimited >= JEWEL_PUSH_LV) {
pushNormalEquipMsg(roleId, roleName, serverId, MSG_SOURCE.JEWEL_COMPOSE, jewel, goodInfo.name);
}
return resResult(STATUS.SUCCESS);
}
@@ -635,6 +640,7 @@ export class EquipHandler {
let roleId: string = session.get('roleId');
let roleName: string = session.get('roleName');
let sid: string = session.get('sid');
let serverId = session.get('serverId');
let goodInfo = getGoodById(jewel);
let good = ITID.get(goodInfo.itid);
let needUpdate = false;
@@ -661,6 +667,11 @@ export class EquipHandler {
let hasError = await decreaseItems(roleId, sid, consumes);//检查是消耗是否足够
if (!!hasError)
return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH);
if (goodInfo.lvLimited >= JEWEL_PUSH_LV) {
pushNormalEquipMsg(roleId, roleName, serverId, MSG_SOURCE.JEWEL_COMPOSE, jewel, goodInfo.name);
}
let result = {};
if (needUpdate) {
//穿戴宝石

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

@@ -10,7 +10,7 @@ import { ItemModel } from '../../../db/Item';
import { gameData, getHeroExpByLv, getHeroStarByQuality, getHeroWakeByQuality, getHeroLvByExp, getMaxGradeByjobClass, getJobByGradeAndClass, getFriendShipById, getFavourLvByExp } from '../../../pubUtils/data';
import { RewardInter } from '../../../pubUtils/interface';
import { getDropItems, FIGURE_UNLOCK_CONDITION } from '../../../consts/constModules/itemConst'
import { pushComposeOrangeHero, pushHeroQualityUpMsg, pushHeroStarMax } from '../../../services/chatService';
import { pushComposeOrangeHero, pushHeroQualityUpMsg, pushHeroStarMax, pushHeroWakeUp } from '../../../services/chatService';
import { calculatetopLineup } from '../../../pubUtils/playerCe';
import { PvpDefenseModel } from '../../../db/PvpDefense';
import { Attribute } from '../../../domain/roleField/attribute';
@@ -215,8 +215,6 @@ export class HeroHandler {
// 武将升星
public async starUp(msg: { hid: number, star: number, starStage: number}, session: BackendSession) {
let roleId: string = session.get('roleId');
let roleName: string = session.get('roleName');
let serverId: string = session.get('serverId');
let sid: string = session.get('sid');
let {hid, star, starStage} = msg;
@@ -258,7 +256,6 @@ export class HeroHandler {
colorStar: hero.colorStar,
colorStarStage: hero.colorStarStage
}
pushHeroStarMax(roleId, roleName, serverId, hero);
return resResult(STATUS.SUCCESS, {isUpStar, curHero});
}
@@ -314,6 +311,8 @@ export class HeroHandler {
let roleId: string = session.get('roleId');
let sid: string = session.get('sid');
let roleName: string = session.get('roleName');
let serverId: string = session.get('serverId');
let {hid, colorStar, colorStarStage} = msg;
// 根据dic_hero 获得 1. 碎片id 2. 碎片数量 3. 初始武将星级 4. 初始品质
@@ -362,6 +361,8 @@ export class HeroHandler {
colorStar: hero.colorStar,
colorStarStage: hero.colorStarStage
}
if(isWakeUp) pushHeroWakeUp(roleId, roleName, serverId, hero); // 第一次觉醒
pushHeroStarMax(roleId, roleName, serverId, hero);
return resResult(STATUS.SUCCESS, {isUpStar, curHero});
}

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

@@ -505,6 +505,8 @@ export class RoleHandler {
if(checkName) return resResult(STATUS.NAME_HAS_USED);
let role = await RoleModel.updateRoleInfo(roleId, { roleName });
session.set('roleName', role.roleName);
session.push('roleName', () => {});
return resResult(STATUS.SUCCESS, { roleName: role.roleName });
}