back_recharge
lvxinran 2019-10-17 16:53:03 +08:00
commit 31c48619dd
3 changed files with 5 additions and 3 deletions

View File

@ -39,6 +39,7 @@ import util.StringUtil;
import util.TimeUtils; import util.TimeUtils;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit;
public class CombatLogic { public class CombatLogic {
private static final Logger LOGGER = LoggerFactory.getLogger(CombatLogic.class); 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() FightInfoProto.AdventureCallBossResponse build = FightInfoProto.AdventureCallBossResponse.newBuilder().setAdventureBossInfo(CommonProto.AdventureBossSimpleInfo.newBuilder()
.setArenaId(fightId) .setArenaId(fightId)
.setBossGroupId(adventureBoss.getBossGroupId()) .setBossGroupId(adventureBoss.getBossGroupId())
.setRemainTime(remainTime) .setLevelTime(remainTime+now)
.setBossId(bossId) .setBossId(bossId)
.build()).build(); .build()).build();
MessageUtil.sendMessage(iSession,1,msgId,build,true); MessageUtil.sendMessage(iSession,1,msgId,build,true);
@ -484,7 +485,7 @@ public class CombatLogic {
.setArenaId(arenaId) .setArenaId(arenaId)
.setBossId(adventureBoss.getBossId()) .setBossId(adventureBoss.getBossId())
.setBossGroupId(adventureBoss.getBossGroupId()) .setBossGroupId(adventureBoss.getBossGroupId())
.setRemainTime(sMainLevelConfig.getInvasionBossHolding()) .setLevelTime(sMainLevelConfig.getInvasionBossHolding() + (int)(TimeUtils.now()/1000))
.setFindUserName(findUserName) .setFindUserName(findUserName)
.build(); .build();
FightInfoProto.AdventureBossFindIndication adventureBossFindIndication = FightInfoProto.AdventureBossFindIndication.newBuilder().setAdventureBossSimpleInfo(build).build(); FightInfoProto.AdventureBossFindIndication adventureBossFindIndication = FightInfoProto.AdventureBossFindIndication.newBuilder().setAdventureBossSimpleInfo(build).build();

View File

@ -481,7 +481,7 @@ public class CBean2Proto {
CommonProto.AdventureBossSimpleInfo.newBuilder() CommonProto.AdventureBossSimpleInfo.newBuilder()
.setArenaId(fightId) .setArenaId(fightId)
.setBossGroupId(adventureBoss.getBossGroupId()) .setBossGroupId(adventureBoss.getBossGroupId())
.setRemainTime(remainTime) .setLevelTime(remainTime+now)
.setBossId(adventureBoss.getBossId()) .setBossId(adventureBoss.getBossId())
.build() .build()
); );

View File

@ -54,6 +54,7 @@ public class SMainLevelConfig implements BaseConfig {
public static boolean biggerThanFight(int soureFight,int targetFight){ public static boolean biggerThanFight(int soureFight,int targetFight){
if(targetFight==0){return true;}
SMainLevelConfig mineLevelConfig = SMainLevelConfig.config.get(soureFight); SMainLevelConfig mineLevelConfig = SMainLevelConfig.config.get(soureFight);
SMainLevelConfig otherLevelConfig = SMainLevelConfig.config.get(targetFight); SMainLevelConfig otherLevelConfig = SMainLevelConfig.config.get(targetFight);
return mineLevelConfig.getVirtureId()>=otherLevelConfig.getVirtureId(); return mineLevelConfig.getVirtureId()>=otherLevelConfig.getVirtureId();