From 1c6c979615475d04d2115e24dcbec249422976c6 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Tue, 1 Jun 2021 15:55:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=94=E6=98=9F=E6=8E=A8=E9=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/AbstractActivity.java | 12 ------------ .../jieling/logic/activity/ActivityLogic.java | 3 --- .../com/ljsd/jieling/logic/hero/HeroLogic.java | 15 --------------- .../main/java/com/ljsd/jieling/util/ItemUtil.java | 13 +++++++++++++ 4 files changed, 13 insertions(+), 30 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java index 2c2b9d6e4..45c2b296e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java @@ -149,9 +149,6 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { //up miss int[][] reward = sActivityRewardConfig.getReward(); CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, BIReason.TAKE_ACTIVITY_REWARD); - if(drop.getHeroList().size() > 0){ - fiveStarPushByActivity(user,drop.getHero(0).getHeroId(),1); - } checkAndSetProgress(activityMission, activityProgressInfo, missionId); SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); if (null != sGlobalActivity && ActivityLogic.getInstance().checkActivityMissionFinishAndTaked(session.getUid(),id, activityMission) && sGlobalActivity.getResetGrade() == 1) { @@ -381,13 +378,4 @@ public abstract class AbstractActivity implements IActivity, IEventHandler { MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.PRIVILLEGE_ADD_INDICATION_VALUE, indication.build(), true); } - /** - *五星推送 - */ - public static void fiveStarPushByActivity(User user,int itemId,int num){ - SCHero scHero = SCHero.getsCHero().get(itemId); - if(scHero != null && scHero.getStar()==5){ - Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(),5,num)); - } - } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 56fc7a823..947a0f7ab 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -1583,9 +1583,6 @@ public class ActivityLogic implements IEventHandler{ // 特权消耗 PlayerLogic.getInstance().checkAndUpdate(user, setting.getMaxTimes(), num); - if(drop.getHeroList().size()>1){ - Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(),5,drop.getHeroList().size())); - } // 事件分发 Poster.getPoster().dispatchEvent(new ChoiceDrawCardEvent(user.getId(),activityId,num)); 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 aa928b0a9..9856ffb24 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 @@ -1140,9 +1140,6 @@ public class HeroLogic{ rankUpHeroExecute(targetHero); Poster.getPoster().dispatchEvent(new HeroUpStarEvent(user.getId(),targetHero.getTemplateId(),targetHero.getStar())); - if (targetHero.getStar()==5){ - Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(), targetHero.getStar(),1)); - } targetHero.setStarBreakId(scHeroRankUpConfig.getId()); user.getUserMissionManager().onGameEvent(user,GameEvent.HERO_UP,2,targetHero.getTemplateId(),targetHero.getStar()); @@ -2490,9 +2487,6 @@ public class HeroLogic{ Map randomMap = new ConcurrentHashMap<>(); randomMap.put(itemId, composeNum); CommonProto.Drop.Builder drop = ItemUtil.useRandomItem(user,randomMap, BIReason.COMPOS_HERO_REWARD); - if(drop.getHeroList().size()>0){ - fiveStarPushByCombine(user,drop.getHero(0).getHeroId(), composeNum); - } if(drop.getPokemonList().size()>0){ fiveStarPokemonPushByCombine(user,drop.getPokemonList().get(0).getTempId(),composeNum); } @@ -4596,15 +4590,6 @@ public class HeroLogic{ } } - /** - *五星推送 - */ - public static void fiveStarPushByCombine(User user,int itemId,int num){ - SCHero scHero = SCHero.getsCHero().get(itemId); - if(scHero != null && scHero.getStar()==5){ - Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(),5,num)); - } - } /** *五星灵兽推送 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index dee3ac4a5..5fc6533e7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1263,6 +1263,9 @@ public class ItemUtil { SItem sItem = SItem.getsItemMap().get(entry.getKey()); extraDropAop(user,dropBuilder,sItem); } + if(reason != BIReason.HERO_RANDOM){ + fiveStarPushByCombine(user,entry.getKey(),count); + } } if (reward.length() > 0) { int nowTime = (int) (TimeUtils.now() / 1000); @@ -1716,4 +1719,14 @@ public class ItemUtil { return 0L; } + /** + *五星推送 + */ + public static void fiveStarPushByCombine(User user,int itemId,int num){ + SCHero scHero = SCHero.getsCHero().get(itemId); + if(scHero != null && scHero.getStar()==5){ + Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(),5,num)); + } + } + }