Merge branch 'master_dev' into master_otnew
commit
45e973a413
|
@ -106,7 +106,7 @@ public class CircleGame extends ColorGame{
|
||||||
|
|
||||||
private void fiveStarPokemonPushByRandom(User user,int itemId) throws Exception{
|
private void fiveStarPokemonPushByRandom(User user,int itemId) throws Exception{
|
||||||
SSpiritAnimal ssa = SSpiritAnimal.mapConfig.get(itemId);
|
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));
|
Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.game_pokemon.getType(),1));
|
||||||
ISession session = OnlineUserManager.getSessionByUid(user.getId());
|
ISession session = OnlineUserManager.getSessionByUid(user.getId());
|
||||||
BuyGoodsNewLogic.openPush(session,user, PushRechargeType.pokemon_quality.getType(),5);
|
BuyGoodsNewLogic.openPush(session,user, PushRechargeType.pokemon_quality.getType(),5);
|
||||||
|
|
|
@ -19,7 +19,6 @@ public class PokemonFiveStarGetEventHandler implements IEventHandler {
|
||||||
//动态控制购买数量
|
//动态控制购买数量
|
||||||
User user = UserManager.getUser(((PokemonFiveStarGetEvent) event).getUid());
|
User user = UserManager.getUser(((PokemonFiveStarGetEvent) event).getUid());
|
||||||
int star = ((PokemonFiveStarGetEvent) event).getStar();
|
int star = ((PokemonFiveStarGetEvent) event).getStar();
|
||||||
int num = ((PokemonFiveStarGetEvent) event).getNum();
|
|
||||||
ISession session = OnlineUserManager.getSessionByUid(user.getId());
|
ISession session = OnlineUserManager.getSessionByUid(user.getId());
|
||||||
BuyGoodsNewLogic.openPush(session,user, PushRechargeType.pokemon_quality.getType(),star);
|
BuyGoodsNewLogic.openPush(session,user, PushRechargeType.pokemon_quality.getType(),star);
|
||||||
}
|
}
|
||||||
|
|
|
@ -504,13 +504,13 @@ public class HeroLogic {
|
||||||
int fiveStarNum = 0;
|
int fiveStarNum = 0;
|
||||||
for (int[] i : getHeros) {
|
for (int[] i : getHeros) {
|
||||||
SSpiritAnimal ssa = SSpiritAnimal.mapConfig.get(i[0]);
|
SSpiritAnimal ssa = SSpiritAnimal.mapConfig.get(i[0]);
|
||||||
if (ssa != null && ssa.getQuality() == 5) {
|
if (ssa != null && ssa.getQuality() == 7) {
|
||||||
fiveStarNum++;
|
fiveStarNum++;
|
||||||
Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.random_pokemon.getType(), 1));
|
Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.random_pokemon.getType(), 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (fiveStarNum > 0) {
|
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) {
|
public static void fiveStarPokemonPushByCombine(User user, int itemId, int num) {
|
||||||
SSpiritAnimal ssa = SSpiritAnimal.mapConfig.get(itemId);
|
SSpiritAnimal ssa = SSpiritAnimal.mapConfig.get(itemId);
|
||||||
if (ssa != null && ssa.getQuality() == 5) {
|
if (ssa != null && ssa.getQuality() == 7) {
|
||||||
Poster.getPoster().dispatchEvent(new PokemonFiveStarGetEvent(user.getId(), 5, num));
|
Poster.getPoster().dispatchEvent(new PokemonFiveStarGetEvent(user.getId(), 7, num));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue