check
parent
11b28fab35
commit
55019f706a
|
@ -13,7 +13,6 @@ import com.ljsd.jieling.exception.ErrorCodeException;
|
||||||
import com.ljsd.jieling.globals.BIReason;
|
import com.ljsd.jieling.globals.BIReason;
|
||||||
import com.ljsd.jieling.globals.Global;
|
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.event.*;
|
||||||
import com.ljsd.jieling.logic.activity.eventhandler.HeroFiveStarGetEventHandler;
|
import com.ljsd.jieling.logic.activity.eventhandler.HeroFiveStarGetEventHandler;
|
||||||
import com.ljsd.jieling.logic.dao.*;
|
import com.ljsd.jieling.logic.dao.*;
|
||||||
|
@ -1509,16 +1508,7 @@ public class HeroLogic{
|
||||||
if(equipIds.size()!=1){
|
if(equipIds.size()!=1){
|
||||||
throw new ErrorCodeException(ErrorCode.HERO_OPT_ONE);
|
throw new ErrorCodeException(ErrorCode.HERO_OPT_ONE);
|
||||||
}else{
|
}else{
|
||||||
int[] equipTalismanaUnlock = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting().getEquipTalismanaUnlock()[0];
|
checkAllowedOpt(1,user,hero.getStar());
|
||||||
if(equipTalismanaUnlock[0]==1){
|
|
||||||
if(user.getPlayerInfoManager().getLevel()<equipTalismanaUnlock[0]){
|
|
||||||
throw new ErrorCodeException(ErrorCode.HERO_USE_LEVE);
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
if(hero.getStar()<equipTalismanaUnlock[1]){
|
|
||||||
throw new ErrorCodeException(ErrorCode.HERO_LEVE_LOW);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// hero.updateEspecial(equipIds.get(0));
|
// hero.updateEspecial(equipIds.get(0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2004,7 +1994,7 @@ public class HeroLogic{
|
||||||
User user = UserManager.getUser(uid);
|
User user = UserManager.getUser(uid);
|
||||||
String heroId = optHeroSoul.getHeroId();
|
String heroId = optHeroSoul.getHeroId();
|
||||||
Hero hero = user.getHeroManager().getHero(heroId);
|
Hero hero = user.getHeroManager().getHero(heroId);
|
||||||
checkAllowedOptSoul(user,hero.getLevel());
|
checkAllowedOpt(2,user,hero.getStar());
|
||||||
checkAllowedWear(user,hero.getTemplateId(),optHeroSoul.getSoulEquipIdsList(),unload);
|
checkAllowedWear(user,hero.getTemplateId(),optHeroSoul.getSoulEquipIdsList(),unload);
|
||||||
optHeroSoul.getSoulEquipIdsList().forEach(e->{
|
optHeroSoul.getSoulEquipIdsList().forEach(e->{
|
||||||
hero.updateSoulEquipPositionMap(e.getPosition(),e.getEquipId());
|
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();
|
SGameSetting gameSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting();
|
||||||
int[][] equipSignUnlock = gameSetting.getEquipSignUnlock();
|
int[][] checkParms = null;
|
||||||
for(int[] item : equipSignUnlock){
|
if(type == 1){
|
||||||
if(item[0] == 1 && user.getPlayerInfoManager().getLevel()<item[1]){
|
checkParms = gameSetting.getEquipTalismanaUnlock();
|
||||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
}else if(type == 2){
|
||||||
|
checkParms = gameSetting.getEquipSignUnlock();
|
||||||
|
}else {
|
||||||
|
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
|
||||||
}
|
}
|
||||||
if(item[0] == 2 && heroLevel<item[1]){
|
|
||||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
for(int[] item : checkParms){
|
||||||
|
if(item[0] == 1 && user.getPlayerInfoManager().getLevel()<item[1]){
|
||||||
|
throw new ErrorCodeException(ErrorCode.HERO_USE_LEVE);
|
||||||
|
}
|
||||||
|
if(item[0] == 2 && heroStar<item[1]){
|
||||||
|
throw new ErrorCodeException(ErrorCode.HERO_LEVE_LOW);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,7 +107,7 @@ public class SGameSetting implements BaseConfig {
|
||||||
|
|
||||||
private int[][] equipSignUnlock;
|
private int[][] equipSignUnlock;
|
||||||
|
|
||||||
private int[] heroReturn;
|
private int[][] heroReturn;
|
||||||
|
|
||||||
private int defaultHead;
|
private int defaultHead;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue