From 368006246b86c352007a1dd36316d947e0d84793 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 25 Nov 2019 10:36:38 +0800 Subject: [PATCH] ranfom pool --- .../com/ljsd/jieling/logic/activity/NewWelfareActivity.java | 3 +++ .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) 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 70d71eb67..6697859f3 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 @@ -104,6 +104,9 @@ public class NewWelfareActivity extends AbstractActivity { return; } } + for(ActivityProgressInfo activityProgressInfo : activityProgressInfoMap.values()){ + activityProgressInfo.setState(2); + } List sActivityRewardConfigs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id); itemAttrs.add(sActivityRewardConfigs.get(0).getReward()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index c70ea0674..2e69be9cd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -234,11 +234,13 @@ public class HeroLogic { int j=0; for(int i=0;i