From 2b06894b07757f9cd82ee7278053efb4b30424d2 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 23 Mar 2021 03:30:42 +0800 Subject: [PATCH] merge2 --- .../logic/family/GuildChallengeLogic.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index af0334e8f..ec5dd8f26 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -25,6 +25,8 @@ import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank; import com.ljsd.jieling.logic.store.StoreLogic; import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.network.session.ISession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import rpc.protocols.CommonProto; import rpc.protocols.Family; import rpc.protocols.MessageTypeProto; @@ -46,6 +48,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public class GuildChallengeLogic { + private static final Logger LOGGER = LoggerFactory.getLogger(GuildChallengeLogic.class); public static GuildChallengeLogic getInstance() { return Instance.instance; } @@ -322,7 +325,11 @@ public class GuildChallengeLogic { } Family.GuildChallengeIndication.Builder indication = Family.GuildChallengeIndication.newBuilder() .setBlood(remainHp) +<<<<<<< HEAD +======= + .setCurBoss(guildInfo.getCurrBossId()); +>>>>>>> 4c0ce0872... 工会副本修改 // GuildLogic.sendIndicationToMemberWithoutUser(guildInfo, MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION,indication.build(),uid); Map> members = guildInfo.getMembers(); for(Set items : members.values()){ @@ -332,6 +339,7 @@ public class GuildChallengeLogic { continue; } ISession isession = OnlineUserManager.getSessionByUid(sendUid); +<<<<<<< HEAD Family.GuildChallengeIndication.Builder otherIndication = Family.GuildChallengeIndication.newBuilder() .setBlood(remainHp) .setCurBoss(guildInfo.getCurrBossId()); @@ -341,6 +349,14 @@ public class GuildChallengeLogic { if(isession!=null){ // LOGGER.info("向{}发送indication",sendUid); MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true); +======= + if(kill==1&&!UserManager.getUser(sendUid).getGuildMyInfo().getRefreshedBoss().contains(bossId)&&guildInfo.getBossHpRemain()!=-1){ + indication.setIsRefresh(1);//需要前端刷新次数 + } + if(isession!=null){ + LOGGER.info("向{}发送indication",sendUid); + MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,indication.build(),true); +>>>>>>> 4c0ce0872... 工会副本修改 } } }