From 55019f706a4446cbed3c56b7a5296848375e7214 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 13 Apr 2020 11:26:32 +0800 Subject: [PATCH] check --- .../ljsd/jieling/logic/hero/HeroLogic.java | 34 +++++++++---------- .../src/main/java/config/SGameSetting.java | 2 +- 2 files changed, 17 insertions(+), 19 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 4619e8771..a07c1e8bb 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 @@ -13,7 +13,6 @@ import com.ljsd.jieling.exception.ErrorCodeException; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.globals.Global; -import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.event.*; import com.ljsd.jieling.logic.activity.eventhandler.HeroFiveStarGetEventHandler; import com.ljsd.jieling.logic.dao.*; @@ -1509,16 +1508,7 @@ public class HeroLogic{ if(equipIds.size()!=1){ throw new ErrorCodeException(ErrorCode.HERO_OPT_ONE); }else{ - int[] equipTalismanaUnlock = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getEquipTalismanaUnlock()[0]; - if(equipTalismanaUnlock[0]==1){ - if(user.getPlayerInfoManager().getLevel(){ hero.updateSoulEquipPositionMap(e.getPosition(),e.getEquipId()); @@ -2130,15 +2120,23 @@ public class HeroLogic{ } - public static void checkAllowedOptSoul(User user,int heroLevel) throws ErrorCodeException { + public static void checkAllowedOpt(int type,User user, int heroStar) throws ErrorCodeException { SGameSetting gameSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting(); - int[][] equipSignUnlock = gameSetting.getEquipSignUnlock(); - for(int[] item : equipSignUnlock){ + int[][] checkParms = null; + if(type == 1){ + checkParms = gameSetting.getEquipTalismanaUnlock(); + }else if(type == 2){ + checkParms = gameSetting.getEquipSignUnlock(); + }else { + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE); + } + + for(int[] item : checkParms){ if(item[0] == 1 && user.getPlayerInfoManager().getLevel()