diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 97eff5b..29dfaec 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -366,8 +366,10 @@ public class GlobalDataManaager implements IManager { SGlobalSystemConfig sGlobalSystemConfig = STableManager.getConfig(SGlobalSystemConfig.class). get(FunctionIdEnum.ENERGY_BASE.getFunctionType()); if(sGlobalSystemConfig != null && HandlerLogicThread.checkOpen(user, sGlobalSystemConfig)) { - user.getEnergyBaseData().dataDailyRefresh(System.currentTimeMillis()); - BaseEnergy.BasePushDataRefresh basePushDataRefresh = BaseEnergy.BasePushDataRefresh.newBuilder().setDailyRefreshTimes(0) + if (!TimeUtils.isSameDay(user.getEnergyBaseData().getLastUpdateTime(), now)) { + user.getEnergyBaseData().dataDailyRefresh(now); + } + BaseEnergy.BasePushDataRefresh basePushDataRefresh = BaseEnergy.BasePushDataRefresh.newBuilder().setDailyRefreshTimes(user.getEnergyBaseData().getDailyRefreshTimes()) .setPlunderRefreshTimes(0) .setTotalSnatchCount(0).build(); MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.PUSH_BASE_DATA_REFRESH_VALUE, basePushDataRefresh, true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/HeroForceRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/HeroForceRankActivity.java index 8241f90..759c921 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/HeroForceRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/HeroForceRankActivity.java @@ -103,6 +103,7 @@ class HeroForceRankActivity extends RankActivity { if(templateId > 0 && templateId != playerInfoCache.getMaxHeroId()){ //最强英雄id变了,更新redis缓存中的最强英雄id playerInfoCache.setMaxHeroId(templateId); + playerInfoCache.setMaxForce(maxForce); RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE, "", String.valueOf(user.getId()), playerInfoCache); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/base/EnergyBaseLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/base/EnergyBaseLogic.java index 0a3dfb4..2259cf7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/base/EnergyBaseLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/base/EnergyBaseLogic.java @@ -110,9 +110,11 @@ public class EnergyBaseLogic { //世界服取当前用户的资源 WorldProto.BaseResourceRefreshResponse baseResourceRefreshResponse = WorldHelper.sendMessageToWorldWithResult(userId, WorldProto.BaseResourceRequest.newBuilder().build(), WorldProto.BaseResourceRefreshResponse.class); - for (int i = 0; i < baseResourceRefreshResponse.getBaseResourceDetailCount(); i++) { - BaseEnergy.BaseResourceDetail baseResourceDetail = baseResourceRefreshResponse.getBaseResourceDetail(i); - ret.addBaseResourceDetails(baseResourceDetail); + if(baseResourceRefreshResponse!= null && baseResourceRefreshResponse.getBaseResourceDetailCount() > 0){ + for (int i = 0; i < baseResourceRefreshResponse.getBaseResourceDetailCount(); i++) { + BaseEnergy.BaseResourceDetail baseResourceDetail = baseResourceRefreshResponse.getBaseResourceDetail(i); + ret.addBaseResourceDetails(baseResourceDetail); + } } //异步执行 CompletableFuture.runAsync(() -> bakMessageDeal(iSession, userId)); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 02ad413..f94bc98 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1327,6 +1327,9 @@ public class PlayerLogic { cache.setMaxHeroId(hero.getTemplateId()); } } + if(cache.getMaxHeroId()==0){ + cache.setMaxHeroId(10020); + } RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE, "", String.valueOf(user.getId()), cache); //同步到内存中 UserManager.updatePlayerInfoCache(cache); @@ -1352,7 +1355,7 @@ public class PlayerLogic { cache.setMaxForce(playerInfoManager.getMaxForce()); cache.setOffLineTime(playerInfoManager.getLoginTime()); cache.setLikeNums(0); - cache.setMaxHeroId(10051); + cache.setMaxHeroId(10020); RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE, "", String.valueOf(user.getId()), cache); //同步到内存中 UserManager.updatePlayerInfoCache(cache);