Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
6bcd974ef2
|
@ -856,8 +856,8 @@ public class ExpeditionLogic {
|
|||
}
|
||||
int oper = skillModify[i][1];
|
||||
if(oper == 1 || oper == 2){
|
||||
String beReplace = skillModify[i][2]+"";
|
||||
String replace = skillModify[i][3]+"";
|
||||
String beReplace = skillModify[i][2]+"#";
|
||||
String replace = skillModify[i][3]+"#";
|
||||
int index = skillSb.indexOf(beReplace);
|
||||
if(index!=-1){
|
||||
skillSb.replace(index,index+beReplace.length(),replace);
|
||||
|
|
|
@ -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.getOpenLevel()){
|
||||
if (heroLevel >= scHeroRankUpConfig.getLimitLevel()){
|
||||
return scHeroRankUpConfig.getId();
|
||||
}
|
||||
}
|
||||
|
@ -1306,7 +1306,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.getOpenLevel()){
|
||||
if (heroLevel >= val.getLimitLevel()){
|
||||
return val.getOpenStar()>10?10:val.getOpenStar();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue