diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java index 84fc74add..a282f9256 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java @@ -2,7 +2,9 @@ package com.ljsd.jieling.logic.explorerMap; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; +import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.activity.crossService.CrossServiceLogic; +import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.cross.CSPlayer; import com.ljsd.jieling.logic.dao.root.User; import config.SArenaRobotConfig; @@ -11,6 +13,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import rpc.protocols.CommonProto; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + public class ExplorerMapLogic { private static final Logger LOGGER = LoggerFactory.getLogger(ExplorerMapLogic.class); @@ -33,6 +39,29 @@ public class ExplorerMapLogic { redisUtil.lSet(key2, String.valueOf(user.getId())); } + + //复活怪物 自己血量之类的 + public static void reset(){ + try{ + Set uids = OnlineUserManager.sessionMap.keySet(); + Map channelMap = new HashMap<>(); + for(int uid:uids){ + User user = UserManager.getUser(uid); + String channel = user.getPlayerInfoManager().getChannel(); + channelMap.put(channel,channelMap.getOrDefault(channel,0)+1); + + //探索队伍 map + + //地图怪物 map<地图id,List<>()地图上所有的怪物(怪物id,刷新时间,血量)> + + + } + }catch (Exception e){ + e.printStackTrace(); + } + + } + //怪物刷新 //邮件结算 /** diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PerpetualWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PerpetualWelfareBag.java index e1f577d75..fcb7b10d7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PerpetualWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PerpetualWelfareBag.java @@ -38,7 +38,12 @@ public class PerpetualWelfareBag extends AbstractWelfareBag { setStartTime(TimeUtils.getCurWeekdayStartTime(1,0)); setRefreshTime(TimeUtils.getCurWeekdayStartTime(1,0) + TimeUtils.WEEK); }else if(config.getTime() == 8){//自然月 - setStartTime(TimeUtils.getCurMonthStartTime(1)); + //TODO 不支持礼包每天刷新 用类型8有瑕疵 之后容错 + if(config.getId() == 1005 || config.getId() == 1006|| config.getId() == 1007){ + TimeUtils.getAppointTime(0); + }else{ + setStartTime(TimeUtils.getCurMonthStartTime(1)); + } setRefreshTime(TimeUtils.getMonthStartTime(1,1)); } }