diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 2d775147a..a5ee13d28 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -16,10 +16,7 @@ import com.ljsd.jieling.jbean.ActivityProgressInfo; import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.activity.ActivityType; import com.ljsd.jieling.logic.activity.IEventHandler; -import com.ljsd.jieling.logic.activity.event.GuildForceChangeEvent; -import com.ljsd.jieling.logic.activity.event.IEvent; -import com.ljsd.jieling.logic.activity.event.MinuteTaskEvent; -import com.ljsd.jieling.logic.activity.event.Poster; +import com.ljsd.jieling.logic.activity.event.*; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.*; import com.ljsd.jieling.logic.mail.MailLogic; @@ -1292,6 +1289,7 @@ public class GuildLogic { throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } user.getGuildMyInfo().addGuildSkillByType(type); + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(session.getUid())); MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true); } @@ -1351,6 +1349,7 @@ public class GuildLogic { CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropArrayReally, BIReason.RESET_GUILD_SKILL); guildMyInfo.removeGuildSkillByType(type); Family.ResetGuildSkillResponse response = Family.ResetGuildSkillResponse.newBuilder().setDrop(drop).build(); + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(session.getUid())); MessageUtil.sendMessage(session,1,messageType.getNumber(),response,true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 7d120cb39..d42c80a49 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -748,6 +748,9 @@ public class HeroLogic{ hero.setBreakId(breakId); user.getUserMissionManager().onGameEvent(user,GameEvent.HERO_UP,1); } + if(isInTeam(user,heroId,1)){ + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(session.getUid())); + } HeroInfoProto.UpHeroLevelResponse build = HeroInfoProto.UpHeroLevelResponse.newBuilder().setHeroId(heroId).setTargetLevel(hero.getLevel()).build(); //发送成功消息 MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,build,true); @@ -871,6 +874,9 @@ public class HeroLogic{ // } targetHero.setStarBreakId(scHeroRankUpConfig.getId()); user.getUserMissionManager().onGameEvent(user,GameEvent.HERO_UP,2,targetHero.getTemplateId(),targetHero.getStar()); + if(isInTeam(user,heroId,1)){ + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(session.getUid())); + } MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE,baseBuilder.build(),true); if(targetHero.getStar()>= SSpecialConfig.getIntegerValue(SSpecialConfig.lamp_rankup_hero_content_parm)){ String message = SErrorCodeEerverConfig.getI18NMessage("lamp_rankup_hero_content", new Object[]{user.getPlayerInfoManager().getNickName(), scHero.getReadingName(),targetHero.getStar()}); @@ -1783,6 +1789,9 @@ public class HeroLogic{ // int force = calForce(heroNotBufferAttribute) + heroNotBufferAttribute.get(HeroAttributeEnum.EquipForce.getPropertyId()); // LOGGER.info("the heroTid={},the force={}",hero.getTemplateId(),force); + if(isInTeam(user,heroId,1)){ + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(uid)); + } //发送成功消息 MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.EQUIP_WEAR_RESPONSE_VALUE,null,true); @@ -1813,6 +1822,7 @@ public class HeroLogic{ if(!StringUtil.isEmpty(remove)){ hero.removeJewel(remove); } + } @@ -1853,6 +1863,9 @@ public class HeroLogic{ } } + if(isInTeam(user,heroId,1)){ + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(uid)); + } //发送成功消息 MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.EQUIP_UNLOAD_OPT_RESPONSE_VALUE,null,true); } @@ -2351,6 +2364,9 @@ public class HeroLogic{ }); ItemUtil.dropMap(user,returnItems,BIReason.REPLACE_SOUL_REWARD); + if(isInTeam(user,heroId,1)){ + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(uid)); + } MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.SOUL_EQUIP_WEAR_RESPONSE_VALUE,null,true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 1415683bd..2bf9e548c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -9,6 +9,7 @@ import com.ljsd.jieling.globals.Global; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.logic.activity.event.EspecialEquipUpEvent; import com.ljsd.jieling.logic.activity.event.Poster; +import com.ljsd.jieling.logic.activity.event.UserMainTeamForceEvent; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.hero.HeroLogic; @@ -567,7 +568,9 @@ public class ItemLogic { String message = SErrorCodeEerverConfig.getI18NMessage("lamp_rankup_equiptalisman_content", new Object[]{user.getPlayerInfoManager().getNickName(), sItem.getName(),hero.getEspecialEquipLevel()}); ChatLogic.getInstance().sendSysChatMessage(message,Global.DILIGENT,sItem.getId(),0,0,0,0,0); } - + if(HeroLogic.getInstance().isInTeam(user,heroId,1)){ + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(session.getUid())); + } }else{ throw new ErrorCodeException(ErrorCode.ITEM_ESPECIAL_EQUIP_UP_ITEM_NOT); } @@ -707,6 +710,9 @@ public class ItemLogic { }else{//精炼 jewel.setBuildLevel(jewel.getBuildLevel()+1); } + if(HeroLogic.getInstance().isInTeam(user,jewel.getHeroId(),1)){ + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(user.getId())); + } MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.JEWEL_BUILD_RESPONSE_VALUE,null,true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 3e0d084ee..bebf0ac0d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -19,6 +19,7 @@ import com.ljsd.jieling.logic.activity.ActivityType; import com.ljsd.jieling.logic.activity.event.GuildForceChangeEvent; import com.ljsd.jieling.logic.activity.event.Poster; import com.ljsd.jieling.logic.activity.event.UserForceChangeEvent; +import com.ljsd.jieling.logic.activity.event.UserMainTeamForceEvent; import com.ljsd.jieling.logic.activity.eventhandler.UserForceUpEventHandler; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; @@ -254,6 +255,7 @@ public class PlayerLogic { .setVipLevel(playerInfoManager.getVipLevel()).build(); PlayerInfoProto.VipLevelUpResponse.Builder builder = PlayerInfoProto.VipLevelUpResponse.newBuilder().addAllUserMissionInfo(missionList); builder.setVipBaseInfo(vipInfoProto); + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(session.getUid())); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.VIP_LEVELUP_RESPONSE_VALUE,builder.build(),true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java index 959e5b3ca..836252935 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java @@ -66,7 +66,6 @@ public class ForceCurrRank extends AbstractRank implements IEventHandler{ } } Set changeId = new HashSet<>(); - System.out.println(("有"+changeId.size()+"个用户主线战力更改")); eventList.forEach(n->changeId.add(n.getUid())); changeId.forEach(i-> { try {