Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

lvxinran 2021-07-31 11:46:41 +08:00
commit a01d8d6037
2 changed files with 5 additions and 3 deletions

View File

@ -1,5 +1,6 @@
package com.ljsd.jieling.logic.dao;
import com.ljsd.GameApplication;
import com.ljsd.common.mogodb.MongoBase;
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.core.VipPrivilegeType;
@ -102,7 +103,7 @@ public class UserMissionManager extends MongoBase {
break;
}
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.
getViewDateUp()&& day <=n.getViewDataDown()).map(n ->n.getId()).collect(Collectors.toSet());
int type = (int) parm[0];
@ -231,7 +232,7 @@ public class UserMissionManager extends MongoBase {
updateString("cowFlySkyMissionType", cowFlySkyMissionType);
break;
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.
getViewDateUp()&& days <=n.getViewDataDown()).map(n ->n.getId()).collect(Collectors.toSet());
endlessMissionType.getDoingMissionIds().clear();

View File

@ -1,6 +1,7 @@
package com.ljsd.jieling.logic.mission;
import com.ljsd.GameApplication;
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil;
import com.ljsd.jieling.exception.ErrorCode;
@ -388,7 +389,7 @@ public class MissionLoigc {
values.forEach(v->{
int id = v.getId();
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()){
CommonProto.UserMissionInfo.Builder info = CommonProto.UserMissionInfo.newBuilder();
info.setMissionId(id);