Merge branch 'master_dev' into master_otnew
commit
d4e1a6cefd
|
|
@ -98,7 +98,7 @@ public class GetWorldArenaInfoRequestHandler extends BaseHandler<WorldProto.GetW
|
|||
builder1.setScore(score==-1?9999:(int)score);
|
||||
|
||||
//如果是攻击阶段
|
||||
if(ArenaLogic.getInstance().getState()==ArenaLogic.BATTLE_STATE){
|
||||
if(ArenaLogic.getState()==ArenaLogic.BATTLE_STATE){
|
||||
List<CommonProto.ArenaEnemy> arenaEnemyList = ArenaLogic.randomRank(iSession.getUid(), score == -1 ? 9999 : (int) score,crossGroup);
|
||||
builder1.addAllArenaEnemys(arenaEnemyList);
|
||||
}else{
|
||||
|
|
|
|||
|
|
@ -71,17 +71,17 @@ public class ChallengeLogic {
|
|||
int ratio = 0;
|
||||
int[][] value = stage.getReward1();
|
||||
if (type == 1){
|
||||
ratio = Arrays.stream(value).filter(v -> bout > v[0]).mapToInt(v -> v[1]).max().orElse(0);
|
||||
ratio = Arrays.stream(value).filter(v -> bout >= v[0]).mapToInt(v -> v[1]).max().orElse(0);
|
||||
}
|
||||
if (type == 2){
|
||||
ratio = Arrays.stream(value).filter(v -> bout < v[0]).mapToInt(v -> v[1]).min().orElse(0);
|
||||
ratio = Arrays.stream(value).filter(v -> bout <= v[0]).mapToInt(v -> v[1]).max().orElse(0);
|
||||
}
|
||||
builder.setLossBloodOrTimes(bout);
|
||||
|
||||
// 加成百分比
|
||||
for (int[] fix : stage.getPassReward()) {
|
||||
Integer num = comDropMap.getOrDefault(fix[0], 0);
|
||||
num = num + (int)(fix[1] * (ratio/10000d+1d));
|
||||
num = num + (int)(fix[1] * (ratio/10000d));
|
||||
comDropMap.put(fix[0], num);
|
||||
}
|
||||
builder.setPercentReward(ratio);
|
||||
|
|
|
|||
Loading…
Reference in New Issue