Merge branch 'master_test' into master_test_gn
commit
4d393b942f
|
|
@ -1066,6 +1066,7 @@ public class PlayerLogic {
|
|||
// 道具背包
|
||||
Map<Integer, Item> itemMap = user.getItemManager().getItemMap();
|
||||
|
||||
// 道具背包
|
||||
for (Item item : itemMap.values()) {
|
||||
// 读表,获取道具详细信息
|
||||
SItem sItem = SItem.getsItemMap().get(item.getItemId());
|
||||
|
|
@ -1074,5 +1075,12 @@ public class PlayerLogic {
|
|||
equipList.add(sItem.getId());
|
||||
}
|
||||
}
|
||||
// 英雄装备中的
|
||||
Collection<Hero> heroes = user.getHeroManager().getHeroMap().values();
|
||||
for (Hero hero : heroes) {
|
||||
if (hero.getSoulEquipByPositionMap() != null){
|
||||
equipList.addAll(hero.getSoulEquipByPositionMap().values());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue