diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java index 43589d0e4..236b3bb05 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java @@ -98,7 +98,7 @@ public class GetWorldArenaInfoRequestHandler extends BaseHandler arenaEnemyList = ArenaLogic.randomRank(iSession.getUid(), score == -1 ? 9999 : (int) score,crossGroup); builder1.addAllArenaEnemys(arenaEnemyList); }else{ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java index e418560da..249d83e6b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ChallengeLogic.java @@ -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);