妖晶累充活动和仙晶累充活动,补充
parent
31e496e566
commit
3463c2052b
|
@ -120,15 +120,15 @@ public abstract class AbstractActivity implements IActivity, IEventHandler {
|
||||||
* @param activityMission
|
* @param activityMission
|
||||||
* @return
|
* @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();
|
Map<Integer, ActivityProgressInfo> activityProgressInfoMap = activityMission.getActivityMissionMap();
|
||||||
if (activityProgressInfoMap.isEmpty()) {
|
if (activityProgressInfoMap.isEmpty()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
for (Map.Entry<Integer, ActivityProgressInfo> item : activityProgressInfoMap.entrySet()) {
|
User user = UserManager.getUser(uid);
|
||||||
ActivityProgressInfo activityProgressInfo = item.getValue();
|
List<CommonProto.ActivityInfo.MissionInfo> allMissInfo = getAllMissInfo(user, activityMission);
|
||||||
int missionStatus = activityProgressInfo.getState();
|
for (CommonProto.ActivityInfo.MissionInfo info : allMissInfo) {
|
||||||
if (missionStatus == ActivityType.WILL_TAKE) {
|
if (info.getState() == ActivityType.WILL_TAKE) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,16 +6,14 @@ import com.ljsd.jieling.globals.BIReason;
|
||||||
import com.ljsd.jieling.jbean.ActivityMission;
|
import com.ljsd.jieling.jbean.ActivityMission;
|
||||||
import com.ljsd.jieling.jbean.ActivityProgressInfo;
|
import com.ljsd.jieling.jbean.ActivityProgressInfo;
|
||||||
import com.ljsd.jieling.logic.OnlineUserManager;
|
import com.ljsd.jieling.logic.OnlineUserManager;
|
||||||
import com.ljsd.jieling.logic.activity.event.IEvent;
|
import com.ljsd.jieling.logic.activity.event.*;
|
||||||
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.dao.UserManager;
|
import com.ljsd.jieling.logic.dao.UserManager;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.network.session.ISession;
|
import com.ljsd.jieling.network.session.ISession;
|
||||||
import com.ljsd.jieling.util.ItemUtil;
|
import com.ljsd.jieling.util.ItemUtil;
|
||||||
import com.ljsd.jieling.util.MessageUtil;
|
import com.ljsd.jieling.util.MessageUtil;
|
||||||
import config.SActivityRewardConfig;
|
import config.SActivityRewardConfig;
|
||||||
|
import config.SGlobalActivity;
|
||||||
import config.SRechargeCommodityNewConfig;
|
import config.SRechargeCommodityNewConfig;
|
||||||
import config.SSuperZhenChong;
|
import config.SSuperZhenChong;
|
||||||
import rpc.protocols.CommonProto;
|
import rpc.protocols.CommonProto;
|
||||||
|
@ -168,4 +166,31 @@ public class MoneyTotalRechargeActivity extends AbstractActivity {
|
||||||
return true;
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue