diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java index 953e2b0b4..fafbdf4e2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/NewWelfareActivity.java @@ -76,13 +76,11 @@ public class NewWelfareActivity extends AbstractActivity { } else { super.takeReward(session,missionId); } - - return true; } @Override - public void getAllMissRewards(User user, ISession session, List itemAttrs) { + public void getAllMissRewards(User user, ISession session, List itemAttrs) throws Exception { if (this.id == 42) { SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id); if (sGlobalActivity == null || !user.getActivityManager().getActivityMissionMap().containsKey(id)) { @@ -107,7 +105,7 @@ public class NewWelfareActivity extends AbstractActivity { List sActivityRewardConfigs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id); itemAttrs.add(sActivityRewardConfigs.get(0).getReward()); }else{ -// super.getAllMissRewards(user,session,itemAttrs); + super.getAllMissRewards(user,session,itemAttrs); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumDayActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumDayActivity.java index 5d8e2cdcf..7891e14d1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumDayActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/RechargeSumDayActivity.java @@ -28,6 +28,10 @@ class RechargeSumDayActivity extends AbstractActivity { } catch (Exception e) { e.printStackTrace(); } + // 该活动已被替换,未参与的玩家不再累计 + if (activityMission.getV() <= 0 || activityMission.getV() >= 15) { + return; + } if (user.getPlayerInfoManager().getRechargedaily() > 0 ) {//充值0.99不触发修改 // SActivityRewardConfig.getsActivityRewardConfigByMissionId(missionId).getValues()[0][0] activityMission.setV(activityMission.getV() + 1);