diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index 7c7e8163f..5ca877c0f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -470,12 +470,12 @@ public class GuildFightLogic { LuaValue getOptionData = FightDataUtil.getOptionData(""); int seed = (int) (System.currentTimeMillis() / 1000); CommonProto.FightData fightData = CommonProto.FightData.newBuilder() - .setFightMaxTime(SArenaSetting.getSArenaSetting().getMostTime()) + .setFightMaxTime(SGuildSetting.sGuildSetting.getWarTime()) .setFightSeed(seed) .setHeroFightInfos(fightAttackTeamInfo) .addMonsterList(fightDefendTeamInfo) .build(); - int[] fightResult = CheckFight.getInstance().checkFight(seed, 1000, getFightData, getOptionData, FightType.GuildFight); + int[] fightResult = CheckFight.getInstance().checkFight(seed, SGuildSetting.sGuildSetting.getWarTime(), getFightData, getOptionData, FightType.GuildFight); for (int i = 0; i < fightResult.length; i++) { System.out.println(fightResult[i]); } diff --git a/tablemanager/src/main/java/config/SGuildSetting.java b/tablemanager/src/main/java/config/SGuildSetting.java index 511b0990d..a15a1029e 100644 --- a/tablemanager/src/main/java/config/SGuildSetting.java +++ b/tablemanager/src/main/java/config/SGuildSetting.java @@ -64,6 +64,8 @@ public class SGuildSetting implements BaseConfig { private String participation; + private int warTime; + public static SGuildSetting sGuildSetting; @@ -189,4 +191,8 @@ public class SGuildSetting implements BaseConfig { public String getParticipation() { return participation; } + + public int getWarTime() { + return warTime; + } } \ No newline at end of file