From df36a686cf227108eb1af37bd96eb4142d3d4780 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 17 Oct 2019 15:01:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=B8=83=E9=98=B2=E4=BA=BA?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/family/GuildFightLogic.java | 6 +++--- .../src/main/java/com/ljsd/jieling/util/CBean2Proto.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) 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 949f64f7e..b674b976e 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 @@ -258,9 +258,9 @@ public class GuildFightLogic { //匹配处理 GuildInfo guildInfo = GuilidManager.guildInfoMap.get(gid); //todo 人数限制 -// if(guildInfo.getDefendInfo().size()> entry:guildInfo.getMembers().entrySet()){ for(Integer uid:entry.getValue()){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index b9e2cd0fe..965d22658 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -438,6 +438,7 @@ public class CBean2Proto { .setOutTime(outTime) .setFrame(user.getPlayerInfoManager().getHeadFrame()) .setTime(applyTime) + .setHead(user.getPlayerInfoManager().getHead()) .build(); }