易经宝库
parent
16ded73f10
commit
08e1b94c60
|
@ -59,28 +59,32 @@ public class SeletSubRewardPoolRequestHandler extends BaseHandler<ActivityProto.
|
|||
throw new ErrorCodeException(ErrorCode.CFG_NULL);
|
||||
}
|
||||
|
||||
|
||||
//check leve
|
||||
|
||||
if(sBlessingRewardPoolNew.getLevelLimit()>user.getPlayerInfoManager().getLevel()){
|
||||
throw new ErrorCodeException(ErrorCode.PLAYER_LEVE_NOT);
|
||||
}
|
||||
|
||||
//check floor
|
||||
ActivityProgressInfo activityProgressInfo = activityMission.getActivityMissionMap().get(SubActivity.LAY_INDEX);
|
||||
if(activityProgressInfo!=null&&sBlessingRewardPoolNew.getFloorLimit()>activityProgressInfo.getProgrss()){
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
|
||||
}
|
||||
|
||||
//check count
|
||||
ActivityProgressInfo activityProgressInfo1 = activityMission.getActivityMissionMap().get(SubActivity.POOL_INDEX + selectId);
|
||||
if(activityProgressInfo1!=null&&activityProgressInfo1.getProgrss()>=sBlessingRewardPoolNew.getInitializeNum()){
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
|
||||
}
|
||||
// //check had select
|
||||
if(activityMission.getV()!=0){
|
||||
ActivityProgressInfo activityProgressInfo1 = activityMission.getActivityMissionMap().get(SubActivity.POOL_INDEX + activityMission.getV());
|
||||
if(activityProgressInfo1!=null&&activityProgressInfo1.getProgrss()!=0){
|
||||
activityProgressInfo1.setProgrss(activityProgressInfo1.getProgrss()-1);
|
||||
ActivityProgressInfo activityProgressInfoOld = activityMission.getActivityMissionMap().get(SubActivity.POOL_INDEX + activityMission.getV());
|
||||
if(activityProgressInfoOld!=null&&activityProgressInfoOld.getProgrss()!=0){
|
||||
activityProgressInfoOld.setProgrss(activityProgressInfoOld.getProgrss()-1);
|
||||
}
|
||||
user.getActivityManager().getSubRewardPoolInfo().getSubRewardPool().remove(user.getActivityManager().getSubRewardPoolInfo().getSubRewardPool().size()-1);
|
||||
}
|
||||
activityMission.setV(selectId);
|
||||
ActivityProgressInfo activityProgressInfo1 = activityMission.getActivityMissionMap().get(SubActivity.POOL_INDEX + selectId);
|
||||
if(activityProgressInfo1!=null){
|
||||
activityProgressInfo1.setProgrss(activityProgressInfo1.getProgrss()+1);
|
||||
}
|
||||
|
|
|
@ -91,8 +91,7 @@ public class SubActivity extends AbstractActivity {
|
|||
//get reward
|
||||
long count = activityMission.getActivityMissionMap().values().stream().filter(activityProgressInfo1 -> activityProgressInfo1.getState() == ActivityType.HAD_TAKED).count();
|
||||
//后5个概率提前结束抽奖
|
||||
|
||||
if (count != (size - 1) && count >= (size - 5) && (Math.random() * 5 < 1)) {
|
||||
if (count != (size - 1) && count >= (size - 5) && ((Math.random() * 5) < 1)&&user.getActivityManager().getSubRewardPoolInfo().getSubRewardPool().get(user.getActivityManager().getSubRewardPoolInfo().getSubRewardPool().size() - 1)== activityMission.getV()) {
|
||||
user.getActivityManager().getSubRewardPoolInfo().getSubRewardPool().add((int) count, activityMission.getV());
|
||||
user.getActivityManager().getSubRewardPoolInfo().getSubRewardPool().remove(user.getActivityManager().getSubRewardPoolInfo().getSubRewardPool().size() - 1);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue