七日任务由六天变成七天
parent
3603493efa
commit
ee2d0ddb69
|
@ -14,7 +14,6 @@ public final class ActivityManager extends MongoBase {
|
||||||
private HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission> activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission>();
|
private HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission> activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission>();
|
||||||
@Transient
|
@Transient
|
||||||
private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityMission, Map<Integer, com.ljsd.jieling.jbean.ActivityMission>> activityMissionMapLog ;
|
private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityMission, Map<Integer, com.ljsd.jieling.jbean.ActivityMission>> activityMissionMapLog ;
|
||||||
private long senvenTime; // 七日狂欢结束时间
|
|
||||||
private long senvenStartTime; // 七日狂欢开始时间
|
private long senvenStartTime; // 七日狂欢开始时间
|
||||||
private com.ljsd.jieling.jbean.LuckWheelMission luckWheel; // 幸运探宝奖池
|
private com.ljsd.jieling.jbean.LuckWheelMission luckWheel; // 幸运探宝奖池
|
||||||
private com.ljsd.jieling.jbean.LuckWheelMission luckWheelAdvance; // 高级幸运探宝奖池
|
private com.ljsd.jieling.jbean.LuckWheelMission luckWheelAdvance; // 高级幸运探宝奖池
|
||||||
|
@ -26,7 +25,6 @@ public final class ActivityManager extends MongoBase {
|
||||||
public ActivityManager(ActivityManager _o_ ) {
|
public ActivityManager(ActivityManager _o_ ) {
|
||||||
this.activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission>();
|
this.activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityMission>();
|
||||||
_o_.activityMissionMap.forEach((_k_, _v_) -> this.activityMissionMap.put(_k_, new ActivityMission(_v_)));
|
_o_.activityMissionMap.forEach((_k_, _v_) -> this.activityMissionMap.put(_k_, new ActivityMission(_v_)));
|
||||||
this.senvenTime = _o_.senvenTime;
|
|
||||||
this.luckWheel = new LuckWheelMission(_o_.luckWheel);
|
this.luckWheel = new LuckWheelMission(_o_.luckWheel);
|
||||||
this.luckWheelAdvance = new LuckWheelMission(_o_.luckWheelAdvance);
|
this.luckWheelAdvance = new LuckWheelMission(_o_.luckWheelAdvance);
|
||||||
}
|
}
|
||||||
|
@ -37,9 +35,6 @@ public final class ActivityManager extends MongoBase {
|
||||||
return this.activityMissionMapLog;
|
return this.activityMissionMapLog;
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getSenvenTime() { // 七日狂欢结束时间
|
|
||||||
return this.senvenTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
public com.ljsd.jieling.jbean.LuckWheelMission getLuckWheel() { // 幸运探宝奖池
|
public com.ljsd.jieling.jbean.LuckWheelMission getLuckWheel() { // 幸运探宝奖池
|
||||||
return this.luckWheel;
|
return this.luckWheel;
|
||||||
|
@ -59,10 +54,6 @@ public final class ActivityManager extends MongoBase {
|
||||||
return senvenStartTime;
|
return senvenStartTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSenvenTime(long senventime) { // 七日狂欢结束时间
|
|
||||||
updateString("senvenTime",senventime);
|
|
||||||
this.senvenTime = senventime;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLuckWheel(LuckWheelMission luckwheel) { // 幸运探宝奖池
|
public void setLuckWheel(LuckWheelMission luckwheel) { // 幸运探宝奖池
|
||||||
updateString("luckWheel",luckwheel);
|
updateString("luckWheel",luckwheel);
|
||||||
|
@ -82,7 +73,6 @@ public final class ActivityManager extends MongoBase {
|
||||||
StringBuilder _sb_ = new StringBuilder(super.toString());
|
StringBuilder _sb_ = new StringBuilder(super.toString());
|
||||||
_sb_.append("=(");
|
_sb_.append("=(");
|
||||||
_sb_.append(this.activityMissionMap).append(",");
|
_sb_.append(this.activityMissionMap).append(",");
|
||||||
_sb_.append(this.senvenTime).append(",");
|
|
||||||
_sb_.append(this.luckWheel).append(",");
|
_sb_.append(this.luckWheel).append(",");
|
||||||
_sb_.append(this.luckWheelAdvance).append(",");
|
_sb_.append(this.luckWheelAdvance).append(",");
|
||||||
_sb_.append(")");
|
_sb_.append(")");
|
||||||
|
|
|
@ -27,14 +27,11 @@ public class DefaultEmptyActivity extends AbstractActivity{
|
||||||
public void initActivity(User user) throws Exception {
|
public void initActivity(User user) throws Exception {
|
||||||
ActivityMission mission = new ActivityMission();
|
ActivityMission mission = new ActivityMission();
|
||||||
ActivityLogic.getInstance().initOtherMission(mission,new ArrayList<>());
|
ActivityLogic.getInstance().initOtherMission(mission,new ArrayList<>());
|
||||||
// mission.initOtherMission(new ArrayList<>(0));
|
|
||||||
user.getActivityManager().getActivityMissionMap().put(id, mission);
|
user.getActivityManager().getActivityMissionMap().put(id, mission);
|
||||||
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
||||||
if(sGlobalActivity.getType() == ActivityType.SERVERHAPPY){
|
if(sGlobalActivity.getType() == ActivityType.SERVERHAPPY){
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.SERVENHAPPY_REFRESH,id);
|
user.getUserMissionManager().onGameEvent(user, GameEvent.SERVENHAPPY_REFRESH,id);
|
||||||
long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 2) - 24 * 3600 * 1000;
|
|
||||||
long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 1);
|
long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),user.getPlayerInfoManager().getCreateTime(), 1);
|
||||||
user.getActivityManager().setSenvenTime(endTime);
|
|
||||||
user.getActivityManager().setSenvenStartTime(startTime);
|
user.getActivityManager().setSenvenStartTime(startTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -370,7 +370,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
|
|
||||||
if(!sevenHappyMissionType.getDoingMissionIds().isEmpty() ){
|
if(!sevenHappyMissionType.getDoingMissionIds().isEmpty() ){
|
||||||
List<STreasureTaskConfig> sTreasureTaskConfigs = STableManager.getFigureConfig(TaskStaticConfig.class).getsTreasureTaskConfigListByTypeMap().get(missionType.getMissionTypeValue());
|
List<STreasureTaskConfig> sTreasureTaskConfigs = STableManager.getFigureConfig(TaskStaticConfig.class).getsTreasureTaskConfigListByTypeMap().get(missionType.getMissionTypeValue());
|
||||||
if(sTreasureTaskConfigs!=null && user.getActivityManager().getSenvenTime()>System.currentTimeMillis()){
|
if(sTreasureTaskConfigs!=null){
|
||||||
if(missionType == MissionType.LOGIN_TIMES){
|
if(missionType == MissionType.LOGIN_TIMES){
|
||||||
parm=new Object[]{TimeUtils.differentDays(user.getActivityManager().getSenvenStartTime(),System.currentTimeMillis())+1};
|
parm=new Object[]{TimeUtils.differentDays(user.getActivityManager().getSenvenStartTime(),System.currentTimeMillis())+1};
|
||||||
}
|
}
|
||||||
|
|
|
@ -420,7 +420,7 @@ public class MissionLoigc {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(type == GameMisionType.SEVENMISSION.getType() && user.getActivityManager().getSenvenTime()>System.currentTimeMillis()){
|
if(type == GameMisionType.SEVENMISSION.getType()){
|
||||||
Map<GameMisionType, List<MissionStateChangeInfo>> gameMisionTypeListMap = userMissionManager.onGameEvent(user, GameEvent.SEVENHAPPY_MISSION_REWARD, missionId);
|
Map<GameMisionType, List<MissionStateChangeInfo>> gameMisionTypeListMap = userMissionManager.onGameEvent(user, GameEvent.SEVENHAPPY_MISSION_REWARD, missionId);
|
||||||
missionStateChangeInfos = gameMisionTypeListMap.get(GameMisionType.SEVENMISSION);
|
missionStateChangeInfos = gameMisionTypeListMap.get(GameMisionType.SEVENMISSION);
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,7 +76,6 @@ public class PlayerLogic {
|
||||||
}
|
}
|
||||||
if(sevenActivityId!=0){
|
if(sevenActivityId!=0){
|
||||||
STreasureTaskConfig sTreasureTaskConfig =STableManager.getFigureConfig(TaskStaticConfig.class).getsTreasureSevenTaskConfigByActivityMap().get(sevenActivityId);
|
STreasureTaskConfig sTreasureTaskConfig =STableManager.getFigureConfig(TaskStaticConfig.class).getsTreasureSevenTaskConfigByActivityMap().get(sevenActivityId);
|
||||||
if(user.getActivityManager().getSenvenTime()<=System.currentTimeMillis()){
|
|
||||||
BitSet rewardedMissionIds = user.getUserMissionManager().getSevenHappyMissionType().getRewardedMissionIds();
|
BitSet rewardedMissionIds = user.getUserMissionManager().getSevenHappyMissionType().getRewardedMissionIds();
|
||||||
MissionState state = MissionState.FINISH;
|
MissionState state = MissionState.FINISH;
|
||||||
if(rewardedMissionIds.get(sTreasureTaskConfig.getId())){
|
if(rewardedMissionIds.get(sTreasureTaskConfig.getId())){
|
||||||
|
@ -87,7 +86,6 @@ public class PlayerLogic {
|
||||||
MissionEventDistributor.getMissionStateChangeInfo(GameMisionType.SEVENMISSION).add(missionStateChangeInfo);
|
MissionEventDistributor.getMissionStateChangeInfo(GameMisionType.SEVENMISSION).add(missionStateChangeInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.UPDATE_STATE_RESPONSE_VALUE,null,true);
|
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.UPDATE_STATE_RESPONSE_VALUE,null,true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -638,10 +636,7 @@ public class PlayerLogic {
|
||||||
public void takeSevenScoreReward(ISession iSession) throws Exception {
|
public void takeSevenScoreReward(ISession iSession) throws Exception {
|
||||||
User user = UserManager.getUser(iSession.getUid());
|
User user = UserManager.getUser(iSession.getUid());
|
||||||
int msgId = MessageTypeProto.MessageType.TAKE_SEVEN_HAPPY_REWARD_RESPONSE_VALUE;
|
int msgId = MessageTypeProto.MessageType.TAKE_SEVEN_HAPPY_REWARD_RESPONSE_VALUE;
|
||||||
long senvenTime = user.getActivityManager().getSenvenTime();
|
|
||||||
if(senvenTime == 0 || senvenTime> System.currentTimeMillis()){
|
|
||||||
throw new ErrorCodeException(ErrorCode.newDefineCode("时间未到"));
|
|
||||||
}
|
|
||||||
Map<Integer, ActivityMission> activityMissionMap = user.getActivityManager().getActivityMissionMap();
|
Map<Integer, ActivityMission> activityMissionMap = user.getActivityManager().getActivityMissionMap();
|
||||||
int treasureActivityId = 0;
|
int treasureActivityId = 0;
|
||||||
for(Integer activityId : activityMissionMap.keySet()){
|
for(Integer activityId : activityMissionMap.keySet()){
|
||||||
|
|
Loading…
Reference in New Issue