diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java index 548726ecd..7a9d27661 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java @@ -2,7 +2,7 @@ package com.ljsd.jieling.core; public interface GlobalsDef { String DEFAULT_NAME = "无名妖灵师"; - int VERSION_CODE=2;//后端兼容版本号 + int VERSION_CODE=3;//后端兼容版本号 int MAP_MISSION_RETURN = -9999; int MAP_MISSION_FAILURE = -10000; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java index 7ace3b792..3a4450646 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -370,6 +370,8 @@ public interface BIReason { int FABAO_SOUL_UP_COST =1223;//法宝之魂升级消耗 + int TRANSFORMATION_CARD_COST = 1224;//变身卡激活消耗 + int BUY_GOOD_ITEM_COST =1225;//妖晶购买道具消耗 int BUY_GOOD_ITEM_GET =1226;//妖晶购买道具获得 } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index a406b44e0..ff442a252 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -168,6 +168,10 @@ public class GetPlayerInfoHandler extends BaseHandler{ if (playerInfoManager.getVersionCode()<2){ calHeroHandBookData(user); } + // 重置天宫商店 + if (playerInfoManager.getVersionCode()<3){ + user.getStoreManager().removeStoreInfo(17); + } playerInfoManager.setVersionCode(GlobalsDef.VERSION_CODE); } // 处理玩家旧头像框,兼容,一个玩家只执行一次 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TrumpGachaSelectItemRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TrumpGachaSelectItemRequestHandler.java index d1dcf5916..e641826ad 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TrumpGachaSelectItemRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TrumpGachaSelectItemRequestHandler.java @@ -42,7 +42,7 @@ public class TrumpGachaSelectItemRequestHandler extends BaseHandler activityMissionMap = activityManager.getActivityMissionMap(); + Map activityMap = SGlobalActivity.getsGlobalActivityMap(); for (Map.Entry item : activityMissionMap.entrySet()) { - if (item.getKey() == activityType) { + if (item.getKey() == activityType && activityMap.get(activityType) != null) { return true; } } + LOGGER.debug("未开启或者活动表已删除的活动id:{}",activityType); return false; } 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 9b05481f4..dea92e67e 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 @@ -100,6 +100,7 @@ public interface ActivityType { int SEVEN_WORLD_TREASURE = 83;//七界秘宝 int RIDING_SWARD = 84;//御剑飞行 int CONTINUOUS_GIFT = 85;//连续礼包 + int TRANSFORMATION_DRAW_CARD = 86;//方寸寻宝 int CONTINUOUS_GIFT_NEW = 87;//新连续礼包 int SPECIAL_MONSTER_RANDOM_ACTIVITY = 100;//灵兽宝阁活动 int SPECIAL_MONSTER_GIFT_ACTIVITY = 101;//灵兽礼包 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java index 2b7f0a508..49954d2ae 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java @@ -91,6 +91,7 @@ public enum ActivityTypeEnum { ITEMS_STORE_NEW(ActivityType.ITEMS_STORE_NEW,SuperBoxActivity::new), TRUMP_GACHA_ACTIVITY(ActivityType.TRUMP_GACHA_ACTIVITY,LimitRandomCardActivity::new), CONTINUOUS_GIFT(ActivityType.CONTINUOUS_GIFT,SuperBoxActivity::new),//连续礼包 + TRANSFORMATION_DRAW_CARD(ActivityType.TRANSFORMATION_DRAW_CARD,DefaultEmptyActivity::new),//方寸寻宝 CONTINUOUS_GIFT_NEW(ActivityType.CONTINUOUS_GIFT_NEW,ContinuousGiftActivity::new),//新连续礼包 ; 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 ac92d7b7d..48805f14e 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 @@ -2340,18 +2340,23 @@ public class HeroLogic { long maxForce,int sex,int userLv,List tfInfoList) { StringBuilder skillStr = new StringBuilder(); // 修行技能 - for (Map.Entry entry : practiceSkillMap.entrySet()) { - SPlayerSkill playerSkill = SPlayerSkill.GetSPlayerSkill(entry.getKey(), entry.getValue()); - if (playerSkill != null){ - skillStr.append(playerSkill.getId()).append("#"); + if (practiceSkillMap != null){ + for (Map.Entry entry : practiceSkillMap.entrySet()) { + SPlayerSkill playerSkill = SPlayerSkill.GetSPlayerSkill(entry.getKey(), entry.getValue()); + if (playerSkill != null){ + skillStr.append(playerSkill.getId()).append("#"); + } } } + // 身外化身技能 - Map cardMap = STableManager.getConfig(SChangingCard.class); - for (int cardId : tfInfoList) { - SChangingCard card = cardMap.get(cardId); - if (card != null){ - skillStr.append(card.getSkill()).append("#"); + if (tfInfoList != null){ + Map cardMap = STableManager.getConfig(SChangingCard.class); + for (int cardId : tfInfoList) { + SChangingCard card = cardMap.get(cardId); + if (card != null){ + skillStr.append(card.getSkill()).append("#"); + } } }