From 74e392be4db3404924f4193220de49990d507cc1 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 22 Nov 2022 10:59:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=90=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clazzStaticCfg/CommonStaticConfig.java | 21 +++---------------- .../jieling/logic/GlobalDataManaager.java | 7 +------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java index 058fc1209..99d1f1491 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java @@ -146,6 +146,9 @@ public class CommonStaticConfig extends AbstractClassStaticConfig { break; } + sGlobalSystemConfig.setSystemOpenLong(TimeUtils.parseTimeToMiles(sGlobalSystemConfig.getSystemOpen(), TimeUtils.Stand_CeHua_Data_format)); + sGlobalSystemConfig.setSystemEndLong(TimeUtils.parseTimeToMiles(sGlobalSystemConfig.getSystemEnd(), TimeUtils.Stand_CeHua_Data_format)); + int[] openRules = sGlobalSystemConfig.getOpenRules(); int openType = openRules[0]; int openCondition = openRules[1]; @@ -205,18 +208,6 @@ public class CommonStaticConfig extends AbstractClassStaticConfig { } sWorkTechMapByTechIdAndLevelTmp.get(techId).put(level, sWorkShopTechnology); professByTechIdMapTmp.put(sWorkShopTechnology.getTechId(), sWorkShopTechnology.getProfession()); - - SWorkShopTechnology sWorkShopTechnologyTmp = sWorkTechMapByTechIdAndLevelTmp.get(techId).get(level - 1); -// if (sWorkShopTechnologyTmp != null) { -// Map mineWillReturn = new HashMap<>(); -// Map willReturn = sWorkShopTechnologyTmp.getWillReturn(); -// if (willReturn != null) { -// mineWillReturn.putAll(willReturn); -// } -// int[][] consume = sWorkShopTechnologyTmp.getConsume(); -// HeroLogic.getInstance().combinedAttribute(consume, mineWillReturn); -// sWorkShopTechnology.setWillReturn(mineWillReturn); -// } } sChampionshipSetting = STableManager.getConfig(SChampionshipSetting.class).get(1); @@ -249,9 +240,6 @@ public class CommonStaticConfig extends AbstractClassStaticConfig { leve2ids.put(sExpeditionFloorConfig.getFloor(), ids); }); - - - } catch (Exception e) { LOGGER.error("SExpeditionFloorConfig init fail",e); } @@ -287,9 +275,6 @@ public class CommonStaticConfig extends AbstractClassStaticConfig { LOGGER.error("ExpeditionRecruitConfig init fail",e); } - - - } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 47ea0cc5c..21eb5dd29 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -114,15 +114,11 @@ public class GlobalDataManaager implements IManager { int id = sGlobalSystemConfig.getId(); long systemOpenLong = sGlobalSystemConfig.getSystemOpenLong(); long systemEndLong = sGlobalSystemConfig.getSystemEndLong(); + //强制关闭 if (now < systemOpenLong || now > systemEndLong) { continue; } if(openTimeOfFuntionCache.containsKey(id)){ - //强制关闭 - if(nowsystemEndLong)){ - closeList.add(id); - continue; - } //开服几天后开启 if(getServerOpenTimeCompareSpecialTimeResult()){ int[]limitDay = sGlobalSystemConfig.getIfOpen(); @@ -239,7 +235,6 @@ public class GlobalDataManaager implements IManager { } closeAction(closeList); updateGetFunctionOfTimeResponse(); - } public void openAction(List ids) throws Exception {