From d86d08821b0ab151057a70385a095d52bfd347aa Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 1 Jul 2021 18:29:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E6=9C=8D=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/rpc/net/GlobalProtocolsManager.java | 62 ++++++++++--------- .../main/java/config/SEndlessHeroProp.java | 6 ++ .../src/main/java/config/SHeroSkin.java | 6 ++ .../config/SRechargeCommodityNewConfig.java | 20 ++++++ .../src/main/java/manager/STableManager.java | 2 +- 5 files changed, 65 insertions(+), 31 deletions(-) diff --git a/gamecommon/src/main/java/rpc/net/GlobalProtocolsManager.java b/gamecommon/src/main/java/rpc/net/GlobalProtocolsManager.java index 81532b06c..b8b9a097c 100644 --- a/gamecommon/src/main/java/rpc/net/GlobalProtocolsManager.java +++ b/gamecommon/src/main/java/rpc/net/GlobalProtocolsManager.java @@ -21,37 +21,39 @@ public abstract class GlobalProtocolsManager { public static final Logger LOGGER = LoggerFactory.getLogger(GlobalProtocolsManager.class); private static Map handlers = new HashMap<>(); + //暂时不用了 public static void initHandler(String pck,ClassLoader classLoader) { - List> handlers = new LinkedList<>(); - try { - try { - ClassLoaderHelper.findLocalClass(pck, gtGBaseHandler.class, classLoader, handlers); - } catch (RuntimeException e) { - LOGGER.info("request unknow RuntimeException {} ", ErrorPrintUtil.getExceptionStackTraceFileLineAndMethod(e)); - } - try { - ClassLoaderHelper.findClassJar(pck, gtGBaseHandler.class,classLoader, handlers); - } catch (RuntimeException e) { - LOGGER.info("request unknow RuntimeException {} ", ErrorPrintUtil.getExceptionStackTraceFileLineAndMethod(e)); - } - - handlers.forEach(hand -> - { - gtGBaseHandler baseHandler = null; - - try { - baseHandler = (gtGBaseHandler) hand.newInstance(); - } catch (Exception ex) { - LOGGER.info("request unknow Exception {} ", ErrorPrintUtil.getExceptionStackTraceFileLineAndMethod(ex)); - } - - if (null != baseHandler) { - addHandler(baseHandler); - } - }); - } catch (RuntimeException e2) { - LOGGER.info("initHandler unknow RuntimeException {} ", ErrorPrintUtil.getExceptionStackTraceFileLineAndMethod(e2)); - } + return; +// List> handlers = new LinkedList<>(); +// try { +// try { +// ClassLoaderHelper.findLocalClass(pck, gtGBaseHandler.class, classLoader, handlers); +// } catch (RuntimeException e) { +// LOGGER.info("request unknow RuntimeException {} ", ErrorPrintUtil.getExceptionStackTraceFileLineAndMethod(e)); +// } +// try { +// ClassLoaderHelper.findClassJar(pck, gtGBaseHandler.class,classLoader, handlers); +// } catch (RuntimeException e) { +// LOGGER.info("request unknow RuntimeException {} ", ErrorPrintUtil.getExceptionStackTraceFileLineAndMethod(e)); +// } +// +// handlers.forEach(hand -> +// { +// gtGBaseHandler baseHandler = null; +// +// try { +// baseHandler = (gtGBaseHandler) hand.newInstance(); +// } catch (Exception ex) { +// LOGGER.info("request unknow Exception {} ", ErrorPrintUtil.getExceptionStackTraceFileLineAndMethod(ex)); +// } +// +// if (null != baseHandler) { +// addHandler(baseHandler); +// } +// }); +// } catch (RuntimeException e2) { +// LOGGER.info("initHandler unknow RuntimeException {} ", ErrorPrintUtil.getExceptionStackTraceFileLineAndMethod(e2)); +// } } diff --git a/tablemanager/src/main/java/config/SEndlessHeroProp.java b/tablemanager/src/main/java/config/SEndlessHeroProp.java index a0feba67e..5f4c10031 100644 --- a/tablemanager/src/main/java/config/SEndlessHeroProp.java +++ b/tablemanager/src/main/java/config/SEndlessHeroProp.java @@ -26,6 +26,8 @@ public class SEndlessHeroProp implements BaseConfig { private int[][] props; + private int heroRankId; + private int heroStarId; public static Map> propsMap = new HashMap<>(); @@ -83,4 +85,8 @@ public class SEndlessHeroProp implements BaseConfig { public int getHeroStarId() { return heroStarId; } + + public int getHeroRankId() { + return heroRankId; + } } \ No newline at end of file diff --git a/tablemanager/src/main/java/config/SHeroSkin.java b/tablemanager/src/main/java/config/SHeroSkin.java index b2a86873f..2af065a99 100644 --- a/tablemanager/src/main/java/config/SHeroSkin.java +++ b/tablemanager/src/main/java/config/SHeroSkin.java @@ -31,6 +31,8 @@ public class SHeroSkin implements BaseConfig { private int[] headIcon; + private int show; + public static Map skinMapByType; @@ -94,4 +96,8 @@ public class SHeroSkin implements BaseConfig { public int[] getHeadIcon() { return headIcon; } + + public int getShow() { + return show; + } } \ No newline at end of file diff --git a/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java b/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java index bd582a0ca..af5ab4357 100644 --- a/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java +++ b/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java @@ -54,6 +54,10 @@ public class SRechargeCommodityNewConfig implements BaseConfig { private String rechargeId5; private String rechargeId6; + private String rechargeId7; + private String rechargeId8; + private String rechargeId9; + private String rechargeId10; private int[] forbid; @@ -174,6 +178,22 @@ public class SRechargeCommodityNewConfig implements BaseConfig { return rechargeId6; } + public String getRechargeId7() { + return rechargeId7; + } + + public String getRechargeId8() { + return rechargeId8; + } + + public String getRechargeId9() { + return rechargeId9; + } + + public String getRechargeId10() { + return rechargeId10; + } + public String[][] getCondition() { return condition; } diff --git a/tablemanager/src/main/java/manager/STableManager.java b/tablemanager/src/main/java/manager/STableManager.java index 86ddfdf09..f440d671e 100644 --- a/tablemanager/src/main/java/manager/STableManager.java +++ b/tablemanager/src/main/java/manager/STableManager.java @@ -197,7 +197,7 @@ public class STableManager { LOGGER.error("file not find {}, do not find sheet with {} you need rebuild all sheet by gen sheet tool!", path, tableName); throw new NullPointerException("clazz.null" + clazz.getName()); } - LOGGER.info("initMap:{}", clazz.getSimpleName()); + LOGGER.info("initConfig:{}", clazz.getSimpleName()); readFileToCache(clazz, map, file); } catch (Exception e) { e.printStackTrace();