From 50bc669250ef75c80c9761daee51dd91a8400e33 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 13 Jul 2020 17:20:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=92=E5=85=83=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=89=93=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/clazzStaticCfg/HeroStaticConfig.java | 2 +- .../ljsd/jieling/ktbeans/ReportUserEvent.java | 2 +- .../com/ljsd/jieling/ktbeans/ReportUtil.java | 2 +- .../src/main/java/config/SHeroReturn.java | 17 ++++++----------- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/HeroStaticConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/HeroStaticConfig.java index 56242b6b7..92b1a09b6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/HeroStaticConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/HeroStaticConfig.java @@ -84,7 +84,7 @@ public class HeroStaticConfig extends AbstractClassStaticConfig { randomPoolByType.put(sLotterySetting.getId(),sLotterySetting.getMergePool()); } randomHeroIds = randomHeroIdTmp; - randomPoolByType = randomPoolByType; + this.randomPoolByType = randomPoolByType; } catch (Exception e) { LOGGER.error("SLotterySetting init fail"); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java index 49af3b390..36bfaf75a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUserEvent.java @@ -10,7 +10,7 @@ import java.util.Map; */ public class ReportUserEvent { - private ReportBaseBean baseBean; + private ReportBaseBean baseBean = new ReportBaseBean(); private Map baseInfo = new HashMap<>(); private Map eventInfo = new HashMap<>(); private String eventName = ""; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUtil.java index 29a0ae4eb..582aa4383 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUtil.java @@ -23,7 +23,7 @@ public class ReportUtil { private static Map baseBeanMap = new HashMap<>(); - private static ThinkingDataAnalytics ta = new ThinkingDataAnalytics(new ThinkingDataAnalytics.LoggerConsumer("")); + private static ThinkingDataAnalytics ta = new ThinkingDataAnalytics(new ThinkingDataAnalytics.LoggerConsumer(LOG_PATH)); public static final int COIN_ID = 14; diff --git a/tablemanager/src/main/java/config/SHeroReturn.java b/tablemanager/src/main/java/config/SHeroReturn.java index 21151565e..556de72a0 100644 --- a/tablemanager/src/main/java/config/SHeroReturn.java +++ b/tablemanager/src/main/java/config/SHeroReturn.java @@ -15,7 +15,7 @@ public class SHeroReturn implements BaseConfig { private int star; - private int[] rankupReturn; + private int[][] rankupReturn; private int[][] returnHero; @@ -33,16 +33,11 @@ public class SHeroReturn implements BaseConfig { for(SHeroReturn sHeroReturn : config.values()){ int heroId = sHeroReturn.getHeroId(); int star = sHeroReturn.getStar(); - int[] rankupReturn = sHeroReturn.getRankupReturn(); - int[][] returnHero = sHeroReturn.getReturnHero(); - int length = 1 + returnHero.length ; - int[][] returnMaterialsTmp = new int[length][]; - for(int i=0;inew HashMap<>()).put(star,sHeroReturn); } @@ -61,7 +56,7 @@ public class SHeroReturn implements BaseConfig { return star; } - public int[] getRankupReturn() { + public int[][] getRankupReturn() { return rankupReturn; }