冲突修改

back_recharge
lvxinran 2021-03-27 16:43:49 +08:00
parent 2b06894b07
commit 4fa6b8e8af
1 changed files with 0 additions and 13 deletions

View File

@ -325,11 +325,7 @@ 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<Integer, Set<Integer>> members = guildInfo.getMembers();
for(Set<Integer> items : members.values()){
@ -339,7 +335,6 @@ public class GuildChallengeLogic {
continue;
}
ISession isession = OnlineUserManager.getSessionByUid(sendUid);
<<<<<<< HEAD
Family.GuildChallengeIndication.Builder otherIndication = Family.GuildChallengeIndication.newBuilder()
.setBlood(remainHp)
.setCurBoss(guildInfo.getCurrBossId());
@ -349,14 +344,6 @@ 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...
}
}
}