diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/CircleGame.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/CircleGame.java index 72b644728..3e6c45811 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/CircleGame.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/miniGame/CircleGame.java @@ -106,7 +106,7 @@ public class CircleGame extends ColorGame{ private void fiveStarPokemonPushByRandom(User user,int itemId) throws Exception{ SSpiritAnimal ssa = SSpiritAnimal.mapConfig.get(itemId); - if(ssa != null && ssa.getQuality()==5){ + if(ssa != null && ssa.getQuality()==7){ Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.game_pokemon.getType(),1)); ISession session = OnlineUserManager.getSessionByUid(user.getId()); BuyGoodsNewLogic.openPush(session,user, PushRechargeType.pokemon_quality.getType(),5); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/PokemonFiveStarGetEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/PokemonFiveStarGetEventHandler.java index 0b0082266..8977a87fa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/PokemonFiveStarGetEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/eventhandler/PokemonFiveStarGetEventHandler.java @@ -19,7 +19,6 @@ public class PokemonFiveStarGetEventHandler implements IEventHandler { //动态控制购买数量 User user = UserManager.getUser(((PokemonFiveStarGetEvent) event).getUid()); int star = ((PokemonFiveStarGetEvent) event).getStar(); - int num = ((PokemonFiveStarGetEvent) event).getNum(); ISession session = OnlineUserManager.getSessionByUid(user.getId()); BuyGoodsNewLogic.openPush(session,user, PushRechargeType.pokemon_quality.getType(),star); } 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 4b6261d74..a4baf53b1 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 @@ -504,13 +504,13 @@ public class HeroLogic { int fiveStarNum = 0; for (int[] i : getHeros) { SSpiritAnimal ssa = SSpiritAnimal.mapConfig.get(i[0]); - if (ssa != null && ssa.getQuality() == 5) { + if (ssa != null && ssa.getQuality() == 7) { fiveStarNum++; Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.random_pokemon.getType(), 1)); } } if (fiveStarNum > 0) { - Poster.getPoster().dispatchEvent(new PokemonFiveStarGetEvent(user.getId(), 5, fiveStarNum)); + Poster.getPoster().dispatchEvent(new PokemonFiveStarGetEvent(user.getId(), 7, fiveStarNum)); } } @@ -519,8 +519,8 @@ public class HeroLogic { */ public static void fiveStarPokemonPushByCombine(User user, int itemId, int num) { SSpiritAnimal ssa = SSpiritAnimal.mapConfig.get(itemId); - if (ssa != null && ssa.getQuality() == 5) { - Poster.getPoster().dispatchEvent(new PokemonFiveStarGetEvent(user.getId(), 5, num)); + if (ssa != null && ssa.getQuality() == 7) { + Poster.getPoster().dispatchEvent(new PokemonFiveStarGetEvent(user.getId(), 7, num)); } }