add 英雄降临SP活动，fixbug

serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java

@@ -107,6 +107,7 @@ public class ActivityLogic implements IEventHandler {
         ActivityLogic.getInstance().resumeActivity(user, ActivityType.FOREVER_MEMBER_PLUS);
         //神秘指令
         ActivityLogic.getInstance().resumeActivity(user, ActivityType.CARD_SUBJECT_MYSTICAL_INSTRUCT);
+        ActivityLogic.getInstance().resumeActivity(user, ActivityType.CARD_SUBJECT_MYSTICAL_INSTRUCT_SP);
 
         Set<Integer> upFiveActivityTypes = new HashSet<>();
         upFiveActivityTypes.add(ActivityType.SevenLogin);
@@ -2530,11 +2531,16 @@ public class ActivityLogic implements IEventHandler {
         User user = UserManager.getUser(iSession.getUid());
 
         //英雄驾到 ActivityType=50000的活动ID
-        List<Integer> activityIdList = new ArrayList<>();
-        List<SGlobalActivity> sGlobalActivities = SGlobalActivity.sGlobalActivityMapByType.get(ActivityType.CARD_SUBJECT_HERO_GET);
-        for (SGlobalActivity globalActivity : sGlobalActivities){
-            activityIdList.add(globalActivity.getId());
-        }
+//        List<Integer> activityIdList = new ArrayList<>();
+//        List<SGlobalActivity> sGlobalActivities = SGlobalActivity.sGlobalActivityMapByType.get(ActivityType.CARD_SUBJECT_HERO_GET);
+//        for (SGlobalActivity globalActivity : sGlobalActivities){
+//            activityIdList.add(globalActivity.getId());
+//        }
+//        List<SGlobalActivity> sSPGlobalActivities = SGlobalActivity.sGlobalActivityMapByType.get(ActivityType.CARD_SUBJECT_HERO_GET_SP);
+//        for (SGlobalActivity globalActivity : sSPGlobalActivities){
+//            activityIdList.add(globalActivity.getId());
+//        }
+
         //int activityId = activityIdList.get(0);
         SWishPoolConfig sWishPoolConfig = SWishPoolConfig.getsWishPoolConfigMapByActivityId().get(activityId);
         //int wishTimes = sWishPoolConfig.getWishTimes();                 //心愿奖励保底次数，本期活动每个心愿奖励所需要的保底次数
@@ -2597,6 +2603,9 @@ public class ActivityLogic implements IEventHandler {
 
         SLotterySetting sLotterySetting = STableManager.getConfig(SLotterySetting.class).get(id);
         int lotteryType = sLotterySetting.getLotteryType(); //招募类型
+        if (lotteryType != 52) {
+            throw new ErrorCodeException(ErrorCode.PARAM_ERR);
+        }
         int[][] costItem = sLotterySetting.getCostItem();   //招募消耗的道具
         int[][] diamondBoxContain = sLotterySetting.getDiamondBoxContain(); //高级招募包含库（库#概率）
         int perCount = sLotterySetting.getPerCount();       //抽卡次数
@@ -2604,13 +2613,18 @@ public class ActivityLogic implements IEventHandler {
         int activityId = sLotterySetting.getActivityId();   //活动id
 
         //英雄驾到 ActivityType=50000的活动ID
-        List<Integer> activityIdList = new ArrayList<>();
-        List<SGlobalActivity> sGlobalActivities = SGlobalActivity.sGlobalActivityMapByType.get(ActivityType.CARD_SUBJECT_HERO_GET);
-        for (SGlobalActivity globalActivity : sGlobalActivities) {
-            activityIdList.add(globalActivity.getId());
-        }
+//        List<Integer> activityIdList = new ArrayList<>();
+//        List<SGlobalActivity> sGlobalActivities = SGlobalActivity.sGlobalActivityMapByType.get(ActivityType.CARD_SUBJECT_HERO_GET);
+//        for (SGlobalActivity globalActivity : sGlobalActivities) {
+//            activityIdList.add(globalActivity.getId());
+//        }
+//        List<SGlobalActivity> sSPGlobalActivities = SGlobalActivity.sGlobalActivityMapByType.get(ActivityType.CARD_SUBJECT_HERO_GET_SP);
+//        for (SGlobalActivity globalActivity : sSPGlobalActivities){
+//            activityIdList.add(globalActivity.getId());
+//        }
 
-        if (lotteryType != 52 && !activityIdList.contains(activityId)) {    //52 = LotterySetting表ActivityId=70001的 LotteryType
+        SGlobalActivity globalActivity = SGlobalActivity.getsGlobalActivityMap().get(activityId);
+        if (globalActivity.getType() != ActivityType.CARD_SUBJECT_HERO_GET && globalActivity.getType() != ActivityType.CARD_SUBJECT_HERO_GET_SP) {    //52 = LotterySetting表ActivityId=70001的 LotteryType
             throw new ErrorCodeException(ErrorCode.PARAM_ERR);
         }
 

serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java

@@ -134,6 +134,11 @@ public interface ActivityType {
     int CARD_SUBJECT_HERO_LUXURY_GET = 50004;       //卡牌主题：英雄豪礼
     int CARD_SUBJECT_MISSION = 50005;               //卡牌主题：英雄收集
     //int CARD_SUBJECT_HERO_COLLECT = 50005;          //卡牌主题：英雄收集
+    int CARD_SUBJECT_HERO_GET_SP = 51000;              //卡牌主题：英雄驾到 SP
+    int CARD_SUBJECT_MYSTICAL_INSTRUCT_SP = 51001;     //卡牌主题：神秘指令 SP
+    int CARD_SUBJECT_HERO_GIFT_SP = 51003;             //卡牌主题：英雄礼包 SP
+    int CARD_SUBJECT_HERO_LUXURY_GET_SP = 51004;       //卡牌主题：英雄豪礼 SP
+    int CARD_SUBJECT_MISSION_SP = 51005;               //卡牌主题：英雄收集 SP
 
     int QUESTIONNAIRE = 201;                 //调查问卷
     int KAIFU_REWARD = 202;                  //开服有奖

serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java

@@ -93,11 +93,16 @@ public enum ActivityTypeEnum {
 
 
     CARD_SUBJECT_HERO_GET(ActivityType.CARD_SUBJECT_HERO_GET,CardSubjectHeroGetActivity::new),                                     //卡牌主题活动：英雄驾到
+    CARD_SUBJECT_HERO_GET_SP(ActivityType.CARD_SUBJECT_HERO_GET_SP,CardSubjectHeroGetActivity::new),                                     //卡牌主题活动：英雄驾到 SP
     CARD_SUBJECT_MYSTICAL_INSTRUCT(ActivityType.CARD_SUBJECT_MYSTICAL_INSTRUCT,CardSubjectMysticalInstructActivity::new),          //卡牌主题活动：神秘指令
+    CARD_SUBJECT_MYSTICAL_INSTRUCT_SP(ActivityType.CARD_SUBJECT_MYSTICAL_INSTRUCT_SP,CardSubjectMysticalInstructActivity::new),          //卡牌主题活动：神秘指令
     CARD_SUBJECT_HERO_GIFT(ActivityType.CARD_SUBJECT_HERO_GIFT,DefaultEmptyActivity::new),                                          //卡牌主题活动：英雄礼包
+    CARD_SUBJECT_HERO_GIFT_SP(ActivityType.CARD_SUBJECT_HERO_GIFT_SP,DefaultEmptyActivity::new),                                          //卡牌主题活动：英雄礼包
     //CARD_SUBJECT_HERO_GIFT(ActivityType.CARD_SUBJECT_HERO_GIFT,CardSubjectHeroGiftActivity::new),                                  //卡牌主题活动：英雄礼包
     CARD_SUBJECT_HERO_LUXURY_GET(ActivityType.CARD_SUBJECT_HERO_LUXURY_GET,CardSubjectHeroLuxuryGetActivity::new),                  //卡牌主题活动：英雄豪礼
+    CARD_SUBJECT_HERO_LUXURY_GET_SO(ActivityType.CARD_SUBJECT_HERO_LUXURY_GET_SP,CardSubjectHeroLuxuryGetActivity::new),                  //卡牌主题活动：英雄豪礼
     CARD_SUBJECT_MISSION(ActivityType.CARD_SUBJECT_MISSION,CardSubjectHeroCollectActivity::new),                                    //卡牌主题活动：英雄收集
+    CARD_SUBJECT_MISSION_SP(ActivityType.CARD_SUBJECT_MISSION_SP,CardSubjectHeroCollectActivity::new),                                    //卡牌主题活动：英雄收集
     //CARD_SUBJECT_HERO_COLLECT(ActivityType.CARD_SUBJECT_HERO_COLLECT,CardSubjectHeroCollectActivity::new),                       //卡牌主题活动：英雄收集
     QUESTIONNAIRE(ActivityType.QUESTIONNAIRE,DefaultEmptyActivity::new),    //调查问卷
     KAIFU_REWARD(ActivityType.KAIFU_REWARD,KaiFuRewardActivity::new),    //开服有奖

tablemanager/src/main/java/config/SMotherShipConfig.java

@@ -33,9 +33,9 @@ public class SMotherShipConfig implements BaseConfig {
     public void init() throws Exception {
         sMotherShipConfigMap = STableManager.getConfig(SMotherShipConfig.class);
         sMotherShipConfigMap.forEach((k,v)-> {
-            if(v.getType() == 1) {
+//            if(v.getType() == 1) {
                 level2MotherShipConfigMap.put(v.getLevel(), v);
-            }
+//            }
         } );
     }
 

tablemanager/src/main/java/manager/STableManager.java

@@ -251,7 +251,7 @@ public class STableManager {
         Map<Integer, Map<Integer, T>> map = new HashMap<>();
         try {
             String tableName = clazz.getAnnotation(Table.class).name();
-            String pathDir = SysUtil.getPath("conf", "server");
+            String pathDir = "conf/server/";
             File mapDir = new File(pathDir);
             String prefix = tableName + "_";
             int preLength = prefix.length();
@@ -267,7 +267,8 @@ public class STableManager {
                 map.put(mapId, mapConf);
             }
         } catch (Exception e) {
-            LOGGER.error("getMapConfig" + e.toString());
+            e.printStackTrace();
+            LOGGER.error("getMapConfig= {}", e.toString());
         }
         return map;
     }

test/src/main/java/exportHeroManeger.java

@@ -26,7 +26,7 @@ public class exportHeroManeger {
 
     /** 读取数据，存入集合中 */
     public static void readtFile(File file) throws Exception {
-        InputStreamReader read = null;// 考虑到编码格式
+        InputStreamReader read = null;// unicode
         try {
             read = new InputStreamReader(new FileInputStream(file), "utf-8");
         } catch (UnsupportedEncodingException e) {
@@ -56,7 +56,7 @@ public class exportHeroManeger {
 
 //        File file = new File("D:\\readFile\\testgame3.log");
 //        if (!file.exists()) {
-//            System.out.println("文件不存在!");
+//            System.out.println("file not exist!");
 //            return ;
 //        }
 //        try {