冲突修改
parent
2b06894b07
commit
4fa6b8e8af
|
@ -325,11 +325,7 @@ public class GuildChallengeLogic {
|
||||||
}
|
}
|
||||||
Family.GuildChallengeIndication.Builder indication = Family.GuildChallengeIndication.newBuilder()
|
Family.GuildChallengeIndication.Builder indication = Family.GuildChallengeIndication.newBuilder()
|
||||||
.setBlood(remainHp)
|
.setBlood(remainHp)
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
.setCurBoss(guildInfo.getCurrBossId());
|
.setCurBoss(guildInfo.getCurrBossId());
|
||||||
>>>>>>> 4c0ce0872... 工会副本修改
|
|
||||||
// GuildLogic.sendIndicationToMemberWithoutUser(guildInfo, MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION,indication.build(),uid);
|
// GuildLogic.sendIndicationToMemberWithoutUser(guildInfo, MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION,indication.build(),uid);
|
||||||
Map<Integer, Set<Integer>> members = guildInfo.getMembers();
|
Map<Integer, Set<Integer>> members = guildInfo.getMembers();
|
||||||
for(Set<Integer> items : members.values()){
|
for(Set<Integer> items : members.values()){
|
||||||
|
@ -339,7 +335,6 @@ public class GuildChallengeLogic {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
ISession isession = OnlineUserManager.getSessionByUid(sendUid);
|
ISession isession = OnlineUserManager.getSessionByUid(sendUid);
|
||||||
<<<<<<< HEAD
|
|
||||||
Family.GuildChallengeIndication.Builder otherIndication = Family.GuildChallengeIndication.newBuilder()
|
Family.GuildChallengeIndication.Builder otherIndication = Family.GuildChallengeIndication.newBuilder()
|
||||||
.setBlood(remainHp)
|
.setBlood(remainHp)
|
||||||
.setCurBoss(guildInfo.getCurrBossId());
|
.setCurBoss(guildInfo.getCurrBossId());
|
||||||
|
@ -349,14 +344,6 @@ public class GuildChallengeLogic {
|
||||||
if(isession!=null){
|
if(isession!=null){
|
||||||
// LOGGER.info("向{}发送indication",sendUid);
|
// LOGGER.info("向{}发送indication",sendUid);
|
||||||
MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true);
|
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... 工会副本修改
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue