From d0aa5e79a55ed23336938df721e38231100277cf Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 21 Jun 2019 11:22:35 +0800 Subject: [PATCH] lua fight --- luafight/Modules/Battle/Logic/RoleLogic.lua | 8 +------- .../ljsd/jieling/handler/GameGM/GMRequestHandler.java | 9 ++++++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/luafight/Modules/Battle/Logic/RoleLogic.lua b/luafight/Modules/Battle/Logic/RoleLogic.lua index cb193307a..eea1695c9 100644 --- a/luafight/Modules/Battle/Logic/RoleLogic.lua +++ b/luafight/Modules/Battle/Logic/RoleLogic.lua @@ -249,13 +249,7 @@ function RoleLogic:Dispose() skillPool:Put(self.superSkill) self.superSkill = nil end - - --清除异常状态 - self.enable = true - self.ctrl_slient = false - self.lockTarget = nil - self.ctrl_noheal = false - self.ctrl_blind = false + BattleLogic.BuffMgr:ClearBuff(self) end function RoleLogic:Update() diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 004fdef9d..a4ce7d5b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -98,7 +98,14 @@ public class GMRequestHandler extends BaseHandler{ Map scHeroRankUpConfigByType = SCHeroRankUpConfig.getScHeroRankUpConfigByShow(GlobalsDef.UP_STAR_TYPE,scHero.getStar()); SCHeroRankUpConfig scHeroRankUpConfig = scHeroRankUpConfigByType.get(prarm2-1); hero.setLevel(cUser,scHeroRankUpConfig.getLimitLevel()); - hero.setBreakId(scHeroRankUpConfig.getId()); + hero.setStarBreakId(scHeroRankUpConfig.getId()); + + scHeroRankUpConfigByType = SCHeroRankUpConfig.getScHeroRankUpConfigByShow(GlobalsDef.BREAK_TYPE,scHero.getStar()); + for(SCHeroRankUpConfig scHeroRankUpConfigBreak :scHeroRankUpConfigByType.values()){ + if(hero.getLevel()>scHeroRankUpConfigBreak.getLimitLevel()){ + hero.setBreakId(scHeroRankUpConfigBreak.getId()); + } + } } CommonProto.Hero finalHeroProto = CBean2Proto.getHero(hero); gmBuilder.setDrop(CommonProto.Drop.newBuilder().addHero(finalHeroProto).build());