竞技场重写二版微改
parent
d1e1a876ea
commit
f167725b51
|
|
@ -3,7 +3,9 @@ package config;
|
|||
import manager.STableManager;
|
||||
import manager.Table;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
@Table(name ="ArenaLevel")
|
||||
public class SArenaLevel implements BaseConfig {
|
||||
|
|
@ -24,21 +26,21 @@ public class SArenaLevel implements BaseConfig {
|
|||
return STableManager.getConfig(SArenaLevel.class);
|
||||
}
|
||||
|
||||
public static int getLv(int score){
|
||||
public static int getLv(long score){
|
||||
Map<Integer, SArenaLevel> map = getMap();
|
||||
int maxKey = -1;
|
||||
int maxValue = Integer.MIN_VALUE;
|
||||
|
||||
int maxKey = 0;
|
||||
for (Map.Entry<Integer, SArenaLevel> entry : map.entrySet()) {
|
||||
int key = entry.getKey();
|
||||
int value = entry.getValue().getArenaLevelIntegral()[1];
|
||||
|
||||
if (value <= score && value > maxValue) {
|
||||
int[] integral = entry.getValue().getArenaLevelIntegral();
|
||||
if (score <= integral[0] && score >= integral[1]) {
|
||||
maxKey = key;
|
||||
maxValue = value;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (maxKey == 0){
|
||||
Optional<SArenaLevel> first = map.values().stream().max(Comparator.comparing(SArenaLevel::getId));
|
||||
maxKey = first.get().getId();
|
||||
}
|
||||
return maxKey;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ public class SArenaRoom implements BaseConfig {
|
|||
* @return int
|
||||
*/
|
||||
public static int getRoomId(int arenaLvId){
|
||||
int result = 0;
|
||||
int result = 1;
|
||||
Map<Integer, SArenaRoom> roomMap = getMap();
|
||||
for (SArenaRoom room : roomMap.values()) {
|
||||
if (room.getIsOpen() == 0){
|
||||
|
|
|
|||
Loading…
Reference in New Issue