diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 8e04fedc9..8f79f0408 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -39,6 +39,7 @@ import util.StringUtil; import util.TimeUtils; import java.util.*; +import java.util.concurrent.TimeUnit; public class CombatLogic { private static final Logger LOGGER = LoggerFactory.getLogger(CombatLogic.class); @@ -471,7 +472,7 @@ public class CombatLogic { FightInfoProto.AdventureCallBossResponse build = FightInfoProto.AdventureCallBossResponse.newBuilder().setAdventureBossInfo(CommonProto.AdventureBossSimpleInfo.newBuilder() .setArenaId(fightId) .setBossGroupId(adventureBoss.getBossGroupId()) - .setRemainTime(remainTime) + .setLevelTime(remainTime+now) .setBossId(bossId) .build()).build(); MessageUtil.sendMessage(iSession,1,msgId,build,true); @@ -484,7 +485,7 @@ public class CombatLogic { .setArenaId(arenaId) .setBossId(adventureBoss.getBossId()) .setBossGroupId(adventureBoss.getBossGroupId()) - .setRemainTime(sMainLevelConfig.getInvasionBossHolding()) + .setLevelTime(sMainLevelConfig.getInvasionBossHolding() + (int)(TimeUtils.now()/1000)) .setFindUserName(findUserName) .build(); FightInfoProto.AdventureBossFindIndication adventureBossFindIndication = FightInfoProto.AdventureBossFindIndication.newBuilder().setAdventureBossSimpleInfo(build).build(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index a2bec6d72..1c688db8f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -481,7 +481,7 @@ public class CBean2Proto { CommonProto.AdventureBossSimpleInfo.newBuilder() .setArenaId(fightId) .setBossGroupId(adventureBoss.getBossGroupId()) - .setRemainTime(remainTime) + .setLevelTime(remainTime+now) .setBossId(adventureBoss.getBossId()) .build() ); diff --git a/tablemanager/src/main/java/config/SMainLevelConfig.java b/tablemanager/src/main/java/config/SMainLevelConfig.java index 3027c2111..e7486f903 100644 --- a/tablemanager/src/main/java/config/SMainLevelConfig.java +++ b/tablemanager/src/main/java/config/SMainLevelConfig.java @@ -54,6 +54,7 @@ public class SMainLevelConfig implements BaseConfig { public static boolean biggerThanFight(int soureFight,int targetFight){ + if(targetFight==0){return true;} SMainLevelConfig mineLevelConfig = SMainLevelConfig.config.get(soureFight); SMainLevelConfig otherLevelConfig = SMainLevelConfig.config.get(targetFight); return mineLevelConfig.getVirtureId()>=otherLevelConfig.getVirtureId();