diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java index 89b76a32c..e047f9e6d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java @@ -82,7 +82,7 @@ public interface ActivityType { int COW_FLY_SKY = 62;//牛气冲天 int LUCKY_GET = 63;//福星高照 int FIFTEEN_LOGIN = 64;//十五日签到 - int EQUIP_UPLEVEL = 65; + int EQUIP_UPLEVEL = 65;//云游商人 int SUB_ACTIVITY = 8000;//易经宝库 int SKIN_RECHARGE_ACTIVITY = 71; diff --git a/tablemanager/src/main/java/config/SComposeActivity.java b/tablemanager/src/main/java/config/SComposeActivity.java index af2eeeaa4..bcfc38296 100644 --- a/tablemanager/src/main/java/config/SComposeActivity.java +++ b/tablemanager/src/main/java/config/SComposeActivity.java @@ -1,7 +1,14 @@ package config; +import manager.STableManager; import manager.Table; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + @Table(name ="SComposeActivity") public class SComposeActivity implements BaseConfig { private int id; @@ -10,9 +17,33 @@ public class SComposeActivity implements BaseConfig { private int count; private int composeType; + private Map> configMap; + private Map>> itemMap; + @Override public void init() throws Exception { - + Map> tempConfigMap = new HashMap<>(); + Map>> tempItemMap = new HashMap<>(); + Map config = STableManager.getConfig(SComposeActivity.class); + for(SComposeActivity activity : config.values()){ + if(tempConfigMap.containsKey(activity.getActivityId())){ + tempConfigMap.get(activity.getActivityId()).put(activity.getComposeType(),activity); + List list = Arrays.stream( activity.getNeedItems() ).boxed().collect(Collectors.toList()); + tempItemMap.get(activity.getActivityId()).put(activity.getComposeType(),list); + }else{ + Map map1 = new HashMap<>(); + map1.put(activity.getComposeType(),activity); + tempConfigMap.put(activity.getActivityId(),map1); + Map> map2 = new HashMap<>(); + List list = Arrays.stream( activity.getNeedItems() ).boxed().collect(Collectors.toList()); + map2.put(activity.getComposeType(),list); + tempItemMap.put(activity.getActivityId(),map2); + } + } + if(configMap == null){ + configMap = tempConfigMap; + itemMap = tempItemMap; + } } public int getId() { diff --git a/tablemanager/src/main/java/config/SComposeBook.java b/tablemanager/src/main/java/config/SComposeBook.java index 5316ad4d7..4f1f47908 100644 --- a/tablemanager/src/main/java/config/SComposeBook.java +++ b/tablemanager/src/main/java/config/SComposeBook.java @@ -1,7 +1,11 @@ package config; +import manager.STableManager; import manager.Table; +import java.util.HashMap; +import java.util.Map; + @Table(name ="SComposeBook") public class SComposeBook implements BaseConfig { private int id; @@ -11,9 +15,24 @@ public class SComposeBook implements BaseConfig { private int type; private String desc; + private Map> typeMap; + @Override public void init() throws Exception { - + Map> tempTypeMap = new HashMap<>(); + Map config = STableManager.getConfig(SComposeBook.class); + for(SComposeBook book : config.values()){ + if(tempTypeMap.containsKey(book.getType())){ + tempTypeMap.get(book.getType()).put(book.getGoalItems()[0],book); + }else{ + Map map = new HashMap<>(); + map.put(book.getGoalItems()[0],book); + tempTypeMap.put(book.getType(),map); + } + } + if(typeMap == null){ + typeMap = tempTypeMap; + } } public int getId() {