diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index ba12cbf50..8c5ff580e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -876,8 +876,9 @@ public class GuildLogic { .setPosition(2) .setSoulForce(HeroLogic.getInstance().calTeamTotalForce(UserManager.getUser(entry.getKey()),501,false)) .setHead(playerManager.getHead()) - .setFrame(playerManager.getHeadFrame()); - playerInfo.setUserInfo(userInfo); + .setFrame(playerManager.getHeadFrame()) + .setContribute(0); + playerInfo.setUserInfo(userInfo.build()); fightInfo.addUser(playerInfo); } return fightInfo.build(); @@ -911,12 +912,14 @@ public class GuildLogic { return; } RedisUtil redisUtil = RedisUtil.getInstence(); + Set rank = redisUtil.getZset(RedisKey.FAMILY_FIGHT_RANK, 0, redisUtil.getZsetSize(RedisKey.FAMILY_FIGHT_RANK)); for(Integer gid:guildIds){ - String key = RedisKey.getKey(RedisKey.FAMILY_FIGHT_RANK, gid.toString(), true); - if(!redisUtil.getZset(key,0, redisUtil.getZsetSize(RedisKey.FAMILY_FIGHT_RANK)).contains(gid)){ - redisUtil.zsetAddOne(RedisKey.FAMILY_FIGHT_RANK,gid.toString(),100); - } GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid); + if(!rank.contains(gid.toString())){ + if(guildInfo.getDefendInfo()!=null&&guildInfo.getDefendInfo().size()>0){ + redisUtil.zsetAddOne(RedisKey.FAMILY_FIGHT_RANK,gid.toString(),100); + } + } Map defendInfo = guildInfo.getDefendInfo(); if(defendInfo==null||defendInfo.size()<1){ continue; @@ -939,6 +942,9 @@ public class GuildLogic { redisUtil.putMapEntry(RedisKey.FAMILY_FIGHT,String.valueOf(guildInfo.getId()),String.valueOf(entry.getKey()),fightInfo); } } +// redisUtil.getZset(key,0, redisUtil.getZsetSize(RedisKey.FAMILY_FIGHT_RANK)); + + } @@ -976,7 +982,6 @@ public class GuildLogic { .setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(userDefend,1)) .build(); CommonProto.FightTeamInfo fightAttackTeamInfo = BehaviorUtil.getFightTeamInfo(userAttack, 502, true); - LuaValue getFightData = FightDataUtil.getFinalPlayerFightData(fightAttackTeamInfo, fightDefendTeamInfo); LuaValue getOptionData = FightDataUtil.getOptionData("");