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 9c9691959..f6d4b7fb3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java @@ -18,6 +18,7 @@ import com.ljsd.jieling.util.MessageUtil; import config.SChallengeConfig; import config.SErrorCodeEerverConfig; import config.SGlobalSystemConfig; +import config.SMainLevelConfig; import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -305,7 +306,7 @@ public class HandlerLogicThread extends Thread{ int type = sGlobalSystemConfig.getOpenRules()[0]; int condition = sGlobalSystemConfig.getOpenRules()[1]; if (type ==1){ - if (mainLevelManager.getFightId()prarm1){ + if(SMainLevelConfig.biggerThanFight(fightId,prarm1)){ break; } SMainLevelConfig sMainLevelConfigMain = SMainLevelConfig.config.get(prarm1); @@ -159,7 +159,7 @@ public class GMRequestHandler extends BaseHandler{ } ItemUtil.userLevelUp(cUser,exp); } - while (fightId=values[0][0]; + int fightId = user.getMainLevelManager().getFightId(); + int targetFightId = values[0][0]; + return SMainLevelConfig.biggerThanFight(fightId,targetFightId); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/GrowthFundActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/GrowthFundActivity.java index 8ae05ecf9..6693ad7af 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/GrowthFundActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/GrowthFundActivity.java @@ -6,6 +6,8 @@ import com.ljsd.jieling.logic.dao.ActivityProgressInfo; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.network.session.ISession; +import config.SMainLevelConfig; + class GrowthFundActivity extends AbstractActivity { public GrowthFundActivity(int id) { @@ -24,7 +26,7 @@ class GrowthFundActivity extends AbstractActivity { return false; } }else if(type == 15){ - return user.getMainLevelManager().getFightId()>value; + return SMainLevelConfig.biggerThanFight(user.getMainLevelManager().getFightId(),value); } return true; } 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 98748105e..3c7490ff9 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 @@ -570,8 +570,16 @@ public class HeroLogic { //校验消耗 boolean result = ItemUtil.itemCost(user, consumeMap,BIReason.UP_HERO_LEVEL_CONSUME,hero.getTemplateId()); if(!result){ - MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.UP_HERO_LEVEL_RESPONSE_VALUE,"道具不足"); - return; + int heroLevel = hero.getLevel(); + for(;oldLevel config; @Override public void init() throws Exception { - config = STableManager.getConfig(SMainLevelConfig.class); + Map configTmp = STableManager.getConfig(SMainLevelConfig.class); + for(SMainLevelConfig sMainLevelConfig : configTmp.values()){ + int id = sMainLevelConfig.getId(); + sMainLevelConfig.setVirtureId(10_000_000*(id%10) + id); + } + config=configTmp; + } + + + public static boolean biggerThanFight(int soureFight,int targetFight){ + SMainLevelConfig mineLevelConfig = SMainLevelConfig.config.get(soureFight); + SMainLevelConfig otherLevelConfig = SMainLevelConfig.config.get(targetFight); + return mineLevelConfig.getVirtureId()>=otherLevelConfig.getVirtureId(); } @@ -99,4 +113,12 @@ public class SMainLevelConfig implements BaseConfig { public int getDifficulty() { return difficulty; } + + public int getVirtureId() { + return virtureId; + } + + public void setVirtureId(int virtureId) { + this.virtureId = virtureId; + } } \ No newline at end of file