From 270ba601d986d3558d72e4ec42f9f9b75556c265 Mon Sep 17 00:00:00 2001 From: gaojie Date: Wed, 9 Jan 2019 17:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=9D=99=E6=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/GameApplication.java | 1 + .../java/com/ljsd/jieling/config/SCMap.java | 2 +- .../com/ljsd/jieling/config/SCMapConfig.java | 41 +++++++++++++++++ .../com/ljsd/jieling/config/SCMapEvent.java | 2 +- .../com/ljsd/jieling/config/SCMapSize.java | 45 ------------------- .../jieling/config/json/ServerProperties.java | 11 +++++ .../com/ljsd/jieling/logic/STableManager.java | 9 ++-- 7 files changed, 61 insertions(+), 50 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/config/SCMapConfig.java delete mode 100644 serverlogic/src/main/java/com/ljsd/jieling/config/SCMapSize.java diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index 6262c9a59..db42bc4b9 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -48,6 +48,7 @@ public class GameApplication { ServerConfiguration serverConfiguration = configurableApplicationContext.getBean(ServerConfiguration.class); serverProperties = serverConfiguration.getServerProperties(); serverId = serverProperties.getId(); + LOGGER.info("ServerProperties ->{},coreIp=>{}", serverProperties.toString()); //注册消息处理方法 ProtocolsManager protocolsManager = ProtocolsManager.getInstance(); // protocolsManager.initContext(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SCMap.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SCMap.java index 961214009..487fa1646 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SCMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SCMap.java @@ -6,7 +6,7 @@ import com.ljsd.jieling.logic.Table; import java.util.Map; -@Table(name = "s_c_map") +@Table(name = "1.Map") public class SCMap implements BaseConfig { public static Map> sCMap; private int id; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapConfig.java new file mode 100644 index 000000000..44f8bf8ba --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapConfig.java @@ -0,0 +1,41 @@ +package com.ljsd.jieling.config; + + +import com.ljsd.jieling.logic.STableManager; +import com.ljsd.jieling.logic.Table; + +import java.util.Map; + +@Table(name = "1.MapConfig") +public class SCMapConfig implements BaseConfig { + public static Map sCMapSize; + private int id; + private String info; + private int[] size; // 0:行 1列 + private int confused; //地图消耗 + private String openRule; // 开启条件 + @Override + public void init() throws Exception { + sCMapSize = STableManager.getConfig(SCMapConfig.class); + } + + public int getId() { + return id; + } + + public String getInfo() { + return info; + } + + public int[] getSize() { + return size; + } + + public int getConfused() { + return confused; + } + + public String getOpenRule() { + return openRule; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapEvent.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapEvent.java index 4093961d0..9a67dbc38 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapEvent.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapEvent.java @@ -5,7 +5,7 @@ import com.ljsd.jieling.logic.Table; import java.util.Map; -@Table(name = "s_c_map_event") +@Table(name = "2.MapEventsConfig") public class SCMapEvent implements BaseConfig{ public static Map scMapEventMap; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapSize.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapSize.java deleted file mode 100644 index e4b69867f..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapSize.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.ljsd.jieling.config; - - -import com.ljsd.jieling.logic.STableManager; -import com.ljsd.jieling.logic.Table; - -import java.util.HashMap; -import java.util.Map; - -@Table(name = "s_c_map_size") -public class SCMapSize implements BaseConfig { - public Map sCMapSize; - public Map sCardMapSizeById; - private int id; - private int length; - private int width; - @Override - public void init() throws Exception { - sCMapSize = STableManager.getConfig(SCMapSize.class); - sCardMapSizeById = new HashMap<>(); - for (Map.Entry entry : sCMapSize.entrySet()) { - sCardMapSizeById.put(entry.getValue().getId(), entry.getValue()); - } - } - - public int getId() { - return id; - } - - public Map getsCMapSize() { - return sCMapSize; - } - - public Map getsCardMapSizeById() { - return sCardMapSizeById; - } - - public int getLength() { - return length; - } - - public int getWidth() { - return width; - } -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/json/ServerProperties.java b/serverlogic/src/main/java/com/ljsd/jieling/config/json/ServerProperties.java index 3e8cfc525..849da3496 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/json/ServerProperties.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/json/ServerProperties.java @@ -16,6 +16,8 @@ public class ServerProperties { private int isLAN; + private String openTime; + public int getId() { return id; } @@ -48,6 +50,14 @@ public class ServerProperties { this.isLAN = isLAN; } + public String getOpenTime() { + return openTime; + } + + public void setOpenTime(String openTime) { + this.openTime = openTime; + } + @Override public String toString() { return "ServerProperties{" + @@ -55,6 +65,7 @@ public class ServerProperties { ", plat='" + plat + '\'' + ", channel='" + channel + '\'' + ", isLAN=" + isLAN + + ", openTime=" + openTime + '}'; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java index c47e4ce44..966db3c48 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java @@ -92,6 +92,9 @@ public class STableManager { BufferedReader bufferedReader = new BufferedReader(new FileReader(file)); LOGGER.info("initMap:{}", clazz.getSimpleName()); while ((line = bufferedReader.readLine()) != null) { + if (line.isEmpty()){ + continue; + } T obj = clazz.newInstance(); String[] prarms = line.split("\\t"); switch (lineNum) { @@ -124,7 +127,7 @@ public class STableManager { int mapType = 101; for (int i = 101; i < 1000; i++) { Map mapConf = new HashMap<>(); - tableName = tableName + i; + tableName = tableName + "_"+ i; String path = SysUtil.getPath("conf", "server", tableName + ".txt"); File file = new File(path); if (!file.exists()) { @@ -156,7 +159,7 @@ public class STableManager { lineNum++; } map.put(i, mapConf); - tableName = tableName.substring(0, 7); + tableName = tableName.substring(0, 5); } return map; } @@ -165,7 +168,7 @@ public class STableManager { * 处理参数 */ private static void dealParams(Class clazz, Map map, List key, List type, T obj, String[] prarms) throws NoSuchFieldException, IllegalAccessException { - int id = Integer.parseInt(prarms[0]); + int id = Integer.parseInt(prarms[0]); for (int i = 0; i < prarms.length; i++) { try { Field field = clazz.getDeclaredField(key.get(i));