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

back_recharge
duhui 2021-07-19 17:04:07 +08:00
commit fca529e5d9
6 changed files with 55 additions and 21 deletions

View File

@ -861,6 +861,25 @@ public class TimeUtils {
return ca.getTimeInMillis(); return ca.getTimeInMillis();
} }
/**
* 235959
*/
public static long getMonthEndTime(Long time){
//获取当前月最后一天
Calendar ca = Calendar.getInstance();
ca.setTimeInMillis(time);
ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
//将小时至0
ca.set(Calendar.HOUR_OF_DAY, 23);
//将分钟至0
ca.set(Calendar.MINUTE, 59);
//将秒至0
ca.set(Calendar.SECOND,59);
//将毫秒至0
ca.set(Calendar.MILLISECOND, 1000);
return ca.getTimeInMillis();
}
/** /**
* x: * x:
* next: * next:

View File

@ -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();
@ -591,7 +592,7 @@ public class UserMissionManager extends MongoBase {
//缥缈之旅 //缥缈之旅
if(!mistyTripMissionType.getDoingMissionIds().isEmpty() ){ if(!mistyTripMissionType.getDoingMissionIds().isEmpty() ){
Map<Integer, SEndlessTask> config = STableManager.getConfig(SEndlessTask.class); Map<Integer, SJourneyWithWind> config = STableManager.getConfig(SJourneyWithWind.class);
if(config!=null&&config.size()!=0){ if(config!=null&&config.size()!=0){
int starSum = HardStageLogic.getHardStageStarsSum(user); int starSum = HardStageLogic.getHardStageStarsSum(user);
if(starSum != 0 && mistyTripCumulationData.getHardstage_stars() == 0){ if(starSum != 0 && mistyTripCumulationData.getHardstage_stars() == 0){

View File

@ -892,6 +892,11 @@ public class GuildLogic {
MailLogic.getInstance().sendMail(user.getId(),title,content,"",(int)(System.currentTimeMillis()/1000), Global.MAIL_EFFECTIVE_TIME); MailLogic.getInstance().sendMail(user.getId(),title,content,"",(int)(System.currentTimeMillis()/1000), Global.MAIL_EFFECTIVE_TIME);
} }
} }
for(int i = 1;i<=10;i++){
RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(RedisKey.DEATH_PATH_EVERY_GUILD_RANK,String.valueOf(i)),String.valueOf(guildInfo.getId()));
}
RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(RedisKey.DEATH_PATH_TOTAL_GUILD_RANK,""),String.valueOf(guildInfo.getId()));
GuilidManager.removeGuildInfo(guildInfo); GuilidManager.removeGuildInfo(guildInfo);
MongoUtil.getInstence().lastUpdate(); MongoUtil.getInstence().lastUpdate();
@ -1636,7 +1641,9 @@ public class GuildLogic {
sendGuildHelpRewardEmail(user); sendGuildHelpRewardEmail(user);
int guildId = user.getPlayerInfoManager().getGuildId(); int guildId = user.getPlayerInfoManager().getGuildId();
RedisUtil.getInstence().zsetRemoveOne(RedisKey.getKey(RedisKey.CAR_DEALY_RANK,"",false),String.valueOf(user.getId())); RedisUtil.getInstence().zsetRemoveOne(RedisKey.getKey(RedisKey.CAR_DEALY_RANK,"",false),String.valueOf(user.getId()));
RedisUtil.getInstence().zsetRemoveOne(RedisKey.getKey(RedisKey.CAR_DEALY_RANK,"",false),String.valueOf(user.getId()));
RedisUtil.getInstence().putMapEntry(RedisKey.USER_LEVEL_GUILD_INFO,"",String.valueOf(user.getId()),guildId); RedisUtil.getInstence().putMapEntry(RedisKey.USER_LEVEL_GUILD_INFO,"",String.valueOf(user.getId()),guildId);
RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(RedisKey.DEATH_PATH_TOTAL_PERSON_RANK,""),String.valueOf(user.getId()));
//删除战力 //删除战力
Poster.getPoster().dispatchEvent(new GuildForceChangeEvent(user.getId(),user.getPlayerInfoManager().getGuildId(),3,0-user.getPlayerInfoManager().getMaxForce())); Poster.getPoster().dispatchEvent(new GuildForceChangeEvent(user.getId(),user.getPlayerInfoManager().getGuildId(),3,0-user.getPlayerInfoManager().getMaxForce()));
//notify ALL //notify ALL

View File

@ -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;
@ -34,6 +35,7 @@ import config.*;
import manager.STableManager; import manager.STableManager;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import util.TimeUtils;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -387,23 +389,26 @@ 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);
CommonProto.UserMissionInfo.Builder info = CommonProto.UserMissionInfo.newBuilder(); int day =new Date(GameApplication.serverConfig.getCacheOpenTime()).getDate();//当月第几天
info.setMissionId(id); if(day >= config.getViewDateUp() && day <= config.getViewDataDown()){
info.setType(GameMisionType.ENDLESS_MISSION.getType()); CommonProto.UserMissionInfo.Builder info = CommonProto.UserMissionInfo.newBuilder();
if (doingMissionIds.contains(id)){ info.setMissionId(id);
info.setState(MissionState.DOING.getState()); info.setType(GameMisionType.ENDLESS_MISSION.getType());
int doingProgress = getDoingProgress(user, treasureCumulationData, config.getType(), config.getValues()[0]); if (doingMissionIds.contains(id)){
info.setProgress(doingProgress); info.setState(MissionState.DOING.getState());
int doingProgress = getDoingProgress(user, treasureCumulationData, config.getType(), config.getValues()[0]);
info.setProgress(doingProgress);
}
if (finishMissionIds.contains(id)){
int finishProgress = config.getValues()[1][0];
info.setState(MissionState.FINISH.getState());
info.setProgress(finishProgress);
}
if (rewardedMissionIds.get(id)){
info.setState(MissionState.REWARD.getState());
}
missionList.add(info.build());
} }
if (finishMissionIds.contains(id)){
int finishProgress = config.getValues()[1][0];
info.setState(MissionState.FINISH.getState());
info.setProgress(finishProgress);
}
if (rewardedMissionIds.get(id)){
info.setState(MissionState.REWARD.getState());
}
missionList.add(info.build());
}); });
} }

View File

@ -30,7 +30,9 @@ public class PerpetualWelfareBag extends AbstractWelfareBag {
} }
if(getDailyUpdate() > 0){ if(getDailyUpdate() > 0){
setStartTime(TimeUtils.getTodayZero()); setStartTime(TimeUtils.getTodayZero());
setRefreshTime(getStartTime()+ getDailyUpdate() * TimeUtils.DAY); if(!isUserBuyRefresh()){
setRefreshTime(getStartTime()+ getDailyUpdate() * TimeUtils.DAY);
}
} }
if(config.getTime() == 7){//自然周 if(config.getTime() == 7){//自然周
setStartTime(TimeUtils.getCurWeekdayStartTime(1,0)); setStartTime(TimeUtils.getCurWeekdayStartTime(1,0));

View File

@ -29,7 +29,7 @@ public class ToolsUtil {
} }
}else if(type ==2){ }else if(type ==2){
if(baseTime ==1){ if(baseTime ==1){
startTime = TimeUtils.getCurMonthEndTime(); startTime = TimeUtils.getMonthEndTime(GameApplication.serverConfig.getCacheOpenTime());
}else{ }else{
startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime); startTime = TimeUtils.getMonthStartTime(GameApplication.serverConfig.getCacheOpenTime(),1,(int)baseTime);
} }