From 92df10cfa7f3fcc7dfc9f21414d2aa407eacaa89 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 17 Aug 2019 14:44:25 +0800 Subject: [PATCH 1/5] fix bug --- .../jieling/handler/GetPlayerInfoHandler.java | 3 +++ .../ljsd/jieling/logic/store/StoreLogic.java | 26 ++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index e3b4be53a..ffb2d23df 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -76,6 +76,9 @@ public class GetPlayerInfoHandler extends BaseHandler{ } RoomInfo roomInfo = user.getRoomInfo(); MapManager mapManager = user.getMapManager(); + if(user.getMapManager().getCurMapId()!=0 && user.getMapManager().getMission() == null){ + user.getMapManager().setCurMapId(0); + } CommonProto.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager(), user.getPlayerInfoManager().getMapId(), user.getMapManager().getCurMapId(),user.getMapManager(),roomInfo); CommonProto.SuddenlyBossInfo suddenlyBossInfo = CommonProto.SuddenlyBossInfo.newBuilder().setSuddBossId(mapManager.getSuddenlyBoss()).setEndTime(mapManager.getSuddenlyBossEndTime()).setFindMapId(mapManager.getFindSuddenlyBossMapId()).build(); CommonProto.VipBaseInfo vipInfoProto = CommonProto.VipBaseInfo.newBuilder() 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 8b9e9777a..067d98d15 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 @@ -1,6 +1,8 @@ package com.ljsd.jieling.logic.store; import com.ljsd.jieling.config.*; +import com.ljsd.jieling.core.HandlerLogicThread; +import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.ktbeans.KtEventUtils; import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean; @@ -13,14 +15,13 @@ import com.ljsd.jieling.logic.dao.StoreManager; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.mission.GameEvent; +import com.ljsd.jieling.logic.mission.event.MissionEventDistributor; +import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.protocols.PlayerInfoProto; -import com.ljsd.jieling.util.ItemUtil; -import com.ljsd.jieling.util.MessageUtil; -import com.ljsd.jieling.util.StringUtil; -import com.ljsd.jieling.util.TimeUtils; +import com.ljsd.jieling.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +43,7 @@ public class StoreLogic { storeGiftType.add(32); } - public static void checkGlobalStore(boolean isStartServer) throws Exception { + public void checkGlobalStore(boolean isStartServer) throws Exception { long now = System.currentTimeMillis(); for(SStoreTypeConfig sStoreTypeConfig : SStoreTypeConfig.getsStoreTypeConfigMap().values()){ if(sStoreTypeConfig.getStoreOpenRule() == 3){ @@ -57,7 +58,7 @@ public class StoreLogic { if(startTime!=0 && endTime!=0 && now > startTime && now Date: Sat, 17 Aug 2019 14:48:06 +0800 Subject: [PATCH 2/5] fix store --- .../src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 067d98d15..2d93b8954 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 @@ -43,7 +43,7 @@ public class StoreLogic { storeGiftType.add(32); } - public void checkGlobalStore(boolean isStartServer) throws Exception { + public static void checkGlobalStore(boolean isStartServer) throws Exception { long now = System.currentTimeMillis(); for(SStoreTypeConfig sStoreTypeConfig : SStoreTypeConfig.getsStoreTypeConfigMap().values()){ if(sStoreTypeConfig.getStoreOpenRule() == 3){ From 4c9dc4245ba3b8e81b85a0b12fa71ca0bb972a1d Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 17 Aug 2019 14:49:17 +0800 Subject: [PATCH 3/5] fxi store --- .../src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2d93b8954..c16b17c41 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 @@ -69,7 +69,7 @@ public class StoreLogic { } } - private void updateUsersStoreAyync(User user,int id){ + private static void updateUsersStoreAyync(User user,int id){ AyyncWorker ayyncWorker = new AyyncWorker(user,true) { @Override public void work(User user) throws Exception { From 37d9d36e1823a10d888b9ffd5ec44407e7bb1c47 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 17 Aug 2019 15:17:48 +0800 Subject: [PATCH 4/5] fix protobean --- serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 1acbaf590..5a89b35c3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -436,6 +436,7 @@ public class CBean2Proto { if(!removeCache.isEmpty()){ adventureStateInfo.removeMutBossGroup(removeCache); } + builder.addAdventureStateInfoList(builder1); } return builder.build(); From 8005f5d2c7f962397ad2829c8022792f3d168198 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 17 Aug 2019 15:23:40 +0800 Subject: [PATCH 5/5] fix type --- .../com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index ffb2d23df..a31309cfc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.handler; +import com.ljsd.jieling.config.SChallengeConfig; import com.ljsd.jieling.config.SLotterySetting; import com.ljsd.jieling.config.SRechargeCommodityConfig; import com.ljsd.jieling.db.redis.RedisKey; @@ -77,7 +78,11 @@ public class GetPlayerInfoHandler extends BaseHandler{ RoomInfo roomInfo = user.getRoomInfo(); MapManager mapManager = user.getMapManager(); if(user.getMapManager().getCurMapId()!=0 && user.getMapManager().getMission() == null){ - user.getMapManager().setCurMapId(0); + int type = SChallengeConfig.sChallengeConfigs.get(user.getMapManager().getCurMapId()).getType(); + if(type == 1 || type == 3){ + user.getMapManager().setCurMapId(0); + } + } CommonProto.Player player = CBean2Proto.getPlayer(userId, user.getPlayerInfoManager(), user.getPlayerInfoManager().getMapId(), user.getMapManager().getCurMapId(),user.getMapManager(),roomInfo); CommonProto.SuddenlyBossInfo suddenlyBossInfo = CommonProto.SuddenlyBossInfo.newBuilder().setSuddBossId(mapManager.getSuddenlyBoss()).setEndTime(mapManager.getSuddenlyBossEndTime()).setFindMapId(mapManager.getFindSuddenlyBossMapId()).build();