From e2c331f84094f20fcd2a7df1e535c221c02219a7 Mon Sep 17 00:00:00 2001 From: duhui Date: Sat, 22 Jan 2022 14:18:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=BB=E8=A7=92?= =?UTF-8?q?=E6=97=B6=E8=A3=85=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/globals/GlobalItemType.java | 4 ++-- serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java index d28007743..74fb8bde8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java @@ -32,8 +32,8 @@ public interface GlobalItemType { int SELECTSecretBox=20; // 自选宝箱（前端要区分） int SpecialMonster=21; // 灵兽 int SpecialMonsterItem=22; // 灵兽碎片 - // 万能狗粮 - int AllPowerful_DogFood = 25; + int PLAYER_SKIN=24;//主角时装 + int AllPowerful_DogFood = 25;// 万能狗粮 int LikableCostItem=27;//好感度功能消耗道具 int MOUNT_FRAGMENTS_ITEM = 28;//坐骑碎片 int TRANSFORMATION_CARD = 29;//化身卡 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index c78de882f..fbde94697 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -629,6 +629,7 @@ public class ItemUtil { case GlobalItemType.LIFE_STONE: case GlobalItemType.TRANSFORMATION_CARD: case GlobalItemType.HOOK_PROP: + case GlobalItemType.PLAYER_SKIN: itemType = GlobalItemType.ITEM; break; default: From 36e8abdb619a715a9860150290365fcd37e80ee9 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 26 Jan 2022 13:44:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8E=A2=E7=B4=A2=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java index 2ee51a86e..c769bf1cd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java @@ -275,6 +275,13 @@ public class ExplorerMapLogic { Set uids = OnlineUserManager.sessionMap.keySet(); for (int uid : uids) { User user = UserManager.getUser(uid); + if(user == null){ + continue; + } + //登录一分钟后才执行 避免消息线程和分钟线程同时修改数据 + if(TimeUtils.now() < user.getPlayerInfoManager().getLoginTime()+60000){ + continue; + } Map explorer = user.getPlayerInfoManager().getExplorer(); if (explorer == null || explorer.size() == 0) { continue; From acb0dcb9d3b026bf4b06b01521c1a36f6d824245 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 26 Jan 2022 15:06:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=A2=E7=B4=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java index c769bf1cd..5f8f20bb5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java @@ -273,13 +273,14 @@ public class ExplorerMapLogic { public void recycleFight() { try { Set uids = OnlineUserManager.sessionMap.keySet(); + long now = TimeUtils.now(); for (int uid : uids) { User user = UserManager.getUser(uid); if(user == null){ continue; } //登录一分钟后才执行 避免消息线程和分钟线程同时修改数据 - if(TimeUtils.now() < user.getPlayerInfoManager().getLoginTime()+60000){ + if(now < user.getPlayerInfoManager().getLoginTime()+60000){ continue; } Map explorer = user.getPlayerInfoManager().getExplorer(); From cafea7ce464bac7d75992d701eae5fff9fd1f8ff Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 10 Feb 2022 15:05:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB?= =?UTF-8?q?=E5=BC=80=E6=88=98=E6=8A=A5=E9=94=99bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/fight/passiveSkillCal/PassiveskillCalEnum.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/passiveSkillCal/PassiveskillCalEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/passiveSkillCal/PassiveskillCalEnum.java index 7aba7a7cb..be7101538 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/passiveSkillCal/PassiveskillCalEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/passiveSkillCal/PassiveskillCalEnum.java @@ -102,6 +102,13 @@ public enum PassiveskillCalEnum { int haveNum=0; for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { Hero localHero=user.getHeroManager().getHero(teamPosHeroInfo.getHeroId()); + ///针对大闹天空招募英雄 + if (localHero==null) { + localHero=user.getExpeditionManager().getHero(teamPosHeroInfo.getHeroId()); + } + if (localHero==null) { + continue; + } if(SCHero.getsCHero().get(localHero.getTemplateId()).getPropertyName()==value[0]){ haveNum++; }