公会战条件
parent
634bdf6317
commit
8a761ab982
|
@ -354,11 +354,11 @@ public class GuildFightLogic {
|
|||
RedisUtil redisUtil = RedisUtil.getInstence();
|
||||
Set<Integer> guildIds = GuilidManager.guildInfoMap.keySet();
|
||||
for (Integer gid : guildIds) {
|
||||
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
|
||||
int enemyFamily = getEnemyFamily(guildInfo.getId());
|
||||
int enemyFamily = getEnemyFamily(gid);
|
||||
if (enemyFamily == -1) {
|
||||
continue;
|
||||
}
|
||||
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
|
||||
GuildCache enemyInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(enemyFamily), GuildCache.class);
|
||||
// GuildInfo enemyInfo = GuilidManager.guildInfoMap.get(enemyFamily);
|
||||
Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder().setId(enemyFamily)
|
||||
|
@ -562,12 +562,12 @@ public class GuildFightLogic {
|
|||
.setRoundEndTime(roundEndTime)
|
||||
.setAttackCount(attackCount)
|
||||
.setJoinType(1);
|
||||
if(guildId==0){
|
||||
response.setType(-1);
|
||||
response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000));
|
||||
MessageUtil.sendMessage(session, 1, messageType.getNumber(), response.build(), true);
|
||||
return;
|
||||
}
|
||||
// if(guildId==0){
|
||||
// response.setType(-1);
|
||||
// response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000));
|
||||
// MessageUtil.sendMessage(session, 1, messageType.getNumber(), response.build(), true);
|
||||
// return;
|
||||
// }
|
||||
if (enemyFamily != -1) {
|
||||
GuildCache enemyInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(enemyFamily), GuildCache.class);
|
||||
// GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily);
|
||||
|
@ -583,19 +583,21 @@ public class GuildFightLogic {
|
|||
response.setEnemy(familyInfo);
|
||||
}
|
||||
}else{
|
||||
if(status!=0&&status!=1){
|
||||
if(!startMatching){
|
||||
if(status!=0){
|
||||
if(!startMatching&&status!=1){
|
||||
response.setType(-1);
|
||||
response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000));
|
||||
}
|
||||
}
|
||||
}
|
||||
//todo 人数限制
|
||||
if(guildId!=0){
|
||||
Map<Integer, SGuildLevelConfig> configMap = STableManager.getConfig(SGuildLevelConfig.class);
|
||||
if(GuilidManager.guildInfoMap.get(guildId).getDefendInfo().size()<configMap.get(GuilidManager.guildInfoMap.get(guildId).getLevel()).getDefendNum()){
|
||||
response.setType(-1);
|
||||
response.setRoundEndTime((int) (TimeUtils.getAppointTime(sGuildSetting.getSettleTime()[1][0], sGuildSetting.getSettleTime()[1][1]) / 1000));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if(GuilidManager.guildInfoMap.get(guildId)!=null){
|
||||
long createTime = GuilidManager.guildInfoMap.get(guildId).getCreateTime();
|
||||
if(createTime/1000>roundStartTime&&createTime/1000<roundEndTime){
|
||||
|
|
Loading…
Reference in New Issue