From 1b0bfdd9be378c8aceb3c32a2ef447e0c4d67152 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 18 Nov 2022 17:08:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E5=8D=B0=E5=A5=97=E8=A3=85=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 8 +++++--- tablemanager/src/main/java/config/SEquipSuiteConfig.java | 7 +++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index e3439845e..ee28ac3c2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -29,6 +29,7 @@ import com.ljsd.jieling.logic.activity.eventhandler.SaveHeroForceEventHandler; import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.cross.CSPlayer; +import com.ljsd.jieling.logic.dao.root.GuildLog; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.vo.HeroVo; import com.ljsd.jieling.logic.expedition.ExpeditionLogic; @@ -2091,14 +2092,15 @@ public class HeroLogic { // 添加到套装list godSealSuiteNumList.add(sEquipConfig); } - Collections.sort(godSealSuiteNumList); // 记录当前长度(位置) int godSealNum = godSealSuiteNumList.size(); - if (!godSealSuiteNumList.isEmpty()) { + if (godSealNum > 0) { + // 根据品质正序排序 + godSealSuiteNumList.sort(Comparator.comparingInt(SEquipConfig::getQuality)); // 遍历套装list for (SEquipConfig item : godSealSuiteNumList) { //根据星级读取配置表,为空表示不是套装 - SEquipSuiteConfig sEquipSuiteConfig = SEquipSuiteConfig.config.get(item.getStar()); + SEquipSuiteConfig sEquipSuiteConfig = SEquipSuiteConfig.config.get(item.getSuiteID1()); if (null != sEquipSuiteConfig) { // 根据套装数量读表,为空标是套装数量不足 Integer integer = sEquipSuiteConfig.getSuiteSkills().get(godSealNum); diff --git a/tablemanager/src/main/java/config/SEquipSuiteConfig.java b/tablemanager/src/main/java/config/SEquipSuiteConfig.java index d24324542..76b5ce351 100644 --- a/tablemanager/src/main/java/config/SEquipSuiteConfig.java +++ b/tablemanager/src/main/java/config/SEquipSuiteConfig.java @@ -15,11 +15,10 @@ public class SEquipSuiteConfig implements BaseConfig { private int[][] suiteSkill; - private Map suiteSkills; - - private Map> suiteMap; - public static Map config; + private Map suiteSkills = new HashMap<>(); + private Map> suiteMap = new HashMap<>(); + public static Map config = new HashMap<>(); @Override public void init() throws Exception {