From e428c0059ae9e16a180d7cafd6cacb92be508e7e Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 27 May 2020 10:00:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E7=BB=99?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8F=91=E9=80=81=E5=A4=A9=E7=A9=BA=E7=A7=98?= =?UTF-8?q?=E5=AE=9D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/expedition/ExpeditionLogic.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index 5afea0a10..9412eef78 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -989,14 +989,14 @@ public class ExpeditionLogic { Expedition.ExpeditionTreasureInfoResponse.Builder response = Expedition.ExpeditionTreasureInfoResponse.newBuilder(); Map rewardStatusMap = worldTreasureReward.getRewardStatusMap(); - if(!rewardStatusMap.isEmpty()){ - List states = new ArrayList<>(100); - for(Map.Entry entry:rewardStatusMap.entrySet()){ - Expedition.TreasureRewardState.Builder builder = Expedition.TreasureRewardState.newBuilder().setId(entry.getKey()).setState(entry.getValue()); - states.add(builder.build()); - } - response.addAllTreasureRewardState(states); - } + WorldBossTreasureStaticConfig worldBossTreasureStaticConfig = STableManager.getFigureConfig(WorldBossTreasureStaticConfig.class); + Set sWorldBossTreasureConfigs = worldBossTreasureStaticConfig.getIdsByPeriods().get(worldTreasureReward.getRound()); + List states = new ArrayList<>(100); + sWorldBossTreasureConfigs.forEach(item->{ + Expedition.TreasureRewardState.Builder builder = Expedition.TreasureRewardState.newBuilder().setId(item.getId()).setState(rewardStatusMap.getOrDefault(item.getId(),0)); + states.add(builder.build()); + }); + response.addAllTreasureRewardState(states); response.setScore(worldTreasureReward.getScore()); MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); } From 3edf0c609f2b9f8ca6475cd245519768268a08df Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 27 May 2020 11:22:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E4=BF=9D=E5=BA=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E6=AC=A1=E8=A7=A6=E5=8F=91=E4=BF=9D?= =?UTF-8?q?=E5=BA=95=E5=8F=AA=E8=A7=A6=E5=8F=91=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/hero/HeroLogic.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 9b6249cd3..c6d138081 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -267,18 +267,20 @@ public class HeroLogic{ } int j=0; + //标记是否触发保底 + boolean specialTrigger=false; for(int i=0;i