From 663cb39c7757505291624c9d7eaea28c8a0cc8c2 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Sat, 18 Jul 2020 22:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB=E5=92=8C?= =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E4=BB=BB=E5=8A=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReCoverExpeditionHeroRequestHandler.java | 1 - .../Expedition/ReliveExpeditionHeroRequest.java | 1 - .../handler/Expedition/TakeHolyEquipRequest.java | 1 - .../jieling/handler/arena/GetArenaInfoHandler.java | 1 + .../com/ljsd/jieling/logic/dao/CumulationData.java | 3 +++ .../jieling/logic/expedition/ExpeditionLogic.java | 4 +++- .../ljsd/jieling/logic/mission/MissionLoigc.java | 2 +- .../logic/mission/data/DataManagerDistributor.java | 1 + .../mission/data/EspecialEquipLeveMamager.java | 14 ++++++++++++++ .../logic/mission/data/EspecialStarManager.java | 4 ++++ .../ljsd/jieling/logic/store/BuyGoodsLogic.java | 2 +- 11 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialEquipLeveMamager.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/ReCoverExpeditionHeroRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/ReCoverExpeditionHeroRequestHandler.java index 9a057668b..e7199f2d1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/ReCoverExpeditionHeroRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/ReCoverExpeditionHeroRequestHandler.java @@ -77,7 +77,6 @@ public class ReCoverExpeditionHeroRequestHandler extends BaseHandler luckyWheelTimes = new HashMap<>(); //幸运探宝次数 public int expeditinoTimes; // 猎妖之路次数 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 9429957ec..902fa2ce1 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 @@ -20,6 +20,7 @@ import com.ljsd.jieling.logic.fight.specialparm.SpecialForTeamBuildEnum; import com.ljsd.jieling.logic.hero.HeroAttributeEnum; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.mail.MailLogic; +import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.store.StoreLogic; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; @@ -162,7 +163,7 @@ public class ExpeditionLogic { /** * 初始化下一层 */ - public static Set openLay(User user, int curryLay, int passNode) { + public static Set openLay(User user, int curryLay, int passNode)throws Exception { final int oldlay = curryLay; final int newlay = oldlay + 1; @@ -204,6 +205,7 @@ public class ExpeditionLogic { }); //updata lay user.getExpeditionManager().setLay(newlay); + user.getUserMissionManager().onGameEvent(user, GameEvent.EXPEDITION_TIMES); return nodeInfos; } 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 29a430aa3..7930767d7 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 @@ -763,7 +763,7 @@ public class MissionLoigc { break; //todo case SPECIAL_EQUIP_LEVEL_UP: - // count = cumulationData.friendApplyCount; + count = cumulationData.especialEquipMaxLeve; break; case LUCKY_WHEELS_TIMES: if(missionSubType[0] == 0){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java index 66b4592a9..4892625ff 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java @@ -114,6 +114,7 @@ public class DataManagerDistributor { judges.put(MissionType.REARGE_TOTAL,new RechargeTotalManger()); judges.put(MissionType.FINISH_MISSING_ROOM,new FinishMissionRoomManager()); judges.put(MissionType.REFRESH_MISSING_ROOM,new RefreshMissionRoomMamager()); + judges.put(MissionType.SPECIAL_EQUIP_LEVEL_UP,new EspecialEquipLeveMamager()); judges.put(MissionType.LUCKY_WHEELS_TIMES,new LuckyWheelTimesManager()); judges.put(MissionType.FINISH_EXPEDITION_HERO_TIMES,new ExpeditionManager()); judges.put(MissionType.LOGIN_TIMES,new LoginTimeManager()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialEquipLeveMamager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialEquipLeveMamager.java new file mode 100644 index 000000000..c8debffe9 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialEquipLeveMamager.java @@ -0,0 +1,14 @@ +package com.ljsd.jieling.logic.mission.data; + +import com.ljsd.jieling.logic.dao.CumulationData; +import com.ljsd.jieling.logic.mission.MissionType; + +public class EspecialEquipLeveMamager implements BaseDataManager{ + @Override + public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) { + if((int)parm[0]>data.especialEquipMaxLeve){ + data.especialEquipMaxLeve=(int)parm[0]; + } + return new CumulationData.Result(missionType); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialStarManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialStarManager.java index 386451dbe..247bf0028 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialStarManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialStarManager.java @@ -15,6 +15,10 @@ public class EspecialStarManager implements BaseDataManager { }else{ especialEquipStar.put(equipStar,1); } + + if(equipStar>data.especialEquipMaxLeve){ + data.especialEquipMaxLeve=equipStar; + } return new CumulationData.Result(missionType); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index a766e3c34..b2ec5dd6c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -93,7 +93,7 @@ public class BuyGoodsLogic { //check money int realMoney =sRechargeCommodityConfig.getPrice(); - if(amount!=realMoney){ + if(amount!=-999&&amount!=realMoney){ LOGGER.error("the uid={},the goodId={}, amount={},real={}", uid, goodsId, amount,realMoney); resultRes.setResultCode(0); resultRes.setResultMsg("前后端金额不对"+amount+"realMoney = " + realMoney);