From d3d6924a572c3956eec1387294bd7ed50bb2cd34 Mon Sep 17 00:00:00 2001 From: duhui Date: Sat, 18 Sep 2021 15:19:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=BD=B1=E5=93=8D=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E7=BE=8E=E8=A7=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/fight/CombatLogic.java | 3 +++ .../main/java/com/ljsd/jieling/logic/store/StoreLogic.java | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index f7052a9b3..109405a4c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -958,6 +958,9 @@ public class CombatLogic { } int fightId = mainLevelManager.getFightId(); SMainLevelConfig targetMainLevelConfig = SMainLevelConfig.config.get(fightId); +// if (targetMainLevelConfig == null){ +// return this; +// } int lastTime = mainLevelManager.getLastTime(); int times = (time - lastTime)/gameSetting.getAdventureRefresh(); int maxTimes = adventureOffline - takeTimes; 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 c19e611d5..dcf2c5e04 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 @@ -356,8 +356,6 @@ public class StoreLogic implements IEventHandler { Map sstoreTypeConfigMap = SStoreTypeConfig.getsStoreTypeConfigMap(); for ( Map.Entry entry :sstoreTypeConfigMap.entrySet()){ SStoreTypeConfig sStoreTypeConfig = entry.getValue(); - - long refreshTimeDelay = System.currentTimeMillis(); //如果有免费次数,在初始化时候把相对时间减去 if(sStoreTypeConfig.getIfManualRefresh()[0]!=0){ @@ -406,7 +404,7 @@ public class StoreLogic implements IEventHandler { /** * 随机获得商店物品 */ - private static Map getStoreItem(int storeId, SStoreTypeConfig sStoreTypeConfig ,User user) { + private static Map getStoreItem(int storeId, SStoreTypeConfig sStoreTypeConfig ,User user) { Map itemNumMap = new ConcurrentHashMap<>(); for (int i = 1; i <= sStoreTypeConfig.getNumber(); i ++){ int rewardId = getRewardId(storeId,i,user);