From dbcb1f98f91e03f06a285c895c8c2dfd22fe9e2a Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 10 Mar 2021 16:56:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=88=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clazzStaticCfg/CommonStaticConfig.java | 20 +++++++++---------- .../jieling/logic/expedition/BattleNode.java | 8 +++++--- .../jieling/logic/expedition/SpecialNode.java | 7 +++++-- .../ljsd/jieling/logic/hero/HeroLogic.java | 9 +++++---- tablemanager/src/main/java/config/SCHero.java | 12 +++++------ 5 files changed, 30 insertions(+), 26 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java index 306258759..74309ffd0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java @@ -207,16 +207,16 @@ public class CommonStaticConfig extends AbstractClassStaticConfig { professByTechIdMapTmp.put(sWorkShopTechnology.getTechId(), sWorkShopTechnology.getProfession()); SWorkShopTechnology sWorkShopTechnologyTmp = sWorkTechMapByTechIdAndLevelTmp.get(techId).get(level - 1); - if (sWorkShopTechnologyTmp != null) { - Map mineWillReturn = new HashMap<>(); - Map willReturn = sWorkShopTechnologyTmp.getWillReturn(); - if (willReturn != null) { - mineWillReturn.putAll(willReturn); - } - int[][] consume = sWorkShopTechnologyTmp.getConsume(); - HeroLogic.getInstance().combinedAttribute(consume, mineWillReturn); - sWorkShopTechnology.setWillReturn(mineWillReturn); - } +// if (sWorkShopTechnologyTmp != null) { +// Map mineWillReturn = new HashMap<>(); +// Map willReturn = sWorkShopTechnologyTmp.getWillReturn(); +// if (willReturn != null) { +// mineWillReturn.putAll(willReturn); +// } +// int[][] consume = sWorkShopTechnologyTmp.getConsume(); +// HeroLogic.getInstance().combinedAttribute(consume, mineWillReturn); +// sWorkShopTechnology.setWillReturn(mineWillReturn); +// } } sChampionshipSetting = STableManager.getConfig(SChampionshipSetting.class).get(1); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/BattleNode.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/BattleNode.java index 0b6cca130..bffefbd8e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/BattleNode.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/BattleNode.java @@ -183,7 +183,7 @@ public class BattleNode extends AbstractExpedition { // 玩家等级超上限,取表里最大值 property = config.get(config.values().size()); } - // 英雄属性 + // 机器人属性 Map robotHeroAttribute = HeroLogic.getInstance().calRobotHeroAttribute(property); // 位置坐标 @@ -197,8 +197,10 @@ public class BattleNode extends AbstractExpedition { fightInfo.updateHeroSkill(id.toString(), skills.substring(0, skills.length() - 1)); // 需要赋值 bossHP.put(id.toString(), 1D); - force+=HeroLogic.getInstance().calForce(robotHeroAttribute); - heroAllAttribute.put(id.toString(), new FamilyHeroInfo(id, property.getId(), property.getStar(), robotHeroAttribute,innerPosition++)); + Map longAttribute = new HashMap<>(); + robotHeroAttribute.forEach((k,v)->longAttribute.put(k,(long)v)); + force+=HeroLogic.getInstance().calForce(longAttribute); + heroAllAttribute.put(id.toString(), new FamilyHeroInfo(id, property.getId(), property.getStar(), longAttribute,innerPosition++)); } fightInfo.setForce(force); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/SpecialNode.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/SpecialNode.java index dfdccf7ef..112db70c2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/SpecialNode.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/SpecialNode.java @@ -64,10 +64,13 @@ public class SpecialNode extends AbstractExpedition { //组装 String skills = robot.getSkill() + robot.getPassiveSkill(); bossHP.put(Integer.toString(heroId),1d); - int force = HeroLogic.getInstance().calForce(robot.getRobotHeroAttribute()); + Map longAttribute = new HashMap<>(); + + robot.getRobotHeroAttribute().forEach((k,v)->longAttribute.put(k,(long)v)); + int force = HeroLogic.getInstance().calForce(longAttribute); fightInfo.setForce(force); //试炼节点 放到第二个位置上 - heroAllAttribute.put(Integer.toString(heroId), new FamilyHeroInfo(heroId,level,robot.getStar(),robot.getRobotHeroAttribute(),2)); + heroAllAttribute.put(Integer.toString(heroId), new FamilyHeroInfo(heroId,level,robot.getStar(),longAttribute,2)); fightInfo.updateHeroSkill(String.valueOf(heroId),skills.substring(0,skills.length()-1)); // 获取灵兽信息 SRobotProperty property = STableManager.getConfig(SRobotProperty.class).get(level); 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 b32becc35..c78263dfb 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 @@ -1179,9 +1179,9 @@ public class HeroLogic{ result.put(attributeType, (long) value); } if(!isForce){ - Map secondaryFactorMap = scHero.getSecondaryFactorMap(); + Map secondaryFactorMap = scHero.getSecondaryFactorMap(); if(secondaryFactorMap!=null && !secondaryFactorMap.isEmpty()){ - result.putAll(secondaryFactorMap); + secondaryFactorMap.forEach((k,v)->result.put(k,(long)v)); } } return result; @@ -1217,9 +1217,9 @@ public class HeroLogic{ result.put(attributeType, (long) value); } if(!isForce){ - Map secondaryFactorMap = scHero.getSecondaryFactorMap(); + Map secondaryFactorMap = scHero.getSecondaryFactorMap(); if(secondaryFactorMap!=null && !secondaryFactorMap.isEmpty()){ - result.putAll(secondaryFactorMap); + secondaryFactorMap.forEach((k,v)->result.put(k,(long)v)); } } return result; @@ -2004,6 +2004,7 @@ public class HeroLogic{ return heroAllAttribute; } + //策划说这里不会超int public Map calRobotHeroAttribute(SRobotProperty property){ int[][] property1 = property.getProperty(); if (property1 == null){ diff --git a/tablemanager/src/main/java/config/SCHero.java b/tablemanager/src/main/java/config/SCHero.java index 27a37118f..0f4451793 100644 --- a/tablemanager/src/main/java/config/SCHero.java +++ b/tablemanager/src/main/java/config/SCHero.java @@ -58,11 +58,9 @@ public class SCHero implements BaseConfig{ private int job; - private Map secondaryFactorMap; - private int maxLevel; -// private Map secondaryFactorMap; + private Map secondaryFactorMap; private Map> skillListByStar; @@ -110,11 +108,11 @@ public class SCHero implements BaseConfig{ int[][] secondaryFactor = scHero.getSecondaryFactor(); if(secondaryFactor!=null && secondaryFactor.length>0){ - Map secondaryFactorMapTmp = new HashMap<>(secondaryFactor.length); + Map secondaryFactorMapTmp = new HashMap<>(secondaryFactor.length); for(int[] secondaryFactorItem : secondaryFactor){ int property = secondaryFactorItem[0]; int propertyValue = secondaryFactorItem[1]; - secondaryFactorMapTmp.put(property, (long) propertyValue); + secondaryFactorMapTmp.put(property, propertyValue); scHero.setSecondaryFactorMap(secondaryFactorMapTmp); } } @@ -276,11 +274,11 @@ public class SCHero implements BaseConfig{ return secondaryFactor; } - public Map getSecondaryFactorMap() { + public Map getSecondaryFactorMap() { return secondaryFactorMap; } - public void setSecondaryFactorMap(Map secondaryFactorMap) { + public void setSecondaryFactorMap(Map secondaryFactorMap) { this.secondaryFactorMap = secondaryFactorMap; }