公会修改

back_recharge
lvxinran 2019-10-13 06:13:37 +08:00
parent e5f1007862
commit c007ac7f3b
3 changed files with 17 additions and 8 deletions

View File

@ -22,7 +22,7 @@ import java.util.*;
public class CommonStaticConfig extends AbstractClassStaticConfig { public class CommonStaticConfig extends AbstractClassStaticConfig {
private Set<Integer> notDelete; private Set<Integer> notDelete;
private int initPos = 0; private int initPos;
private SGameSetting gameSetting; private SGameSetting gameSetting;
private int maxLevel; //百味居、工坊相关 private int maxLevel; //百味居、工坊相关

View File

@ -197,6 +197,7 @@ public class GuildLogic {
MessageUtil.sendErrorResponse(session,0,msgId,"已加入过公会"); MessageUtil.sendErrorResponse(session,0,msgId,"已加入过公会");
return; return;
} }
Map<Integer, GuildApply> applyGuildPersonInfos = GuilidManager.getApplyGuildInfos(session.getUid(), 1); Map<Integer, GuildApply> applyGuildPersonInfos = GuilidManager.getApplyGuildInfos(session.getUid(), 1);
SGuildSetting guildSetting = SGuildSetting.sGuildSetting; SGuildSetting guildSetting = SGuildSetting.sGuildSetting;
if(applyGuildPersonInfos.size()>=guildSetting.getApplyLimit()){ if(applyGuildPersonInfos.size()>=guildSetting.getApplyLimit()){
@ -204,6 +205,10 @@ public class GuildLogic {
return; return;
} }
for(Integer applyGuildId : applyGuilds){ 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); GuildApply guildApply = new GuildApply(uid,applyGuildId);
Map<Integer, GuildApply> applyGuildFamilyInfos = GuilidManager.getApplyGuildInfos(applyGuildId, 0); Map<Integer, GuildApply> applyGuildFamilyInfos = GuilidManager.getApplyGuildInfos(applyGuildId, 0);
if(applyGuildFamilyInfos.size()>=guildSetting.getBeApplyLimit()){ if(applyGuildFamilyInfos.size()>=guildSetting.getBeApplyLimit()){
@ -247,7 +252,7 @@ public class GuildLogic {
return; return;
} }
if(guildInfo.getJoinType()!=1){ if(guildInfo.getJoinType()!=1){
MessageUtil.sendErrorResponse(session,0,msgId,"该工会限制条件已修改"); MessageUtil.sendErrorResponse(session,0,msgId,"该公会限制条件已修改,请刷新页面");
return; return;
} }
if(user.getPlayerInfoManager().getLevel()<guildInfo.getIntoLevel()){ if(user.getPlayerInfoManager().getLevel()<guildInfo.getIntoLevel()){

View File

@ -1,15 +1,18 @@
#server info #server info
server.id = 50215 server.id = 10153
server.openTime = 20190101000101 server.openTime = 20190101000101
server.num = 1 server.num = 1
#0为默认开发环境1为正式环境
server.isLAN = 0
server.sendlog37 = false
#services.core.gmport=7901
# redis config # redis config
# Redis数据库索引默认为0 # Redis数据库索引默认为0
spring.redis.database=13 spring.redis.database=0
#spring.redis.database=2 #spring.redis.database=2
# Redis服务器地址 # Redis服务器地址
spring.redis.host=60.1.1.14 spring.redis.host=60.1.1.21
# Redis服务器连接端口 # Redis服务器连接端口
spring.redis.port=6379 spring.redis.port=6379
# Redis服务器连接密码默认为空 # Redis服务器连接密码默认为空
@ -31,7 +34,8 @@ spring.redis.expireTime = -1
#spring.data.mongodb.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/ysj_wx_1 #spring.data.mongodb.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/ysj_wx_1
#spring.data.mongodb2.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/develop_ysj_wx_1 #spring.data.mongodb2.uri = mongodb://mongouser:ysj#2017#ljsd@111.231.54.96:27017/develop_ysj_wx_1
#mongodb2 develop #mongodb2 develop
spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_50215 spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10153
spring.data.mongodbcore.uri = mongodb://60.1.1.14:27017/jl_core
#spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10212 #spring.data.mongodb.uri = mongodb://60.1.1.14:27017/jieling_10212
mongodb.options.maxWaitTime = 120000 mongodb.options.maxWaitTime = 120000
mongodb.options.connectTimeout = 1000 mongodb.options.connectTimeout = 1000
@ -43,7 +47,7 @@ mongodb.options.maxConnectionIdleTime = 1000
# netty config # netty config
netty.tcpPort = 26080 netty.tcpPort = 16080
netty.chatTcpPort = 20001 netty.chatTcpPort = 20001
netty.logintcpPort = 18091 netty.logintcpPort = 18091
netty.udpPort = 18092 netty.udpPort = 18092