From b5806bcf2681fd6c26e61c9efef1b0b892175ed3 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Sat, 16 Oct 2021 17:46:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=B0=94=E5=86=B2=E5=A4=A9=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/mission/MissionLoigc.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index d23d0217e..70ccb6180 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -397,7 +397,7 @@ public class MissionLoigc { */ public static void getCowFlySkyMission(User user ,List missionList){ CowFlySkyMissionType missionType = user.getUserMissionManager().getCowFlySkyMissionType(); - + CumulationData cumulationData = user.getUserMissionManager().getCumulationData(); // 进行中 Set doingMissionIds = missionType.getDoingMissionIds(); // 可领取 @@ -406,22 +406,26 @@ public class MissionLoigc { BitSet rewardedMissionIds = missionType.getRewardedMissionIds(); Collection values = STableManager.getConfig(SArroGantFly.class).values(); - values.forEach(v->{ + for (SArroGantFly v : values) { int id = v.getId(); CommonProto.UserMissionInfo.Builder info = CommonProto.UserMissionInfo.newBuilder(); info.setMissionId(id); info.setType(GameMisionType.COWFLYSKYMISSION.getType()); if (doingMissionIds.contains(id)){ info.setState(MissionState.DOING.getState()); + int doingProgress = getDoingProgress(user, cumulationData, v.getValues(), v.getValuesII()[0]); + info.setProgress(doingProgress); } if (finishMissionIds.contains(id)){ info.setState(MissionState.FINISH.getState()); + info.setProgress(v.getValuesII()[1][0]); } if (rewardedMissionIds.get(id)){ info.setState(MissionState.REWARD.getState()); + info.setProgress(v.getValuesII()[1][0]); } missionList.add(info.build()); - }); + } } public static void getEndlessMission(User user,List missionList){ From c96fc8d7ec7e2c04c90ddb0b99ba6c7553a3cb9d Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 21 Oct 2021 15:02:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A8=E9=80=81bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 064ef73a1..d3a331c7f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -832,7 +832,7 @@ public class BuyGoodsNewLogic { info.setTypePushTimeMap(conditionType,System.currentTimeMillis() + con.getPrivateCD() * TimeUtils.HOUR); info.setDayPushNum(pushId,1); info.setAllPuthNum(pushId,1); - boolean tempPush = createPushBag(bagId,user,num); + boolean tempPush = createPushBag(bagId,user,1); if(!push){ push = tempPush; }