diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java index 8b36e1fa9..54e7dcef4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java @@ -108,6 +108,8 @@ public class SGameSetting implements BaseConfig { private int[] equipTalismanaUnlock; + private int[] equipSignUnlock; + private static SGameSetting gameSetting; @@ -319,4 +321,9 @@ public class SGameSetting implements BaseConfig { public int[] getEquipTalismanaUnlock() { return equipTalismanaUnlock; } + + public int[] getEquipSignUnlock() { + return equipSignUnlock; + } + } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java index ddd76da7d..04d79da22 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java @@ -58,8 +58,8 @@ public class SGlobalSystemConfig implements BaseConfig { } if(2 == sGlobalSystemConfig.getType()){ long cacheOpenTime = GameApplication.serverConfig.getCacheOpenTime(); - sGlobalSystemConfig.setSeasonOpenLong(cacheOpenTime +Integer.parseInt(sGlobalSystemConfig.getSeasonOpen())); - sGlobalSystemConfig.setSeasonEndLong(cacheOpenTime +Integer.parseInt(sGlobalSystemConfig.getSeasonEnd())); + sGlobalSystemConfig.setSeasonOpenLong(cacheOpenTime +Integer.parseInt(sGlobalSystemConfig.getSeasonOpen())*1000); + sGlobalSystemConfig.setSeasonEndLong(cacheOpenTime +Integer.parseInt(sGlobalSystemConfig.getSeasonEnd())*1000); }else{ sGlobalSystemConfig.setSeasonOpenLong(TimeUtils.parseTimeToMiles(sGlobalSystemConfig.getSeasonOpen(), TimeUtils.Stand_CeHua_Data_format)); sGlobalSystemConfig.setSeasonEndLong(TimeUtils.parseTimeToMiles(sGlobalSystemConfig.getSeasonEnd(), TimeUtils.Stand_CeHua_Data_format)); 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 429308760..dc6ab90a3 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 @@ -1406,8 +1406,20 @@ public class HeroLogic { Hero hero = user.getHeroManager().getHeroMap().get(heroId); if (hero == null || equipIds.isEmpty()) { - MessageUtil.sendErrorResponse(session, 0, MessageTypeProto.MessageType.SOUL_EQUIP_WEAR_RESPONSE_VALUE, ""); - return; + throw new Exception("英雄不存在或无装备"+heroId+"size"+equipIds.size()); + } + + int[] equipSignUnlock = SGameSetting.getGameSetting().getEquipSignUnlock(); + if(equipSignUnlock[0]==1){ + if(user.getPlayerInfoManager().getLevel() currentType = new HashMap<>(); //pos2type