From 875484ac61667e2d1f6c3edbcda3548e92d15763 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Mon, 18 Oct 2021 16:17:15 +0800 Subject: [PATCH] =?UTF-8?q?yx=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/CoreService.java | 8 -------- .../java/com/ljsd/jieling/logic/player/PlayerLogic.java | 9 +++++---- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index 786a1d25e..bc903e11a 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -91,7 +91,6 @@ public class CoreService implements RPCRequestIFace.Iface { Map> teams = new HashMap<>(); // 需要存储的英雄列表 HashSet set = new HashSet<>(); - //主线编队 List main = user.getTeamPosManager().getTeamPosForHero().getOrDefault(GlobalsDef.FORMATION_NORMAL,new ArrayList<>()); List nomal = new ArrayList(); @@ -113,7 +112,6 @@ public class CoreService implements RPCRequestIFace.Iface { teams.put(TeamEnum.SEVEN_WORLD_TEAM.getTeamId(),qijierpc); set.addAll(qijierpc); - //玉虚论道编队 List yxldOne = user.getTeamPosManager().getTeamPosForHero().getOrDefault(GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE,new ArrayList<>()); List rpcYxldOne = new ArrayList(); @@ -132,7 +130,6 @@ public class CoreService implements RPCRequestIFace.Iface { yxldTree.forEach(n->rpcYxldTree.add(new TeamPosHeroInfo().setHeroId(n.getHeroId()).setPosition(n.getPosition()))); teams.put(GlobalsDef.CROSS_YU_XU_LUN_DAO_THREE,rpcYxldTree); set.addAll(rpcYxldTree); - // 英雄 Map heroes = new HashMap<>(); Map heroMap = user.getHeroManager().getHeroMap(); @@ -140,10 +137,8 @@ public class CoreService implements RPCRequestIFace.Iface { Hero hero = heroMap.get(v.getHeroId()); heroes.put(v.getHeroId(),buildArenaOfHero(user,hero,teams)); }); - // 魂宝灵宝 Map jewels = new HashMap<>(); - Map equipMap = user.getEquipManager().getEquipMap(); heroMap.values().forEach(v-> v.getJewelInfo().forEach(v2->{ com.ljsd.jieling.logic.dao.PropertyItem item = equipMap.get(v2); @@ -157,15 +152,12 @@ public class CoreService implements RPCRequestIFace.Iface { int force1 = HeroLogic.getInstance().calTeamTotalForce(user, GlobalsDef.CROSS_YU_XU_LUN_DAO_ONE, false); int force2 = HeroLogic.getInstance().calTeamTotalForce(user, GlobalsDef.CROSS_YU_XU_LUN_DAO_TWO, false); int force3 = HeroLogic.getInstance().calTeamTotalForce(user, GlobalsDef.CROSS_YU_XU_LUN_DAO_THREE, false); - CrossArenaManager rpcArenaManager = new CrossArenaManager(); rpcArenaManager.setTeams(teams); rpcArenaManager.setHeros(heroes); rpcArenaManager.setJewels(jewels); rpcArenaManager.setTotalForceByTeam(map); rpcArenaManager.setTotalForce(force1+force2+force3); - - //TODO new HashMap<>(user.getHeroManager().getPurpleMansionSeal()) 需要做类型转换 Map sealMap= user.getHeroManager().getPurpleMansionSeal(); Map rpdSealMap = new HashMap<>(); sealMap.forEach((m,n)->{ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index e0d8cc1d1..7ccc23319 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1177,9 +1177,10 @@ public class PlayerLogic { for(Map.Entry item : heroNotBufferAttribute.entrySet()){ int id = item.getKey(); int values = item.getValue().intValue(); - /*if (id == 53 || id == 57 || id == 58){ + if (id == 53 || id == 57 || id == 58){ + //命中几率 治疗加成 受疗加成 values = item.getValue().intValue()-10000; - }*/ + } builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(id).setPropertyValue(values).build()); } Map jewels = crossArenaManager.getJewels(); @@ -1224,9 +1225,9 @@ public class PlayerLogic { for(Map.Entry item : heroNotBufferAttribute.entrySet()){ int id = item.getKey(); int values = item.getValue().intValue(); - /*if (id == 53 || id == 57 || id == 58){ + if (id == 53 || id == 57 || id == 58){ values = item.getValue().intValue()-10000; - }*/ + } builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(id).setPropertyValue(values).build()); }