diff --git a/bloodybattle/src/main/java/com/ljsd/battle/actor/Scene.java b/bloodybattle/src/main/java/com/ljsd/battle/actor/Scene.java index d10b78f35..7de27daca 100644 --- a/bloodybattle/src/main/java/com/ljsd/battle/actor/Scene.java +++ b/bloodybattle/src/main/java/com/ljsd/battle/actor/Scene.java @@ -403,6 +403,7 @@ public class Scene implements Runnable{ } } SceneManager.clearScene(roomId); + RedisUtil.getInstence().del( "MATCH_ROOM_KEY:" + roomId); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java index 838e5e086..9902cad05 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java @@ -158,6 +158,7 @@ public class RedisKey { //掉线缓存indication public static final String INDICATION_OFFLINE = "INDICATION_OFFLINE"; + public static final String INDICATION_OFFLINE_INDEX = "INDICATION_OFFLINE_INDEX"; public static final String INDICATION_OFFLINE_BLOODY = "INDICATION_OFFLINE_BLOODY"; public static final String RESPONSE_OFFLINE = "RESPONSE_OFFLINE"; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java index 84e95d2d5..d2eba2101 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java @@ -228,7 +228,8 @@ public class FriendLogic { continue; } if (friends1.size() >= maxFriends){ - continue; + MessageUtil.sendErrorResponse(iSession,Global.SHOW_TIPS_ERROR,msgId,"对方好友已达上限"); + return; } if (applyFriends.size()>= maxApplyFriends){ applyFriends.remove(0); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java index e4ac7617e..81ec7a9eb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java @@ -129,7 +129,7 @@ public class StoreLogic { while(it.hasNext()){ StoreInfo storeInfo = it.next().getValue(); SStoreTypeConfig sStoreTypeConfig = SStoreTypeConfig.getsStoreTypeConfigMap().get(storeInfo.getId()); - if (sStoreTypeConfig.getStoreOpenRule() ==2){ + if (sStoreTypeConfig.getStoreOpenRule() ==2 || sStoreTypeConfig.getStoreOpenRule() ==5){ if (nowTime > storeInfo.getEndTime()){ removeStoreIds.add(storeInfo.getId()); }