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]秒 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/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index ad0d99645..75ad6df8d 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 @@ -1540,7 +1540,17 @@ public class MapLogic { } int teamId = mapManager.getTeamId(); List team = user.getTeamPosManager().getTeamPosForHero().get(teamId); +<<<<<<< HEAD if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){ +======= + for (TeamPosHeroInfo teamPosHeroInfo : team) { + 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){ +>>>>>>> abd7ebd8754c1471b2b50e9478087bae40f0ad8f mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1); Set cacheRemove = new HashSet<>(); for (int i = 0 ; i (OnlineUserManager.sessionMap.keySet()), 120); } - if (isNeedUp) { - MongoUtil.getInstence().getMyMongoTemplate().save(globalSystemControl); - } + + } + if (isNeedUp) { + MongoUtil.getInstence().getMyMongoTemplate().save(globalSystemControl); } //remove for (Integer id:remove) {