From e656ac4344464f9bd0dbea42773e74d176965aa3 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Sat, 15 May 2021 17:04:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E6=B2=B3=E7=A4=BE=E7=A8=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/hardStage/HardStageLogic.java | 16 ++++++++++++++-- .../jieling/logic/hardStage/HardStageNode.java | 9 +++++++++ .../java/com/ljsd/jieling/util/CBean2Proto.java | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java index 8ac002ada..00080e4a4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java @@ -47,7 +47,7 @@ public class HardStageLogic { nodeBuilder.setNodeId(node.getId()); nodeBuilder.setType(node.getType()); nodeBuilder.setState(node.getState()); - nodeBuilder.setIsFirst(node.isHasPass()); + nodeBuilder.setIsFirst(node.isFirst()); chapterBuilder.addNode(nodeBuilder); } chapterBuilder.setChapterId(entry.getKey()); @@ -105,7 +105,19 @@ public class HardStageLogic { StringBuffer currenState = StringUtil.intArrToStringArr(num);; //已存在的星星状态 StringBuffer existState = reformatBinary(currentStar); - + //荣耀三星 + if(currenState.toString().equals("111")&&existState.toString().equals("000")){ + for (int rewardId: config.getReward1()) { + if (addDropAndStar(node, dropList, rewardId, user)) { + if(!node.isFirst()){ + node.setFirst(true); + } + } + } + node.setState(7); + addStar +=3; + return addStar; + } for (int i = 2; i >= 0; i--) { if (currenState.charAt(i) == '1' && existState.charAt(i) == '0') { double increase = Math.pow(2, (2 - i)); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageNode.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageNode.java index 323009123..7802facd4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageNode.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageNode.java @@ -12,6 +12,7 @@ public class HardStageNode extends MongoBase { private int state; private Map rewardMap = new HashMap<>();//三星奖励情况 private boolean hasPass;//是否通过 + private boolean isFirst;//是否第一次荣耀 public int getId() { return id; @@ -56,4 +57,12 @@ public class HardStageNode extends MongoBase { this.hasPass = hasPass; updateString("hasPass" , this.hasPass); } + + public boolean isFirst() { + return isFirst; + } + + public void setFirst(boolean first) { + isFirst = first; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 7175292b2..f3b22e78b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -773,7 +773,7 @@ public class CBean2Proto { CommonProto.FightData fightDataProto = CommonProto.FightData.parseFrom(arenaRecord.getFightData()); return CommonProto.HardStagePlayerInfo.newBuilder() .setUid(arenaRecord.getAttackId()) - .setLevel(arenaRecord.getAttackId()) + .setLevel(arenaRecord.getLevel()) .setHead(arenaRecord.getHead()) .setUserName(arenaRecord.getUserName()) .setHeadFrame(arenaRecord.getHeadFrame())