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/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java index f468c64f3..112e18949 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/TowerRank.java @@ -13,13 +13,6 @@ public class TowerRank extends AbstractRank { public TowerRank(Integer type,String redisKey){ super(type,redisKey); } - - @Override - public PlayerInfoProto.RankResponse getRank(int uid,String rkey,int page,int rankEndLine) throws Exception { - rankEndLine = SSpecialConfig.getIntegerValue(SSpecialConfig.TRIAL_RANKINGSHOWNUM); - return super.getRank(uid,rkey,1, rankEndLine); - } - // @Override // public long[] getDataByScore(Double score) { // long[] array = new long [2]; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java index 5e5b1f2fa..da3887770 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java @@ -128,7 +128,7 @@ public class MonsterUtil { int[] monsterIds = groupIds[i]; List monsterList = new ArrayList<>(); int position=1; - /* for (int monsterId : monsterIds) { + for (int monsterId : monsterIds) { if(monsterId!=0){ SMonsterConfig sMonsterConfig = STableManager.getConfig(SMonsterConfig.class).get(monsterId); monsterList.add( CBean2Proto.getMonster(sMonsterConfig, nodeConfig).setPosition(position++).build()); @@ -136,15 +136,15 @@ public class MonsterUtil { position++; } - }*/ - for (int monsterId : monsterIds) { - if(monsterId!=0){ - monsterList.add(monsterMap.get(monsterId).setPosition(position++).build()); - }else{ - position++; - } - } +// for (int monsterId : monsterIds) { +// if(monsterId!=0){ +// monsterList.add(monsterMap.get(monsterId).setPosition(position++).build()); +// }else{ +// position++; +// } +// +// } map.put(i,monsterList); } return map; 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();