From 726c98f3ab7c4d9008cded497e7d2eab5d1d0cd5 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 16 May 2022 15:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=81=A2=E5=A4=8D100=E6=A1=A3?= =?UTF-8?q?=E9=A6=96=E5=85=85=E5=A5=96=E5=8A=B1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/RechargeTotalActivity.java | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java index aa235562e..b394d302c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeTotalActivity.java @@ -36,32 +36,32 @@ class RechargeTotalActivity extends AbstractActivity { return true; } - @Override - public List getAllMissInfo(User user, ActivityMission activityMission, Set filter) { - Map activityProgressInfoMap = activityMission.getActivityMissionMap(); - List missionInfos = new ArrayList<>(activityProgressInfoMap.size()); - long openTime = TimeUtils.stringToTimeLong2(GameApplication.serverConfig.getOpenTime()); - for (Map.Entry missionProgress : activityProgressInfoMap.entrySet()) { - if (filter != null && !filter.contains(missionProgress.getKey())) { - continue; - } - Integer missionId = missionProgress.getKey(); - SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId); - if (sActivityRewardConfig == null) { - continue; - } - if(id == ActivityType.RechargeTotal){ - // 2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务 - if (openTime > 1640134800000L) { - int value = sActivityRewardConfig.getValues()[0][0]; - if (value == 100) { - continue; - } - } - } - ActivityProgressInfo activityProgressInfo = missionProgress.getValue(); - missionInfos.add(CommonProto.ActivityInfo.MissionInfo.newBuilder().setMissionId(missionId).setProgress(activityProgressInfo.getProgrss()).setState(activityProgressInfo.getState()).build()); - } - return missionInfos; - } +// @Override +// public List getAllMissInfo(User user, ActivityMission activityMission, Set filter) { +// Map activityProgressInfoMap = activityMission.getActivityMissionMap(); +// List missionInfos = new ArrayList<>(activityProgressInfoMap.size()); +// long openTime = TimeUtils.stringToTimeLong2(GameApplication.serverConfig.getOpenTime()); +// for (Map.Entry missionProgress : activityProgressInfoMap.entrySet()) { +// if (filter != null && !filter.contains(missionProgress.getKey())) { +// continue; +// } +// Integer missionId = missionProgress.getKey(); +// SActivityRewardConfig sActivityRewardConfig = SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId); +// if (sActivityRewardConfig == null) { +// continue; +// } +// if(id == ActivityType.RechargeTotal){ +// // 2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务 +// if (openTime > 1640134800000L) { +// int value = sActivityRewardConfig.getValues()[0][0]; +// if (value == 100) { +// continue; +// } +// } +// } +// ActivityProgressInfo activityProgressInfo = missionProgress.getValue(); +// missionInfos.add(CommonProto.ActivityInfo.MissionInfo.newBuilder().setMissionId(missionId).setProgress(activityProgressInfo.getProgrss()).setState(activityProgressInfo.getState()).build()); +// } +// return missionInfos; +// } }