From bb70007bbc227d9257f1a822de3e748a854f4039 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 7 Jul 2020 22:01:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E5=BE=81=E8=A3=85=E5=A4=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/expedition/ExpeditionLogic.java | 22 +++++++++---------- .../jieling/logic/player/PlayerLogic.java | 4 ++-- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index c5d93ced5..9429957ec 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -100,7 +100,7 @@ public class ExpeditionLogic { manager.clearHeroToTemp(); manager.getHeroMap().clear(); manager.clearEquipToTemp(); - manager.clearEquip(); +// manager.clearEquip(); manager.getEffectItems().clear(); manager.setFreshTime((int)(openTimeOfFuntionCacheByType.getStartTime()/1000)); checkAndResetTreasure(user); @@ -863,18 +863,16 @@ public class ExpeditionLogic { //random tempid Hero newHero = new Hero(uid,tempid,finalstar,hero); - EquipManager equipManager = user.getEquipManager(); for (Map.Entry next : hero.getEquipByPositionMap().entrySet()) { - Integer equipId = next.getValue(); - PropertyItem equip = equipManager.getEquipMap().get(equipId); - if (equip == null) { - continue; - } -// if(isTemp){ -// user.getExpeditionManager().addEquipToTemp(user, newequip); -// }else { - user.getExpeditionManager().addEquip(user, newequip); - // } + int equipId = next.getValue(); +// if (equip == null) { +// continue; +// } +//// if(isTemp){ +//// user.getExpeditionManager().addEquipToTemp(user, newequip); +//// }else { +// user.getExpeditionManager().addEquip(user, newequip); +// // } newHero.updateEquipPositionMap(next.getKey(), equipId); } 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 8c81bc3d1..8382e5d7f 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 @@ -654,8 +654,8 @@ public class PlayerLogic { for(String equipId : hero.getJewelInfo()){ builder.addEquip(CBean2Proto.getEquipProto(equipMap.get(equipId))); } - for(String equipId : hero.getEquipByPositionMap().values()){ - builder.addEquip(CBean2Proto.getEquipProto(equipMap.get(equipId))); + for(int equipId : hero.getEquipByPositionMap().values()){ + builder.addEquip(CBean2Proto.getEquipProto(equipId)); } builder.setForce(HeroLogic.getInstance().calForce(heroNotBufferAttribute)); builder.setHero(CBean2Proto.getHero(hero));