diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java index 2a8761409..10fdcc2fd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java @@ -110,14 +110,6 @@ public class CommonStaticConfig extends AbstractClassStaticConfig { } catch (Exception e) { LOGGER.error("SGlobalSystemConfig init fail"); } - - try { - GuildFightLogic.familyFightStatus(); - } catch (Exception e) { - LOGGER.error("SGuildSetting init fail"); - } - - try { Map sWorkShopSettingMapTmp = STableManager.getConfig(SWorkShopSetting.class); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 09a0a3180..da94017c0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -17,6 +17,7 @@ import com.ljsd.jieling.logic.dao.ServerConfig; import com.ljsd.jieling.logic.dao.TimeControllerOfFunction; import com.ljsd.jieling.logic.dao.root.GlobalSystemControl; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.family.GuildFightLogic; import com.ljsd.jieling.logic.friend.FriendLogic; import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.mission.GameMisionType; @@ -216,6 +217,7 @@ public class GlobalDataManaager { public void whenServerStart(ConfigurableApplicationContext configurableApplicationContext){ try { + GuildFightLogic.familyFightStatus(); ActivityLogic.getInstance().checkSecretBoxSeason(); checkSystemFunctioIsOpen(); GlobalSystemControl globalSystemControl = MongoUtil.getInstence().getMyMongoTemplate().findById(GameApplication.serverId, GlobalSystemControl.class); 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 8f79f0408..62325b432 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 @@ -346,6 +346,7 @@ public class CombatLogic { public void getInvasionBoss(ISession session,FightInfoProto.AdventureBossInfoResponse.Builder builder) throws Exception { int uid = session.getUid(); + Map myHurtInfo = RedisUtil.getInstence().getMapValues(RedisKey.ADVENTRUEN_BOSS_OWN, Integer.toString(uid), String.class, Integer.class); if(myHurtInfo!=null&&!myHurtInfo.isEmpty()){ int now = (int)(TimeUtils.now()/1000); @@ -394,7 +395,7 @@ public class CombatLogic { .setBossId(bossId) .setBossGroupId(adventureBoss.getBossGroupId()) .setMyHurt(myHurtInfo.get(bossId)) - .setRemainTime(remainTime) + .setLevelTime(remainTime+now) .setTotalHp(adventureBoss.getTotalHp()) .setArenaLevel(adventureBoss.getArenaLevel()) .setBossRemainlHp(adventureBoss.getRemainHp())