Revert "冲突修改"

This reverts commit 987c524652.
back_recharge
yuanshuai 2021-09-09 20:25:40 +08:00
parent 987c524652
commit 31c1268a27
1 changed files with 4 additions and 0 deletions

View File

@ -175,10 +175,14 @@ 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);//重载功能商店