活动修改

yuanshuai 2021-10-25 11:56:58 +08:00
parent bd0f84629b
commit c1f4f45656
1 changed files with 12 additions and 5 deletions

View File

@ -80,6 +80,8 @@ public class NewWelfareActivity extends AbstractActivity {
} }
if(parm ==sActivityRewardConfig.getValues()[1][0]){ if(parm ==sActivityRewardConfig.getValues()[1][0]){
activityProgressInfo.setState(3); activityProgressInfo.setState(3);
activityMission.getActivityMissionMap().put(sActivityRewardConfig.getId(), activityProgressInfo);
isUpdate = true;
if (sActivityRewardConfig.getSort()==2){ if (sActivityRewardConfig.getSort()==2){
Poster.getPoster().dispatchEvent(new NewWelfareEvent(user,NewWelfareTypeEnum.ALL_MISSION_FIN.getType(),1)); Poster.getPoster().dispatchEvent(new NewWelfareEvent(user,NewWelfareTypeEnum.ALL_MISSION_FIN.getType(),1));
} }
@ -107,17 +109,22 @@ public class NewWelfareActivity extends AbstractActivity {
Map<Integer, ActivityProgressInfo> activityProgressInfoMap = activityMission.getActivityMissionMap(); Map<Integer, ActivityProgressInfo> activityProgressInfoMap = activityMission.getActivityMissionMap();
//0是领取最后奖励 //0是领取最后奖励
if(missionId==0){ if(missionId==0){
for(ActivityProgressInfo activityProgressInfo : activityProgressInfoMap.values()){ for (Map.Entry<Integer, ActivityProgressInfo> inter : activityProgressInfoMap.entrySet()) {
if(activityProgressInfo.getState() != 1){ ActivityProgressInfo activityProgressInfo=inter.getValue();
int activityMissionId=inter.getKey();
SActivityRewardConfig missonConfig= SActivityRewardConfig.getsActivityRewardConfigByMissionId(activityMissionId);
if(activityProgressInfo.getState() != 1&&missonConfig.getSort()==1){
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
} }
} }
for(Map.Entry<Integer,ActivityProgressInfo> item: activityProgressInfoMap.entrySet()){ for(Map.Entry<Integer,ActivityProgressInfo> item: activityProgressInfoMap.entrySet()){
item.getValue().setState(2); SActivityRewardConfig missonConfig= SActivityRewardConfig.getsActivityRewardConfigByMissionId(item.getKey());
activityMission.getActivityMissionMap().put(item.getKey(),item.getValue()); if (missonConfig.getSort()==1){
item.getValue().setState(2);
activityMission.getActivityMissionMap().put(item.getKey(),item.getValue());
}
} }
sendActivityProgress(session, activityMission, null); sendActivityProgress(session, activityMission, null);
List<SActivityRewardConfig> sActivityRewardConfigs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id); List<SActivityRewardConfig> sActivityRewardConfigs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id);
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sActivityRewardConfigs.get(0).getReward(), BIReason.TAKE_ACTIVITY_REWARD); CommonProto.Drop.Builder drop = ItemUtil.drop(user, sActivityRewardConfigs.get(0).getReward(), BIReason.TAKE_ACTIVITY_REWARD);