公会战
parent
d301d88bdf
commit
5e5832178d
|
@ -877,7 +877,7 @@ public class GuildLogic {
|
||||||
for(Map.Entry<Integer, Integer> entry:defendInfo.entrySet()){
|
for(Map.Entry<Integer, Integer> entry:defendInfo.entrySet()){
|
||||||
Family.FamilyFightPlayerInfo.Builder playerInfo = Family.FamilyFightPlayerInfo.newBuilder();
|
Family.FamilyFightPlayerInfo.Builder playerInfo = Family.FamilyFightPlayerInfo.newBuilder();
|
||||||
playerInfo.setBuildId(entry.getValue());
|
playerInfo.setBuildId(entry.getValue());
|
||||||
playerInfo.setBuildId(5);
|
playerInfo.setStarCount(5);
|
||||||
PlayerManager playerManager = UserManager.getUser(entry.getKey()).getPlayerInfoManager();
|
PlayerManager playerManager = UserManager.getUser(entry.getKey()).getPlayerInfoManager();
|
||||||
Family.FamilyUserInfo.Builder userInfo =Family.FamilyUserInfo.newBuilder()
|
Family.FamilyUserInfo.Builder userInfo =Family.FamilyUserInfo.newBuilder()
|
||||||
.setRoleUid(entry.getKey())
|
.setRoleUid(entry.getKey())
|
||||||
|
@ -925,9 +925,13 @@ public class GuildLogic {
|
||||||
Set<String> rank = redisUtil.getZset(RedisKey.FAMILY_FIGHT_RANK, 0, redisUtil.getZsetSize(RedisKey.FAMILY_FIGHT_RANK));
|
Set<String> rank = redisUtil.getZset(RedisKey.FAMILY_FIGHT_RANK, 0, redisUtil.getZsetSize(RedisKey.FAMILY_FIGHT_RANK));
|
||||||
for(Integer gid:guildIds){
|
for(Integer gid:guildIds){
|
||||||
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
|
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
|
||||||
if(!rank.contains(gid.toString())){
|
if(guildInfo.getDefendInfo()!=null&&guildInfo.getDefendInfo().size()>0) {
|
||||||
if(guildInfo.getDefendInfo()!=null&&guildInfo.getDefendInfo().size()>0){
|
if (!rank.contains(gid.toString())) {
|
||||||
redisUtil.zsetAddOne(RedisKey.FAMILY_FIGHT_RANK,gid.toString(),100);
|
String key = RedisKey.getKey(RedisKey.FAMILY_FIGHT_MATCHING_RANK, gid.toString(), false);
|
||||||
|
redisUtil.zsetAddOne(key, gid.toString(), 100);
|
||||||
|
} else {
|
||||||
|
Double zSetScore = redisUtil.getZSetScore(RedisKey.FAMILY_FIGHT_RANK, "", gid.toString());
|
||||||
|
redisUtil.zsetAddOne(RedisKey.FAMILY_FIGHT_MATCHING_RANK, gid.toString(), zSetScore);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Map<Integer, Integer> defendInfo = guildInfo.getDefendInfo();
|
Map<Integer, Integer> defendInfo = guildInfo.getDefendInfo();
|
||||||
|
@ -1011,4 +1015,7 @@ public class GuildLogic {
|
||||||
}
|
}
|
||||||
RedisUtil.getInstence().putMapEntry(RedisKey.FAMILY_FIGHT,String.valueOf(defendGuildId),String.valueOf(userDefend.getId()),defendInfo);
|
RedisUtil.getInstence().putMapEntry(RedisKey.FAMILY_FIGHT,String.valueOf(defendGuildId),String.valueOf(userDefend.getId()),defendInfo);
|
||||||
}
|
}
|
||||||
|
public void accountFamilyFightResult(){
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue