diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java index 579ec0aba..498afdd7f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewRechargeSumDayActivity.java @@ -1,19 +1,16 @@ package com.ljsd.jieling.logic.activity; -import com.ljsd.jieling.config.clazzStaticCfg.ActivityStaticConfig; import com.ljsd.jieling.jbean.ActivityManager; import com.ljsd.jieling.jbean.ActivityMission; import com.ljsd.jieling.jbean.ActivityProgressInfo; import com.ljsd.jieling.logic.OnlineUserManager; -import com.ljsd.jieling.logic.activity.event.*; +import com.ljsd.jieling.logic.activity.event.IEvent; +import com.ljsd.jieling.logic.activity.event.Poster; +import com.ljsd.jieling.logic.activity.event.RechargeRewardEvent; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.store.GiftGoodsType; -import com.ljsd.jieling.logic.store.newRechargeInfo.RechargeType; import com.ljsd.jieling.network.session.ISession; import config.SActivityRewardConfig; -import config.SRechargeCommodityNewConfig; -import manager.STableManager; import java.util.HashSet; import java.util.Map; @@ -77,22 +74,4 @@ class NewRechargeSumDayActivity extends AbstractActivity { ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); sendActivityProgress(sessionByUid, activityMission, null); } - - - @Override - public Set getCloseGoods(User user) { - HashSet set = new HashSet<>(); - ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id); - if (mission == null) { - return set; - } - Map map = mission.getActivityMissionMap(); - for (Map.Entry progressInfoEntry : map.entrySet()) { - SActivityRewardConfig rewardConfig = SActivityRewardConfig.getsActivityRewardConfigByMissionId(progressInfoEntry.getKey()); - if (progressInfoEntry.getValue().getState() == ActivityType.HAD_TAKED || (progressInfoEntry.getValue().getState() == ActivityType.WILL_TAKE && mission.getV() + 1 != rewardConfig.getSort())) { - set.add(rewardConfig.getValues()[0][0]); - } - } - return set; - } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 6c022ef7c..ef814f9b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1904,7 +1904,7 @@ public class ItemUtil { case Global.EXP: sourceNum = parseTheValueByPrivilegeMap(user,sourceNum,VipPrivilegeType.CHALLENGE_MAINLINE_ADD_USER_EXP); break; - case GlobalItemType.ONE_RMB_RECHARGE_CARD: + case GlobalItemType.SecretBox: sourceNum = parseTheValueByPrivilegeMap(user,sourceNum,VipPrivilegeType.CHALLENGE_MAINLINE_ADD_ONE_RECHARGE_NUM); break; default: @@ -1975,6 +1975,9 @@ public class ItemUtil { case GlobalItemType.RUNNE: sourceNum = parseTheValueByPrivilegeMap(user,sourceNum,VipPrivilegeType.ADVENTURE_RUNNE_REWARD); break; + case GlobalItemType.SecretBox: + sourceNum = parseTheValueByPrivilegeMap(user,sourceNum,VipPrivilegeType.HANGUP_ADD_ONE_RECHARGE_NUM); + break; default: break; }