From c007ac7f3b8a9216c4df5ecfcfd5f184f22ede9a Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sun, 13 Oct 2019 06:13:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../classsStaticCfg/CommonStaticConfig.java | 2 +- .../ljsd/jieling/logic/family/GuildLogic.java | 7 ++++++- .../src/main/resources/application.properties | 16 ++++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/classsStaticCfg/CommonStaticConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/classsStaticCfg/CommonStaticConfig.java index 8bbb0feed..a900be3a2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/classsStaticCfg/CommonStaticConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/classsStaticCfg/CommonStaticConfig.java @@ -22,7 +22,7 @@ import java.util.*; public class CommonStaticConfig extends AbstractClassStaticConfig { private Set notDelete; - private int initPos = 0; + private int initPos; private SGameSetting gameSetting; private int maxLevel; //百味居、工坊相关 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 9de63d81b..a1576c7b3 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 @@ -197,6 +197,7 @@ public class GuildLogic { MessageUtil.sendErrorResponse(session,0,msgId,"已加入过公会"); return; } + Map applyGuildPersonInfos = GuilidManager.getApplyGuildInfos(session.getUid(), 1); SGuildSetting guildSetting = SGuildSetting.sGuildSetting; if(applyGuildPersonInfos.size()>=guildSetting.getApplyLimit()){ @@ -204,6 +205,10 @@ public class GuildLogic { return; } for(Integer applyGuildId : applyGuilds){ + if(GuilidManager.guildInfoMap.get(applyGuildId).getJoinType()!=0&&applyGuilds.size()==1){ + MessageUtil.sendErrorResponse(session,0,msgId,"该公会限制条件已修改,请刷新页面"); + return; + } GuildApply guildApply = new GuildApply(uid,applyGuildId); Map applyGuildFamilyInfos = GuilidManager.getApplyGuildInfos(applyGuildId, 0); if(applyGuildFamilyInfos.size()>=guildSetting.getBeApplyLimit()){ @@ -247,7 +252,7 @@ public class GuildLogic { return; } if(guildInfo.getJoinType()!=1){ - MessageUtil.sendErrorResponse(session,0,msgId,"该工会限制条件已修改"); + MessageUtil.sendErrorResponse(session,0,msgId,"该公会限制条件已修改,请刷新页面"); return; } if(user.getPlayerInfoManager().getLevel()