错误修复
parent
9bdd4163c2
commit
227f57090d
|
@ -12,6 +12,7 @@ import com.ljsd.jieling.logic.dao.UserManager;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.mail.MailLogic;
|
import com.ljsd.jieling.logic.mail.MailLogic;
|
||||||
import com.ljsd.jieling.util.ItemUtil;
|
import com.ljsd.jieling.util.ItemUtil;
|
||||||
|
import com.ljsd.jieling.util.ToolsUtil;
|
||||||
import config.*;
|
import config.*;
|
||||||
import manager.STableManager;
|
import manager.STableManager;
|
||||||
import util.TimeUtils;
|
import util.TimeUtils;
|
||||||
|
@ -68,19 +69,16 @@ public class WeekCardActivity extends AbstractActivity {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 封装周卡信息
|
* 封装周卡信息
|
||||||
* @param cardId
|
|
||||||
* @param activityId
|
|
||||||
* @param valueMap
|
|
||||||
* @return
|
|
||||||
*/
|
*/
|
||||||
private Map<Integer,Integer> packagingWeekCardMap(User user, int activityId, int cardId, Map<Integer,Integer> valueMap){
|
private Map<Integer,Integer> packagingWeekCardMap(User user, int activityId, int cardId, Map<Integer,Integer> valueMap){
|
||||||
HashMap<Integer, Integer> result = new HashMap<>();
|
HashMap<Integer, Integer> result = new HashMap<>();
|
||||||
Map<Integer, SWeekcardConfig> config = STableManager.getConfig(SWeekcardConfig.class);
|
Map<Integer, SWeekcardConfig> config = STableManager.getConfig(SWeekcardConfig.class);
|
||||||
|
|
||||||
SWeekcardConfig sWeekcardConfig = config.get(cardId);
|
SWeekcardConfig sWeekcardConfig = config.get(cardId);
|
||||||
|
|
||||||
|
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(activityId);
|
||||||
|
long createTime = user.getPlayerInfoManager().getCreateTime();
|
||||||
// 计算间隔时间
|
// 计算间隔时间
|
||||||
long startTimeLong = WeekCardLogic.getInstance().getStartTime(user, activityId);
|
long startTimeLong = ToolsUtil.getTimeLong(activity.getStartTimeLong(),activity.getEndTimeLong(),activity.getTime(),createTime,1);
|
||||||
int days = TimeUtils.differentDays(startTimeLong, TimeUtils.now()) + 1;
|
int days = TimeUtils.differentDays(startTimeLong, TimeUtils.now()) + 1;
|
||||||
|
|
||||||
for (int[] ints : sWeekcardConfig.getBaseRewardID()) {
|
for (int[] ints : sWeekcardConfig.getBaseRewardID()) {
|
||||||
|
@ -111,8 +109,11 @@ public class WeekCardActivity extends AbstractActivity {
|
||||||
Map<Integer, Map<Integer, Integer>> weekCard = user.getPlayerInfoManager().getWeekCard();
|
Map<Integer, Map<Integer, Integer>> weekCard = user.getPlayerInfoManager().getWeekCard();
|
||||||
Map<Integer, SWeekRewardConfig> rewardConfigMap = STableManager.getConfig(SWeekRewardConfig.class);
|
Map<Integer, SWeekRewardConfig> rewardConfigMap = STableManager.getConfig(SWeekRewardConfig.class);
|
||||||
Map<Integer, SWeekcardConfig> configMap = STableManager.getConfig(SWeekcardConfig.class);
|
Map<Integer, SWeekcardConfig> configMap = STableManager.getConfig(SWeekcardConfig.class);
|
||||||
|
|
||||||
|
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
||||||
|
long createTime = user.getPlayerInfoManager().getCreateTime();
|
||||||
// 计算间隔时间
|
// 计算间隔时间
|
||||||
long startTimeLong = WeekCardLogic.getInstance().getStartTime(user,id);
|
long startTimeLong = ToolsUtil.getTimeLong(activity.getStartTimeLong(),activity.getEndTimeLong(),activity.getTime(),createTime,1);
|
||||||
int days = TimeUtils.differentDays(startTimeLong, TimeUtils.now())+1;
|
int days = TimeUtils.differentDays(startTimeLong, TimeUtils.now())+1;
|
||||||
for (Map.Entry<Integer, Map<Integer, Integer>> entry : weekCard.entrySet()) {
|
for (Map.Entry<Integer, Map<Integer, Integer>> entry : weekCard.entrySet()) {
|
||||||
|
|
||||||
|
@ -151,7 +152,7 @@ public class WeekCardActivity extends AbstractActivity {
|
||||||
}
|
}
|
||||||
weekCard.put(weekCardId,value);
|
weekCard.put(weekCardId,value);
|
||||||
}
|
}
|
||||||
if (itemArrs.size() == 0) {
|
if (itemArrs.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// 更新数据
|
// 更新数据
|
||||||
|
|
|
@ -271,7 +271,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
if(!achievementMissionTypMap.getDoingMissionIds().isEmpty() ){
|
if(!achievementMissionTypMap.getDoingMissionIds().isEmpty() ){
|
||||||
|
|
||||||
List<SAchievementConfig> sAchievementConfigs = SAchievementConfig.sTaskConfigByTypeMap.get(missionType.getMissionTypeValue());
|
List<SAchievementConfig> sAchievementConfigs = SAchievementConfig.sTaskConfigByTypeMap.get(missionType.getMissionTypeValue());
|
||||||
if(sAchievementConfigs!=null&&sAchievementConfigs.size()!=0){
|
if(sAchievementConfigs!=null&& !sAchievementConfigs.isEmpty()){
|
||||||
CumulationData.Result result= achievementMap.updateData(missionType, parm);
|
CumulationData.Result result= achievementMap.updateData(missionType, parm);
|
||||||
if(result!=null){
|
if(result!=null){
|
||||||
achievementMissionTypMap.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.ACHIEVEMISSION),achievementMap);
|
achievementMissionTypMap.calCumulationDataResult(user,result,missionTypeEnumListMap.get(GameMisionType.ACHIEVEMISSION),achievementMap);
|
||||||
|
@ -293,7 +293,7 @@ public class UserMissionManager extends MongoBase {
|
||||||
//缥缈之旅
|
//缥缈之旅
|
||||||
if(!mistyTripMissionType.getDoingMissionIds().isEmpty() ){
|
if(!mistyTripMissionType.getDoingMissionIds().isEmpty() ){
|
||||||
Map<Integer, SJourneyWithWind> config = STableManager.getConfig(SJourneyWithWind.class);
|
Map<Integer, SJourneyWithWind> config = STableManager.getConfig(SJourneyWithWind.class);
|
||||||
if(config!=null&&config.size()!=0){
|
if(config!=null&& !config.isEmpty()){
|
||||||
int starSum = HardStageLogic.getHardStageStarsSum(user);
|
int starSum = HardStageLogic.getHardStageStarsSum(user);
|
||||||
if(starSum != 0 && mistyTripCumulationData.getHardstage_stars() == 0){
|
if(starSum != 0 && mistyTripCumulationData.getHardstage_stars() == 0){
|
||||||
mistyTripCumulationData.setHardstage_stars(starSum);
|
mistyTripCumulationData.setHardstage_stars(starSum);
|
||||||
|
|
Loading…
Reference in New Issue