Merge branch 'master_test' into master_test_gn
commit
5aa5b1fecb
|
@ -1238,7 +1238,7 @@ public class HeroLogic{
|
|||
// 聚合::根据openlevel倒序,输出list
|
||||
List<SCHeroRankUpConfig> collect = rankUpConfigs.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList());
|
||||
for(SCHeroRankUpConfig scHeroRankUpConfig : collect){
|
||||
if (heroLevel >= scHeroRankUpConfig.getOpenLevel()){
|
||||
if (heroLevel > scHeroRankUpConfig.getOpenLevel()){
|
||||
if (scHeroRankUpConfig.getOpenStar() > 10){
|
||||
continue;
|
||||
}
|
||||
|
@ -1265,7 +1265,7 @@ public class HeroLogic{
|
|||
// 聚合:根据openlevel倒叙排序,输出成list
|
||||
List<SCHeroRankUpConfig> collect = rankUpConfigs.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList());
|
||||
for(SCHeroRankUpConfig scHeroRankUpConfig : collect){
|
||||
if (heroLevel >= scHeroRankUpConfig.getLimitLevel()){
|
||||
if (heroLevel > scHeroRankUpConfig.getLimitLevel()){
|
||||
return scHeroRankUpConfig.getId();
|
||||
}
|
||||
}
|
||||
|
@ -1292,9 +1292,11 @@ public class HeroLogic{
|
|||
// 聚合::根据openlevel倒序,输出list
|
||||
List<SCHeroRankUpConfig> collect = rankUpStar.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList());
|
||||
for(SCHeroRankUpConfig val : collect){
|
||||
if (heroLevel >= val.getOpenLevel()){
|
||||
if (heroLevel > val.getOpenLevel()){
|
||||
// 计算星级需要+1操作
|
||||
int result = val.getOpenStar()+1;
|
||||
// 机器人生成星级,最高10星
|
||||
return val.getOpenStar()>10?10:val.getOpenStar();
|
||||
return result>10?10:result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1306,7 +1308,7 @@ public class HeroLogic{
|
|||
// 聚合:根据openlevel倒叙排序,输出成list
|
||||
List<SCHeroRankUpConfig> collect = rankUpBreak.stream().sorted(Comparator.comparing(SCHeroRankUpConfig::getOpenLevel).reversed()).collect(Collectors.toList());
|
||||
for(SCHeroRankUpConfig val : collect){
|
||||
if (heroLevel >= val.getLimitLevel()){
|
||||
if (heroLevel > val.getLimitLevel()){
|
||||
return val.getOpenStar()>10?10:val.getOpenStar();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue