From f708a2f5467856af75c12bd98f4bb729218861f3 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 26 Sep 2019 12:56:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E6=88=98=E6=88=98=E5=8A=9B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/blood/BloodLogic.java | 3 +-- .../ljsd/jieling/logic/dao/FamilyFightInfo.java | 9 +++++++++ .../com/ljsd/jieling/logic/dao/FamilyHeroInfo.java | 12 +----------- .../ljsd/jieling/logic/family/GuildFightLogic.java | 14 +++++++++----- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java index 6ea44ae70..cce1fd834 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java @@ -62,7 +62,6 @@ public class BloodLogic { teamPosHeroInfos = teamPosManager.getTeamPosForHero().get(1); teamId = 1; } - int force = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false); Iterator it = teamPosHeroInfos.iterator(); Map heroAllAttribute = new HashMap<>(); while (it.hasNext()) { @@ -75,7 +74,7 @@ public class BloodLogic { heroAttributeMap = CombatLogic.getInstance().bufferOneHeroAttrAfterEat(heroAttributeMap,buffInfo[i]); } } - heroAllAttribute.put(heroInfo.getHeroId(), new FamilyHeroInfo(hero.getTemplateId(), hero.getLevel(), heroAttributeMap,force)); + heroAllAttribute.put(heroInfo.getHeroId(), new FamilyHeroInfo(hero.getTemplateId(), hero.getLevel(), heroAttributeMap)); } return heroAllAttribute; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyFightInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyFightInfo.java index 22d1aa479..0481cdf13 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyFightInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyFightInfo.java @@ -8,6 +8,7 @@ public class FamilyFightInfo { private int familyId; private int buildId; private int starCount; + private int force; public Map getHeroAttribute() { return heroAttribute; @@ -48,4 +49,12 @@ public class FamilyFightInfo { public void setStarCount(int starCount) { this.starCount = starCount; } + + public int getForce() { + return force; + } + + public void setForce(int force) { + this.force = force; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java index bc1f38deb..1700f1bc4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/FamilyHeroInfo.java @@ -7,7 +7,6 @@ public class FamilyHeroInfo { private int templeteId; private int level; private Map attribute; - private int force; public int getTempleteId() { return templeteId; @@ -33,19 +32,10 @@ public class FamilyHeroInfo { this.attribute = attribute; } - public FamilyHeroInfo(int templeteId, int level, Map attribute,int force) { + public FamilyHeroInfo(int templeteId, int level, Map attribute) { this.templeteId = templeteId; this.level = level; this.attribute = attribute; - this.force = force; - } - - public int getForce() { - return force; - } - - public void setForce(int force) { - this.force = force; } public FamilyHeroInfo() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index 9695944ed..78d19f816 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -187,20 +187,17 @@ public class GuildFightLogic { fightInfo.addBuildBuff(buffInfo); } for (Map.Entry entry : fightValues.entrySet()) { - int force = HeroLogic.getInstance().calTeamTotalForce(UserManager.getUser(entry.getKey()), 501, false); - if(force==0){ - force = HeroLogic.getInstance().calTeamTotalForce(UserManager.getUser(entry.getKey()), 1, false); - } Family.FamilyFightPlayerInfo.Builder playerInfo = Family.FamilyFightPlayerInfo.newBuilder(); playerInfo.setBuildId(entry.getValue().getBuildId()); playerInfo.setStarCount(fightValues.get(entry.getKey()).getStarCount()); PlayerInfoCache player = RedisUtil.getInstence().getMapEntry(RedisKey.PLAYER_INFO_CACHE, "", String.valueOf(entry.getKey()), PlayerInfoCache.class); + FamilyFightInfo forceInfo = RedisUtil.getInstence().getMapEntry(RedisKey.FAMILY_FIGHT, String.valueOf(guildId), String.valueOf(entry.getKey()), FamilyFightInfo.class); Family.FamilyUserInfo.Builder userInfo = Family.FamilyUserInfo.newBuilder() .setRoleUid(entry.getKey()) .setUserName(player.getName()) .setUserLevel(player.getLevel()) .setPosition(player.getGuildPosition()) - .setSoulForce(force) + .setSoulForce(forceInfo.getForce()) .setHead(player.getHead()) .setFrame(player.getHeadFrame()) .setContribute(0); @@ -294,10 +291,17 @@ public class GuildFightLogic { int[] buffInfo = redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_BUFF, gid.toString(), entry.getValue().toString(), int[].class); FamilyFightInfo fightInfo = new FamilyFightInfo(); //血量处理,buff处理 + + + int force = HeroLogic.getInstance().calTeamTotalForce(user, 501, false); + if(force==0){ + force = HeroLogic.getInstance().calTeamTotalForce(user, 1, false); + } Map heroAllAttribute = BloodLogic.getInstance().battleRecord(user, 501, buffInfo); fightInfo.setHeroAttribute(heroAllAttribute); fightInfo.setBuildId(entry.getValue()); fightInfo.setStarCount(guildSetting.getStarNum()[memberType-1]); + fightInfo.setForce(force); redisUtil.putMapEntry(RedisKey.FAMILY_FIGHT, String.valueOf(guildInfo.getId()), String.valueOf(entry.getKey()), fightInfo); familyTotalStar+=fightInfo.getStarCount(); }