巅峰赛
parent
ebe7802660
commit
8fff0be3c3
|
@ -67,7 +67,7 @@ public class GameApplication {
|
||||||
String cmd = sc.nextLine();
|
String cmd = sc.nextLine();
|
||||||
if(cmd.startsWith("//"))
|
if(cmd.startsWith("//"))
|
||||||
{
|
{
|
||||||
System.out.println("执行命令:" + cmd.substring(2));
|
System.out.println("gmgmgm:" + cmd.substring(2));
|
||||||
String cmd2 = cmd.substring(2);
|
String cmd2 = cmd.substring(2);
|
||||||
GmService.exeCmd(cmd2);
|
GmService.exeCmd(cmd2);
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,10 @@ public class ChampinGetHandler extends BaseHandler {
|
||||||
int state = -1;
|
int state = -1;
|
||||||
for (String redisId : strings) {
|
for (String redisId : strings) {
|
||||||
ArenaRecord record = RedisUtil.getInstence().getMapValue(RedisKey.CHAMPION_ARENA_RECORD, "", redisId, ArenaRecord.class);
|
ArenaRecord record = RedisUtil.getInstence().getMapValue(RedisKey.CHAMPION_ARENA_RECORD, "", redisId, ArenaRecord.class);
|
||||||
if ((!record.getId().equals(arenaRecord.getId())) && record.getRoundTims() == roundTims) {
|
if(record.getTurn()==-1){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if(ChampionshipLogic.getFightTime()!=record.getTurn()&&record.getRoundTims()==(arenaRecord.getRoundTims())){
|
||||||
if (record.getFightResult() == 1) {
|
if (record.getFightResult() == 1) {
|
||||||
if (state == -1) {
|
if (state == -1) {
|
||||||
state = 2;
|
state = 2;
|
||||||
|
|
|
@ -73,7 +73,7 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
||||||
if(record.getTurn()==-1){
|
if(record.getTurn()==-1){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if((!record.getId().equals(arenaRecord.getId()))&&record.getRoundTims()==(arenaRecord.getRoundTims())){
|
if(ChampionshipLogic.getFightTime()!=record.getTurn()&&record.getRoundTims()==(arenaRecord.getRoundTims())){
|
||||||
|
|
||||||
if(record.getFightResult()==-2){
|
if(record.getFightResult()==-2){
|
||||||
continue;
|
continue;
|
||||||
|
@ -96,7 +96,6 @@ public class ChampionBetInfoHandler extends BaseHandler<ArenaInfoProto.ChampionG
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// System.out.println("vvvvvvvvvvvvvv22ccc = " +record.getDefUid()+"turn"+ record.getId()+"RoundTims()"+record.getRoundTims()+"turn"+record.getTurn()+"fight"+record.getFightResult()+"state"+state);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -225,7 +225,6 @@ public class ChampionshipLogic {
|
||||||
|
|
||||||
int score ;
|
int score ;
|
||||||
if (schedule == 2) {
|
if (schedule == 2) {
|
||||||
|
|
||||||
joinMemberInfo.setFinalScore(joinMemberInfo.getFinalScore() + 1);
|
joinMemberInfo.setFinalScore(joinMemberInfo.getFinalScore() + 1);
|
||||||
MemberInfo failMemberInfo = getJoinMemberInfo(failerUid);
|
MemberInfo failMemberInfo = getJoinMemberInfo(failerUid);
|
||||||
failMemberInfo.setFinalScore(joinMemberInfo.getFinalScore() * -1);
|
failMemberInfo.setFinalScore(joinMemberInfo.getFinalScore() * -1);
|
||||||
|
@ -234,8 +233,8 @@ public class ChampionshipLogic {
|
||||||
score = joinMemberInfo.getFinalScore();
|
score = joinMemberInfo.getFinalScore();
|
||||||
finalArenaIds.add(v.getId());
|
finalArenaIds.add(v.getId());
|
||||||
}else {
|
}else {
|
||||||
score = joinMemberInfo.getScore();
|
|
||||||
joinMemberInfo.setScore(joinMemberInfo.getScore() + 1);
|
joinMemberInfo.setScore(joinMemberInfo.getScore() + 1);
|
||||||
|
score = joinMemberInfo.getScore();
|
||||||
updateJoinMemberInfo(joinMemberInfo);
|
updateJoinMemberInfo(joinMemberInfo);
|
||||||
}
|
}
|
||||||
integerIntegerHashMap.putIfAbsent(winnerUid,new DefaultTypedTuple(Integer.toString(winnerUid), (double) score));
|
integerIntegerHashMap.putIfAbsent(winnerUid,new DefaultTypedTuple(Integer.toString(winnerUid), (double) score));
|
||||||
|
|
Loading…
Reference in New Issue