From f7fd4e430fcda315d766cacd756bf5306ff261cf Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Wed, 17 Apr 2024 17:10:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E9=89=B4=E6=88=98=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/dao/ItemManager.java | 9 -------- .../ljsd/jieling/logic/hero/HeroLogic.java | 23 ++++++++----------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java index c0e524ca6..cab7a208c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ItemManager.java @@ -13,21 +13,12 @@ public class ItemManager extends MongoBase { private Map itemMap = new ConcurrentHashMap<>(); - private boolean isAbsEquip;//兼容线上数据,计算统计装备(为了做白金装备图鉴,需要初始化统计一次用户身上所有装备)true:已经计算过了 false:未计算 private Map equipBookMap = new HashMap<>(); private Set equipBookEnabled = new HashSet<>(); private Set huashenRecordList = new HashSet<>();// 全部身外化身图鉴 private Set huashenEnabled = new HashSet<>();// 身外化身激活图鉴 - public boolean getIsAbsEquip() { - return isAbsEquip; - } - public void setAbsEquip(boolean absEquip) { - isAbsEquip = absEquip; - updateString("isAbsEquip", isAbsEquip); - } - public Map getEquipBookMap() { return equipBookMap; } 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 8a54ad61e..fae48024c 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 @@ -5122,23 +5122,18 @@ public class HeroLogic { for (Integer enabled : user.getEquipManager().getBaublesBookEnabled()) { builder.addAllBookEnabled(enabled); } - + // 法相 + for (Integer enabled : user.getEquipManager().getFaxiangEnabled()) { + builder.addAllBookEnabled(enabled); + } + // 变身卡 + for (Integer enabled : user.getItemManager().getHuashenEnabled()) { + builder.addAllBookEnabled(enabled); + } + // 魂印记录 for (Integer equip : equipManager.getSoulGealList()) { builder.addEquipGot(equip); } - if (!user.getItemManager().getIsAbsEquip()) { - for (Map.Entry equipEntry : user.getItemManager().getItemMap().entrySet()) { - if (SItem.getsItemMap().get(equipEntry.getKey()).getItemType() == 3) { - user.getItemManager().setEquipBookMap(equipEntry.getValue().getItemId(), equipEntry.getValue().getItemNum()); - } - } - for (Map.Entry stringHeroEntry : user.getHeroManager().getHeroMap().entrySet()) { - for (Map.Entry entry : stringHeroEntry.getValue().getEquipByPositionMap().entrySet()) { - user.getItemManager().setEquipBookMap(entry.getValue(), 1); - } - } - user.getItemManager().setAbsEquip(true); - } for (Map.Entry entry : user.getItemManager().getEquipBookMap().entrySet()) { CommonProto.EquipBookInfo equipBook = CommonProto.EquipBookInfo.newBuilder() .setEquipId(entry.getKey())