冲突修改

back_recharge
yuanshuai 2021-09-09 17:03:29 +08:00
parent ea4430e298
commit 987c524652
1 changed files with 0 additions and 4 deletions

View File

@ -175,14 +175,10 @@ public class GetPlayerInfoHandler extends BaseHandler{
user.getPlayerInfoManager().getMonthCard().put(Global.LMONTHCARDID, (int) (System.currentTimeMillis() / 1000));
Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.RECHARGE_BUY.getType(),Global.LMONTHCARDID));
}
<<<<<<< Updated upstream
// 四灵试炼初始化
FourChallengeLogic.getInstance().firstGetTimes(user);
=======
List<CommonProto.SixiangxinfaInfo> sixiangxinfaInfos = getSixiangxinfaInfos(heroManager);
>>>>>>> Stashed changes
int randomCount =SLotterySpecialConfig.getLotteryListByDifferentType(7).iterator().next().getCount()- user.getHeroManager().getRandomPoolByType().getOrDefault(11,new HashMap<>()).getOrDefault(7,0);
StoreLogic.reloadStoreInfo(user,7);//重载功能商店