From 08324adb9189d5fd38c4772ddeb150ef0b8a45cc Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 13 Sep 2019 12:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=97=B6=E6=98=9F=E6=95=B0?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/family/GuildFightLogic.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 2cc8be711..c27bf4c12 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 @@ -311,6 +311,7 @@ public class GuildFightLogic { .setName(enemyInfo.getName()) .setPictureId(1) .setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class)) + .setMyTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(guildInfo.getId()),Integer.class)) .build(); GuildLogic.sendIndicationToMember(guildInfo, MessageTypeProto.MessageType.FAMILY_FIGHT_MATCHING_SUCCESS_INDICATION, familyInfo); } @@ -501,7 +502,14 @@ public class GuildFightLogic { .setJoinType(1); if (enemyFamily != -1) { GuildInfo guildInfo = GuilidManager.guildInfoMap.get(enemyFamily); - Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder().setId(guildInfo.getId()).setLevel(guildInfo.getLevel()).setName(guildInfo.getName()).setPictureId(1).build(); + Family.EnemyFamily familyInfo = Family.EnemyFamily.newBuilder() + .setId(guildInfo.getId()) + .setLevel(guildInfo.getLevel()) + .setName(guildInfo.getName()) + .setPictureId(1) + .setTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(enemyFamily),Integer.class)) + .setMyTotalStar(redisUtil.getMapEntry(RedisKey.FAMILY_FIGHT_TOTAL_STAR,"",String.valueOf(guildInfo.getId()),Integer.class)) + .build(); response.setEnemy(familyInfo); }else{ if(status!=0&&status!=1){