Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
b419bba13e
|
@ -1551,7 +1551,7 @@ public class ActivityLogic implements IEventHandler{
|
|||
// 消费抽取
|
||||
if (drop == null){
|
||||
// 十连抽还是单抽消耗物品获取
|
||||
int[][] item = type == 1?setting.getCostItemMul():setting.getCostItemSingle();
|
||||
int[][] item = type == 1?setting.getCostItemSingle():setting.getCostItemMul();
|
||||
// 验证道具消耗
|
||||
int[][] cost = new int[][]{{item[0][0],item[0][1]}};
|
||||
boolean itemCost = ItemUtil.itemCost(user, cost, BIReason.CHOICE_DRAW_CARD, 0);
|
||||
|
|
|
@ -414,13 +414,14 @@ public class ChampionshipLogic {
|
|||
user.getArenaManager().setTopMaxRank(rank);
|
||||
}
|
||||
user.getUserMissionManager().onGameEvent(user, GameEvent.CHAMPIONSHIP_RANK, rank);
|
||||
if(rank == 1){
|
||||
Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.top_match_rank.getType(),1));
|
||||
}
|
||||
rank++;
|
||||
String title = SErrorCodeEerverConfig.getI18NMessage("champion_reward_title");
|
||||
String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("champion_reward_txt", new Object[]{sChampionshipReward.getTitleDesc()},new int[]{1},"#");
|
||||
MailLogic.getInstance().sendMail(user.getId(), title, content, ItemUtil.getMailReward(sChampionshipReward.getSeasonReward()), nowTime, Global.MAIL_EFFECTIVE_TIME);
|
||||
if(rank == 1){
|
||||
Poster.getPoster().dispatchEvent(new WelfareRedPackEvent(user.getId(), WelfareRedPacketType.top_match_rank.getType(),1));
|
||||
}
|
||||
|
||||
}
|
||||
}catch (Exception e){
|
||||
LOGGER.info("Exception e = "+"size"+ arenaRankInfo.size()+ e.toString());
|
||||
|
|
Loading…
Reference in New Issue