Merge branch 'master_dev' into master_otnew

master_otnew
grimm 2023-12-29 15:45:19 +08:00
commit 38cd94dc5e
1 changed files with 1 additions and 1 deletions

View File

@ -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();
}