Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
a01d8d6037
|
@ -1,5 +1,6 @@
|
||||||
package com.ljsd.jieling.logic.dao;
|
package com.ljsd.jieling.logic.dao;
|
||||||
|
|
||||||
|
import com.ljsd.GameApplication;
|
||||||
import com.ljsd.common.mogodb.MongoBase;
|
import com.ljsd.common.mogodb.MongoBase;
|
||||||
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
|
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
|
||||||
import com.ljsd.jieling.core.VipPrivilegeType;
|
import com.ljsd.jieling.core.VipPrivilegeType;
|
||||||
|
@ -102,7 +103,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case DAILY_REFRESH:
|
case DAILY_REFRESH:
|
||||||
int day = new Date(TimeUtils.now()).getDate();//当月第几天
|
int day = new Date(GameApplication.serverConfig.getCacheOpenTime()).getDate();//当月第几天
|
||||||
Set<Integer> missionIds = SDailyTasksConfig.config.values().stream().filter(n->day >=n.
|
Set<Integer> missionIds = SDailyTasksConfig.config.values().stream().filter(n->day >=n.
|
||||||
getViewDateUp()&& day <=n.getViewDataDown()).map(n ->n.getId()).collect(Collectors.toSet());
|
getViewDateUp()&& day <=n.getViewDataDown()).map(n ->n.getId()).collect(Collectors.toSet());
|
||||||
int type = (int) parm[0];
|
int type = (int) parm[0];
|
||||||
|
@ -231,7 +232,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
updateString("cowFlySkyMissionType", cowFlySkyMissionType);
|
updateString("cowFlySkyMissionType", cowFlySkyMissionType);
|
||||||
break;
|
break;
|
||||||
case ENDLESS_MISSION_REFRESH:
|
case ENDLESS_MISSION_REFRESH:
|
||||||
int days = new Date(TimeUtils.now()).getDate();//当月第几天
|
int days = new Date(GameApplication.serverConfig.getCacheOpenTime()).getDate();//当月第几天
|
||||||
Set<Integer> endlessTask = STableManager.getConfig(SEndlessTask.class).values().stream().filter(n->days >=n.
|
Set<Integer> endlessTask = STableManager.getConfig(SEndlessTask.class).values().stream().filter(n->days >=n.
|
||||||
getViewDateUp()&& days <=n.getViewDataDown()).map(n ->n.getId()).collect(Collectors.toSet());
|
getViewDateUp()&& days <=n.getViewDataDown()).map(n ->n.getId()).collect(Collectors.toSet());
|
||||||
endlessMissionType.getDoingMissionIds().clear();
|
endlessMissionType.getDoingMissionIds().clear();
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.ljsd.jieling.logic.mission;
|
package com.ljsd.jieling.logic.mission;
|
||||||
|
|
||||||
|
|
||||||
|
import com.ljsd.GameApplication;
|
||||||
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
|
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
|
||||||
import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil;
|
import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil;
|
||||||
import com.ljsd.jieling.exception.ErrorCode;
|
import com.ljsd.jieling.exception.ErrorCode;
|
||||||
|
@ -388,7 +389,7 @@ public class MissionLoigc {
|
||||||
values.forEach(v->{
|
values.forEach(v->{
|
||||||
int id = v.getId();
|
int id = v.getId();
|
||||||
SEndlessTask config = STableManager.getConfig(SEndlessTask.class).get(id);
|
SEndlessTask config = STableManager.getConfig(SEndlessTask.class).get(id);
|
||||||
int day =new Date(TimeUtils.now()).getDate();//当月第几天
|
int day =new Date(GameApplication.serverConfig.getCacheOpenTime()).getDate();//当月第几天
|
||||||
if(day >= config.getViewDateUp() && day <= config.getViewDataDown()){
|
if(day >= config.getViewDateUp() && day <= config.getViewDataDown()){
|
||||||
CommonProto.UserMissionInfo.Builder info = CommonProto.UserMissionInfo.newBuilder();
|
CommonProto.UserMissionInfo.Builder info = CommonProto.UserMissionInfo.newBuilder();
|
||||||
info.setMissionId(id);
|
info.setMissionId(id);
|
||||||
|
|
Loading…
Reference in New Issue