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 72f0ac0d4..4690e86f7 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 @@ -2936,21 +2936,29 @@ public class HeroLogic { // 身外化身加成 Map transformationList = heroManager.getTransformationList(); Map changingCardMap = STableManager.getConfig(SChangingCard.class); - int[][] arrayValue = SSpecialConfig.getTwiceArrayValue(SSpecialConfig.PER_CHANGING_CART_PROP); for (TransformationInfo info : transformationList.values()) { SChangingCard card = changingCardMap.get(info.getCardId()); if (card != null){ // 变身卡单独提供得属性 combinedAttribute(card.getPropList(), heroAllAttribute); - // 每张变身卡提供得额外属性 - //combinedAttribute(arrayValue, heroAllAttribute); //变身卡升星属性 - if(info.getStar() == 1){ - combinedAttribute(card.getStar1UpProps(), heroAllAttribute); - }else if(info.getStar() == 2){ - combinedAttribute(card.getStar2UpProps(), heroAllAttribute); - }else if(info.getStar() == 3){ - combinedAttribute(card.getStar3UpProps(), heroAllAttribute); + switch (info.getStar()){ + case 1: + combinedAttribute(card.getStar1UpProps(), heroAllAttribute); + break; + case 2: + combinedAttribute(card.getStar2UpProps(), heroAllAttribute); + break; + case 3: + combinedAttribute(card.getStar3UpProps(), heroAllAttribute); + break; + case 4: + combinedAttribute(card.getStar4UpProps(), heroAllAttribute); + break; + case 5: + combinedAttribute(card.getStar5UpProps(), heroAllAttribute); + break; + default:break; } //变身卡升级属性 int pool = card.getLevelUpPool(); diff --git a/tablemanager/src/main/java/config/SChangingCard.java b/tablemanager/src/main/java/config/SChangingCard.java index 7944b191a..ea16212d1 100644 --- a/tablemanager/src/main/java/config/SChangingCard.java +++ b/tablemanager/src/main/java/config/SChangingCard.java @@ -1,10 +1,7 @@ package config; -import manager.STableManager; import manager.Table; -import java.util.Map; - @Table(name ="ChangingCard") public class SChangingCard implements BaseConfig { @@ -22,6 +19,10 @@ public class SChangingCard implements BaseConfig { private int[][] star3UpProps; + private int[][] star4UpProps; + + private int[][] star5UpProps; + private int[] exp; private int[][] starUpExp; @@ -97,4 +98,12 @@ public class SChangingCard implements BaseConfig { public int getLevelMax() { return levelMax; } + + public int[][] getStar4UpProps() { + return star4UpProps; + } + + public int[][] getStar5UpProps() { + return star5UpProps; + } } \ No newline at end of file