diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index 58c890a06..0db06832c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -1223,10 +1223,13 @@ public class ChampionshipLogic { schedule=1; }else {//决赛 int totalWiner =sChampionshipSetting.getChampionshipPlayer()/ sChampionshipSetting.getTrialsGroup() * sChampionshipSetting.getTrialsGroupWinner(); - int roundTimes = totalWiner>>diff; - if(roundTimes<2){ - return; - } + if(diff>totalWiner){ + return; + } + if(Math.pow(2,diff)>=totalWiner){ + return; + } + progressTmp = 200 + (int)(diff+1)*10 + progressState; if(schedule==1){ // 刚开始进入决赛,选拔出选手 selectToJoinFinal(); @@ -1259,7 +1262,6 @@ public class ChampionshipLogic { MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.CHAMPION_PROGRESS_UPDATE_INDICATION_VALUE,build,true); } } - private static int getDuratimeByProgressState(int progressState){ SChampionshipSetting sChampionshipSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getsChampionshipSetting(); if(progressState == 0){