妖晶累充活动和仙晶累充活动,补充

back_recharge
duhui 2022-12-08 17:33:12 +08:00
parent 31e496e566
commit 3463c2052b
2 changed files with 34 additions and 9 deletions

View File

@ -120,15 +120,15 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
* @param activityMission
* @return
*/
public boolean checkActivityMissionFinishAndTake(int uid,int activityId,ActivityMission activityMission) {
public boolean checkActivityMissionFinishAndTake(int uid,int activityId,ActivityMission activityMission) throws Exception {
Map<Integer, ActivityProgressInfo> activityProgressInfoMap = activityMission.getActivityMissionMap();
if (activityProgressInfoMap.isEmpty()) {
return false;
}
for (Map.Entry<Integer, ActivityProgressInfo> item : activityProgressInfoMap.entrySet()) {
ActivityProgressInfo activityProgressInfo = item.getValue();
int missionStatus = activityProgressInfo.getState();
if (missionStatus == ActivityType.WILL_TAKE) {
User user = UserManager.getUser(uid);
List<CommonProto.ActivityInfo.MissionInfo> allMissInfo = getAllMissInfo(user, activityMission);
for (CommonProto.ActivityInfo.MissionInfo info : allMissInfo) {
if (info.getState() == ActivityType.WILL_TAKE) {
return false;
}
}

View File

@ -6,16 +6,14 @@ import com.ljsd.jieling.globals.BIReason;
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.IEvent;
import com.ljsd.jieling.logic.activity.event.Poster;
import com.ljsd.jieling.logic.activity.event.SuperBoxEvent;
import com.ljsd.jieling.logic.activity.event.TotalItemEvent;
import com.ljsd.jieling.logic.activity.event.*;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.util.ItemUtil;
import com.ljsd.jieling.util.MessageUtil;
import config.SActivityRewardConfig;
import config.SGlobalActivity;
import config.SRechargeCommodityNewConfig;
import config.SSuperZhenChong;
import rpc.protocols.CommonProto;
@ -168,4 +166,31 @@ public class MoneyTotalRechargeActivity extends AbstractActivity {
return true;
}
/**
*
* @param uid
* @param activityId
* @param activityMission
* @return
*/
public boolean checkActivityMissionFinishAndTake(int uid,int activityId,ActivityMission activityMission) throws Exception {
Map<Integer, ActivityProgressInfo> activityProgressInfoMap = activityMission.getActivityMissionMap();
if (activityProgressInfoMap.isEmpty()) {
return false;
}
User user = UserManager.getUser(uid);
List<CommonProto.ActivityInfo.MissionInfo> allMissInfo = getAllMissInfo(user, activityMission);
for (CommonProto.ActivityInfo.MissionInfo info : allMissInfo) {
if (info.getState() != 2) {
return false;
}
}
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(activityId);
if(sGlobalActivity.getResetGrade()==0){
activityMission.setActivityState(ActivityType.FINISH_STATE);
Poster.getPoster().dispatchEvent(new ActivityStateChangeEvent(uid,activityId,ActivityType.FINISH_STATE));
}
return true;
}
}