Merge branch 'master_test' into master_test_gn
commit
88fba2ddb6
|
@ -595,8 +595,10 @@ public class ExpeditionLogic {
|
|||
if (scHero == null) {
|
||||
throw new ErrorCodeException(ErrorCode.CFG_NULL,"英雄表id不存在:"+heroTid);
|
||||
}
|
||||
// 等级上限验证
|
||||
// 最高等级
|
||||
level = level>scHero.getMaxLevel()?scHero.getMaxLevel():level;
|
||||
// 最低20级
|
||||
level = level<20?20:level;
|
||||
//创建新的英雄
|
||||
Hero newHero = new Hero(hero,user.getId(),heroTid,level);
|
||||
// 魂宝灵宝,魂印需要走表
|
||||
|
|
|
@ -1294,7 +1294,8 @@ public class HeroLogic{
|
|||
List<SCHeroRankUpConfig> collect = rankUpStar.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList());
|
||||
for(SCHeroRankUpConfig val : collect){
|
||||
if (heroLevel >= val.getOpenLevel()){
|
||||
return val.getOpenStar();
|
||||
// 机器人生成星级,最高10星
|
||||
return val.getOpenStar()>10?10:val.getOpenStar();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1307,7 +1308,7 @@ public class HeroLogic{
|
|||
List<SCHeroRankUpConfig> collect = rankUpBreak.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList());
|
||||
for(SCHeroRankUpConfig val : collect){
|
||||
if (heroLevel >= val.getOpenLevel()){
|
||||
return val.getOpenStar();
|
||||
return val.getOpenStar()>10?10:val.getOpenStar();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue