From 33d1cf6a03ac996e5168a17dd2398e6cc31dbdd4 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 10 Sep 2019 10:21:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=AD=82=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8d6c47a44..429308760 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 @@ -1459,7 +1459,7 @@ public class HeroLogic { if(hero.getSoulEquipByPositionMap().containsKey(soulEquipPos.getPosition())){ String id = hero.getSoulEquipByPositionMap().get(soulEquipPos.getPosition()); SoulEquip oldEquip = user.getEquipManager().getSoulEquipMap().get(id); - if(null!=oldEquip){ + if (null != oldEquip && !oldEquip.getId().equals( soulEquipPos.getEquipId())) { oldEquip.setHeroId(""); } } From a1e0d88052dac86a506d860915b71bb6f267e840 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 12 Sep 2019 11:08:55 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E6=9C=AC=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 1a4d1365d..4789ad3ea 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1541,7 +1541,10 @@ public class MapLogic { int teamId = mapManager.getTeamId(); List team = user.getTeamPosManager().getTeamPosForHero().get(teamId); for (TeamPosHeroInfo teamPosHeroInfo : team) { - mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition()+1]); + Map heroAttr = mapManager.getHeroAllAttributeMap().get(teamPosHeroInfo.getHeroId()); + if(heroAttr!=null) { + mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition() + 1]); + } } if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){ mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1); From b5b563c2dc819711b601eeb218475fd347729fa9 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 12 Sep 2019 12:34:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luafight/Modules/Battle/Logic/Base/Passivity.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luafight/Modules/Battle/Logic/Base/Passivity.lua b/luafight/Modules/Battle/Logic/Base/Passivity.lua index 96742ff02..f5be158c0 100644 --- a/luafight/Modules/Battle/Logic/Base/Passivity.lua +++ b/luafight/Modules/Battle/Logic/Base/Passivity.lua @@ -644,7 +644,7 @@ local passivityList = { local OnPassiveDamaging = function(damagingFunc) damagingFunc(-f1) end - role.Event:AddEvent(BattleEventName.PassiveBeDamaging, OnPassiveDamaging) + role.Event:AddEvent(BattleEventName.PassiveDamaging, OnPassiveDamaging) end, --进入战斗[a]秒后,造成的伤害提升[b],持续[c]秒 From f36c71cadaf798328cdf65cc59a8d7db976fef59 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 10 Sep 2019 11:54:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/question/QuestionLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/question/QuestionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/question/QuestionLogic.java index d1a41b4ca..55af1a043 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/question/QuestionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/question/QuestionLogic.java @@ -85,7 +85,7 @@ public class QuestionLogic { continue; } last.add(entry.getValue()); - remove.add(entry.getKey()); + // remove.add(entry.getKey()); } From abd7ebd8754c1471b2b50e9478087bae40f0ad8f Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 10 Sep 2019 13:25:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A7=82=E6=98=9F=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/core/FunctionIdEnum.java | 1 + .../java/com/ljsd/jieling/core/HandlerLogicThread.java | 7 +++++++ .../com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 6 ++++-- .../com/ljsd/jieling/logic/question/QuestionLogic.java | 10 +++++++--- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java index d8caa376a..dad65275b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java @@ -38,6 +38,7 @@ public enum FunctionIdEnum { Endless(46), Blood(47), ToBeStronger(48), + SoulEquip(52), WorkShopTech(101), WorkShopCreateEquip(102), WorkShopCreateProtectEquip(103), diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java b/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java index 2fabe3833..81dc1ed74 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java @@ -278,6 +278,13 @@ public class HandlerLogicThread extends Thread{ return false; } break; + case MessageTypeProto.MessageType.SOUL_RAND_EQUIP_REQUEST_VALUE: + case MessageTypeProto.MessageType.SOUL_FORCE_RAND_EQUIP_REQUEST_VALUE: + sGlobalSystemConfig = SGlobalSystemConfig.getsGlobalSystemConfigByFunctionId(FunctionIdEnum.SoulEquip); + if (checkOpen(user,sGlobalSystemConfig)) { + return false; + } + break; } } catch (Exception e) { e.printStackTrace(); 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 c8da80117..fb98cbb64 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -12,6 +12,7 @@ import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.logic.GlobalDataManaager; import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.dao.*; +import com.ljsd.jieling.logic.dao.root.GlobalSystemControl; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.hotfix.DoFix; import com.ljsd.jieling.logic.player.PlayerLogic; @@ -117,8 +118,9 @@ public class GetPlayerInfoHandler extends BaseHandler{ } //问卷状态 int questState =-1; - if(user.getQuestionManager().getQuestId()!=0){ - questState=user.getQuestionManager().getQuestState(); + GlobalSystemControl globalSystemControl = GlobalSystemControl.getGlobalSystemControl(); + if(globalSystemControl.getQuestId()!=0 && user.getQuestionManager().getQuestId()!=0){ + questState=user.getQuestionManager().getQuestState(); } //图鉴信息 Set heroHandBookSet = user.getHeroManager().getHeroHandBook().keySet(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/question/QuestionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/question/QuestionLogic.java index 55af1a043..4be4c02c3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/question/QuestionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/question/QuestionLogic.java @@ -125,13 +125,17 @@ public class QuestionLogic { user.getQuestionManager().setQuestId(qid); user.getQuestionManager().setQuestState(0); ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId()); + if(null ==sessionByUid){ + return; + } MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.QUESTION_INDICATION_VALUE, builder, true); } }, new ArrayList<>(OnlineUserManager.sessionMap.keySet()), 120); } - if (isNeedUp) { - MongoUtil.getInstence().getMyMongoTemplate().save(globalSystemControl); - } + + } + if (isNeedUp) { + MongoUtil.getInstence().getMyMongoTemplate().save(globalSystemControl); } //remove for (Integer id:remove) {