From a4942479a099fcedab81598accba57d8eb87bd4b Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sun, 1 Aug 2021 00:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E7=A7=98=E5=AE=9D=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/map/MapLogic.java | 34 ++++++++++++------- .../logic/activity/ActivityTypeEnum.java | 2 +- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index a73b287a6..4ce67ceb7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -3420,24 +3420,30 @@ public class MapLogic { EndlessTreasureReward worldTreasureReward = user.getMapManager().getEndlessTreasureReward(); //检测一下刷新 flushEndlessTreasure(user); - MapInfoProto.EndlessTreasureInfoResponse.Builder response = MapInfoProto.EndlessTreasureInfoResponse.newBuilder(); -// if(worldTreasureReward.getFirstStartTime()!=0&&worldTreasureReward.getFirstStartTime()<=TimeUtils.nowInt()&&worldTreasureReward.getCreateTime()>TimeUtils.now()/1000){ - Map rewardStatusMap = worldTreasureReward.getRewardStatusMap(); - Map worldBossTreasureStaticConfig = STableManager.getConfig(SEndlessTreasure.class); - List states = new ArrayList<>(100); - worldBossTreasureStaticConfig.forEach((k,v)->{ - MapInfoProto.EndlessTreasureRewardState.Builder builder = MapInfoProto.EndlessTreasureRewardState.newBuilder().setId(k).setState(rewardStatusMap.getOrDefault(k,0)); - states.add(builder.build()); - }); - response.addAllTreasureRewardState(states); - response.setResetTime(worldTreasureReward.getCreateTime()); - response.setIsBuy(worldTreasureReward.getIsBuy()); + MapInfoProto.EndlessTreasureInfoResponse.Builder response = getEndlessResponseBuilder(worldTreasureReward); // }else { // response.setResetTime(-1); // } MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); } + public MapInfoProto.EndlessTreasureInfoResponse.Builder getEndlessResponseBuilder(EndlessTreasureReward worldTreasureReward){ + MapInfoProto.EndlessTreasureInfoResponse.Builder response = MapInfoProto.EndlessTreasureInfoResponse.newBuilder(); +// if(worldTreasureReward.getFirstStartTime()!=0&&worldTreasureReward.getFirstStartTime()<=TimeUtils.nowInt()&&worldTreasureReward.getCreateTime()>TimeUtils.now()/1000){ + Map rewardStatusMap = worldTreasureReward.getRewardStatusMap(); + Map worldBossTreasureStaticConfig = STableManager.getConfig(SEndlessTreasure.class); + List states = new ArrayList<>(100); + worldBossTreasureStaticConfig.forEach((k,v)->{ + MapInfoProto.EndlessTreasureRewardState.Builder builder = MapInfoProto.EndlessTreasureRewardState.newBuilder().setId(k).setState(rewardStatusMap.getOrDefault(k,0)); + states.add(builder.build()); + }); + response.addAllTreasureRewardState(states); + response.setResetTime(worldTreasureReward.getCreateTime()); + response.setIsBuy(worldTreasureReward.getIsBuy()); + return response; + + } + public void flushEndlessTreasure(User user) throws Exception { if(user.getMapManager().getEndlessTreasureReward().getCreateTime()0){ item.setItemNum(0); } + LOGGER.info("刷新无尽秘宝uid=>{}",user.getId()); + MapInfoProto.EndlessTreasureInfoResponse.Builder response = getEndlessResponseBuilder(user.getMapManager().getEndlessTreasureReward()); + MessageUtil.sendIndicationMessage(OnlineUserManager.getSessionByUid(user.getId()),1, MessageTypeProto.MessageType.ENDLESS_TREASURE_REFRESH_INDICATION_VALUE,response.build(),true); + } } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index 7bb2bacb3..e7d37f109 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -80,7 +80,7 @@ public enum ActivityTypeEnum { MISTYTRIP(ActivityType.MISTY_TRIP,MistyTripActivity::new), SUPERFUND128(ActivityType.SUPERFUND128,SuperFundActivity::new),//超值基金128 SUPERFUND328(ActivityType.SUPERFUND328,SuperFundActivity::new),//超值基金328 - PREPARE_FIFTEEN_ACTIVITY(ActivityType.PREPARE_FIFTEEN_ACTIVITY,DefaultEmptyActivity::new),//超值基金328 + PREPARE_FIFTEEN_ACTIVITY(ActivityType.PREPARE_FIFTEEN_ACTIVITY,DefaultEmptyActivity::new);//超值基金328 private int type; private Function toActivityFunction;