整理：删除不需要的channel

game-server/app/servers/connector/handler/entryHandler.ts

@@ -11,7 +11,7 @@ import { COM_BTL_QUALITY, HERO_SELECT, DEBUG_MAGIC_WORD, REDIS_KEY, TASK_TYPE, E
 import { getAp } from '../../../services/actionPointService';
 import { ItemModel } from '../../../db/Item';
 import { SkinModel } from '../../../db/Skin';
-import { loginRefresh } from '../../../services/playerEventService';
+// import { loginRefresh } from '../../../services/playerEventService';
 import { nowSeconds, getZeroPoint } from '../../../pubUtils/timeUtil';
 import { rmRoleFromQueue, roleLeave, getRoleOnlineInfo, roleLogin } from '../../../services/redisService';
 
@@ -39,6 +39,7 @@ export class EntryHandler {
      * @param  {Object}   session current session object
      */
     async enter(msg: { token: string, serverId: number }, session: FrontendSession) {
+        console.log('****** entry before', Date.now());
         let self = this;
         let serverId = msg.serverId;
 
@@ -66,12 +67,6 @@ export class EntryHandler {
         await roleLogin(role.roleId, user.userCode, serverName, user.pkgName); // 保存在线用户
         await this.addSession(role, session);
 
-        let channelService = self.app.get('channelService');
-        let channel = channelService.getChannel(role.roleId, true);
-        if (channel.getMembers().indexOf(role.roleId) === -1) {
-            channel.add(role.roleId, self.app.get('serverId'));
-        }
-
         // put user into channel
         // console.log(JSON.stringify(self.app.rpc.battle))
         // await self.app.rpc.battle.battleRemote.add.route(session)(role.roleId, self.app.get('serverId'), role.serverId, true);
@@ -82,7 +77,7 @@ export class EntryHandler {
         let equips = await EquipModel.findbyRole(role.roleId);
         let items = await ItemModel.findbyRole(role.roleId);
         let skins = await SkinModel.findbyRole(role.roleId);
-        if (role.hasInit) await loginRefresh(role.roleId);
+        // if (role.hasInit) await loginRefresh(role.roleId); // pvp在getData的时候会做初始，这里先注掉
         reportOneOnline(role.roleId, user.userCode, self.app.get('serverId'), true, user);
 
         let r = new Rank(REDIS_KEY.HERO_NUM_RANK, { serverId });
@@ -115,6 +110,7 @@ export class EntryHandler {
         let todayZeroPoint = getZeroPoint();
         role['todayZeroPoint'] = todayZeroPoint;
 
+        console.log('****** entry after', Date.now());
         return resResult(STATUS.SUCCESS, { role: pick(role, ENTERY_ROLE_PICK) });
     }
 

game-server/app/servers/gm/handler/gmHandler.ts

@@ -28,7 +28,6 @@ export class GmHandler {
     }
 
     async pushEvent(msg: { uid: number, serverId: number }, session: BackendSession) {
-        let sid = session.get('sid');
 
         let { uid, serverId } = msg;
         let role = await RoleModel.findByUid(uid, serverId);
@@ -36,19 +35,14 @@ export class GmHandler {
         let { roleId, roleName, eventStatus } = role;
 
         let channelService = this.app.get('channelService');
-        let channel = channelService.getChannel(roleId, true);
-        let users = channel.getMembers();
-        if (users.indexOf(roleId) === -1) {
-            channel.add(roleId, sid);
-        }
-
         let event = await getEvent(eventStatus, roleId, roleName);
-
-        let tsid = channel.getMember(roleId)['sid'];
-        channelService.pushMessageByUids('onSpecialEvent', resResult(STATUS.SUCCESS, { event }), [{
-            uid: roleId,
-            sid: tsid
-        }]);
+        let hisOnlineInfo = await getRoleOnlineInfo(role.roleId);
+        if (hisOnlineInfo.isOnline) {
+            channelService.pushMessageByUids('onSpecialEvent', resResult(STATUS.SUCCESS, { event }), [{
+                uid: roleId,
+                sid: hisOnlineInfo.sid
+            }]);
+        }
         return resResult(STATUS.SUCCESS, { list: event });
     }
 

game-server/app/servers/role/handler/roleHandler.ts

@@ -47,7 +47,6 @@ export class RoleHandler {
         let checkName = await RoleModel.checkName(roleName, serverId);
         if (checkName) return resResult(STATUS.NAME_HAS_USED);
 
-        console.log('****** createHeroes before', Date.now())
         let initInfos: { role: RoleUpdate, initInfos: {heroInfo: HeroUpdate, skinInfo: SkinUpdate}[], figureInfo: { heads: Figure[], frames: Figure[], spines: Figure[] }} 
             = this.app.get('initRoleInfos');
         role = await RoleModel.updateRoleInfo(roleId, {...initInfos.role, roleName, hasInit: true});
@@ -60,12 +59,9 @@ export class RoleHandler {
         await createHero.createWithInitInfo(infos, initInfos.figureInfo);
         await createHero.clearTask(await getActivities());
         await createHero.pushMessage(pinus, sid);
-        console.log('updateRedisRank before', Date.now())
         await createHero.updateRedisRank(Rank);
-        console.log('updateRedisRank after', Date.now())
         let heroes = createHero.getResultHeroes();
 
-        console.log('****** createHeroes after', Date.now())
         session.set('roleName', roleName);
         session.push('roleName', () => { });