巅峰赛提交
parent
4c6fe83533
commit
dcfa14717c
|
@ -16,6 +16,6 @@ public class ChampionFunction implements FunctionManager {
|
|||
|
||||
@Override
|
||||
public void closeAction() throws Exception {
|
||||
ChampionshipLogic.close();
|
||||
// ChampionshipLogic.close();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -67,8 +67,6 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
|||
//
|
||||
List<String> strings = RedisUtil.getInstence().lGet(RedisKey.CHAMPION_MY_BATTLLE_IDS, Integer.toString(arenaRecord.getAttackId()), 0,-1);
|
||||
//
|
||||
|
||||
|
||||
for (String redisId:strings) {
|
||||
ArenaRecord record = RedisUtil.getInstence().getMapValue(RedisKey.CHAMPION_ARENA_RECORD, "", redisId, ArenaRecord.class);
|
||||
|
||||
|
@ -76,26 +74,24 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
|||
continue;
|
||||
}
|
||||
if((!record.getId().equals(arenaRecord.getId()))&&record.getRoundTims()==(arenaRecord.getRoundTims())){
|
||||
if(record.getFightResult()==0){
|
||||
if(state==-1){
|
||||
state=3;
|
||||
}else if(state==2){
|
||||
state=4;
|
||||
}else{
|
||||
state=record.getFightResult();}
|
||||
}else {
|
||||
if(state==-1){
|
||||
state=2;
|
||||
}else if(state==3){
|
||||
state=5;
|
||||
}else {
|
||||
state=record.getFightResult();
|
||||
if (record.getFightResult() == 1) {
|
||||
if (state == -1) {
|
||||
state = 2;
|
||||
} else if (state == 3) {
|
||||
state = 5;
|
||||
} else {
|
||||
state = record.getFightResult();
|
||||
}
|
||||
} else {
|
||||
if (state == -1) {
|
||||
state = 3;
|
||||
} else if (state == 2) {
|
||||
state = 4;
|
||||
} else {
|
||||
state = record.getFightResult();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// if(state<2){
|
||||
|
|
|
@ -1147,6 +1147,10 @@ public class ChampionshipLogic {
|
|||
progress = -1;
|
||||
return;
|
||||
}
|
||||
|
||||
if(progress == -2){
|
||||
return;
|
||||
}
|
||||
long now = TimeUtils.now();
|
||||
long startTime = timeControllerOfFunction.getStartTime();
|
||||
SChampionshipSetting sChampionshipSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getsChampionshipSetting();
|
||||
|
@ -1172,6 +1176,7 @@ public class ChampionshipLogic {
|
|||
schedule = 2;
|
||||
if (progress != -2) {
|
||||
progress = -2;
|
||||
ChampionshipLogic.close();
|
||||
sendAllProgressUpdate();
|
||||
}
|
||||
progress = -2;
|
||||
|
|
Loading…
Reference in New Issue