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){ 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; }