Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
5e4368aa77
|
@ -1280,9 +1280,12 @@ public class GuildFightLogic {
|
||||||
|
|
||||||
}else if(sourceCompare>=battleCompaeEnd && sourceCompare<grapCompareStart){
|
}else if(sourceCompare>=battleCompaeEnd && sourceCompare<grapCompareStart){
|
||||||
carProgressTmp = 2;
|
carProgressTmp = 2;
|
||||||
|
} else if(timeControllerOfFunction==null){
|
||||||
|
carProgressTmp = -5;
|
||||||
}else{
|
}else{
|
||||||
carProgressTmp = -1;
|
carProgressTmp = -1;
|
||||||
}
|
}
|
||||||
|
System.out.println("当前状态"+carProgressTmp);
|
||||||
if(carProgressTmp!=carProgress){
|
if(carProgressTmp!=carProgress){
|
||||||
int battleStartTime = 0;
|
int battleStartTime = 0;
|
||||||
int grapStartTime = 0;
|
int grapStartTime = 0;
|
||||||
|
@ -1312,6 +1315,7 @@ public class GuildFightLogic {
|
||||||
|
|
||||||
public static void sendAllProgressUpdate(){
|
public static void sendAllProgressUpdate(){
|
||||||
//向全服玩家广播进度变更信息
|
//向全服玩家广播进度变更信息
|
||||||
|
System.out.println("状态更改发送推送");
|
||||||
for(ISession session : OnlineUserManager.sessionMap.values()){
|
for(ISession session : OnlineUserManager.sessionMap.values()){
|
||||||
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.CAR_DELAY_PROGRESS_INDICATION_VALUE,carDelayProgressIndication,true);
|
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.CAR_DELAY_PROGRESS_INDICATION_VALUE,carDelayProgressIndication,true);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue