back_recharge
zhangshanxue 2019-08-12 21:07:17 +08:00
commit 087d03e8dc
1 changed files with 12 additions and 7 deletions

View File

@ -886,8 +886,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();
@ -921,12 +922,14 @@ public class GuildLogic {
return;
}
RedisUtil redisUtil = RedisUtil.getInstence();
Set<String> 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<Integer, Integer> defendInfo = guildInfo.getDefendInfo();
if(defendInfo==null||defendInfo.size()<1){
continue;
@ -949,6 +952,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));
}
@ -986,7 +992,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("");