merge2
parent
5f335130c9
commit
2b06894b07
|
|
@ -25,6 +25,8 @@ import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank;
|
||||||
import com.ljsd.jieling.logic.store.StoreLogic;
|
import com.ljsd.jieling.logic.store.StoreLogic;
|
||||||
import com.ljsd.jieling.network.server.ProtocolsManager;
|
import com.ljsd.jieling.network.server.ProtocolsManager;
|
||||||
import com.ljsd.jieling.network.session.ISession;
|
import com.ljsd.jieling.network.session.ISession;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
import rpc.protocols.CommonProto;
|
import rpc.protocols.CommonProto;
|
||||||
import rpc.protocols.Family;
|
import rpc.protocols.Family;
|
||||||
import rpc.protocols.MessageTypeProto;
|
import rpc.protocols.MessageTypeProto;
|
||||||
|
|
@ -46,6 +48,7 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||||
*/
|
*/
|
||||||
public class GuildChallengeLogic {
|
public class GuildChallengeLogic {
|
||||||
|
|
||||||
|
private static final Logger LOGGER = LoggerFactory.getLogger(GuildChallengeLogic.class);
|
||||||
public static GuildChallengeLogic getInstance() {
|
public static GuildChallengeLogic getInstance() {
|
||||||
return Instance.instance;
|
return Instance.instance;
|
||||||
}
|
}
|
||||||
|
|
@ -322,7 +325,11 @@ 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());
|
||||||
|
>>>>>>> 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()){
|
||||||
|
|
@ -332,6 +339,7 @@ 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());
|
||||||
|
|
@ -341,6 +349,14 @@ 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