Merge branch 'master_test_gn' into master_prb_gn
commit
bc1fb4b47f
|
@ -1,33 +1,24 @@
|
|||
package com.ljsd.jieling.logic.activity;
|
||||
|
||||
import com.ljsd.GameApplication;
|
||||
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.AbstractActivity;
|
||||
import com.ljsd.jieling.logic.activity.event.GoldEvent;
|
||||
import com.ljsd.jieling.logic.activity.event.IEvent;
|
||||
import com.ljsd.jieling.logic.activity.event.MistyTripEvent;
|
||||
import com.ljsd.jieling.logic.activity.event.Poster;
|
||||
import com.ljsd.jieling.logic.dao.MainLevelManager;
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.UserMissionManager;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.logic.mission.GameEvent;
|
||||
import com.ljsd.jieling.logic.mission.main.BeginerTaskIdsType;
|
||||
import com.ljsd.jieling.logic.mission.main.MistyTripMissionType;
|
||||
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.SJourneyWithWind;
|
||||
import rpc.protocols.CommonProto;
|
||||
import rpc.protocols.PlayerInfoProto;
|
||||
import util.TimeUtils;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
public class MistyTripActivity extends AbstractActivity {
|
||||
|
||||
|
@ -80,6 +71,15 @@ public class MistyTripActivity extends AbstractActivity {
|
|||
@Override
|
||||
public boolean takeReward(ISession session, int missionId) throws Exception {
|
||||
User user = UserManager.getUser(session.getUid());
|
||||
|
||||
// 缥缈之旅的奖励改为双月卡专享 updateDate:2022-7-4
|
||||
Map<Integer, Integer> monthCard = user.getPlayerInfoManager().getMonthCard();
|
||||
Integer one_month_card = monthCard.get(2);
|
||||
Integer two_month_card = monthCard.get(3);
|
||||
if (one_month_card == null || two_month_card == null){
|
||||
return false;
|
||||
}
|
||||
|
||||
long userCreateTime = user.getPlayerInfoManager().getCreateTime();
|
||||
int days = TimeUtils.getSoFarWentDays(userCreateTime, TimeUtils.now())+1;
|
||||
|
||||
|
|
Loading…
Reference in New Issue