远征装备修改
parent
7acbce59c5
commit
bb70007bbc
|
@ -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<Integer, Integer> 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);
|
||||
}
|
||||
|
|
|
@ -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));
|
||||
|
|
Loading…
Reference in New Issue