merge
parent
6f8e28efcd
commit
5f335130c9
|
@ -27,7 +27,9 @@ public class RemoveEventHeroHandler implements IEventHandler{
|
|||
}
|
||||
Hero hero = userInMem.getHeroManager().getHeroMap().get(heroId);
|
||||
Map<String, PropertyItem> equipMap = userInMem.getEquipManager().getEquipMap();
|
||||
hero.getEquipByPositionMap().values().forEach(equip->equipMap.get(equip).setHeroId(""));
|
||||
hero.getEquipByPositionMap().values().forEach(equip-> {
|
||||
equipMap.get(String.valueOf(equip)).setHeroId("");
|
||||
});
|
||||
Map<String, Integer> endlessHeroInfo = userInMem.getMapManager().getEndlessMapInfo().getEndlessHeroInfo();
|
||||
if(endlessHeroInfo!=null && endlessHeroInfo.containsKey(heroId)){
|
||||
endlessHeroInfo.remove(heroId);
|
||||
|
|
|
@ -322,9 +322,28 @@ public class GuildChallengeLogic {
|
|||
}
|
||||
Family.GuildChallengeIndication.Builder indication = Family.GuildChallengeIndication.newBuilder()
|
||||
.setBlood(remainHp)
|
||||
.setCurBoss(guildInfo.getCurrBossId());
|
||||
|
||||
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();
|
||||
for(Set<Integer> items : members.values()){
|
||||
for(Integer sendUid : items){
|
||||
//把自己跳过,自己的特殊处理
|
||||
if(sendUid==uid){
|
||||
continue;
|
||||
}
|
||||
ISession isession = OnlineUserManager.getSessionByUid(sendUid);
|
||||
Family.GuildChallengeIndication.Builder otherIndication = Family.GuildChallengeIndication.newBuilder()
|
||||
.setBlood(remainHp)
|
||||
.setCurBoss(guildInfo.getCurrBossId());
|
||||
if(kill==1&&!UserManager.getUser(sendUid).getGuildMyInfo().getRefreshedBoss().contains(bossId)&&guildInfo.getBossHpRemain()!=-1){
|
||||
otherIndication.setIsRefresh(1);//需要前端刷新次数
|
||||
}
|
||||
if(isession!=null){
|
||||
// LOGGER.info("向{}发送indication",sendUid);
|
||||
MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true);
|
||||
}
|
||||
}
|
||||
}
|
||||
indication.setIsKill(kill);
|
||||
//伤害排行
|
||||
|
||||
|
@ -350,6 +369,9 @@ public class GuildChallengeLogic {
|
|||
PlayerLogic.getInstance().checkAndUpdate(user,config.getPrivilege()[0],1);
|
||||
|
||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true);
|
||||
if(kill==1&&!UserManager.getUser(uid).getGuildMyInfo().getRefreshedBoss().contains(bossId)&&guildInfo.getBossHpRemain()!=-1){
|
||||
indication.setIsRefresh(1);//需要前端刷新次数
|
||||
}
|
||||
|
||||
MessageUtil.sendIndicationMessage(session,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,indication.build(),true);
|
||||
}
|
||||
|
|
|
@ -278,7 +278,9 @@ public class BuyGoodsLogic {
|
|||
// if(rechargeInfo.getIsFirst()==0 && firstInvest == 1){
|
||||
// ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.FirstRecharge,sRechargeCommodityConfig.getPrice());
|
||||
// SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByActivityId(4).get(0);
|
||||
if(sRechargeCommodityConfig.getPrice()!=0&&price!=0){
|
||||
rechargeInfo.setFirst(1);
|
||||
}
|
||||
// String title = SErrorCodeEerverConfig.getI18NMessage("recharge_first_title");
|
||||
// String content = SErrorCodeEerverConfig.getI18NMessage("recharge_first_txt");
|
||||
// MailLogic.getInstance().sendMail(user.getId(),title,content,ItemUtil.getMailReward(sActivityRewardConfig.getReward()),nowTime, Global.MAIL_EFFECTIVE_TIME);
|
||||
|
|
Loading…
Reference in New Issue