diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java index 217916bce..e8e3a9495 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java @@ -131,11 +131,11 @@ public class CumulationData { public Map servenGiftTimes = new HashMap<>();//每日登陆次数 public Map dailyChallengeMap = new HashMap<>();//每日挑战副本 - public Map card_random_type;//使用普通召唤num次(十连抽num计10) - public Map guild_give_time ;//使用level级别(0不限、1普通、2钻石小、3钻石大)的公会捐献num次 + public Map card_random_type= new HashMap<>();//使用普通召唤num次(十连抽num计10) + public Map guild_give_time= new HashMap<>() ;//使用level级别(0不限、1普通、2钻石小、3钻石大)的公会捐献num次 public int ten_challenge_time;// 挑战十绝阵num次 // public Map finisin_daily_challenge_times;//完成type(0不限、1金币、2武将经验、3武将碎片、4兵魂、5谋略)的日常副本num次 - public Map expedition_floor_times;//猎妖之路通过floor层num次 + public Map expedition_floor_times= new HashMap<>();//猎妖之路通过floor层num次 public int decompose_times;//献祭武将次数 public int death_path_times;// 击杀过关十绝阵num次 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java index c9a4aa03f..e67b53807 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java @@ -112,6 +112,7 @@ public enum MissionType { GUILD_HELP_TIMES(104),//公会援助他人次数达到num CAR_PLAY_TIMES(105),//参与车迟斗法num次 CAR_PLAY_LOOT_TIME(106),//于车迟斗法中抢夺其他玩家积分num次 + RANDOM_All_TIMES(107),//使用募英殿内(即包含魂晶、友情、普通三种方式)任意类型招募武将num次 ; private int missionType; 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 e4a6840c8..1a924caae 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 @@ -131,6 +131,7 @@ public class DataManagerDistributor { judges.put(MissionType.GUILD_HELP_TIMES,new GuildHelpManager()); judges.put(MissionType.CAR_PLAY_TIMES,new CarPlayManager()); judges.put(MissionType.CAR_PLAY_LOOT_TIME,new CarPlayLootManager()); + judges.put(MissionType.RANDOM_All_TIMES,new CardTypeRandomTimes()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/RandomAllTypeTimes.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/RandomAllTypeTimes.java new file mode 100644 index 000000000..e3665fb10 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/RandomAllTypeTimes.java @@ -0,0 +1,32 @@ +package com.ljsd.jieling.logic.mission.data; + +import com.ljsd.jieling.logic.dao.CumulationData; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.mission.MissionType; + +/** + * Description: 所有类型招募 + * Author: zsx + * CreateDate: 2020/6/1 14:13 + */ +public class RandomAllTypeTimes extends AbstractDataManager { + + @Override + public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) { + int type =(int)parm[0]; + int count =(int)parm[1]; + data.card_random_type.put(type,data.card_random_type.getOrDefault(type, 0)+count); + return new CumulationData.Result(missionType); + } + + @Override + public boolean isFinish(User user, CumulationData data, int[][] cfgValue, Object... parm) { + Integer orDefault = data.card_random_type.getOrDefault(cfgValue[0][0], 0); + return orDefault>=cfgValue[1][0]; + } + + @Override + public int getprocess(User user, CumulationData data, int[] missionSubType) { + return data.card_random_type.getOrDefault(missionSubType[0], 0); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java index 6766b9170..f24960b89 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java @@ -50,6 +50,7 @@ public class MissionEventDistributor { typeList.add(MissionType.RECRUITMENT_RANDOM_HEROES); typeList.add(MissionType.ELEMENT_RANDOM_TIMES); typeList.add(MissionType.CARD_RANDOM_TYPE); + typeList.add(MissionType.RANDOM_All_TIMES); eventEnumListMap.put(GameEvent.RANDOM_HERO,typeList); eventProcessor.put(GameEvent.RANDOM_HERO,new CumulationDataEventProcessor());