Merge branch 'master_dev' into master_otnew
commit
38cd94dc5e
|
|
@ -257,7 +257,7 @@ public class CBean2Proto {
|
|||
List<CommonProto.Equip> equips = new ArrayList<>();
|
||||
hero.getEquipByPositionMap().values().forEach(v->equips.add(getEquipProto(v)));
|
||||
// 法宝
|
||||
CommonProto.Equip.Builder baublesProto = null;
|
||||
CommonProto.Equip.Builder baublesProto = CommonProto.Equip.newBuilder();
|
||||
if (helpHero.getBaubles() != null){
|
||||
baublesProto = getBaublesProto(helpHero.getBaublesList(), helpHero.getBaubles()).toBuilder();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue