From 843e4f921d5bc65ced6568bf5fc4b58b2b17cf54 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Sat, 23 Nov 2019 11:15:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/DailyRechargeActivity.java | 13 ++++++------- .../com/ljsd/jieling/logic/store/BuyGoodsLogic.java | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DailyRechargeActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DailyRechargeActivity.java index 9120fb6a5..c32152e9b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DailyRechargeActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DailyRechargeActivity.java @@ -25,13 +25,12 @@ class DailyRechargeActivity extends AbstractActivity { Map activityMissionMap = user.getActivityManager().getActivityMissionMap(); // //每日充值隐含开启条件是 首冲完成 策划说首冲的活动id 5绝对不会变 - ActivityMission activityMission = activityMissionMap.get(5); - if (null != activityMission && activityMission.getActivityState() == ActivityType.FINISH_STATE) { - ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); - takeAllReward(sessionByUid); - } -// ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); -// takeAllReward(sessionByUid); +// ActivityMission activityMission = activityMissionMap.get(5); +// if (null != activityMission && activityMission.getActivityState() == ActivityType.FINISH_STATE) { +// +// } + ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); + takeAllReward(sessionByUid); super.onResume(user); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index 9e93dbeff..33e6b21c5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -176,7 +176,7 @@ public class BuyGoodsLogic { rechargeInfo.setSaveAmt(price+saveAmt); user.getPlayerInfoManager().addRechargedaily(price); //TODO 用事件分发 - ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,rechargeInfo.getSaveAmt()); + ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,price);