From 8c928fd864a670137fb7a7b6f831514fe9bdb716 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 17 Jun 2022 11:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E5=8D=A1=E6=9C=88=E5=8D=A1=E8=B0=83?= =?UTF-8?q?=E6=95=B4,=E5=85=BC=E5=AE=B9=E8=80=81=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9C=88=E5=8D=A1=EF=BC=8C=E5=9B=9B=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/player/PlayerLogic.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 558872f91..7b452264d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1680,14 +1680,18 @@ public class PlayerLogic { endTime = startTime + monthcardConfig.getContiueDays() * 24 * 60 * 60; } - SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(monthcardConfig.getPrice()); - RechargeHandler rechargeHandler = BuyGoodsNewLogic.getRechargeHandler(config.getOtype()); - AbstractWelfareBag bag = rechargeHandler.getRechargeMap(user).get(config.getId()); - int state = 0; - if (bag != null && !bag.checkBuy()){ + SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(monthcardConfig.getPrice()); + if (config == null){ + RechargeHandler rechargeHandler = BuyGoodsNewLogic.getRechargeHandler(config.getOtype()); + AbstractWelfareBag bag = rechargeHandler.getRechargeMap(user).get(config.getId()); + if (bag != null && !bag.checkBuy()){ + state = playerInfoManager.getMonthCardDailyTake().contains(monthcardConfig.getId())?2:1; + } + }else { state = playerInfoManager.getMonthCardDailyTake().contains(monthcardConfig.getId())?2:1; } + cardInfos.add(CommonProto.MonthCardInfo.newBuilder().setId(monthcardConfig.getId()).setEndingTime(endTime).setState(state).setTotleAmt(0).build()); } return cardInfos;