diff --git a/bloodybattle/src/main/java/com/ljsd/battle/actor/Creature.java b/bloodybattle/src/main/java/com/ljsd/battle/actor/Creature.java index dd06ddd71..a5ee1e365 100644 --- a/bloodybattle/src/main/java/com/ljsd/battle/actor/Creature.java +++ b/bloodybattle/src/main/java/com/ljsd/battle/actor/Creature.java @@ -162,7 +162,6 @@ public abstract class Creature extends SceneActor{ int curPos = getPos(); LOGGER.info("the id={},preMoveTimestamp={},the time ={},move={},the oldXy={},the curXy={}",getId(),new Date(preMoveTimestamp),new Date(timestamp),moveDistance,CellUtil.pos2XY(oldXY),CellUtil.pos2XY(curPos)); - setStateType(StateType.MOVEABLE); preMoveTimestamp = timestamp; return curPos; } diff --git a/bloodybattle/src/main/java/com/ljsd/battle/actor/SceneActor.java b/bloodybattle/src/main/java/com/ljsd/battle/actor/SceneActor.java index d622224d9..4ae98801b 100644 --- a/bloodybattle/src/main/java/com/ljsd/battle/actor/SceneActor.java +++ b/bloodybattle/src/main/java/com/ljsd/battle/actor/SceneActor.java @@ -132,6 +132,7 @@ public abstract class SceneActor{ } } //清楚挖抗连续事件 + setStateType(StateType.MOVEABLE); MessageBoxUtils.onGameEvent(AnalysisEventType.DIGGER,scene,new AnalysisSourceData(value.getTarget(),value.getCaster(),-1)); scene.processEventUpdate(EventType.BUFFER_REMOVE,value.getId()); } @@ -160,7 +161,7 @@ public abstract class SceneActor{ scene.processEventUpdate(EventType.SCENEACTORE_REMOVE,this.getId()); return; } - addOrUpdateBuffer(new EffectBuffer(scene.getBufferId(),4,now,now+5000,this.getId(),0,0)); + addOrUpdateBuffer(new EffectBuffer(scene.getBufferId(),BufferType.REBIRTH.getType(),now,now+5000,this.getId(),0,0)); // 定位到出生点位置 this.setPos(SceneManager.selectForPlayerRebirth(scene)); scene.processEventUpdate(EventType.SCENEACTORE_UPDATE,id); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java index 7e61e9b66..fb9483df2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/room/RoomMatchRequestHandler.java @@ -128,15 +128,20 @@ public class RoomMatchRequestHandler extends BaseHandler{ int[][] openPeriod = setting.getOpenPeriod(); Calendar calendar = Calendar.getInstance(); int minute = calendar.get(Calendar.MINUTE); - boolean enter = true; + int hour = calendar.get(Calendar.HOUR_OF_DAY); + boolean enter = false; for(int i = 0;i=openPeriod[i][0]/10000&&minute>=openPeriod[i][0]%10000/1000){ - enter = false; - continue; + if(hour>=openPeriod[i][0]/10000){ + if(hour == openPeriod[i][0]/10000 && minuteopenPeriod[i][1]%10000/100){ + continue; + } + enter =true; + break; + } } } return enter;