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