From 8bc3f131174d2799c3fa6c5d68cce0999c6fa166 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Sun, 26 Sep 2021 18:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E9=87=91=E8=A3=85=E5=A4=87=E6=8A=80?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/config/SEquipSuiteConfig.java | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/tablemanager/src/main/java/config/SEquipSuiteConfig.java b/tablemanager/src/main/java/config/SEquipSuiteConfig.java index 01c9fe6e6..d24324542 100644 --- a/tablemanager/src/main/java/config/SEquipSuiteConfig.java +++ b/tablemanager/src/main/java/config/SEquipSuiteConfig.java @@ -15,6 +15,8 @@ public class SEquipSuiteConfig implements BaseConfig { private int[][] suiteSkill; + private Map suiteSkills; + private Map> suiteMap; public static Map config; @@ -22,18 +24,24 @@ public class SEquipSuiteConfig implements BaseConfig { @Override public void init() throws Exception { Map configTmp = STableManager.getConfig(SEquipSuiteConfig.class); - configTmp.values().forEach(item->{ + for (SEquipSuiteConfig value : configTmp.values()) { Map> suiteMapTmp = new HashMap<>(); - int[][] suiteValue = item.getSuiteValue(); + Map suiteSkills = new HashMap<>(2); + int[][] suiteValue = value.getSuiteValue(); for(int[] suiteItem :suiteValue){ HashMap map = new HashMap<>(); map.putIfAbsent(suiteItem[1], (long) suiteItem[2]); suiteMapTmp.put(suiteItem[0],map); -// suiteMapTmp.putIfAbsent(suiteItem[0],suiteMapTmp.getOrDefault(suiteItem[0],new HashMap<>(suiteMapTmp.getOrDefault(suiteItem[0]-1,new HashMap<>())))); -// suiteMapTmp.get(suiteItem[0]).put(suiteItem[1], suiteMapTmp.get(suiteItem[0]).getOrDefault(suiteItem[1],0) + suiteItem[2]); } - item.setSuiteMap(suiteMapTmp); - }); + int[][] suiteSkill = value.getSuiteSkill(); + if (suiteSkill != null && suiteSkill.length > 0) { + for (int[] ints : suiteSkill) { + suiteSkills.put(ints[0], ints[1]); + } + } + value.setSuiteSkills(suiteSkills); + value.setSuiteMap(suiteMapTmp); + } config=configTmp; } @@ -57,4 +65,12 @@ public class SEquipSuiteConfig implements BaseConfig { public int[][] getSuiteSkill() { return suiteSkill; } + + public Map getSuiteSkills() { + return suiteSkills; + } + + public void setSuiteSkills(Map suiteSkills) { + this.suiteSkills = suiteSkills; + } } \ No newline at end of file