From a00a5f4597869ea5279dc252c8df01e524e63295 Mon Sep 17 00:00:00 2001 From: gaojie Date: Mon, 29 Apr 2019 20:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=90=88=E6=88=90=E7=A2=8E?= =?UTF-8?q?=E7=89=87=E4=B8=8A=E9=99=90=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/GameSetting.txt | 6 +++--- .../src/main/java/com/ljsd/jieling/config/SGameSetting.java | 6 ++++++ .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/conf/server/GameSetting.txt b/conf/server/GameSetting.txt index 73dd656cd..7e73301d3 100644 --- a/conf/server/GameSetting.txt +++ b/conf/server/GameSetting.txt @@ -1,3 +1,3 @@ -Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition AdventureRefresh NatureName -int mut,int#int,2 mut,float#float,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 int string -1 10046#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 9999 1 08#19 60 数值策划专场 +Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition AdventureRefresh NatureName ItemCompoundLimit HeroCompoundLimit +int mut,int#int,2 mut,float#float,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 int string int int +1 10046#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 9999 1 08#19 60 数值策划专场 99 20 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java index 8c75eab79..778221889 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java @@ -36,6 +36,8 @@ public class SGameSetting implements BaseConfig { private int itemCompoundLimit; + private int heroCompoundLimit; + private static SGameSetting gameSetting; @@ -93,6 +95,10 @@ public class SGameSetting implements BaseConfig { return itemCompoundLimit; } + public int getHeroCompoundLimit() { + return heroCompoundLimit; + } + public float calSpeed(float speed, int breakId){ if(breakId == 0){ return 0; 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 6ed9d7902..f71303fa0 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 @@ -900,7 +900,7 @@ public class HeroLogic { SItem sItem = SItem.getsItemMap().get(itemId); int composeNum = itemNum/sItem.getUsePerCount(); SGameSetting gameSetting = SGameSetting.getGameSetting(); - if (composeNum <= 0 || composeNum >= gameSetting.getItemCompoundLimit()){ + if (composeNum <= 0 || composeNum > gameSetting.getHeroCompoundLimit()){ MessageUtil.sendErrorResponse(iSession,0,msgId,""); return; }