From d6f16d1f6183b2b9b66bf624cd82bfb9ae700ea7 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 30 Nov 2021 10:09:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8F=98=E8=BA=AB=E5=8D=A1=E6=BF=80?= =?UTF-8?q?=E6=B4=BB=E6=B6=88=E8=80=97=E9=81=93=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/globals/BIReason.java | 1 + .../transformation/UpOrDownTransformationHandler.java | 7 +++++++ 2 files changed, 8 insertions(+) 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 1612fba97..c1460d7bf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java @@ -369,4 +369,5 @@ public interface BIReason { int WEEK_CARD_REWARD =1222;//周卡奖励 int FABAO_SOUL_UP_COST =1223;//法宝之魂升级消耗 + int TRANSFORMATION_CARD_COST = 1224;//变身卡激活消耗 } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/UpOrDownTransformationHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/UpOrDownTransformationHandler.java index aa37662f6..311c728ae 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/UpOrDownTransformationHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/UpOrDownTransformationHandler.java @@ -2,12 +2,14 @@ package com.ljsd.jieling.handler.transformation; import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; +import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.dao.TransformationInfo; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.CBean2Proto; +import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; import config.SChangingCard; import manager.STableManager; @@ -59,6 +61,11 @@ public class UpOrDownTransformationHandler extends BaseHandler Date: Tue, 30 Nov 2021 11:25:01 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=A3=98=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/activity/TrumpGachaSelectItemRequestHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Date: Wed, 1 Dec 2021 06:58:13 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=88=98=E6=96=97=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/hero/HeroLogic.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) 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("#"); + } } } From c4e252a3ed61be556af24779c50594fd94dabbad Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 1 Dec 2021 07:14:08 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=A4=BC=E5=8C=85=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 4 +++- 1 file changed, 3 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 14a9d2ad1..d94541657 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 @@ -1455,11 +1455,13 @@ public class ActivityLogic implements IEventHandler{ public static boolean checkActivityOpen(User user, int activityType) { ActivityManager activityManager = user.getActivityManager(); Map 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.error("未开启或者活动表已删除的活动id:{}",activityType); return false; } From 4e4ed641cac51556cdca823dbf3f06773622e078 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 1 Dec 2021 15:25:19 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=96=B9=E5=AF=B8=E5=AF=BB=E5=AE=9D?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/activity/ActivityType.java | 1 + .../java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java | 2 ++ 2 files changed, 3 insertions(+) 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 de955d80c..26f944e6b 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 @@ -99,6 +99,7 @@ public interface ActivityType { int SEVEN_WORLD_TREASURE = 83;//七界秘宝 int RIDING_SWARD = 84;//御剑飞行 int CONTINUOUS_GIFT = 85;//连续礼包 + int TRANSFORMATION_DRAW_CARD = 86;//方寸寻宝 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 7fde6dc35..fe6a84f81 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 @@ -5,6 +5,7 @@ import config.SGlobalActivity; import java.util.HashMap; import java.util.function.Function; +@SuppressWarnings("ALL") public enum ActivityTypeEnum { ONLINEREWARD(ActivityType.OnlineReward, OnlineRewardActivity::new), @@ -90,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),//方寸寻宝 ; private int type; From 5c4874ab9e02fbf544ccb9ada398d97bef924109 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 1 Dec 2021 17:55:46 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=A4=A9=E5=AE=AB?= =?UTF-8?q?=E5=95=86=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/core/GlobalsDef.java | 2 +- .../java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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/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); } // 处理玩家旧头像框,兼容,一个玩家只执行一次 From b418a8e53c6321a75ee88007f044a7b73d7d2df0 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 2 Dec 2021 10:20:55 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 2 +- 1 file changed, 1 insertion(+), 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 d94541657..1b58527c0 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 @@ -1461,7 +1461,7 @@ public class ActivityLogic implements IEventHandler{ return true; } } - LOGGER.error("未开启或者活动表已删除的活动id:{}",activityType); + LOGGER.debug("未开启或者活动表已删除的活动id:{}",activityType); return false; }