From ffc3e7890da0c7d51b89ed8efc8ee8020da030de Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sun, 29 Sep 2019 12:06:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E6=88=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/family/GuildFightLogic.java | 2 +- .../src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java | 2 +- .../src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 d365a4e68..10fcda2e9 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 @@ -616,7 +616,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(); From 6e4ba9ed73ce12cd1f2198ab36eea0c7ea947474 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 27 Sep 2019 13:36:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E8=B5=B0=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java | 1 + 1 file changed, 1 insertion(+) 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 6d9450619..167fec330 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())