public Builder mergeFrom( com.xinqihd.sns.gameserver.proto.XinqiBceRobotOver.BceRobotOver other) { if (other == com.xinqihd.sns.gameserver.proto.XinqiBceRobotOver.BceRobotOver.getDefaultInstance()) return this; if (!other.userId_.isEmpty()) { if (userId_.isEmpty()) { userId_ = other.userId_; bitField0_ = (bitField0_ & ~0x00000001); } else { ensureUserIdIsMutable(); userId_.addAll(other.userId_); } onChanged(); } if (!other.dead_.isEmpty()) { if (dead_.isEmpty()) { dead_ = other.dead_; bitField0_ = (bitField0_ & ~0x00000002); } else { ensureDeadIsMutable(); dead_.addAll(other.dead_); } onChanged(); } if (!other.attackCounts_.isEmpty()) { if (attackCounts_.isEmpty()) { attackCounts_ = other.attackCounts_; bitField0_ = (bitField0_ & ~0x00000004); } else { ensureAttackCountsIsMutable(); attackCounts_.addAll(other.attackCounts_); } onChanged(); } if (!other.hitCounts_.isEmpty()) { if (hitCounts_.isEmpty()) { hitCounts_ = other.hitCounts_; bitField0_ = (bitField0_ & ~0x00000008); } else { ensureHitCountsIsMutable(); hitCounts_.addAll(other.hitCounts_); } onChanged(); } if (!other.damage_.isEmpty()) { if (damage_.isEmpty()) { damage_ = other.damage_; bitField0_ = (bitField0_ & ~0x00000010); } else { ensureDamageIsMutable(); damage_.addAll(other.damage_); } onChanged(); } if (!other.killCounts_.isEmpty()) { if (killCounts_.isEmpty()) { killCounts_ = other.killCounts_; bitField0_ = (bitField0_ & ~0x00000020); } else { ensureKillCountsIsMutable(); killCounts_.addAll(other.killCounts_); } onChanged(); } if (!other.userTools_.isEmpty()) { if (userTools_.isEmpty()) { userTools_ = other.userTools_; bitField0_ = (bitField0_ & ~0x00000040); } else { ensureUserToolsIsMutable(); userTools_.addAll(other.userTools_); } onChanged(); } if (!other.useSkill_.isEmpty()) { if (useSkill_.isEmpty()) { useSkill_ = other.useSkill_; bitField0_ = (bitField0_ & ~0x00000080); } else { ensureUseSkillIsMutable(); useSkill_.addAll(other.useSkill_); } onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); return this; }