root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

公会战bug

lvxinran 2019-09-29 12:06:40 +08:00
parent 0319fcefae
commit ffc3e7890d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java
View File

@ -236,7 +236,7 @@ public class GuildFightLogic {
String key = RedisKey.getKey(RedisKey.FAMILY_FIGHT_RANK, "", false); String key = RedisKey.getKey(RedisKey.FAMILY_FIGHT_RANK, "", false);
SGuildSetting guildSetting = sGuildSetting; SGuildSetting guildSetting = sGuildSetting;
for (Integer gid : guildIds) { 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; continue;
} }
Map<Integer, SGuildLevelConfig> configMap = SGuildLevelConfig.sGuildLevelConfigMap; Map<Integer, SGuildLevelConfig> configMap = SGuildLevelConfig.sGuildLevelConfigMap;

2
serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
View File

@ -616,7 +616,7 @@ public class GuildLogic {
MessageUtil.sendErrorResponse(session,0,msgId,"已操作过了"); MessageUtil.sendErrorResponse(session,0,msgId,"已操作过了");
return; return;
} }
if(GuildFightLogic.getStatus()!=0){ if(type == 1&&GuildFightLogic.getStatus()!=0){
MessageUtil.sendErrorResponse(session,0,msgId,"公会战期间不允许解散工会"); MessageUtil.sendErrorResponse(session,0,msgId,"公会战期间不允许解散工会");
} }
//解散公会 //解散公会

2
serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
View File

@ -63,7 +63,7 @@ public class MinuteTask extends Thread {
fiveMinuteOnlineSend(); fiveMinuteOnlineSend();
CheckFight.getInstance().luaHotFix(); CheckFight.getInstance().luaHotFix();
MongoUtil.getInstence().lastUpdate(); MongoUtil.getInstence().lastUpdate();
// GuildFightLogic.familyFightStatus(); GuildFightLogic.familyFightStatus();
QuestionLogic.getInstence().checkQuestion(); QuestionLogic.getInstence().checkQuestion();
MailLogic.getInstance().checkReadyToMail(); MailLogic.getInstance().checkReadyToMail();
ProtocolsManager.getInstance().minuteCheckForbidUser(); ProtocolsManager.getInstance().minuteCheckForbidUser();