diff --git a/netty/src/main/java/com/ljsd/jieling/netty/server/AbstractServer.java b/netty/src/main/java/com/ljsd/jieling/netty/server/AbstractServer.java index 9d0f8fa4f..2784aac9f 100644 --- a/netty/src/main/java/com/ljsd/jieling/netty/server/AbstractServer.java +++ b/netty/src/main/java/com/ljsd/jieling/netty/server/AbstractServer.java @@ -88,22 +88,26 @@ public abstract class AbstractServer extends AbstractEndport { public void received(IChannel channel, Object msg) { String sessionId = channel.getBindSessionId(); if (handler instanceof INetReceived) { - NettyGameSession gameSession = currentSessions.get(sessionId); - if (null != gameSession) { - gameSession.received(msg); + if(this.currentSessions.containsKey(sessionId)){ + NettyGameSession gameSession = this.currentSessions.get(sessionId); + if (null != gameSession) { + gameSession.received(msg); + } } } } @Override public void caught(IChannel channel, Throwable caught) { - NettyGameSession gameSession = ((INetSession) handler).createGameSession(channel,handler); - if (null != gameSession) { - LOGGER.info("seission" + gameSession + "channelActive: " + gameSession.getChannel().getRemoteAddress() + " ,uid: " + - gameSession.getUid() + " ,areaId: " + gameSession.getAreaId()); - caught.printStackTrace(); + String sessionId = channel.getBindSessionId(); + if(this.currentSessions.containsKey(sessionId)){ + NettyGameSession gameSession = this.currentSessions.get(sessionId); + if (null != gameSession) { + LOGGER.info("seission" + gameSession + "channelActive: " + gameSession.getChannel().getRemoteAddress() + " ,uid: " + + gameSession.getUid() + " ,areaId: " + gameSession.getAreaId()); + caught.printStackTrace(); + } } - } diff --git a/serverlogic/src/main/java/com/ljsd/GameLogicService.java b/serverlogic/src/main/java/com/ljsd/GameLogicService.java index b8269c7d2..82a7bc66d 100644 --- a/serverlogic/src/main/java/com/ljsd/GameLogicService.java +++ b/serverlogic/src/main/java/com/ljsd/GameLogicService.java @@ -108,6 +108,7 @@ public class GameLogicService implements IService { } Runtime.getRuntime().addShutdownHook(new Thread(() -> { + LOGGER.info("ShutdownHook start"); Thread.currentThread().setName("addShutdownHook"); try { GameApplication.close(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java index 21c4f02d6..246073b65 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/Global.java @@ -67,4 +67,7 @@ public interface Global { int VIPSTORID = 20; //vip商店id + int LUXURYMONTHCARDID =11;//6豪华月卡 + int WEEKCARDID = 10; //月卡 + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java index 617a403cf..64a2694cc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java @@ -113,10 +113,10 @@ public class QuickStartMonsterFighter extends BaseHandler