Merge branch 'project0.93'

back_recharge
lvxinran 2019-09-27 13:36:46 +08:00
commit 8867433bf4
4 changed files with 4 additions and 3 deletions

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;

View File

@ -621,7 +621,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,"公会战期间不允许解散工会");
} }
//解散公会 //解散公会

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();

View File

@ -434,6 +434,7 @@ public class CBean2Proto {
} }
public static Family.FamilyWalkIndicaiton getFamilyWalkIndicaiton(User user){ public static Family.FamilyWalkIndicaiton getFamilyWalkIndicaiton(User user){
user.getGuildMyInfo().move(System.currentTimeMillis());
return Family.FamilyWalkIndicaiton.newBuilder() return Family.FamilyWalkIndicaiton.newBuilder()
.setCurPos(user.getGuildMyInfo().getCurPos()) .setCurPos(user.getGuildMyInfo().getCurPos())
.addAllPath(user.getGuildMyInfo().getPath()) .addAllPath(user.getGuildMyInfo().getPath())