From 23bfdbe50f7aa3067b8fdcc420d39cb2d8403802 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 16 Nov 2020 21:09:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=85=BD=E6=8A=BD=E5=8D=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/ActivityLogic.java | 4 +++ .../ljsd/jieling/logic/hero/HeroLogic.java | 35 +++++++++++++++++++ .../main/java/config/SSpiritAnimalSummon.java | 15 +++++++- 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 64138cc53..c55ffa330 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -1391,6 +1391,10 @@ public class ActivityLogic implements IEventHandler{ if(activityMission==null||!activityMission.getActivityMissionMap().containsKey(0)){ throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } + Map sSpiritAnimalSummon = STableManager.getConfig(SSpiritAnimalSummon.class); + if(!sSpiritAnimalSummon.containsKey(chooseId)||sSpiritAnimalSummon.get(chooseId).getActivityID()!=activityId){ + throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); + } activityMission.getActivityMissionMap().get(0).setProgrss(chooseId); MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.SPECICAL_MONSTER_CHOOSE_RESPONSE_VALUE,null,true); 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 d74d144e1..5b93c23c3 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 @@ -14,6 +14,8 @@ import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.globals.Global; import com.ljsd.jieling.globals.GlobalItemType; +import com.ljsd.jieling.jbean.ActivityMission; +import com.ljsd.jieling.jbean.ActivityProgressInfo; import com.ljsd.jieling.ktbeans.ReportEventEnum; import com.ljsd.jieling.ktbeans.ReportUtil; import com.ljsd.jieling.logic.activity.ActivityType; @@ -333,6 +335,10 @@ public class HeroLogic{ for(int i = 0;i> spiritAnimalSummonMapByActivityId = SSpiritAnimalSummo.spiritAnimalSummonMapByActivityId; + ActivityProgressInfo activityProgressInfo = activityMission.getActivityMissionMap().get(0); + if(activityProgressInfo==null||activityProgressInfo.getProgrss()==0){ + return; + } + Map config = STableManager.getConfig(SSpiritAnimalSummon.class); + if(!config.containsKey(activityProgressInfo.getProgrss())){ + return; + } + SSpiritAnimalSummon sSpiritAnimalSummon = config.get(activityProgressInfo.getProgrss()); + if(sSpiritAnimalSummon.getActivityID()!=activityId){ + return; + } + //进行替换 + for(int[] randomItem:random){ + int length = Math.min(sSpiritAnimalSummon.getOriginalItemList().length,sSpiritAnimalSummon.getTargetItemList().length); + for(int i = 0 ; i >> spiritAnimalSummonMapByActivityId; + @Override public void init() throws Exception { - +// Map>> spiritAnimalSummonMapByActivityIdTemp = new HashMap<>(); +// Map config = STableManager.getConfig(SSpiritAnimalSummon.class); +// for(Map.Entry entry:config.entrySet()){ +// SSpiritAnimalSummon value = entry.getValue(); +// spiritAnimalSummonMapByActivityIdTemp.putIfAbsent(value.getActivityID(),new HashMap<>()); +// spiritAnimalSummonMapByActivityIdTemp.get(entry.getKey()) +// for(int i = 0 ; i