公会战
parent
f46031890a
commit
81a443322a
|
@ -876,8 +876,9 @@ public class GuildLogic {
|
||||||
.setPosition(2)
|
.setPosition(2)
|
||||||
.setSoulForce(HeroLogic.getInstance().calTeamTotalForce(UserManager.getUser(entry.getKey()),501,false))
|
.setSoulForce(HeroLogic.getInstance().calTeamTotalForce(UserManager.getUser(entry.getKey()),501,false))
|
||||||
.setHead(playerManager.getHead())
|
.setHead(playerManager.getHead())
|
||||||
.setFrame(playerManager.getHeadFrame());
|
.setFrame(playerManager.getHeadFrame())
|
||||||
playerInfo.setUserInfo(userInfo);
|
.setContribute(0);
|
||||||
|
playerInfo.setUserInfo(userInfo.build());
|
||||||
fightInfo.addUser(playerInfo);
|
fightInfo.addUser(playerInfo);
|
||||||
}
|
}
|
||||||
return fightInfo.build();
|
return fightInfo.build();
|
||||||
|
@ -911,12 +912,14 @@ public class GuildLogic {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
RedisUtil redisUtil = RedisUtil.getInstence();
|
RedisUtil redisUtil = RedisUtil.getInstence();
|
||||||
|
Set<String> rank = redisUtil.getZset(RedisKey.FAMILY_FIGHT_RANK, 0, redisUtil.getZsetSize(RedisKey.FAMILY_FIGHT_RANK));
|
||||||
for(Integer gid:guildIds){
|
for(Integer gid:guildIds){
|
||||||
String key = RedisKey.getKey(RedisKey.FAMILY_FIGHT_RANK, gid.toString(), true);
|
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
|
||||||
if(!redisUtil.getZset(key,0, redisUtil.getZsetSize(RedisKey.FAMILY_FIGHT_RANK)).contains(gid)){
|
if(!rank.contains(gid.toString())){
|
||||||
|
if(guildInfo.getDefendInfo()!=null&&guildInfo.getDefendInfo().size()>0){
|
||||||
redisUtil.zsetAddOne(RedisKey.FAMILY_FIGHT_RANK,gid.toString(),100);
|
redisUtil.zsetAddOne(RedisKey.FAMILY_FIGHT_RANK,gid.toString(),100);
|
||||||
}
|
}
|
||||||
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid);
|
}
|
||||||
Map<Integer, Integer> defendInfo = guildInfo.getDefendInfo();
|
Map<Integer, Integer> defendInfo = guildInfo.getDefendInfo();
|
||||||
if(defendInfo==null||defendInfo.size()<1){
|
if(defendInfo==null||defendInfo.size()<1){
|
||||||
continue;
|
continue;
|
||||||
|
@ -939,6 +942,9 @@ public class GuildLogic {
|
||||||
redisUtil.putMapEntry(RedisKey.FAMILY_FIGHT,String.valueOf(guildInfo.getId()),String.valueOf(entry.getKey()),fightInfo);
|
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))
|
.setTeamSkillList(HeroLogic.getInstance().getPokenmonSkills(userDefend,1))
|
||||||
.build();
|
.build();
|
||||||
CommonProto.FightTeamInfo fightAttackTeamInfo = BehaviorUtil.getFightTeamInfo(userAttack, 502, true);
|
CommonProto.FightTeamInfo fightAttackTeamInfo = BehaviorUtil.getFightTeamInfo(userAttack, 502, true);
|
||||||
|
|
||||||
LuaValue getFightData = FightDataUtil.getFinalPlayerFightData(fightAttackTeamInfo, fightDefendTeamInfo);
|
LuaValue getFightData = FightDataUtil.getFinalPlayerFightData(fightAttackTeamInfo, fightDefendTeamInfo);
|
||||||
LuaValue getOptionData = FightDataUtil.getOptionData("");
|
LuaValue getOptionData = FightDataUtil.getOptionData("");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue