From e80c2b6e030ec35a997a6b3f1e281799b68bbee0 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 27 Nov 2020 10:58:18 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E9=B8=BF=E8=92=99=E9=98=B5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c1bc98d9723ef7e77bf1646da784a573bac286bc. --- .../com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 6 +----- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 10 +++++----- .../main/java/config/{SHongmeng.java => Hongmeng.java} | 8 ++++---- .../java/config/{SHongmengUP.java => HongmengUP.java} | 10 +++++----- 4 files changed, 15 insertions(+), 19 deletions(-) rename tablemanager/src/main/java/config/{SHongmeng.java => Hongmeng.java} (70%) rename tablemanager/src/main/java/config/{SHongmengUP.java => HongmengUP.java} (67%) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index d6a77149c..f64bb2df4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -20,7 +20,6 @@ import com.ljsd.jieling.logic.activity.event.UserOnlineEvent; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.GlobalSystemControl; import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.hero.HongMengAttributeEnum; import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.player.PlayerLogic; @@ -169,7 +168,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ remove.removeAll(user.getItemManager().getItemMap().keySet()); remove.forEach(n->{ try { - LOGGER.info("GET_PLAYERINFO_REQUEST uid n = {}", userId, n); + System.out.println("n = " + n); user.getItemManager().newItem(n, 0); }catch (Exception e){ e.printStackTrace(); @@ -190,9 +189,6 @@ public class GetPlayerInfoHandler extends BaseHandler{ user.getPlayerInfoManager().getMonthCard().put(Global.LMONTHCARDID, (int) (System.currentTimeMillis() / 1000)); Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.RECHARGE_BUY.getType(),Global.LMONTHCARDID)); } - // 刷新鸿蒙阵 -// HeroLogic.getInstance().addOrUpdateHongmeng(user); - // 组装鸿蒙阵信息 List hongmengHeroInfos = new ArrayList<>(); Map resonances = heroManager.getResonances(); Map resonancesTime = heroManager.getResonancesTime(); 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 c12bedcc0..b87c419c7 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 @@ -3416,11 +3416,11 @@ public class HeroLogic{ Collections.sort(heroes, new Comparator() { @Override public int compare(Hero hero1, Hero hero2) { - int compareValue = hero2.getLevel() - hero1.getLevel(); + int compareValue = hero1.getLevel() - hero2.getLevel(); if (compareValue != 0) { return compareValue; } - return Integer.compare(hero2.getStar(), hero1.getStar()); + return Integer.compare(hero1.getStar(), hero2.getStar()); } }); List hongmengs = heroManager.getHongmengGuard(); @@ -3448,7 +3448,7 @@ public class HeroLogic{ if (values2.contains(hero.getId())) { continue; } - if (hero.getEquipByPositionMap().size() != 4 && isUnloadEquip == 1) { + if (hero.getEquipByPositionMap().size() != 4) { isUnloadEquip = 0; } if (hero.getJewelInfo().isEmpty()) { @@ -3522,7 +3522,7 @@ public class HeroLogic{ LOGGER.info("openResonance uid=>{} has open=>{}", user.getId(), graidId); throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); } - SHongmeng hongmeng = SHongmeng.hongmengs.get(graidId); + Hongmeng hongmeng = Hongmeng.hongmengs.get(graidId); if (hongmeng == null) { LOGGER.info("openResonance uid=>{} graidId not exist=>{}", user.getId(), graidId); throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); @@ -3668,7 +3668,7 @@ public class HeroLogic{ throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); } int nextLevel = heroManager.getHongmengTablet() + 1; - SHongmengUP hongmengUP = SHongmengUP.hongmengUPLevels.get(nextLevel); + HongmengUP hongmengUP = HongmengUP.hongmengUPLevels.get(nextLevel); if (hongmengUP == null) { LOGGER.info("updateHongmengTablet uid=>{} curLevel={} maxLevel =>{} nextLevel=>{}", user.getId(), heroManager.getHongmengTablet(), maxLevel, nextLevel); throw new ErrorCodeException(ErrorCode.SERVER_DEFINE_SELF); diff --git a/tablemanager/src/main/java/config/SHongmeng.java b/tablemanager/src/main/java/config/Hongmeng.java similarity index 70% rename from tablemanager/src/main/java/config/SHongmeng.java rename to tablemanager/src/main/java/config/Hongmeng.java index b8dd962f5..20e43e99d 100644 --- a/tablemanager/src/main/java/config/SHongmeng.java +++ b/tablemanager/src/main/java/config/Hongmeng.java @@ -6,9 +6,9 @@ import manager.Table; import java.util.Map; @Table(name = "Hongmeng") -public class SHongmeng implements BaseConfig{ +public class Hongmeng implements BaseConfig{ - public static Map hongmengs; + public static Map hongmengs; private int id; @@ -19,10 +19,10 @@ public class SHongmeng implements BaseConfig{ @Override public void init() throws Exception { - hongmengs = STableManager.getConfig(SHongmeng.class); + hongmengs = STableManager.getConfig(Hongmeng.class); } - public SHongmeng getHongmengById(int id){ + public Hongmeng getHongmengById(int id){ return hongmengs.get(id); } diff --git a/tablemanager/src/main/java/config/SHongmengUP.java b/tablemanager/src/main/java/config/HongmengUP.java similarity index 67% rename from tablemanager/src/main/java/config/SHongmengUP.java rename to tablemanager/src/main/java/config/HongmengUP.java index 647e42232..932eebff2 100644 --- a/tablemanager/src/main/java/config/SHongmengUP.java +++ b/tablemanager/src/main/java/config/HongmengUP.java @@ -7,11 +7,11 @@ import java.util.HashMap; import java.util.Map; @Table(name = "HongmengUP") -public class SHongmengUP implements BaseConfig{ +public class HongmengUP implements BaseConfig{ - public static Map hongmengUPs; + public static Map hongmengUPs; - public static Map hongmengUPLevels; + public static Map hongmengUPLevels; private int id; @@ -22,9 +22,9 @@ public class SHongmengUP implements BaseConfig{ @Override public void init() throws Exception { - hongmengUPs = STableManager.getConfig(SHongmengUP.class); + hongmengUPs = STableManager.getConfig(HongmengUP.class); hongmengUPLevels = new HashMap<>(); - for (SHongmengUP hongmengUP : hongmengUPs.values()) { + for (HongmengUP hongmengUP : hongmengUPs.values()) { hongmengUPLevels.put(hongmengUP.getHongmengLevel(), hongmengUP); } }