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 21319859f..587f91508 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 @@ -236,7 +236,7 @@ public class GuildFightLogic { String key = RedisKey.getKey(RedisKey.FAMILY_FIGHT_RANK, "", false); SGuildSetting guildSetting = sGuildSetting; for (Integer gid : guildIds) { - if(redisUtil.getZSetScore(RedisUtil.getInstence().getKey("guild-release", ""),"",String.valueOf(gid))>0){ + if(redisUtil.getZSetScore("guild-release","",String.valueOf(gid))>0){ continue; } Map configMap = SGuildLevelConfig.sGuildLevelConfigMap; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 1bf6e2d38..e7b4e6e2d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -621,7 +621,7 @@ public class GuildLogic { MessageUtil.sendErrorResponse(session,0,msgId,"已操作过了"); return; } - if(GuildFightLogic.getStatus()!=0){ + if(type == 1&&GuildFightLogic.getStatus()!=0){ MessageUtil.sendErrorResponse(session,0,msgId,"公会战期间不允许解散工会"); } //解散公会 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java index bc1d8740a..78f0b6ed5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java @@ -63,7 +63,7 @@ public class MinuteTask extends Thread { fiveMinuteOnlineSend(); CheckFight.getInstance().luaHotFix(); MongoUtil.getInstence().lastUpdate(); -// GuildFightLogic.familyFightStatus(); + GuildFightLogic.familyFightStatus(); QuestionLogic.getInstence().checkQuestion(); MailLogic.getInstance().checkReadyToMail(); ProtocolsManager.getInstance().minuteCheckForbidUser(); 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 e30712f4a..79a2bc023 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -434,6 +434,7 @@ public class CBean2Proto { } public static Family.FamilyWalkIndicaiton getFamilyWalkIndicaiton(User user){ + user.getGuildMyInfo().move(System.currentTimeMillis()); return Family.FamilyWalkIndicaiton.newBuilder() .setCurPos(user.getGuildMyInfo().getCurPos()) .addAllPath(user.getGuildMyInfo().getPath())