diff --git a/src/generated/main/emu/nebula/proto/ActivityPenguinCardEndlessLevelSave.java b/src/generated/main/emu/nebula/proto/ActivityPenguinCardEndlessLevelSave.java new file mode 100644 index 0000000..e657e40 --- /dev/null +++ b/src/generated/main/emu/nebula/proto/ActivityPenguinCardEndlessLevelSave.java @@ -0,0 +1,579 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.nebula.proto; + +import java.io.IOException; +import us.hebi.quickbuf.FieldName; +import us.hebi.quickbuf.InvalidProtocolBufferException; +import us.hebi.quickbuf.JsonSink; +import us.hebi.quickbuf.JsonSource; +import us.hebi.quickbuf.MessageFactory; +import us.hebi.quickbuf.ProtoMessage; +import us.hebi.quickbuf.ProtoSink; +import us.hebi.quickbuf.ProtoSource; +import us.hebi.quickbuf.RepeatedByte; +import us.hebi.quickbuf.Utf8String; + +public final class ActivityPenguinCardEndlessLevelSave { + /** + * Protobuf type {@code ActivityPenguinCardEndlessLevelSaveReq} + */ + public static final class ActivityPenguinCardEndlessLevelSaveReq extends ProtoMessage implements Cloneable { + private static final long serialVersionUID = 0L; + + /** + * optional uint32 LevelId = 1; + */ + private int levelId; + + /** + * optional uint32 Score = 3; + */ + private int score; + + /** + * optional bytes NextPackage = 2047; + */ + private final RepeatedByte nextPackage = RepeatedByte.newEmptyInstance(); + + /** + * optional string Data = 2; + */ + private final Utf8String data = Utf8String.newEmptyInstance(); + + private ActivityPenguinCardEndlessLevelSaveReq() { + } + + /** + * @return a new empty instance of {@code ActivityPenguinCardEndlessLevelSaveReq} + */ + public static ActivityPenguinCardEndlessLevelSaveReq newInstance() { + return new ActivityPenguinCardEndlessLevelSaveReq(); + } + + /** + * optional uint32 LevelId = 1; + * @return whether the levelId field is set + */ + public boolean hasLevelId() { + return (bitField0_ & 0x00000001) != 0; + } + + /** + * optional uint32 LevelId = 1; + * @return this + */ + public ActivityPenguinCardEndlessLevelSaveReq clearLevelId() { + bitField0_ &= ~0x00000001; + levelId = 0; + return this; + } + + /** + * optional uint32 LevelId = 1; + * @return the levelId + */ + public int getLevelId() { + return levelId; + } + + /** + * optional uint32 LevelId = 1; + * @param value the levelId to set + * @return this + */ + public ActivityPenguinCardEndlessLevelSaveReq setLevelId(final int value) { + bitField0_ |= 0x00000001; + levelId = value; + return this; + } + + /** + * optional uint32 Score = 3; + * @return whether the score field is set + */ + public boolean hasScore() { + return (bitField0_ & 0x00000002) != 0; + } + + /** + * optional uint32 Score = 3; + * @return this + */ + public ActivityPenguinCardEndlessLevelSaveReq clearScore() { + bitField0_ &= ~0x00000002; + score = 0; + return this; + } + + /** + * optional uint32 Score = 3; + * @return the score + */ + public int getScore() { + return score; + } + + /** + * optional uint32 Score = 3; + * @param value the score to set + * @return this + */ + public ActivityPenguinCardEndlessLevelSaveReq setScore(final int value) { + bitField0_ |= 0x00000002; + score = value; + return this; + } + + /** + * optional bytes NextPackage = 2047; + * @return whether the nextPackage field is set + */ + public boolean hasNextPackage() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional bytes NextPackage = 2047; + * @return this + */ + public ActivityPenguinCardEndlessLevelSaveReq clearNextPackage() { + bitField0_ &= ~0x00000004; + nextPackage.clear(); + return this; + } + + /** + * optional bytes NextPackage = 2047; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableNextPackage()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedByte getNextPackage() { + return nextPackage; + } + + /** + * optional bytes NextPackage = 2047; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedByte getMutableNextPackage() { + bitField0_ |= 0x00000004; + return nextPackage; + } + + /** + * optional bytes NextPackage = 2047; + * @param value the nextPackage to add + * @return this + */ + public ActivityPenguinCardEndlessLevelSaveReq addNextPackage(final byte value) { + bitField0_ |= 0x00000004; + nextPackage.add(value); + return this; + } + + /** + * optional bytes NextPackage = 2047; + * @param values the nextPackage to add + * @return this + */ + public ActivityPenguinCardEndlessLevelSaveReq addAllNextPackage(final byte... values) { + bitField0_ |= 0x00000004; + nextPackage.addAll(values); + return this; + } + + /** + * optional bytes NextPackage = 2047; + * @param values the nextPackage to set + * @return this + */ + public ActivityPenguinCardEndlessLevelSaveReq setNextPackage(final byte... values) { + bitField0_ |= 0x00000004; + nextPackage.copyFrom(values); + return this; + } + + /** + * optional string Data = 2; + * @return whether the data field is set + */ + public boolean hasData() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional string Data = 2; + * @return this + */ + public ActivityPenguinCardEndlessLevelSaveReq clearData() { + bitField0_ &= ~0x00000008; + data.clear(); + return this; + } + + /** + * optional string Data = 2; + * @return the data + */ + public String getData() { + return data.getString(); + } + + /** + * optional string Data = 2; + * @return internal {@code Utf8String} representation of data for reading + */ + public Utf8String getDataBytes() { + return this.data; + } + + /** + * optional string Data = 2; + * @return internal {@code Utf8String} representation of data for modifications + */ + public Utf8String getMutableDataBytes() { + bitField0_ |= 0x00000008; + return this.data; + } + + /** + * optional string Data = 2; + * @param value the data to set + * @return this + */ + public ActivityPenguinCardEndlessLevelSaveReq setData(final CharSequence value) { + bitField0_ |= 0x00000008; + data.copyFrom(value); + return this; + } + + /** + * optional string Data = 2; + * @param value the data to set + * @return this + */ + public ActivityPenguinCardEndlessLevelSaveReq setData(final Utf8String value) { + bitField0_ |= 0x00000008; + data.copyFrom(value); + return this; + } + + @Override + public ActivityPenguinCardEndlessLevelSaveReq copyFrom( + final ActivityPenguinCardEndlessLevelSaveReq other) { + cachedSize = other.cachedSize; + if ((bitField0_ | other.bitField0_) != 0) { + bitField0_ = other.bitField0_; + levelId = other.levelId; + score = other.score; + nextPackage.copyFrom(other.nextPackage); + data.copyFrom(other.data); + } + return this; + } + + @Override + public ActivityPenguinCardEndlessLevelSaveReq mergeFrom( + final ActivityPenguinCardEndlessLevelSaveReq other) { + if (other.isEmpty()) { + return this; + } + cachedSize = -1; + if (other.hasLevelId()) { + setLevelId(other.levelId); + } + if (other.hasScore()) { + setScore(other.score); + } + if (other.hasNextPackage()) { + getMutableNextPackage().copyFrom(other.nextPackage); + } + if (other.hasData()) { + getMutableDataBytes().copyFrom(other.data); + } + return this; + } + + @Override + public ActivityPenguinCardEndlessLevelSaveReq clear() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + levelId = 0; + score = 0; + nextPackage.clear(); + data.clear(); + return this; + } + + @Override + public ActivityPenguinCardEndlessLevelSaveReq clearQuick() { + if (isEmpty()) { + return this; + } + cachedSize = -1; + bitField0_ = 0; + nextPackage.clear(); + data.clear(); + return this; + } + + @Override + public boolean equals(Object o) { + if (o == this) { + return true; + } + if (!(o instanceof ActivityPenguinCardEndlessLevelSaveReq)) { + return false; + } + ActivityPenguinCardEndlessLevelSaveReq other = (ActivityPenguinCardEndlessLevelSaveReq) o; + return bitField0_ == other.bitField0_ + && (!hasLevelId() || levelId == other.levelId) + && (!hasScore() || score == other.score) + && (!hasNextPackage() || nextPackage.equals(other.nextPackage)) + && (!hasData() || data.equals(other.data)); + } + + @Override + public void writeTo(final ProtoSink output) throws IOException { + if ((bitField0_ & 0x00000001) != 0) { + output.writeRawByte((byte) 8); + output.writeUInt32NoTag(levelId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(score); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeRawLittleEndian16((short) 32762); + output.writeBytesNoTag(nextPackage); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 18); + output.writeStringNoTag(data); + } + } + + @Override + protected int computeSerializedSize() { + int size = 0; + if ((bitField0_ & 0x00000001) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(levelId); + } + if ((bitField0_ & 0x00000002) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(score); + } + if ((bitField0_ & 0x00000004) != 0) { + size += 2 + ProtoSink.computeBytesSizeNoTag(nextPackage); + } + if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeStringSizeNoTag(data); + } + return size; + } + + @Override + @SuppressWarnings("fallthrough") + public ActivityPenguinCardEndlessLevelSaveReq mergeFrom(final ProtoSource input) throws + IOException { + // Enabled Fall-Through Optimization (QuickBuffers) + int tag = input.readTag(); + while (true) { + switch (tag) { + case 8: { + // levelId + levelId = input.readUInt32(); + bitField0_ |= 0x00000001; + tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { + // score + score = input.readUInt32(); + bitField0_ |= 0x00000002; + tag = input.readTag(); + if (tag != 16378) { + break; + } + } + case 16378: { + // nextPackage + input.readBytes(nextPackage); + bitField0_ |= 0x00000004; + tag = input.readTag(); + if (tag != 18) { + break; + } + } + case 18: { + // data + input.readString(data); + bitField0_ |= 0x00000008; + tag = input.readTag(); + if (tag != 0) { + break; + } + } + case 0: { + return this; + } + default: { + if (!input.skipField(tag)) { + return this; + } + tag = input.readTag(); + break; + } + } + } + } + + @Override + public void writeTo(final JsonSink output) throws IOException { + output.beginObject(); + if ((bitField0_ & 0x00000001) != 0) { + output.writeUInt32(FieldNames.levelId, levelId); + } + if ((bitField0_ & 0x00000002) != 0) { + output.writeUInt32(FieldNames.score, score); + } + if ((bitField0_ & 0x00000004) != 0) { + output.writeBytes(FieldNames.nextPackage, nextPackage); + } + if ((bitField0_ & 0x00000008) != 0) { + output.writeString(FieldNames.data, data); + } + output.endObject(); + } + + @Override + public ActivityPenguinCardEndlessLevelSaveReq mergeFrom(final JsonSource input) throws + IOException { + if (!input.beginObject()) { + return this; + } + while (!input.isAtEnd()) { + switch (input.readFieldHash()) { + case 1734437791: { + if (input.isAtField(FieldNames.levelId)) { + if (!input.trySkipNullValue()) { + levelId = input.readUInt32(); + bitField0_ |= 0x00000001; + } + } else { + input.skipUnknownField(); + } + break; + } + case 79711858: { + if (input.isAtField(FieldNames.score)) { + if (!input.trySkipNullValue()) { + score = input.readUInt32(); + bitField0_ |= 0x00000002; + } + } else { + input.skipUnknownField(); + } + break; + } + case -2082324045: { + if (input.isAtField(FieldNames.nextPackage)) { + if (!input.trySkipNullValue()) { + input.readBytes(nextPackage); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } + case 2122698: { + if (input.isAtField(FieldNames.data)) { + if (!input.trySkipNullValue()) { + input.readString(data); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } + default: { + input.skipUnknownField(); + break; + } + } + } + input.endObject(); + return this; + } + + @Override + public ActivityPenguinCardEndlessLevelSaveReq clone() { + return new ActivityPenguinCardEndlessLevelSaveReq().copyFrom(this); + } + + @Override + public boolean isEmpty() { + return ((bitField0_) == 0); + } + + public static ActivityPenguinCardEndlessLevelSaveReq parseFrom(final byte[] data) throws + InvalidProtocolBufferException { + return ProtoMessage.mergeFrom(new ActivityPenguinCardEndlessLevelSaveReq(), data).checkInitialized(); + } + + public static ActivityPenguinCardEndlessLevelSaveReq parseFrom(final ProtoSource input) throws + IOException { + return ProtoMessage.mergeFrom(new ActivityPenguinCardEndlessLevelSaveReq(), input).checkInitialized(); + } + + public static ActivityPenguinCardEndlessLevelSaveReq parseFrom(final JsonSource input) throws + IOException { + return ProtoMessage.mergeFrom(new ActivityPenguinCardEndlessLevelSaveReq(), input).checkInitialized(); + } + + /** + * @return factory for creating ActivityPenguinCardEndlessLevelSaveReq messages + */ + public static MessageFactory getFactory() { + return ActivityPenguinCardEndlessLevelSaveReqFactory.INSTANCE; + } + + private enum ActivityPenguinCardEndlessLevelSaveReqFactory implements MessageFactory { + INSTANCE; + + @Override + public ActivityPenguinCardEndlessLevelSaveReq create() { + return ActivityPenguinCardEndlessLevelSaveReq.newInstance(); + } + } + + /** + * Contains name constants used for serializing JSON + */ + static class FieldNames { + static final FieldName levelId = FieldName.forField("LevelId"); + + static final FieldName score = FieldName.forField("Score"); + + static final FieldName nextPackage = FieldName.forField("NextPackage"); + + static final FieldName data = FieldName.forField("Data"); + } + } +} diff --git a/src/generated/main/emu/nebula/proto/ActivityPenguinCardLevelSettle.java b/src/generated/main/emu/nebula/proto/ActivityPenguinCardLevelSettle.java index f9f1c1b..24e1df4 100644 --- a/src/generated/main/emu/nebula/proto/ActivityPenguinCardLevelSettle.java +++ b/src/generated/main/emu/nebula/proto/ActivityPenguinCardLevelSettle.java @@ -34,6 +34,11 @@ public final class ActivityPenguinCardLevelSettle { */ private int score; + /** + * optional uint32 Difficulty = 4; + */ + private int difficulty; + /** * optional bytes NextPackage = 2047; */ @@ -160,12 +165,49 @@ public final class ActivityPenguinCardLevelSettle { return this; } + /** + * optional uint32 Difficulty = 4; + * @return whether the difficulty field is set + */ + public boolean hasDifficulty() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 Difficulty = 4; + * @return this + */ + public ActivityPenguinCardSettleReq clearDifficulty() { + bitField0_ &= ~0x00000008; + difficulty = 0; + return this; + } + + /** + * optional uint32 Difficulty = 4; + * @return the difficulty + */ + public int getDifficulty() { + return difficulty; + } + + /** + * optional uint32 Difficulty = 4; + * @param value the difficulty to set + * @return this + */ + public ActivityPenguinCardSettleReq setDifficulty(final int value) { + bitField0_ |= 0x00000008; + difficulty = value; + return this; + } + /** * optional bytes NextPackage = 2047; * @return whether the nextPackage field is set */ public boolean hasNextPackage() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000010) != 0; } /** @@ -173,7 +215,7 @@ public final class ActivityPenguinCardLevelSettle { * @return this */ public ActivityPenguinCardSettleReq clearNextPackage() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000010; nextPackage.clear(); return this; } @@ -202,7 +244,7 @@ public final class ActivityPenguinCardLevelSettle { * @return internal storage object for modifications */ public RepeatedByte getMutableNextPackage() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; return nextPackage; } @@ -212,7 +254,7 @@ public final class ActivityPenguinCardLevelSettle { * @return this */ public ActivityPenguinCardSettleReq addNextPackage(final byte value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; nextPackage.add(value); return this; } @@ -223,7 +265,7 @@ public final class ActivityPenguinCardLevelSettle { * @return this */ public ActivityPenguinCardSettleReq addAllNextPackage(final byte... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; nextPackage.addAll(values); return this; } @@ -234,7 +276,7 @@ public final class ActivityPenguinCardLevelSettle { * @return this */ public ActivityPenguinCardSettleReq setNextPackage(final byte... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; nextPackage.copyFrom(values); return this; } @@ -247,6 +289,7 @@ public final class ActivityPenguinCardLevelSettle { levelId = other.levelId; star = other.star; score = other.score; + difficulty = other.difficulty; nextPackage.copyFrom(other.nextPackage); } return this; @@ -267,6 +310,9 @@ public final class ActivityPenguinCardLevelSettle { if (other.hasScore()) { setScore(other.score); } + if (other.hasDifficulty()) { + setDifficulty(other.difficulty); + } if (other.hasNextPackage()) { getMutableNextPackage().copyFrom(other.nextPackage); } @@ -283,6 +329,7 @@ public final class ActivityPenguinCardLevelSettle { levelId = 0; star = 0; score = 0; + difficulty = 0; nextPackage.clear(); return this; } @@ -311,6 +358,7 @@ public final class ActivityPenguinCardLevelSettle { && (!hasLevelId() || levelId == other.levelId) && (!hasStar() || star == other.star) && (!hasScore() || score == other.score) + && (!hasDifficulty() || difficulty == other.difficulty) && (!hasNextPackage() || nextPackage.equals(other.nextPackage)); } @@ -329,6 +377,10 @@ public final class ActivityPenguinCardLevelSettle { output.writeUInt32NoTag(score); } if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 32); + output.writeUInt32NoTag(difficulty); + } + if ((bitField0_ & 0x00000010) != 0) { output.writeRawLittleEndian16((short) 32762); output.writeBytesNoTag(nextPackage); } @@ -347,6 +399,9 @@ public final class ActivityPenguinCardLevelSettle { size += 1 + ProtoSink.computeUInt32SizeNoTag(score); } if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(difficulty); + } + if ((bitField0_ & 0x00000010) != 0) { size += 2 + ProtoSink.computeBytesSizeNoTag(nextPackage); } return size; @@ -382,6 +437,15 @@ public final class ActivityPenguinCardLevelSettle { score = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 32) { + break; + } + } + case 32: { + // difficulty + difficulty = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 16378) { break; } @@ -389,7 +453,7 @@ public final class ActivityPenguinCardLevelSettle { case 16378: { // nextPackage input.readBytes(nextPackage); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { break; @@ -422,6 +486,9 @@ public final class ActivityPenguinCardLevelSettle { output.writeUInt32(FieldNames.score, score); } if ((bitField0_ & 0x00000008) != 0) { + output.writeUInt32(FieldNames.difficulty, difficulty); + } + if ((bitField0_ & 0x00000010) != 0) { output.writeBytes(FieldNames.nextPackage, nextPackage); } output.endObject(); @@ -467,11 +534,22 @@ public final class ActivityPenguinCardLevelSettle { } break; } + case -472001573: { + if (input.isAtField(FieldNames.difficulty)) { + if (!input.trySkipNullValue()) { + difficulty = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } case -2082324045: { if (input.isAtField(FieldNames.nextPackage)) { if (!input.trySkipNullValue()) { input.readBytes(nextPackage); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -539,6 +617,8 @@ public final class ActivityPenguinCardLevelSettle { static final FieldName score = FieldName.forField("Score"); + static final FieldName difficulty = FieldName.forField("Difficulty"); + static final FieldName nextPackage = FieldName.forField("NextPackage"); } } diff --git a/src/generated/main/emu/nebula/proto/CharGemInstanceApply.java b/src/generated/main/emu/nebula/proto/CharGemInstanceApply.java index 5abdfb3..8bcf157 100644 --- a/src/generated/main/emu/nebula/proto/CharGemInstanceApply.java +++ b/src/generated/main/emu/nebula/proto/CharGemInstanceApply.java @@ -29,6 +29,11 @@ public final class CharGemInstanceApply { */ private int id; + /** + * optional uint32 RewardType = 3; + */ + private int rewardType; + /** * optional bytes NextPackage = 2047; */ @@ -118,12 +123,49 @@ public final class CharGemInstanceApply { return this; } + /** + * optional uint32 RewardType = 3; + * @return whether the rewardType field is set + */ + public boolean hasRewardType() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 RewardType = 3; + * @return this + */ + public CharGemInstanceApplyReq clearRewardType() { + bitField0_ &= ~0x00000004; + rewardType = 0; + return this; + } + + /** + * optional uint32 RewardType = 3; + * @return the rewardType + */ + public int getRewardType() { + return rewardType; + } + + /** + * optional uint32 RewardType = 3; + * @param value the rewardType to set + * @return this + */ + public CharGemInstanceApplyReq setRewardType(final int value) { + bitField0_ |= 0x00000004; + rewardType = value; + return this; + } + /** * optional bytes NextPackage = 2047; * @return whether the nextPackage field is set */ public boolean hasNextPackage() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -131,7 +173,7 @@ public final class CharGemInstanceApply { * @return this */ public CharGemInstanceApplyReq clearNextPackage() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; nextPackage.clear(); return this; } @@ -160,7 +202,7 @@ public final class CharGemInstanceApply { * @return internal storage object for modifications */ public RepeatedByte getMutableNextPackage() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return nextPackage; } @@ -170,7 +212,7 @@ public final class CharGemInstanceApply { * @return this */ public CharGemInstanceApplyReq addNextPackage(final byte value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; nextPackage.add(value); return this; } @@ -181,7 +223,7 @@ public final class CharGemInstanceApply { * @return this */ public CharGemInstanceApplyReq addAllNextPackage(final byte... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; nextPackage.addAll(values); return this; } @@ -192,7 +234,7 @@ public final class CharGemInstanceApply { * @return this */ public CharGemInstanceApplyReq setNextPackage(final byte... values) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; nextPackage.copyFrom(values); return this; } @@ -204,6 +246,7 @@ public final class CharGemInstanceApply { bitField0_ = other.bitField0_; buildId = other.buildId; id = other.id; + rewardType = other.rewardType; nextPackage.copyFrom(other.nextPackage); } return this; @@ -221,6 +264,9 @@ public final class CharGemInstanceApply { if (other.hasId()) { setId(other.id); } + if (other.hasRewardType()) { + setRewardType(other.rewardType); + } if (other.hasNextPackage()) { getMutableNextPackage().copyFrom(other.nextPackage); } @@ -236,6 +282,7 @@ public final class CharGemInstanceApply { bitField0_ = 0; buildId = 0L; id = 0; + rewardType = 0; nextPackage.clear(); return this; } @@ -263,6 +310,7 @@ public final class CharGemInstanceApply { return bitField0_ == other.bitField0_ && (!hasBuildId() || buildId == other.buildId) && (!hasId() || id == other.id) + && (!hasRewardType() || rewardType == other.rewardType) && (!hasNextPackage() || nextPackage.equals(other.nextPackage)); } @@ -277,6 +325,10 @@ public final class CharGemInstanceApply { output.writeUInt32NoTag(id); } if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(rewardType); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeRawLittleEndian16((short) 32762); output.writeBytesNoTag(nextPackage); } @@ -292,6 +344,9 @@ public final class CharGemInstanceApply { size += 1 + ProtoSink.computeUInt32SizeNoTag(id); } if ((bitField0_ & 0x00000004) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(rewardType); + } + if ((bitField0_ & 0x00000008) != 0) { size += 2 + ProtoSink.computeBytesSizeNoTag(nextPackage); } return size; @@ -318,6 +373,15 @@ public final class CharGemInstanceApply { id = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { + // rewardType + rewardType = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 16378) { break; } @@ -325,7 +389,7 @@ public final class CharGemInstanceApply { case 16378: { // nextPackage input.readBytes(nextPackage); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 0) { break; @@ -355,6 +419,9 @@ public final class CharGemInstanceApply { output.writeUInt32(FieldNames.id, id); } if ((bitField0_ & 0x00000004) != 0) { + output.writeUInt32(FieldNames.rewardType, rewardType); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeBytes(FieldNames.nextPackage, nextPackage); } output.endObject(); @@ -389,11 +456,22 @@ public final class CharGemInstanceApply { } break; } + case -610271447: { + if (input.isAtField(FieldNames.rewardType)) { + if (!input.trySkipNullValue()) { + rewardType = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } case -2082324045: { if (input.isAtField(FieldNames.nextPackage)) { if (!input.trySkipNullValue()) { input.readBytes(nextPackage); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -457,6 +535,8 @@ public final class CharGemInstanceApply { static final FieldName id = FieldName.forField("Id"); + static final FieldName rewardType = FieldName.forField("RewardType"); + static final FieldName nextPackage = FieldName.forField("NextPackage"); } } diff --git a/src/generated/main/emu/nebula/proto/CharGemInstanceSweep.java b/src/generated/main/emu/nebula/proto/CharGemInstanceSweep.java index 9731342..c1f75bb 100644 --- a/src/generated/main/emu/nebula/proto/CharGemInstanceSweep.java +++ b/src/generated/main/emu/nebula/proto/CharGemInstanceSweep.java @@ -30,6 +30,11 @@ public final class CharGemInstanceSweep { */ private int times; + /** + * optional uint32 RewardType = 3; + */ + private int rewardType; + /** * optional .Events Events = 15; */ @@ -124,12 +129,49 @@ public final class CharGemInstanceSweep { return this; } + /** + * optional uint32 RewardType = 3; + * @return whether the rewardType field is set + */ + public boolean hasRewardType() { + return (bitField0_ & 0x00000004) != 0; + } + + /** + * optional uint32 RewardType = 3; + * @return this + */ + public CharGemInstanceSweepReq clearRewardType() { + bitField0_ &= ~0x00000004; + rewardType = 0; + return this; + } + + /** + * optional uint32 RewardType = 3; + * @return the rewardType + */ + public int getRewardType() { + return rewardType; + } + + /** + * optional uint32 RewardType = 3; + * @param value the rewardType to set + * @return this + */ + public CharGemInstanceSweepReq setRewardType(final int value) { + bitField0_ |= 0x00000004; + rewardType = value; + return this; + } + /** * optional .Events Events = 15; * @return whether the events field is set */ public boolean hasEvents() { - return (bitField0_ & 0x00000004) != 0; + return (bitField0_ & 0x00000008) != 0; } /** @@ -137,7 +179,7 @@ public final class CharGemInstanceSweep { * @return this */ public CharGemInstanceSweepReq clearEvents() { - bitField0_ &= ~0x00000004; + bitField0_ &= ~0x00000008; events.clear(); return this; } @@ -166,7 +208,7 @@ public final class CharGemInstanceSweep { * @return internal storage object for modifications */ public Public.Events getMutableEvents() { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; return events; } @@ -176,7 +218,7 @@ public final class CharGemInstanceSweep { * @return this */ public CharGemInstanceSweepReq setEvents(final Public.Events value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; events.copyFrom(value); return this; } @@ -186,7 +228,7 @@ public final class CharGemInstanceSweep { * @return whether the nextPackage field is set */ public boolean hasNextPackage() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000010) != 0; } /** @@ -194,7 +236,7 @@ public final class CharGemInstanceSweep { * @return this */ public CharGemInstanceSweepReq clearNextPackage() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000010; nextPackage.clear(); return this; } @@ -223,7 +265,7 @@ public final class CharGemInstanceSweep { * @return internal storage object for modifications */ public RepeatedByte getMutableNextPackage() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; return nextPackage; } @@ -233,7 +275,7 @@ public final class CharGemInstanceSweep { * @return this */ public CharGemInstanceSweepReq addNextPackage(final byte value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; nextPackage.add(value); return this; } @@ -244,7 +286,7 @@ public final class CharGemInstanceSweep { * @return this */ public CharGemInstanceSweepReq addAllNextPackage(final byte... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; nextPackage.addAll(values); return this; } @@ -255,7 +297,7 @@ public final class CharGemInstanceSweep { * @return this */ public CharGemInstanceSweepReq setNextPackage(final byte... values) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; nextPackage.copyFrom(values); return this; } @@ -267,6 +309,7 @@ public final class CharGemInstanceSweep { bitField0_ = other.bitField0_; id = other.id; times = other.times; + rewardType = other.rewardType; events.copyFrom(other.events); nextPackage.copyFrom(other.nextPackage); } @@ -285,6 +328,9 @@ public final class CharGemInstanceSweep { if (other.hasTimes()) { setTimes(other.times); } + if (other.hasRewardType()) { + setRewardType(other.rewardType); + } if (other.hasEvents()) { getMutableEvents().mergeFrom(other.events); } @@ -303,6 +349,7 @@ public final class CharGemInstanceSweep { bitField0_ = 0; id = 0; times = 0; + rewardType = 0; events.clear(); nextPackage.clear(); return this; @@ -332,6 +379,7 @@ public final class CharGemInstanceSweep { return bitField0_ == other.bitField0_ && (!hasId() || id == other.id) && (!hasTimes() || times == other.times) + && (!hasRewardType() || rewardType == other.rewardType) && (!hasEvents() || events.equals(other.events)) && (!hasNextPackage() || nextPackage.equals(other.nextPackage)); } @@ -347,10 +395,14 @@ public final class CharGemInstanceSweep { output.writeUInt32NoTag(times); } if ((bitField0_ & 0x00000004) != 0) { + output.writeRawByte((byte) 24); + output.writeUInt32NoTag(rewardType); + } + if ((bitField0_ & 0x00000008) != 0) { output.writeRawByte((byte) 122); output.writeMessageNoTag(events); } - if ((bitField0_ & 0x00000008) != 0) { + if ((bitField0_ & 0x00000010) != 0) { output.writeRawLittleEndian16((short) 32762); output.writeBytesNoTag(nextPackage); } @@ -366,9 +418,12 @@ public final class CharGemInstanceSweep { size += 1 + ProtoSink.computeUInt32SizeNoTag(times); } if ((bitField0_ & 0x00000004) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(events); + size += 1 + ProtoSink.computeUInt32SizeNoTag(rewardType); } if ((bitField0_ & 0x00000008) != 0) { + size += 1 + ProtoSink.computeMessageSizeNoTag(events); + } + if ((bitField0_ & 0x00000010) != 0) { size += 2 + ProtoSink.computeBytesSizeNoTag(nextPackage); } return size; @@ -395,6 +450,15 @@ public final class CharGemInstanceSweep { times = input.readUInt32(); bitField0_ |= 0x00000002; tag = input.readTag(); + if (tag != 24) { + break; + } + } + case 24: { + // rewardType + rewardType = input.readUInt32(); + bitField0_ |= 0x00000004; + tag = input.readTag(); if (tag != 122) { break; } @@ -402,7 +466,7 @@ public final class CharGemInstanceSweep { case 122: { // events input.readMessage(events); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; tag = input.readTag(); if (tag != 16378) { break; @@ -411,7 +475,7 @@ public final class CharGemInstanceSweep { case 16378: { // nextPackage input.readBytes(nextPackage); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 0) { break; @@ -441,9 +505,12 @@ public final class CharGemInstanceSweep { output.writeUInt32(FieldNames.times, times); } if ((bitField0_ & 0x00000004) != 0) { - output.writeMessage(FieldNames.events, events); + output.writeUInt32(FieldNames.rewardType, rewardType); } if ((bitField0_ & 0x00000008) != 0) { + output.writeMessage(FieldNames.events, events); + } + if ((bitField0_ & 0x00000010) != 0) { output.writeBytes(FieldNames.nextPackage, nextPackage); } output.endObject(); @@ -478,11 +545,22 @@ public final class CharGemInstanceSweep { } break; } + case -610271447: { + if (input.isAtField(FieldNames.rewardType)) { + if (!input.trySkipNullValue()) { + rewardType = input.readUInt32(); + bitField0_ |= 0x00000004; + } + } else { + input.skipUnknownField(); + } + break; + } case 2087505209: { if (input.isAtField(FieldNames.events)) { if (!input.trySkipNullValue()) { input.readMessage(events); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -493,7 +571,7 @@ public final class CharGemInstanceSweep { if (input.isAtField(FieldNames.nextPackage)) { if (!input.trySkipNullValue()) { input.readBytes(nextPackage); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -557,6 +635,8 @@ public final class CharGemInstanceSweep { static final FieldName times = FieldName.forField("Times"); + static final FieldName rewardType = FieldName.forField("RewardType"); + static final FieldName events = FieldName.forField("Events"); static final FieldName nextPackage = FieldName.forField("NextPackage"); diff --git a/src/generated/main/emu/nebula/proto/GachaInformation.java b/src/generated/main/emu/nebula/proto/GachaInformation.java index a895856..5aacace 100644 --- a/src/generated/main/emu/nebula/proto/GachaInformation.java +++ b/src/generated/main/emu/nebula/proto/GachaInformation.java @@ -65,6 +65,11 @@ public final class GachaInformation { */ private boolean recvGuaranteeReward; + /** + * optional bytes RewardsRecords = 10; + */ + private final RepeatedByte rewardsRecords = RepeatedByte.newEmptyInstance(); + /** * optional bytes NextPackage = 2047; */ @@ -413,12 +418,91 @@ public final class GachaInformation { return this; } + /** + * optional bytes RewardsRecords = 10; + * @return whether the rewardsRecords field is set + */ + public boolean hasRewardsRecords() { + return (bitField0_ & 0x00000200) != 0; + } + + /** + * optional bytes RewardsRecords = 10; + * @return this + */ + public GachaInfo clearRewardsRecords() { + bitField0_ &= ~0x00000200; + rewardsRecords.clear(); + return this; + } + + /** + * optional bytes RewardsRecords = 10; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableRewardsRecords()} if you want to modify it. + * + * @return internal storage object for reading + */ + public RepeatedByte getRewardsRecords() { + return rewardsRecords; + } + + /** + * optional bytes RewardsRecords = 10; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public RepeatedByte getMutableRewardsRecords() { + bitField0_ |= 0x00000200; + return rewardsRecords; + } + + /** + * optional bytes RewardsRecords = 10; + * @param value the rewardsRecords to add + * @return this + */ + public GachaInfo addRewardsRecords(final byte value) { + bitField0_ |= 0x00000200; + rewardsRecords.add(value); + return this; + } + + /** + * optional bytes RewardsRecords = 10; + * @param values the rewardsRecords to add + * @return this + */ + public GachaInfo addAllRewardsRecords(final byte... values) { + bitField0_ |= 0x00000200; + rewardsRecords.addAll(values); + return this; + } + + /** + * optional bytes RewardsRecords = 10; + * @param values the rewardsRecords to set + * @return this + */ + public GachaInfo setRewardsRecords(final byte... values) { + bitField0_ |= 0x00000200; + rewardsRecords.copyFrom(values); + return this; + } + /** * optional bytes NextPackage = 2047; * @return whether the nextPackage field is set */ public boolean hasNextPackage() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000400) != 0; } /** @@ -426,7 +510,7 @@ public final class GachaInformation { * @return this */ public GachaInfo clearNextPackage() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000400; nextPackage.clear(); return this; } @@ -455,7 +539,7 @@ public final class GachaInformation { * @return internal storage object for modifications */ public RepeatedByte getMutableNextPackage() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; return nextPackage; } @@ -465,7 +549,7 @@ public final class GachaInformation { * @return this */ public GachaInfo addNextPackage(final byte value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; nextPackage.add(value); return this; } @@ -476,7 +560,7 @@ public final class GachaInformation { * @return this */ public GachaInfo addAllNextPackage(final byte... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; nextPackage.addAll(values); return this; } @@ -487,7 +571,7 @@ public final class GachaInformation { * @return this */ public GachaInfo setNextPackage(final byte... values) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; nextPackage.copyFrom(values); return this; } @@ -506,6 +590,7 @@ public final class GachaInformation { aupGuaranteeTimes = other.aupGuaranteeTimes; reveFirstTenReward = other.reveFirstTenReward; recvGuaranteeReward = other.recvGuaranteeReward; + rewardsRecords.copyFrom(other.rewardsRecords); nextPackage.copyFrom(other.nextPackage); } return this; @@ -544,6 +629,9 @@ public final class GachaInformation { if (other.hasRecvGuaranteeReward()) { setRecvGuaranteeReward(other.recvGuaranteeReward); } + if (other.hasRewardsRecords()) { + getMutableRewardsRecords().copyFrom(other.rewardsRecords); + } if (other.hasNextPackage()) { getMutableNextPackage().copyFrom(other.nextPackage); } @@ -566,6 +654,7 @@ public final class GachaInformation { aupGuaranteeTimes = 0; reveFirstTenReward = false; recvGuaranteeReward = false; + rewardsRecords.clear(); nextPackage.clear(); return this; } @@ -577,6 +666,7 @@ public final class GachaInformation { } cachedSize = -1; bitField0_ = 0; + rewardsRecords.clear(); nextPackage.clear(); return this; } @@ -600,6 +690,7 @@ public final class GachaInformation { && (!hasAupGuaranteeTimes() || aupGuaranteeTimes == other.aupGuaranteeTimes) && (!hasReveFirstTenReward() || reveFirstTenReward == other.reveFirstTenReward) && (!hasRecvGuaranteeReward() || recvGuaranteeReward == other.recvGuaranteeReward) + && (!hasRewardsRecords() || rewardsRecords.equals(other.rewardsRecords)) && (!hasNextPackage() || nextPackage.equals(other.nextPackage)); } @@ -642,6 +733,10 @@ public final class GachaInformation { output.writeBoolNoTag(recvGuaranteeReward); } if ((bitField0_ & 0x00000200) != 0) { + output.writeRawByte((byte) 82); + output.writeBytesNoTag(rewardsRecords); + } + if ((bitField0_ & 0x00000400) != 0) { output.writeRawLittleEndian16((short) 32762); output.writeBytesNoTag(nextPackage); } @@ -678,6 +773,9 @@ public final class GachaInformation { size += 2; } if ((bitField0_ & 0x00000200) != 0) { + size += 1 + ProtoSink.computeBytesSizeNoTag(rewardsRecords); + } + if ((bitField0_ & 0x00000400) != 0) { size += 2 + ProtoSink.computeBytesSizeNoTag(nextPackage); } return size; @@ -767,6 +865,15 @@ public final class GachaInformation { recvGuaranteeReward = input.readBool(); bitField0_ |= 0x00000100; tag = input.readTag(); + if (tag != 82) { + break; + } + } + case 82: { + // rewardsRecords + input.readBytes(rewardsRecords); + bitField0_ |= 0x00000200; + tag = input.readTag(); if (tag != 16378) { break; } @@ -774,7 +881,7 @@ public final class GachaInformation { case 16378: { // nextPackage input.readBytes(nextPackage); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; tag = input.readTag(); if (tag != 0) { break; @@ -825,6 +932,9 @@ public final class GachaInformation { output.writeBool(FieldNames.recvGuaranteeReward, recvGuaranteeReward); } if ((bitField0_ & 0x00000200) != 0) { + output.writeBytes(FieldNames.rewardsRecords, rewardsRecords); + } + if ((bitField0_ & 0x00000400) != 0) { output.writeBytes(FieldNames.nextPackage, nextPackage); } output.endObject(); @@ -936,11 +1046,22 @@ public final class GachaInformation { } break; } + case 1917737630: { + if (input.isAtField(FieldNames.rewardsRecords)) { + if (!input.trySkipNullValue()) { + input.readBytes(rewardsRecords); + bitField0_ |= 0x00000200; + } + } else { + input.skipUnknownField(); + } + break; + } case -2082324045: { if (input.isAtField(FieldNames.nextPackage)) { if (!input.trySkipNullValue()) { input.readBytes(nextPackage); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; } } else { input.skipUnknownField(); @@ -1017,6 +1138,8 @@ public final class GachaInformation { static final FieldName recvGuaranteeReward = FieldName.forField("RecvGuaranteeReward"); + static final FieldName rewardsRecords = FieldName.forField("RewardsRecords"); + static final FieldName nextPackage = FieldName.forField("NextPackage"); } } diff --git a/src/generated/main/emu/nebula/proto/GachaRewardGet.java b/src/generated/main/emu/nebula/proto/GachaRewardGet.java new file mode 100644 index 0000000..312d6ae --- /dev/null +++ b/src/generated/main/emu/nebula/proto/GachaRewardGet.java @@ -0,0 +1,5 @@ +// Code generated by protocol buffer compiler. Do not edit! +package emu.nebula.proto; + +public final class GachaRewardGet { +} diff --git a/src/generated/main/emu/nebula/proto/PlayerData.java b/src/generated/main/emu/nebula/proto/PlayerData.java index 5d7467d..f47105a 100644 --- a/src/generated/main/emu/nebula/proto/PlayerData.java +++ b/src/generated/main/emu/nebula/proto/PlayerData.java @@ -63,6 +63,11 @@ public final class PlayerData { */ private int tourGuideQuestGroup; + /** + * optional uint32 TowerTicketGrowthBonus = 116; + */ + private int towerTicketGrowthBonus; + /** * optional uint32 TowerTicket = 126; */ @@ -128,6 +133,11 @@ public final class PlayerData { */ private final Public.VampireSurvivorRecordInfo vampireSurvivorRecord = Public.VampireSurvivorRecordInfo.newInstance(); + /** + * optional .LastRead LastRead = 117; + */ + private final Public.LastRead lastRead = Public.LastRead.newInstance(); + /** * optional .TraceHuntItemInfo HuntPermit = 118; */ @@ -138,11 +148,6 @@ public final class PlayerData { */ private final Public.TraceHuntItemInfo traceRequest = Public.TraceHuntItemInfo.newInstance(); - /** - * optional .LastRead LastRead = 128; - */ - private final Public.LastRead lastRead = Public.LastRead.newInstance(); - /** * optional bytes Achievements = 18; */ @@ -589,12 +594,49 @@ public final class PlayerData { return this; } + /** + * optional uint32 TowerTicketGrowthBonus = 116; + * @return whether the towerTicketGrowthBonus field is set + */ + public boolean hasTowerTicketGrowthBonus() { + return (bitField0_ & 0x00000100) != 0; + } + + /** + * optional uint32 TowerTicketGrowthBonus = 116; + * @return this + */ + public PlayerInfo clearTowerTicketGrowthBonus() { + bitField0_ &= ~0x00000100; + towerTicketGrowthBonus = 0; + return this; + } + + /** + * optional uint32 TowerTicketGrowthBonus = 116; + * @return the towerTicketGrowthBonus + */ + public int getTowerTicketGrowthBonus() { + return towerTicketGrowthBonus; + } + + /** + * optional uint32 TowerTicketGrowthBonus = 116; + * @param value the towerTicketGrowthBonus to set + * @return this + */ + public PlayerInfo setTowerTicketGrowthBonus(final int value) { + bitField0_ |= 0x00000100; + towerTicketGrowthBonus = value; + return this; + } + /** * optional uint32 TowerTicket = 126; * @return whether the towerTicket field is set */ public boolean hasTowerTicket() { - return (bitField0_ & 0x00000100) != 0; + return (bitField0_ & 0x00000200) != 0; } /** @@ -602,7 +644,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearTowerTicket() { - bitField0_ &= ~0x00000100; + bitField0_ &= ~0x00000200; towerTicket = 0; return this; } @@ -621,7 +663,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setTowerTicket(final int value) { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; towerTicket = value; return this; } @@ -631,7 +673,7 @@ public final class PlayerData { * @return whether the dailyMallRewardStatus field is set */ public boolean hasDailyMallRewardStatus() { - return (bitField0_ & 0x00000200) != 0; + return (bitField0_ & 0x00000400) != 0; } /** @@ -639,7 +681,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearDailyMallRewardStatus() { - bitField0_ &= ~0x00000200; + bitField0_ &= ~0x00000400; dailyMallRewardStatus = false; return this; } @@ -658,7 +700,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setDailyMallRewardStatus(final boolean value) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; dailyMallRewardStatus = value; return this; } @@ -668,7 +710,7 @@ public final class PlayerData { * @return whether the dailyShopRewardStatus field is set */ public boolean hasDailyShopRewardStatus() { - return (bitField0_ & 0x00000400) != 0; + return (bitField0_ & 0x00000800) != 0; } /** @@ -676,7 +718,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearDailyShopRewardStatus() { - bitField0_ &= ~0x00000400; + bitField0_ &= ~0x00000800; dailyShopRewardStatus = false; return this; } @@ -695,7 +737,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setDailyShopRewardStatus(final boolean value) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; dailyShopRewardStatus = value; return this; } @@ -705,7 +747,7 @@ public final class PlayerData { * @return whether the acc field is set */ public boolean hasAcc() { - return (bitField0_ & 0x00000800) != 0; + return (bitField0_ & 0x00001000) != 0; } /** @@ -713,7 +755,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearAcc() { - bitField0_ &= ~0x00000800; + bitField0_ &= ~0x00001000; acc.clear(); return this; } @@ -742,7 +784,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public Public.AccInfo getMutableAcc() { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; return acc; } @@ -752,7 +794,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setAcc(final Public.AccInfo value) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; acc.copyFrom(value); return this; } @@ -762,7 +804,7 @@ public final class PlayerData { * @return whether the formation field is set */ public boolean hasFormation() { - return (bitField0_ & 0x00001000) != 0; + return (bitField0_ & 0x00002000) != 0; } /** @@ -770,7 +812,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearFormation() { - bitField0_ &= ~0x00001000; + bitField0_ &= ~0x00002000; formation.clear(); return this; } @@ -799,7 +841,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public Public.TowerFormation getMutableFormation() { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; return formation; } @@ -809,7 +851,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setFormation(final Public.TowerFormation value) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; formation.copyFrom(value); return this; } @@ -819,7 +861,7 @@ public final class PlayerData { * @return whether the energy field is set */ public boolean hasEnergy() { - return (bitField0_ & 0x00002000) != 0; + return (bitField0_ & 0x00004000) != 0; } /** @@ -827,7 +869,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearEnergy() { - bitField0_ &= ~0x00002000; + bitField0_ &= ~0x00004000; energy.clear(); return this; } @@ -856,7 +898,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public EnergyInfo getMutableEnergy() { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; return energy; } @@ -866,7 +908,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setEnergy(final EnergyInfo value) { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; energy.copyFrom(value); return this; } @@ -876,7 +918,7 @@ public final class PlayerData { * @return whether the worldClass field is set */ public boolean hasWorldClass() { - return (bitField0_ & 0x00004000) != 0; + return (bitField0_ & 0x00008000) != 0; } /** @@ -884,7 +926,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearWorldClass() { - bitField0_ &= ~0x00004000; + bitField0_ &= ~0x00008000; worldClass.clear(); return this; } @@ -913,7 +955,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public WorldClassInfo getMutableWorldClass() { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00008000; return worldClass; } @@ -923,7 +965,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setWorldClass(final WorldClassInfo value) { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00008000; worldClass.copyFrom(value); return this; } @@ -933,7 +975,7 @@ public final class PlayerData { * @return whether the agent field is set */ public boolean hasAgent() { - return (bitField0_ & 0x00008000) != 0; + return (bitField0_ & 0x00010000) != 0; } /** @@ -941,7 +983,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearAgent() { - bitField0_ &= ~0x00008000; + bitField0_ &= ~0x00010000; agent.clear(); return this; } @@ -970,7 +1012,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public Public.AgentData getMutableAgent() { - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; return agent; } @@ -980,7 +1022,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setAgent(final Public.AgentData value) { - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; agent.copyFrom(value); return this; } @@ -990,7 +1032,7 @@ public final class PlayerData { * @return whether the quests field is set */ public boolean hasQuests() { - return (bitField0_ & 0x00010000) != 0; + return (bitField0_ & 0x00020000) != 0; } /** @@ -998,7 +1040,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearQuests() { - bitField0_ &= ~0x00010000; + bitField0_ &= ~0x00020000; quests.clear(); return this; } @@ -1027,7 +1069,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public Public.Quests getMutableQuests() { - bitField0_ |= 0x00010000; + bitField0_ |= 0x00020000; return quests; } @@ -1037,7 +1079,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setQuests(final Public.Quests value) { - bitField0_ |= 0x00010000; + bitField0_ |= 0x00020000; quests.copyFrom(value); return this; } @@ -1047,7 +1089,7 @@ public final class PlayerData { * @return whether the state field is set */ public boolean hasState() { - return (bitField0_ & 0x00020000) != 0; + return (bitField0_ & 0x00040000) != 0; } /** @@ -1055,7 +1097,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearState() { - bitField0_ &= ~0x00020000; + bitField0_ &= ~0x00040000; state.clear(); return this; } @@ -1084,7 +1126,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public Public.StateInfo getMutableState() { - bitField0_ |= 0x00020000; + bitField0_ |= 0x00040000; return state; } @@ -1094,7 +1136,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setState(final Public.StateInfo value) { - bitField0_ |= 0x00020000; + bitField0_ |= 0x00040000; state.copyFrom(value); return this; } @@ -1104,7 +1146,7 @@ public final class PlayerData { * @return whether the phone field is set */ public boolean hasPhone() { - return (bitField0_ & 0x00040000) != 0; + return (bitField0_ & 0x00080000) != 0; } /** @@ -1112,7 +1154,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearPhone() { - bitField0_ &= ~0x00040000; + bitField0_ &= ~0x00080000; phone.clear(); return this; } @@ -1141,7 +1183,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public PhoneInfo getMutablePhone() { - bitField0_ |= 0x00040000; + bitField0_ |= 0x00080000; return phone; } @@ -1151,7 +1193,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setPhone(final PhoneInfo value) { - bitField0_ |= 0x00040000; + bitField0_ |= 0x00080000; phone.copyFrom(value); return this; } @@ -1161,7 +1203,7 @@ public final class PlayerData { * @return whether the story field is set */ public boolean hasStory() { - return (bitField0_ & 0x00080000) != 0; + return (bitField0_ & 0x00100000) != 0; } /** @@ -1169,7 +1211,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearStory() { - bitField0_ &= ~0x00080000; + bitField0_ &= ~0x00100000; story.clear(); return this; } @@ -1198,7 +1240,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public Public.StoryInfo getMutableStory() { - bitField0_ |= 0x00080000; + bitField0_ |= 0x00100000; return story; } @@ -1208,7 +1250,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setStory(final Public.StoryInfo value) { - bitField0_ |= 0x00080000; + bitField0_ |= 0x00100000; story.copyFrom(value); return this; } @@ -1218,7 +1260,7 @@ public final class PlayerData { * @return whether the vampireSurvivorRecord field is set */ public boolean hasVampireSurvivorRecord() { - return (bitField0_ & 0x00100000) != 0; + return (bitField0_ & 0x00200000) != 0; } /** @@ -1226,7 +1268,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearVampireSurvivorRecord() { - bitField0_ &= ~0x00100000; + bitField0_ &= ~0x00200000; vampireSurvivorRecord.clear(); return this; } @@ -1255,7 +1297,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public Public.VampireSurvivorRecordInfo getMutableVampireSurvivorRecord() { - bitField0_ |= 0x00100000; + bitField0_ |= 0x00200000; return vampireSurvivorRecord; } @@ -1265,17 +1307,74 @@ public final class PlayerData { * @return this */ public PlayerInfo setVampireSurvivorRecord(final Public.VampireSurvivorRecordInfo value) { - bitField0_ |= 0x00100000; + bitField0_ |= 0x00200000; vampireSurvivorRecord.copyFrom(value); return this; } + /** + * optional .LastRead LastRead = 117; + * @return whether the lastRead field is set + */ + public boolean hasLastRead() { + return (bitField0_ & 0x00400000) != 0; + } + + /** + * optional .LastRead LastRead = 117; + * @return this + */ + public PlayerInfo clearLastRead() { + bitField0_ &= ~0x00400000; + lastRead.clear(); + return this; + } + + /** + * optional .LastRead LastRead = 117; + * + * This method returns the internal storage object without modifying any has state. + * The returned object should not be modified and be treated as read-only. + * + * Use {@link #getMutableLastRead()} if you want to modify it. + * + * @return internal storage object for reading + */ + public Public.LastRead getLastRead() { + return lastRead; + } + + /** + * optional .LastRead LastRead = 117; + * + * This method returns the internal storage object and sets the corresponding + * has state. The returned object will become part of this message and its + * contents may be modified as long as the has state is not cleared. + * + * @return internal storage object for modifications + */ + public Public.LastRead getMutableLastRead() { + bitField0_ |= 0x00400000; + return lastRead; + } + + /** + * optional .LastRead LastRead = 117; + * @param value the lastRead to set + * @return this + */ + public PlayerInfo setLastRead(final Public.LastRead value) { + bitField0_ |= 0x00400000; + lastRead.copyFrom(value); + return this; + } + /** * optional .TraceHuntItemInfo HuntPermit = 118; * @return whether the huntPermit field is set */ public boolean hasHuntPermit() { - return (bitField0_ & 0x00200000) != 0; + return (bitField0_ & 0x00800000) != 0; } /** @@ -1283,7 +1382,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearHuntPermit() { - bitField0_ &= ~0x00200000; + bitField0_ &= ~0x00800000; huntPermit.clear(); return this; } @@ -1312,7 +1411,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public Public.TraceHuntItemInfo getMutableHuntPermit() { - bitField0_ |= 0x00200000; + bitField0_ |= 0x00800000; return huntPermit; } @@ -1322,7 +1421,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setHuntPermit(final Public.TraceHuntItemInfo value) { - bitField0_ |= 0x00200000; + bitField0_ |= 0x00800000; huntPermit.copyFrom(value); return this; } @@ -1332,7 +1431,7 @@ public final class PlayerData { * @return whether the traceRequest field is set */ public boolean hasTraceRequest() { - return (bitField0_ & 0x00400000) != 0; + return (bitField0_ & 0x01000000) != 0; } /** @@ -1340,7 +1439,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearTraceRequest() { - bitField0_ &= ~0x00400000; + bitField0_ &= ~0x01000000; traceRequest.clear(); return this; } @@ -1369,7 +1468,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public Public.TraceHuntItemInfo getMutableTraceRequest() { - bitField0_ |= 0x00400000; + bitField0_ |= 0x01000000; return traceRequest; } @@ -1379,74 +1478,17 @@ public final class PlayerData { * @return this */ public PlayerInfo setTraceRequest(final Public.TraceHuntItemInfo value) { - bitField0_ |= 0x00400000; + bitField0_ |= 0x01000000; traceRequest.copyFrom(value); return this; } - /** - * optional .LastRead LastRead = 128; - * @return whether the lastRead field is set - */ - public boolean hasLastRead() { - return (bitField0_ & 0x00800000) != 0; - } - - /** - * optional .LastRead LastRead = 128; - * @return this - */ - public PlayerInfo clearLastRead() { - bitField0_ &= ~0x00800000; - lastRead.clear(); - return this; - } - - /** - * optional .LastRead LastRead = 128; - * - * This method returns the internal storage object without modifying any has state. - * The returned object should not be modified and be treated as read-only. - * - * Use {@link #getMutableLastRead()} if you want to modify it. - * - * @return internal storage object for reading - */ - public Public.LastRead getLastRead() { - return lastRead; - } - - /** - * optional .LastRead LastRead = 128; - * - * This method returns the internal storage object and sets the corresponding - * has state. The returned object will become part of this message and its - * contents may be modified as long as the has state is not cleared. - * - * @return internal storage object for modifications - */ - public Public.LastRead getMutableLastRead() { - bitField0_ |= 0x00800000; - return lastRead; - } - - /** - * optional .LastRead LastRead = 128; - * @param value the lastRead to set - * @return this - */ - public PlayerInfo setLastRead(final Public.LastRead value) { - bitField0_ |= 0x00800000; - lastRead.copyFrom(value); - return this; - } - /** * optional bytes Achievements = 18; * @return whether the achievements field is set */ public boolean hasAchievements() { - return (bitField0_ & 0x01000000) != 0; + return (bitField0_ & 0x02000000) != 0; } /** @@ -1454,7 +1496,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearAchievements() { - bitField0_ &= ~0x01000000; + bitField0_ &= ~0x02000000; achievements.clear(); return this; } @@ -1483,7 +1525,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedByte getMutableAchievements() { - bitField0_ |= 0x01000000; + bitField0_ |= 0x02000000; return achievements; } @@ -1493,7 +1535,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAchievements(final byte value) { - bitField0_ |= 0x01000000; + bitField0_ |= 0x02000000; achievements.add(value); return this; } @@ -1504,7 +1546,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllAchievements(final byte... values) { - bitField0_ |= 0x01000000; + bitField0_ |= 0x02000000; achievements.addAll(values); return this; } @@ -1515,7 +1557,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setAchievements(final byte... values) { - bitField0_ |= 0x01000000; + bitField0_ |= 0x02000000; achievements.copyFrom(values); return this; } @@ -1525,7 +1567,7 @@ public final class PlayerData { * @return whether the nextPackage field is set */ public boolean hasNextPackage() { - return (bitField0_ & 0x02000000) != 0; + return (bitField0_ & 0x04000000) != 0; } /** @@ -1533,7 +1575,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearNextPackage() { - bitField0_ &= ~0x02000000; + bitField0_ &= ~0x04000000; nextPackage.clear(); return this; } @@ -1562,7 +1604,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedByte getMutableNextPackage() { - bitField0_ |= 0x02000000; + bitField0_ |= 0x04000000; return nextPackage; } @@ -1572,7 +1614,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addNextPackage(final byte value) { - bitField0_ |= 0x02000000; + bitField0_ |= 0x04000000; nextPackage.add(value); return this; } @@ -1583,7 +1625,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllNextPackage(final byte... values) { - bitField0_ |= 0x02000000; + bitField0_ |= 0x04000000; nextPackage.addAll(values); return this; } @@ -1594,7 +1636,7 @@ public final class PlayerData { * @return this */ public PlayerInfo setNextPackage(final byte... values) { - bitField0_ |= 0x02000000; + bitField0_ |= 0x04000000; nextPackage.copyFrom(values); return this; } @@ -1604,7 +1646,7 @@ public final class PlayerData { * @return whether the rglPassedIds field is set */ public boolean hasRglPassedIds() { - return (bitField0_ & 0x04000000) != 0; + return (bitField0_ & 0x08000000) != 0; } /** @@ -1612,7 +1654,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearRglPassedIds() { - bitField0_ &= ~0x04000000; + bitField0_ &= ~0x08000000; rglPassedIds.clear(); return this; } @@ -1641,7 +1683,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedInt getMutableRglPassedIds() { - bitField0_ |= 0x04000000; + bitField0_ |= 0x08000000; return rglPassedIds; } @@ -1651,7 +1693,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addRglPassedIds(final int value) { - bitField0_ |= 0x04000000; + bitField0_ |= 0x08000000; rglPassedIds.add(value); return this; } @@ -1662,7 +1704,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllRglPassedIds(final int... values) { - bitField0_ |= 0x04000000; + bitField0_ |= 0x08000000; rglPassedIds.addAll(values); return this; } @@ -1672,7 +1714,7 @@ public final class PlayerData { * @return whether the board field is set */ public boolean hasBoard() { - return (bitField0_ & 0x08000000) != 0; + return (bitField0_ & 0x10000000) != 0; } /** @@ -1680,7 +1722,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearBoard() { - bitField0_ &= ~0x08000000; + bitField0_ &= ~0x10000000; board.clear(); return this; } @@ -1709,7 +1751,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedInt getMutableBoard() { - bitField0_ |= 0x08000000; + bitField0_ |= 0x10000000; return board; } @@ -1719,7 +1761,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addBoard(final int value) { - bitField0_ |= 0x08000000; + bitField0_ |= 0x10000000; board.add(value); return this; } @@ -1730,7 +1772,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllBoard(final int... values) { - bitField0_ |= 0x08000000; + bitField0_ |= 0x10000000; board.addAll(values); return this; } @@ -1740,7 +1782,7 @@ public final class PlayerData { * @return whether the datingCharIds field is set */ public boolean hasDatingCharIds() { - return (bitField0_ & 0x10000000) != 0; + return (bitField0_ & 0x20000000) != 0; } /** @@ -1748,7 +1790,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearDatingCharIds() { - bitField0_ &= ~0x10000000; + bitField0_ &= ~0x20000000; datingCharIds.clear(); return this; } @@ -1777,7 +1819,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedInt getMutableDatingCharIds() { - bitField0_ |= 0x10000000; + bitField0_ |= 0x20000000; return datingCharIds; } @@ -1787,7 +1829,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addDatingCharIds(final int value) { - bitField0_ |= 0x10000000; + bitField0_ |= 0x20000000; datingCharIds.add(value); return this; } @@ -1798,7 +1840,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllDatingCharIds(final int... values) { - bitField0_ |= 0x10000000; + bitField0_ |= 0x20000000; datingCharIds.addAll(values); return this; } @@ -1808,7 +1850,7 @@ public final class PlayerData { * @return whether the dailyActiveIds field is set */ public boolean hasDailyActiveIds() { - return (bitField0_ & 0x20000000) != 0; + return (bitField0_ & 0x40000000) != 0; } /** @@ -1816,7 +1858,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearDailyActiveIds() { - bitField0_ &= ~0x20000000; + bitField0_ &= ~0x40000000; dailyActiveIds.clear(); return this; } @@ -1845,7 +1887,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedInt getMutableDailyActiveIds() { - bitField0_ |= 0x20000000; + bitField0_ |= 0x40000000; return dailyActiveIds; } @@ -1855,7 +1897,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addDailyActiveIds(final int value) { - bitField0_ |= 0x20000000; + bitField0_ |= 0x40000000; dailyActiveIds.add(value); return this; } @@ -1866,7 +1908,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllDailyActiveIds(final int... values) { - bitField0_ |= 0x20000000; + bitField0_ |= 0x40000000; dailyActiveIds.addAll(values); return this; } @@ -1876,7 +1918,7 @@ public final class PlayerData { * @return whether the weeklyActiveIds field is set */ public boolean hasWeeklyActiveIds() { - return (bitField0_ & 0x40000000) != 0; + return (bitField0_ & 0x80000000) != 0; } /** @@ -1884,7 +1926,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearWeeklyActiveIds() { - bitField0_ &= ~0x40000000; + bitField0_ &= ~0x80000000; weeklyActiveIds.clear(); return this; } @@ -1913,7 +1955,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedInt getMutableWeeklyActiveIds() { - bitField0_ |= 0x40000000; + bitField0_ |= 0x80000000; return weeklyActiveIds; } @@ -1923,7 +1965,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addWeeklyActiveIds(final int value) { - bitField0_ |= 0x40000000; + bitField0_ |= 0x80000000; weeklyActiveIds.add(value); return this; } @@ -1934,7 +1976,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllWeeklyActiveIds(final int... values) { - bitField0_ |= 0x40000000; + bitField0_ |= 0x80000000; weeklyActiveIds.addAll(values); return this; } @@ -1944,7 +1986,7 @@ public final class PlayerData { * @return whether the honorList field is set */ public boolean hasHonorList() { - return (bitField0_ & 0x80000000) != 0; + return (bitField1_ & 0x00000001) != 0; } /** @@ -1952,7 +1994,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearHonorList() { - bitField0_ &= ~0x80000000; + bitField1_ &= ~0x00000001; honorList.clear(); return this; } @@ -1981,7 +2023,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedInt getMutableHonorList() { - bitField0_ |= 0x80000000; + bitField1_ |= 0x00000001; return honorList; } @@ -1991,7 +2033,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addHonorList(final int value) { - bitField0_ |= 0x80000000; + bitField1_ |= 0x00000001; honorList.add(value); return this; } @@ -2002,7 +2044,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllHonorList(final int... values) { - bitField0_ |= 0x80000000; + bitField1_ |= 0x00000001; honorList.addAll(values); return this; } @@ -2012,7 +2054,7 @@ public final class PlayerData { * @return whether the res field is set */ public boolean hasRes() { - return (bitField1_ & 0x00000001) != 0; + return (bitField1_ & 0x00000002) != 0; } /** @@ -2020,7 +2062,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearRes() { - bitField1_ &= ~0x00000001; + bitField1_ &= ~0x00000002; res.clear(); return this; } @@ -2049,7 +2091,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableRes() { - bitField1_ |= 0x00000001; + bitField1_ |= 0x00000002; return res; } @@ -2059,7 +2101,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addRes(final Public.Res value) { - bitField1_ |= 0x00000001; + bitField1_ |= 0x00000002; res.add(value); return this; } @@ -2070,7 +2112,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllRes(final Public.Res... values) { - bitField1_ |= 0x00000001; + bitField1_ |= 0x00000002; res.addAll(values); return this; } @@ -2080,7 +2122,7 @@ public final class PlayerData { * @return whether the items field is set */ public boolean hasItems() { - return (bitField1_ & 0x00000002) != 0; + return (bitField1_ & 0x00000004) != 0; } /** @@ -2088,7 +2130,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearItems() { - bitField1_ &= ~0x00000002; + bitField1_ &= ~0x00000004; items.clear(); return this; } @@ -2117,7 +2159,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableItems() { - bitField1_ |= 0x00000002; + bitField1_ |= 0x00000004; return items; } @@ -2127,7 +2169,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addItems(final Public.Item value) { - bitField1_ |= 0x00000002; + bitField1_ |= 0x00000004; items.add(value); return this; } @@ -2138,7 +2180,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllItems(final Public.Item... values) { - bitField1_ |= 0x00000002; + bitField1_ |= 0x00000004; items.addAll(values); return this; } @@ -2148,7 +2190,7 @@ public final class PlayerData { * @return whether the chars field is set */ public boolean hasChars() { - return (bitField1_ & 0x00000004) != 0; + return (bitField1_ & 0x00000008) != 0; } /** @@ -2156,7 +2198,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearChars() { - bitField1_ &= ~0x00000004; + bitField1_ &= ~0x00000008; chars.clear(); return this; } @@ -2185,7 +2227,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableChars() { - bitField1_ |= 0x00000004; + bitField1_ |= 0x00000008; return chars; } @@ -2195,7 +2237,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addChars(final Public.Char value) { - bitField1_ |= 0x00000004; + bitField1_ |= 0x00000008; chars.add(value); return this; } @@ -2206,7 +2248,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllChars(final Public.Char... values) { - bitField1_ |= 0x00000004; + bitField1_ |= 0x00000008; chars.addAll(values); return this; } @@ -2216,7 +2258,7 @@ public final class PlayerData { * @return whether the equipments field is set */ public boolean hasEquipments() { - return (bitField1_ & 0x00000008) != 0; + return (bitField1_ & 0x00000010) != 0; } /** @@ -2224,7 +2266,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearEquipments() { - bitField1_ &= ~0x00000008; + bitField1_ &= ~0x00000010; equipments.clear(); return this; } @@ -2253,7 +2295,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableEquipments() { - bitField1_ |= 0x00000008; + bitField1_ |= 0x00000010; return equipments; } @@ -2263,7 +2305,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addEquipments(final Public.EquipmentInfo value) { - bitField1_ |= 0x00000008; + bitField1_ |= 0x00000010; equipments.add(value); return this; } @@ -2274,7 +2316,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllEquipments(final Public.EquipmentInfo... values) { - bitField1_ |= 0x00000008; + bitField1_ |= 0x00000010; equipments.addAll(values); return this; } @@ -2284,7 +2326,7 @@ public final class PlayerData { * @return whether the regionBossLevels field is set */ public boolean hasRegionBossLevels() { - return (bitField1_ & 0x00000010) != 0; + return (bitField1_ & 0x00000020) != 0; } /** @@ -2292,7 +2334,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearRegionBossLevels() { - bitField1_ &= ~0x00000010; + bitField1_ &= ~0x00000020; regionBossLevels.clear(); return this; } @@ -2321,7 +2363,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableRegionBossLevels() { - bitField1_ |= 0x00000010; + bitField1_ |= 0x00000020; return regionBossLevels; } @@ -2331,7 +2373,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addRegionBossLevels(final Public.RegionBossLevel value) { - bitField1_ |= 0x00000010; + bitField1_ |= 0x00000020; regionBossLevels.add(value); return this; } @@ -2342,7 +2384,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllRegionBossLevels(final Public.RegionBossLevel... values) { - bitField1_ |= 0x00000010; + bitField1_ |= 0x00000020; regionBossLevels.addAll(values); return this; } @@ -2352,7 +2394,7 @@ public final class PlayerData { * @return whether the handbook field is set */ public boolean hasHandbook() { - return (bitField1_ & 0x00000020) != 0; + return (bitField1_ & 0x00000040) != 0; } /** @@ -2360,7 +2402,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearHandbook() { - bitField1_ &= ~0x00000020; + bitField1_ &= ~0x00000040; handbook.clear(); return this; } @@ -2389,7 +2431,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableHandbook() { - bitField1_ |= 0x00000020; + bitField1_ |= 0x00000040; return handbook; } @@ -2399,7 +2441,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addHandbook(final Public.HandbookInfo value) { - bitField1_ |= 0x00000020; + bitField1_ |= 0x00000040; handbook.add(value); return this; } @@ -2410,7 +2452,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllHandbook(final Public.HandbookInfo... values) { - bitField1_ |= 0x00000020; + bitField1_ |= 0x00000040; handbook.addAll(values); return this; } @@ -2420,7 +2462,7 @@ public final class PlayerData { * @return whether the titles field is set */ public boolean hasTitles() { - return (bitField1_ & 0x00000040) != 0; + return (bitField1_ & 0x00000080) != 0; } /** @@ -2428,7 +2470,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearTitles() { - bitField1_ &= ~0x00000040; + bitField1_ &= ~0x00000080; titles.clear(); return this; } @@ -2457,7 +2499,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableTitles() { - bitField1_ |= 0x00000040; + bitField1_ |= 0x00000080; return titles; } @@ -2467,7 +2509,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addTitles(final Public.Title value) { - bitField1_ |= 0x00000040; + bitField1_ |= 0x00000080; titles.add(value); return this; } @@ -2478,7 +2520,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllTitles(final Public.Title... values) { - bitField1_ |= 0x00000040; + bitField1_ |= 0x00000080; titles.addAll(values); return this; } @@ -2488,7 +2530,7 @@ public final class PlayerData { * @return whether the dailyInstances field is set */ public boolean hasDailyInstances() { - return (bitField1_ & 0x00000080) != 0; + return (bitField1_ & 0x00000100) != 0; } /** @@ -2496,7 +2538,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearDailyInstances() { - bitField1_ &= ~0x00000080; + bitField1_ &= ~0x00000100; dailyInstances.clear(); return this; } @@ -2525,7 +2567,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableDailyInstances() { - bitField1_ |= 0x00000080; + bitField1_ |= 0x00000100; return dailyInstances; } @@ -2535,7 +2577,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addDailyInstances(final Public.DailyInstance value) { - bitField1_ |= 0x00000080; + bitField1_ |= 0x00000100; dailyInstances.add(value); return this; } @@ -2546,7 +2588,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllDailyInstances(final Public.DailyInstance... values) { - bitField1_ |= 0x00000080; + bitField1_ |= 0x00000100; dailyInstances.addAll(values); return this; } @@ -2556,7 +2598,7 @@ public final class PlayerData { * @return whether the dictionaries field is set */ public boolean hasDictionaries() { - return (bitField1_ & 0x00000100) != 0; + return (bitField1_ & 0x00000200) != 0; } /** @@ -2564,7 +2606,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearDictionaries() { - bitField1_ &= ~0x00000100; + bitField1_ &= ~0x00000200; dictionaries.clear(); return this; } @@ -2593,7 +2635,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableDictionaries() { - bitField1_ |= 0x00000100; + bitField1_ |= 0x00000200; return dictionaries; } @@ -2603,7 +2645,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addDictionaries(final DictionaryTab value) { - bitField1_ |= 0x00000100; + bitField1_ |= 0x00000200; dictionaries.add(value); return this; } @@ -2614,7 +2656,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllDictionaries(final DictionaryTab... values) { - bitField1_ |= 0x00000100; + bitField1_ |= 0x00000200; dictionaries.addAll(values); return this; } @@ -2624,7 +2666,7 @@ public final class PlayerData { * @return whether the activities field is set */ public boolean hasActivities() { - return (bitField1_ & 0x00000200) != 0; + return (bitField1_ & 0x00000400) != 0; } /** @@ -2632,7 +2674,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearActivities() { - bitField1_ &= ~0x00000200; + bitField1_ &= ~0x00000400; activities.clear(); return this; } @@ -2661,7 +2703,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableActivities() { - bitField1_ |= 0x00000200; + bitField1_ |= 0x00000400; return activities; } @@ -2671,7 +2713,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addActivities(final Public.Activity value) { - bitField1_ |= 0x00000200; + bitField1_ |= 0x00000400; activities.add(value); return this; } @@ -2682,7 +2724,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllActivities(final Public.Activity... values) { - bitField1_ |= 0x00000200; + bitField1_ |= 0x00000400; activities.addAll(values); return this; } @@ -2692,7 +2734,7 @@ public final class PlayerData { * @return whether the discs field is set */ public boolean hasDiscs() { - return (bitField1_ & 0x00000400) != 0; + return (bitField1_ & 0x00000800) != 0; } /** @@ -2700,7 +2742,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearDiscs() { - bitField1_ &= ~0x00000400; + bitField1_ &= ~0x00000800; discs.clear(); return this; } @@ -2729,7 +2771,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableDiscs() { - bitField1_ |= 0x00000400; + bitField1_ |= 0x00000800; return discs; } @@ -2739,7 +2781,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addDiscs(final Public.Disc value) { - bitField1_ |= 0x00000400; + bitField1_ |= 0x00000800; discs.add(value); return this; } @@ -2750,7 +2792,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllDiscs(final Public.Disc... values) { - bitField1_ |= 0x00000400; + bitField1_ |= 0x00000800; discs.addAll(values); return this; } @@ -2760,7 +2802,7 @@ public final class PlayerData { * @return whether the equipmentInstances field is set */ public boolean hasEquipmentInstances() { - return (bitField1_ & 0x00000800) != 0; + return (bitField1_ & 0x00001000) != 0; } /** @@ -2768,7 +2810,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearEquipmentInstances() { - bitField1_ &= ~0x00000800; + bitField1_ &= ~0x00001000; equipmentInstances.clear(); return this; } @@ -2797,7 +2839,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableEquipmentInstances() { - bitField1_ |= 0x00000800; + bitField1_ |= 0x00001000; return equipmentInstances; } @@ -2807,7 +2849,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addEquipmentInstances(final Public.EquipmentInstance value) { - bitField1_ |= 0x00000800; + bitField1_ |= 0x00001000; equipmentInstances.add(value); return this; } @@ -2818,7 +2860,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllEquipmentInstances(final Public.EquipmentInstance... values) { - bitField1_ |= 0x00000800; + bitField1_ |= 0x00001000; equipmentInstances.addAll(values); return this; } @@ -2828,7 +2870,7 @@ public final class PlayerData { * @return whether the skillInstances field is set */ public boolean hasSkillInstances() { - return (bitField1_ & 0x00001000) != 0; + return (bitField1_ & 0x00002000) != 0; } /** @@ -2836,7 +2878,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearSkillInstances() { - bitField1_ &= ~0x00001000; + bitField1_ &= ~0x00002000; skillInstances.clear(); return this; } @@ -2865,7 +2907,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableSkillInstances() { - bitField1_ |= 0x00001000; + bitField1_ |= 0x00002000; return skillInstances; } @@ -2875,7 +2917,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addSkillInstances(final Public.SkillInstance value) { - bitField1_ |= 0x00001000; + bitField1_ |= 0x00002000; skillInstances.add(value); return this; } @@ -2886,7 +2928,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllSkillInstances(final Public.SkillInstance... values) { - bitField1_ |= 0x00001000; + bitField1_ |= 0x00002000; skillInstances.addAll(values); return this; } @@ -2896,7 +2938,7 @@ public final class PlayerData { * @return whether the weekBossLevels field is set */ public boolean hasWeekBossLevels() { - return (bitField1_ & 0x00002000) != 0; + return (bitField1_ & 0x00004000) != 0; } /** @@ -2904,7 +2946,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearWeekBossLevels() { - bitField1_ &= ~0x00002000; + bitField1_ &= ~0x00004000; weekBossLevels.clear(); return this; } @@ -2933,7 +2975,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableWeekBossLevels() { - bitField1_ |= 0x00002000; + bitField1_ |= 0x00004000; return weekBossLevels; } @@ -2943,7 +2985,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addWeekBossLevels(final Public.WeekBossLevel value) { - bitField1_ |= 0x00002000; + bitField1_ |= 0x00004000; weekBossLevels.add(value); return this; } @@ -2954,7 +2996,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllWeekBossLevels(final Public.WeekBossLevel... values) { - bitField1_ |= 0x00002000; + bitField1_ |= 0x00004000; weekBossLevels.addAll(values); return this; } @@ -2964,7 +3006,7 @@ public final class PlayerData { * @return whether the charGemInstances field is set */ public boolean hasCharGemInstances() { - return (bitField1_ & 0x00004000) != 0; + return (bitField1_ & 0x00008000) != 0; } /** @@ -2972,7 +3014,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearCharGemInstances() { - bitField1_ &= ~0x00004000; + bitField1_ &= ~0x00008000; charGemInstances.clear(); return this; } @@ -3001,7 +3043,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableCharGemInstances() { - bitField1_ |= 0x00004000; + bitField1_ |= 0x00008000; return charGemInstances; } @@ -3011,7 +3053,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addCharGemInstances(final Public.CharGemInstance value) { - bitField1_ |= 0x00004000; + bitField1_ |= 0x00008000; charGemInstances.add(value); return this; } @@ -3022,7 +3064,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllCharGemInstances(final Public.CharGemInstance... values) { - bitField1_ |= 0x00004000; + bitField1_ |= 0x00008000; charGemInstances.addAll(values); return this; } @@ -3032,7 +3074,7 @@ public final class PlayerData { * @return whether the tutorialLevels field is set */ public boolean hasTutorialLevels() { - return (bitField1_ & 0x00008000) != 0; + return (bitField1_ & 0x00010000) != 0; } /** @@ -3040,7 +3082,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearTutorialLevels() { - bitField1_ &= ~0x00008000; + bitField1_ &= ~0x00010000; tutorialLevels.clear(); return this; } @@ -3069,7 +3111,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableTutorialLevels() { - bitField1_ |= 0x00008000; + bitField1_ |= 0x00010000; return tutorialLevels; } @@ -3079,7 +3121,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addTutorialLevels(final Public.TutorialLevel value) { - bitField1_ |= 0x00008000; + bitField1_ |= 0x00010000; tutorialLevels.add(value); return this; } @@ -3090,7 +3132,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllTutorialLevels(final Public.TutorialLevel... values) { - bitField1_ |= 0x00008000; + bitField1_ |= 0x00010000; tutorialLevels.addAll(values); return this; } @@ -3100,7 +3142,7 @@ public final class PlayerData { * @return whether the assists field is set */ public boolean hasAssists() { - return (bitField1_ & 0x00010000) != 0; + return (bitField1_ & 0x00020000) != 0; } /** @@ -3108,7 +3150,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearAssists() { - bitField1_ &= ~0x00010000; + bitField1_ &= ~0x00020000; assists.clear(); return this; } @@ -3137,7 +3179,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableAssists() { - bitField1_ |= 0x00010000; + bitField1_ |= 0x00020000; return assists; } @@ -3147,7 +3189,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAssists(final AssistInfo value) { - bitField1_ |= 0x00010000; + bitField1_ |= 0x00020000; assists.add(value); return this; } @@ -3158,7 +3200,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllAssists(final AssistInfo... values) { - bitField1_ |= 0x00010000; + bitField1_ |= 0x00020000; assists.addAll(values); return this; } @@ -3168,7 +3210,7 @@ public final class PlayerData { * @return whether the activityHonors field is set */ public boolean hasActivityHonors() { - return (bitField1_ & 0x00020000) != 0; + return (bitField1_ & 0x00040000) != 0; } /** @@ -3176,7 +3218,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearActivityHonors() { - bitField1_ &= ~0x00020000; + bitField1_ &= ~0x00040000; activityHonors.clear(); return this; } @@ -3205,7 +3247,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableActivityHonors() { - bitField1_ |= 0x00020000; + bitField1_ |= 0x00040000; return activityHonors; } @@ -3215,7 +3257,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addActivityHonors(final Public.ActivityHonor value) { - bitField1_ |= 0x00020000; + bitField1_ |= 0x00040000; activityHonors.add(value); return this; } @@ -3226,7 +3268,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllActivityHonors(final Public.ActivityHonor... values) { - bitField1_ |= 0x00020000; + bitField1_ |= 0x00040000; activityHonors.addAll(values); return this; } @@ -3236,7 +3278,7 @@ public final class PlayerData { * @return whether the personalityModels field is set */ public boolean hasPersonalityModels() { - return (bitField1_ & 0x00040000) != 0; + return (bitField1_ & 0x00080000) != 0; } /** @@ -3244,7 +3286,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearPersonalityModels() { - bitField1_ &= ~0x00040000; + bitField1_ &= ~0x00080000; personalityModels.clear(); return this; } @@ -3273,7 +3315,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutablePersonalityModels() { - bitField1_ |= 0x00040000; + bitField1_ |= 0x00080000; return personalityModels; } @@ -3283,7 +3325,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addPersonalityModels(final Public.ActivityPersonalityModel value) { - bitField1_ |= 0x00040000; + bitField1_ |= 0x00080000; personalityModels.add(value); return this; } @@ -3294,7 +3336,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllPersonalityModels(final Public.ActivityPersonalityModel... values) { - bitField1_ |= 0x00040000; + bitField1_ |= 0x00080000; personalityModels.addAll(values); return this; } @@ -3304,7 +3346,7 @@ public final class PlayerData { * @return whether the honors field is set */ public boolean hasHonors() { - return (bitField1_ & 0x00080000) != 0; + return (bitField1_ & 0x00100000) != 0; } /** @@ -3312,7 +3354,7 @@ public final class PlayerData { * @return this */ public PlayerInfo clearHonors() { - bitField1_ &= ~0x00080000; + bitField1_ &= ~0x00100000; honors.clear(); return this; } @@ -3341,7 +3383,7 @@ public final class PlayerData { * @return internal storage object for modifications */ public RepeatedMessage getMutableHonors() { - bitField1_ |= 0x00080000; + bitField1_ |= 0x00100000; return honors; } @@ -3351,7 +3393,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addHonors(final Public.HonorInfo value) { - bitField1_ |= 0x00080000; + bitField1_ |= 0x00100000; honors.add(value); return this; } @@ -3362,7 +3404,7 @@ public final class PlayerData { * @return this */ public PlayerInfo addAllHonors(final Public.HonorInfo... values) { - bitField1_ |= 0x00080000; + bitField1_ |= 0x00100000; honors.addAll(values); return this; } @@ -3380,6 +3422,7 @@ public final class PlayerData { signinIndex = other.signinIndex; equipmentDoubleCount = other.equipmentDoubleCount; tourGuideQuestGroup = other.tourGuideQuestGroup; + towerTicketGrowthBonus = other.towerTicketGrowthBonus; towerTicket = other.towerTicket; dailyMallRewardStatus = other.dailyMallRewardStatus; dailyShopRewardStatus = other.dailyShopRewardStatus; @@ -3393,9 +3436,9 @@ public final class PlayerData { phone.copyFrom(other.phone); story.copyFrom(other.story); vampireSurvivorRecord.copyFrom(other.vampireSurvivorRecord); + lastRead.copyFrom(other.lastRead); huntPermit.copyFrom(other.huntPermit); traceRequest.copyFrom(other.traceRequest); - lastRead.copyFrom(other.lastRead); achievements.copyFrom(other.achievements); nextPackage.copyFrom(other.nextPackage); rglPassedIds.copyFrom(other.rglPassedIds); @@ -3403,10 +3446,10 @@ public final class PlayerData { datingCharIds.copyFrom(other.datingCharIds); dailyActiveIds.copyFrom(other.dailyActiveIds); weeklyActiveIds.copyFrom(other.weeklyActiveIds); - honorList.copyFrom(other.honorList); } if ((bitField1_ | other.bitField1_) != 0) { bitField1_ = other.bitField1_; + honorList.copyFrom(other.honorList); res.copyFrom(other.res); items.copyFrom(other.items); chars.copyFrom(other.chars); @@ -3461,6 +3504,9 @@ public final class PlayerData { if (other.hasTourGuideQuestGroup()) { setTourGuideQuestGroup(other.tourGuideQuestGroup); } + if (other.hasTowerTicketGrowthBonus()) { + setTowerTicketGrowthBonus(other.towerTicketGrowthBonus); + } if (other.hasTowerTicket()) { setTowerTicket(other.towerTicket); } @@ -3500,15 +3546,15 @@ public final class PlayerData { if (other.hasVampireSurvivorRecord()) { getMutableVampireSurvivorRecord().mergeFrom(other.vampireSurvivorRecord); } + if (other.hasLastRead()) { + getMutableLastRead().mergeFrom(other.lastRead); + } if (other.hasHuntPermit()) { getMutableHuntPermit().mergeFrom(other.huntPermit); } if (other.hasTraceRequest()) { getMutableTraceRequest().mergeFrom(other.traceRequest); } - if (other.hasLastRead()) { - getMutableLastRead().mergeFrom(other.lastRead); - } if (other.hasAchievements()) { getMutableAchievements().copyFrom(other.achievements); } @@ -3612,6 +3658,7 @@ public final class PlayerData { signinIndex = 0; equipmentDoubleCount = 0; tourGuideQuestGroup = 0; + towerTicketGrowthBonus = 0; towerTicket = 0; dailyMallRewardStatus = false; dailyShopRewardStatus = false; @@ -3625,9 +3672,9 @@ public final class PlayerData { phone.clear(); story.clear(); vampireSurvivorRecord.clear(); + lastRead.clear(); huntPermit.clear(); traceRequest.clear(); - lastRead.clear(); achievements.clear(); nextPackage.clear(); rglPassedIds.clear(); @@ -3677,9 +3724,9 @@ public final class PlayerData { phone.clearQuick(); story.clearQuick(); vampireSurvivorRecord.clearQuick(); + lastRead.clearQuick(); huntPermit.clearQuick(); traceRequest.clearQuick(); - lastRead.clearQuick(); achievements.clear(); nextPackage.clear(); rglPassedIds.clear(); @@ -3730,6 +3777,7 @@ public final class PlayerData { && (!hasSigninIndex() || signinIndex == other.signinIndex) && (!hasEquipmentDoubleCount() || equipmentDoubleCount == other.equipmentDoubleCount) && (!hasTourGuideQuestGroup() || tourGuideQuestGroup == other.tourGuideQuestGroup) + && (!hasTowerTicketGrowthBonus() || towerTicketGrowthBonus == other.towerTicketGrowthBonus) && (!hasTowerTicket() || towerTicket == other.towerTicket) && (!hasDailyMallRewardStatus() || dailyMallRewardStatus == other.dailyMallRewardStatus) && (!hasDailyShopRewardStatus() || dailyShopRewardStatus == other.dailyShopRewardStatus) @@ -3743,9 +3791,9 @@ public final class PlayerData { && (!hasPhone() || phone.equals(other.phone)) && (!hasStory() || story.equals(other.story)) && (!hasVampireSurvivorRecord() || vampireSurvivorRecord.equals(other.vampireSurvivorRecord)) + && (!hasLastRead() || lastRead.equals(other.lastRead)) && (!hasHuntPermit() || huntPermit.equals(other.huntPermit)) && (!hasTraceRequest() || traceRequest.equals(other.traceRequest)) - && (!hasLastRead() || lastRead.equals(other.lastRead)) && (!hasAchievements() || achievements.equals(other.achievements)) && (!hasNextPackage() || nextPackage.equals(other.nextPackage)) && (!hasRglPassedIds() || rglPassedIds.equals(other.rglPassedIds)) @@ -3811,228 +3859,232 @@ public final class PlayerData { output.writeUInt32NoTag(tourGuideQuestGroup); } if ((bitField0_ & 0x00000100) != 0) { + output.writeRawLittleEndian16((short) 1952); + output.writeUInt32NoTag(towerTicketGrowthBonus); + } + if ((bitField0_ & 0x00000200) != 0) { output.writeRawLittleEndian16((short) 2032); output.writeUInt32NoTag(towerTicket); } - if ((bitField0_ & 0x00000200) != 0) { + if ((bitField0_ & 0x00000400) != 0) { output.writeRawLittleEndian16((short) 704); output.writeBoolNoTag(dailyMallRewardStatus); } - if ((bitField0_ & 0x00000400) != 0) { + if ((bitField0_ & 0x00000800) != 0) { output.writeRawLittleEndian16((short) 2024); output.writeBoolNoTag(dailyShopRewardStatus); } - if ((bitField0_ & 0x00000800) != 0) { + if ((bitField0_ & 0x00001000) != 0) { output.writeRawByte((byte) 10); output.writeMessageNoTag(acc); } - if ((bitField0_ & 0x00001000) != 0) { + if ((bitField0_ & 0x00002000) != 0) { output.writeRawByte((byte) 42); output.writeMessageNoTag(formation); } - if ((bitField0_ & 0x00002000) != 0) { + if ((bitField0_ & 0x00004000) != 0) { output.writeRawByte((byte) 58); output.writeMessageNoTag(energy); } - if ((bitField0_ & 0x00004000) != 0) { + if ((bitField0_ & 0x00008000) != 0) { output.writeRawByte((byte) 66); output.writeMessageNoTag(worldClass); } - if ((bitField0_ & 0x00008000) != 0) { + if ((bitField0_ & 0x00010000) != 0) { output.writeRawByte((byte) 74); output.writeMessageNoTag(agent); } - if ((bitField0_ & 0x00010000) != 0) { + if ((bitField0_ & 0x00020000) != 0) { output.writeRawByte((byte) 106); output.writeMessageNoTag(quests); } - if ((bitField0_ & 0x00020000) != 0) { + if ((bitField0_ & 0x00040000) != 0) { output.writeRawByte((byte) 114); output.writeMessageNoTag(state); } - if ((bitField0_ & 0x00040000) != 0) { + if ((bitField0_ & 0x00080000) != 0) { output.writeRawLittleEndian16((short) 458); output.writeMessageNoTag(phone); } - if ((bitField0_ & 0x00080000) != 0) { + if ((bitField0_ & 0x00100000) != 0) { output.writeRawLittleEndian16((short) 498); output.writeMessageNoTag(story); } - if ((bitField0_ & 0x00100000) != 0) { + if ((bitField0_ & 0x00200000) != 0) { output.writeRawLittleEndian16((short) 506); output.writeMessageNoTag(vampireSurvivorRecord); } - if ((bitField0_ & 0x00200000) != 0) { + if ((bitField0_ & 0x00400000) != 0) { + output.writeRawLittleEndian16((short) 1962); + output.writeMessageNoTag(lastRead); + } + if ((bitField0_ & 0x00800000) != 0) { output.writeRawLittleEndian16((short) 1970); output.writeMessageNoTag(huntPermit); } - if ((bitField0_ & 0x00400000) != 0) { + if ((bitField0_ & 0x01000000) != 0) { output.writeRawLittleEndian16((short) 1978); output.writeMessageNoTag(traceRequest); } - if ((bitField0_ & 0x00800000) != 0) { - output.writeRawLittleEndian16((short) 2178); - output.writeMessageNoTag(lastRead); - } - if ((bitField0_ & 0x01000000) != 0) { + if ((bitField0_ & 0x02000000) != 0) { output.writeRawLittleEndian16((short) 402); output.writeBytesNoTag(achievements); } - if ((bitField0_ & 0x02000000) != 0) { + if ((bitField0_ & 0x04000000) != 0) { output.writeRawLittleEndian16((short) 32762); output.writeBytesNoTag(nextPackage); } - if ((bitField0_ & 0x04000000) != 0) { + if ((bitField0_ & 0x08000000) != 0) { for (int i = 0; i < rglPassedIds.length(); i++) { output.writeRawByte((byte) 80); output.writeUInt32NoTag(rglPassedIds.array()[i]); } } - if ((bitField0_ & 0x08000000) != 0) { + if ((bitField0_ & 0x10000000) != 0) { for (int i = 0; i < board.length(); i++) { output.writeRawLittleEndian16((short) 384); output.writeUInt32NoTag(board.array()[i]); } } - if ((bitField0_ & 0x10000000) != 0) { + if ((bitField0_ & 0x20000000) != 0) { for (int i = 0; i < datingCharIds.length(); i++) { output.writeRawLittleEndian16((short) 392); output.writeUInt32NoTag(datingCharIds.array()[i]); } } - if ((bitField0_ & 0x20000000) != 0) { + if ((bitField0_ & 0x40000000) != 0) { for (int i = 0; i < dailyActiveIds.length(); i++) { output.writeRawLittleEndian16((short) 640); output.writeUInt32NoTag(dailyActiveIds.array()[i]); } } - if ((bitField0_ & 0x40000000) != 0) { + if ((bitField0_ & 0x80000000) != 0) { for (int i = 0; i < weeklyActiveIds.length(); i++) { output.writeRawLittleEndian16((short) 688); output.writeUInt32NoTag(weeklyActiveIds.array()[i]); } } - if ((bitField0_ & 0x80000000) != 0) { + if ((bitField1_ & 0x00000001) != 0) { for (int i = 0; i < honorList.length(); i++) { output.writeRawLittleEndian16((short) 2008); output.writeUInt32NoTag(honorList.array()[i]); } } - if ((bitField1_ & 0x00000001) != 0) { + if ((bitField1_ & 0x00000002) != 0) { for (int i = 0; i < res.length(); i++) { output.writeRawByte((byte) 18); output.writeMessageNoTag(res.get(i)); } } - if ((bitField1_ & 0x00000002) != 0) { + if ((bitField1_ & 0x00000004) != 0) { for (int i = 0; i < items.length(); i++) { output.writeRawByte((byte) 26); output.writeMessageNoTag(items.get(i)); } } - if ((bitField1_ & 0x00000004) != 0) { + if ((bitField1_ & 0x00000008) != 0) { for (int i = 0; i < chars.length(); i++) { output.writeRawByte((byte) 34); output.writeMessageNoTag(chars.get(i)); } } - if ((bitField1_ & 0x00000008) != 0) { + if ((bitField1_ & 0x00000010) != 0) { for (int i = 0; i < equipments.length(); i++) { output.writeRawByte((byte) 90); output.writeMessageNoTag(equipments.get(i)); } } - if ((bitField1_ & 0x00000010) != 0) { + if ((bitField1_ & 0x00000020) != 0) { for (int i = 0; i < regionBossLevels.length(); i++) { output.writeRawByte((byte) 98); output.writeMessageNoTag(regionBossLevels.get(i)); } } - if ((bitField1_ & 0x00000020) != 0) { + if ((bitField1_ & 0x00000040) != 0) { for (int i = 0; i < handbook.length(); i++) { output.writeRawLittleEndian16((short) 410); output.writeMessageNoTag(handbook.get(i)); } } - if ((bitField1_ & 0x00000040) != 0) { + if ((bitField1_ & 0x00000080) != 0) { for (int i = 0; i < titles.length(); i++) { output.writeRawLittleEndian16((short) 426); output.writeMessageNoTag(titles.get(i)); } } - if ((bitField1_ & 0x00000080) != 0) { + if ((bitField1_ & 0x00000100) != 0) { for (int i = 0; i < dailyInstances.length(); i++) { output.writeRawLittleEndian16((short) 434); output.writeMessageNoTag(dailyInstances.get(i)); } } - if ((bitField1_ & 0x00000100) != 0) { + if ((bitField1_ & 0x00000200) != 0) { for (int i = 0; i < dictionaries.length(); i++) { output.writeRawLittleEndian16((short) 442); output.writeMessageNoTag(dictionaries.get(i)); } } - if ((bitField1_ & 0x00000200) != 0) { + if ((bitField1_ & 0x00000400) != 0) { for (int i = 0; i < activities.length(); i++) { output.writeRawLittleEndian16((short) 450); output.writeMessageNoTag(activities.get(i)); } } - if ((bitField1_ & 0x00000400) != 0) { + if ((bitField1_ & 0x00000800) != 0) { for (int i = 0; i < discs.length(); i++) { output.writeRawLittleEndian16((short) 482); output.writeMessageNoTag(discs.get(i)); } } - if ((bitField1_ & 0x00000800) != 0) { + if ((bitField1_ & 0x00001000) != 0) { for (int i = 0; i < equipmentInstances.length(); i++) { output.writeRawLittleEndian16((short) 490); output.writeMessageNoTag(equipmentInstances.get(i)); } } - if ((bitField1_ & 0x00001000) != 0) { + if ((bitField1_ & 0x00002000) != 0) { for (int i = 0; i < skillInstances.length(); i++) { output.writeRawLittleEndian16((short) 658); output.writeMessageNoTag(skillInstances.get(i)); } } - if ((bitField1_ & 0x00002000) != 0) { + if ((bitField1_ & 0x00004000) != 0) { for (int i = 0; i < weekBossLevels.length(); i++) { output.writeRawLittleEndian16((short) 666); output.writeMessageNoTag(weekBossLevels.get(i)); } } - if ((bitField1_ & 0x00004000) != 0) { + if ((bitField1_ & 0x00008000) != 0) { for (int i = 0; i < charGemInstances.length(); i++) { output.writeRawLittleEndian16((short) 674); output.writeMessageNoTag(charGemInstances.get(i)); } } - if ((bitField1_ & 0x00008000) != 0) { + if ((bitField1_ & 0x00010000) != 0) { for (int i = 0; i < tutorialLevels.length(); i++) { output.writeRawLittleEndian16((short) 682); output.writeMessageNoTag(tutorialLevels.get(i)); } } - if ((bitField1_ & 0x00010000) != 0) { + if ((bitField1_ & 0x00020000) != 0) { for (int i = 0; i < assists.length(); i++) { output.writeRawLittleEndian16((short) 698); output.writeMessageNoTag(assists.get(i)); } } - if ((bitField1_ & 0x00020000) != 0) { + if ((bitField1_ & 0x00040000) != 0) { for (int i = 0; i < activityHonors.length(); i++) { output.writeRawLittleEndian16((short) 714); output.writeMessageNoTag(activityHonors.get(i)); } } - if ((bitField1_ & 0x00040000) != 0) { + if ((bitField1_ & 0x00080000) != 0) { for (int i = 0; i < personalityModels.length(); i++) { output.writeRawLittleEndian16((short) 1986); output.writeMessageNoTag(personalityModels.get(i)); } } - if ((bitField1_ & 0x00080000) != 0) { + if ((bitField1_ & 0x00100000) != 0) { for (int i = 0; i < honors.length(); i++) { output.writeRawLittleEndian16((short) 2018); output.writeMessageNoTag(honors.get(i)); @@ -4068,135 +4120,138 @@ public final class PlayerData { size += 2 + ProtoSink.computeUInt32SizeNoTag(tourGuideQuestGroup); } if ((bitField0_ & 0x00000100) != 0) { - size += 2 + ProtoSink.computeUInt32SizeNoTag(towerTicket); + size += 2 + ProtoSink.computeUInt32SizeNoTag(towerTicketGrowthBonus); } if ((bitField0_ & 0x00000200) != 0) { - size += 3; + size += 2 + ProtoSink.computeUInt32SizeNoTag(towerTicket); } if ((bitField0_ & 0x00000400) != 0) { size += 3; } if ((bitField0_ & 0x00000800) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(acc); + size += 3; } if ((bitField0_ & 0x00001000) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(formation); + size += 1 + ProtoSink.computeMessageSizeNoTag(acc); } if ((bitField0_ & 0x00002000) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(energy); + size += 1 + ProtoSink.computeMessageSizeNoTag(formation); } if ((bitField0_ & 0x00004000) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(worldClass); + size += 1 + ProtoSink.computeMessageSizeNoTag(energy); } if ((bitField0_ & 0x00008000) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(agent); + size += 1 + ProtoSink.computeMessageSizeNoTag(worldClass); } if ((bitField0_ & 0x00010000) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(quests); + size += 1 + ProtoSink.computeMessageSizeNoTag(agent); } if ((bitField0_ & 0x00020000) != 0) { - size += 1 + ProtoSink.computeMessageSizeNoTag(state); + size += 1 + ProtoSink.computeMessageSizeNoTag(quests); } if ((bitField0_ & 0x00040000) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(phone); + size += 1 + ProtoSink.computeMessageSizeNoTag(state); } if ((bitField0_ & 0x00080000) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(story); + size += 2 + ProtoSink.computeMessageSizeNoTag(phone); } if ((bitField0_ & 0x00100000) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(vampireSurvivorRecord); + size += 2 + ProtoSink.computeMessageSizeNoTag(story); } if ((bitField0_ & 0x00200000) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(huntPermit); + size += 2 + ProtoSink.computeMessageSizeNoTag(vampireSurvivorRecord); } if ((bitField0_ & 0x00400000) != 0) { - size += 2 + ProtoSink.computeMessageSizeNoTag(traceRequest); - } - if ((bitField0_ & 0x00800000) != 0) { size += 2 + ProtoSink.computeMessageSizeNoTag(lastRead); } + if ((bitField0_ & 0x00800000) != 0) { + size += 2 + ProtoSink.computeMessageSizeNoTag(huntPermit); + } if ((bitField0_ & 0x01000000) != 0) { - size += 2 + ProtoSink.computeBytesSizeNoTag(achievements); + size += 2 + ProtoSink.computeMessageSizeNoTag(traceRequest); } if ((bitField0_ & 0x02000000) != 0) { - size += 2 + ProtoSink.computeBytesSizeNoTag(nextPackage); + size += 2 + ProtoSink.computeBytesSizeNoTag(achievements); } if ((bitField0_ & 0x04000000) != 0) { - size += (1 * rglPassedIds.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(rglPassedIds); + size += 2 + ProtoSink.computeBytesSizeNoTag(nextPackage); } if ((bitField0_ & 0x08000000) != 0) { - size += (2 * board.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(board); + size += (1 * rglPassedIds.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(rglPassedIds); } if ((bitField0_ & 0x10000000) != 0) { - size += (2 * datingCharIds.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(datingCharIds); + size += (2 * board.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(board); } if ((bitField0_ & 0x20000000) != 0) { - size += (2 * dailyActiveIds.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(dailyActiveIds); + size += (2 * datingCharIds.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(datingCharIds); } if ((bitField0_ & 0x40000000) != 0) { - size += (2 * weeklyActiveIds.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(weeklyActiveIds); + size += (2 * dailyActiveIds.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(dailyActiveIds); } if ((bitField0_ & 0x80000000) != 0) { - size += (2 * honorList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(honorList); + size += (2 * weeklyActiveIds.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(weeklyActiveIds); } if ((bitField1_ & 0x00000001) != 0) { - size += (1 * res.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(res); + size += (2 * honorList.length()) + ProtoSink.computeRepeatedUInt32SizeNoTag(honorList); } if ((bitField1_ & 0x00000002) != 0) { - size += (1 * items.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(items); + size += (1 * res.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(res); } if ((bitField1_ & 0x00000004) != 0) { - size += (1 * chars.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(chars); + size += (1 * items.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(items); } if ((bitField1_ & 0x00000008) != 0) { - size += (1 * equipments.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipments); + size += (1 * chars.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(chars); } if ((bitField1_ & 0x00000010) != 0) { - size += (1 * regionBossLevels.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(regionBossLevels); + size += (1 * equipments.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipments); } if ((bitField1_ & 0x00000020) != 0) { - size += (2 * handbook.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(handbook); + size += (1 * regionBossLevels.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(regionBossLevels); } if ((bitField1_ & 0x00000040) != 0) { - size += (2 * titles.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(titles); + size += (2 * handbook.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(handbook); } if ((bitField1_ & 0x00000080) != 0) { - size += (2 * dailyInstances.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dailyInstances); + size += (2 * titles.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(titles); } if ((bitField1_ & 0x00000100) != 0) { - size += (2 * dictionaries.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dictionaries); + size += (2 * dailyInstances.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dailyInstances); } if ((bitField1_ & 0x00000200) != 0) { - size += (2 * activities.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(activities); + size += (2 * dictionaries.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(dictionaries); } if ((bitField1_ & 0x00000400) != 0) { - size += (2 * discs.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(discs); + size += (2 * activities.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(activities); } if ((bitField1_ & 0x00000800) != 0) { - size += (2 * equipmentInstances.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentInstances); + size += (2 * discs.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(discs); } if ((bitField1_ & 0x00001000) != 0) { - size += (2 * skillInstances.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skillInstances); + size += (2 * equipmentInstances.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(equipmentInstances); } if ((bitField1_ & 0x00002000) != 0) { - size += (2 * weekBossLevels.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(weekBossLevels); + size += (2 * skillInstances.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(skillInstances); } if ((bitField1_ & 0x00004000) != 0) { - size += (2 * charGemInstances.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(charGemInstances); + size += (2 * weekBossLevels.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(weekBossLevels); } if ((bitField1_ & 0x00008000) != 0) { - size += (2 * tutorialLevels.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(tutorialLevels); + size += (2 * charGemInstances.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(charGemInstances); } if ((bitField1_ & 0x00010000) != 0) { - size += (2 * assists.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(assists); + size += (2 * tutorialLevels.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(tutorialLevels); } if ((bitField1_ & 0x00020000) != 0) { - size += (2 * activityHonors.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(activityHonors); + size += (2 * assists.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(assists); } if ((bitField1_ & 0x00040000) != 0) { - size += (2 * personalityModels.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(personalityModels); + size += (2 * activityHonors.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(activityHonors); } if ((bitField1_ & 0x00080000) != 0) { + size += (2 * personalityModels.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(personalityModels); + } + if ((bitField1_ & 0x00100000) != 0) { size += (2 * honors.length()) + ProtoSink.computeRepeatedMessageSizeNoTag(honors); } return size; @@ -4277,6 +4332,15 @@ public final class PlayerData { tourGuideQuestGroup = input.readUInt32(); bitField0_ |= 0x00000080; tag = input.readTag(); + if (tag != 928) { + break; + } + } + case 928: { + // towerTicketGrowthBonus + towerTicketGrowthBonus = input.readUInt32(); + bitField0_ |= 0x00000100; + tag = input.readTag(); if (tag != 1008) { break; } @@ -4284,7 +4348,7 @@ public final class PlayerData { case 1008: { // towerTicket towerTicket = input.readUInt32(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; tag = input.readTag(); if (tag != 320) { break; @@ -4293,7 +4357,7 @@ public final class PlayerData { case 320: { // dailyMallRewardStatus dailyMallRewardStatus = input.readBool(); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; tag = input.readTag(); if (tag != 1000) { break; @@ -4302,7 +4366,7 @@ public final class PlayerData { case 1000: { // dailyShopRewardStatus dailyShopRewardStatus = input.readBool(); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; tag = input.readTag(); if (tag != 10) { break; @@ -4311,7 +4375,7 @@ public final class PlayerData { case 10: { // acc input.readMessage(acc); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; tag = input.readTag(); if (tag != 42) { break; @@ -4320,7 +4384,7 @@ public final class PlayerData { case 42: { // formation input.readMessage(formation); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; tag = input.readTag(); if (tag != 58) { break; @@ -4329,7 +4393,7 @@ public final class PlayerData { case 58: { // energy input.readMessage(energy); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; tag = input.readTag(); if (tag != 66) { break; @@ -4338,7 +4402,7 @@ public final class PlayerData { case 66: { // worldClass input.readMessage(worldClass); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00008000; tag = input.readTag(); if (tag != 74) { break; @@ -4347,7 +4411,7 @@ public final class PlayerData { case 74: { // agent input.readMessage(agent); - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; tag = input.readTag(); if (tag != 106) { break; @@ -4356,7 +4420,7 @@ public final class PlayerData { case 106: { // quests input.readMessage(quests); - bitField0_ |= 0x00010000; + bitField0_ |= 0x00020000; tag = input.readTag(); if (tag != 114) { break; @@ -4365,7 +4429,7 @@ public final class PlayerData { case 114: { // state input.readMessage(state); - bitField0_ |= 0x00020000; + bitField0_ |= 0x00040000; tag = input.readTag(); if (tag != 202) { break; @@ -4374,7 +4438,7 @@ public final class PlayerData { case 202: { // phone input.readMessage(phone); - bitField0_ |= 0x00040000; + bitField0_ |= 0x00080000; tag = input.readTag(); if (tag != 242) { break; @@ -4383,7 +4447,7 @@ public final class PlayerData { case 242: { // story input.readMessage(story); - bitField0_ |= 0x00080000; + bitField0_ |= 0x00100000; tag = input.readTag(); if (tag != 250) { break; @@ -4392,7 +4456,16 @@ public final class PlayerData { case 250: { // vampireSurvivorRecord input.readMessage(vampireSurvivorRecord); - bitField0_ |= 0x00100000; + bitField0_ |= 0x00200000; + tag = input.readTag(); + if (tag != 938) { + break; + } + } + case 938: { + // lastRead + input.readMessage(lastRead); + bitField0_ |= 0x00400000; tag = input.readTag(); if (tag != 946) { break; @@ -4401,7 +4474,7 @@ public final class PlayerData { case 946: { // huntPermit input.readMessage(huntPermit); - bitField0_ |= 0x00200000; + bitField0_ |= 0x00800000; tag = input.readTag(); if (tag != 954) { break; @@ -4410,16 +4483,7 @@ public final class PlayerData { case 954: { // traceRequest input.readMessage(traceRequest); - bitField0_ |= 0x00400000; - tag = input.readTag(); - if (tag != 1026) { - break; - } - } - case 1026: { - // lastRead - input.readMessage(lastRead); - bitField0_ |= 0x00800000; + bitField0_ |= 0x01000000; tag = input.readTag(); if (tag != 146) { break; @@ -4428,7 +4492,7 @@ public final class PlayerData { case 146: { // achievements input.readBytes(achievements); - bitField0_ |= 0x01000000; + bitField0_ |= 0x02000000; tag = input.readTag(); if (tag != 16378) { break; @@ -4437,7 +4501,7 @@ public final class PlayerData { case 16378: { // nextPackage input.readBytes(nextPackage); - bitField0_ |= 0x02000000; + bitField0_ |= 0x04000000; tag = input.readTag(); if (tag != 82) { break; @@ -4446,7 +4510,7 @@ public final class PlayerData { case 82: { // rglPassedIds [packed=true] input.readPackedUInt32(rglPassedIds, tag); - bitField0_ |= 0x04000000; + bitField0_ |= 0x08000000; tag = input.readTag(); if (tag != 130) { break; @@ -4455,7 +4519,7 @@ public final class PlayerData { case 130: { // board [packed=true] input.readPackedUInt32(board, tag); - bitField0_ |= 0x08000000; + bitField0_ |= 0x10000000; tag = input.readTag(); if (tag != 138) { break; @@ -4464,7 +4528,7 @@ public final class PlayerData { case 138: { // datingCharIds [packed=true] input.readPackedUInt32(datingCharIds, tag); - bitField0_ |= 0x10000000; + bitField0_ |= 0x20000000; tag = input.readTag(); if (tag != 258) { break; @@ -4473,7 +4537,7 @@ public final class PlayerData { case 258: { // dailyActiveIds [packed=true] input.readPackedUInt32(dailyActiveIds, tag); - bitField0_ |= 0x20000000; + bitField0_ |= 0x40000000; tag = input.readTag(); if (tag != 306) { break; @@ -4482,7 +4546,7 @@ public final class PlayerData { case 306: { // weeklyActiveIds [packed=true] input.readPackedUInt32(weeklyActiveIds, tag); - bitField0_ |= 0x40000000; + bitField0_ |= 0x80000000; tag = input.readTag(); if (tag != 986) { break; @@ -4491,7 +4555,7 @@ public final class PlayerData { case 986: { // honorList [packed=true] input.readPackedUInt32(honorList, tag); - bitField0_ |= 0x80000000; + bitField1_ |= 0x00000001; tag = input.readTag(); if (tag != 18) { break; @@ -4500,7 +4564,7 @@ public final class PlayerData { case 18: { // res tag = input.readRepeatedMessage(res, tag); - bitField1_ |= 0x00000001; + bitField1_ |= 0x00000002; if (tag != 26) { break; } @@ -4508,7 +4572,7 @@ public final class PlayerData { case 26: { // items tag = input.readRepeatedMessage(items, tag); - bitField1_ |= 0x00000002; + bitField1_ |= 0x00000004; if (tag != 34) { break; } @@ -4516,7 +4580,7 @@ public final class PlayerData { case 34: { // chars tag = input.readRepeatedMessage(chars, tag); - bitField1_ |= 0x00000004; + bitField1_ |= 0x00000008; if (tag != 90) { break; } @@ -4524,7 +4588,7 @@ public final class PlayerData { case 90: { // equipments tag = input.readRepeatedMessage(equipments, tag); - bitField1_ |= 0x00000008; + bitField1_ |= 0x00000010; if (tag != 98) { break; } @@ -4532,7 +4596,7 @@ public final class PlayerData { case 98: { // regionBossLevels tag = input.readRepeatedMessage(regionBossLevels, tag); - bitField1_ |= 0x00000010; + bitField1_ |= 0x00000020; if (tag != 154) { break; } @@ -4540,7 +4604,7 @@ public final class PlayerData { case 154: { // handbook tag = input.readRepeatedMessage(handbook, tag); - bitField1_ |= 0x00000020; + bitField1_ |= 0x00000040; if (tag != 170) { break; } @@ -4548,7 +4612,7 @@ public final class PlayerData { case 170: { // titles tag = input.readRepeatedMessage(titles, tag); - bitField1_ |= 0x00000040; + bitField1_ |= 0x00000080; if (tag != 178) { break; } @@ -4556,7 +4620,7 @@ public final class PlayerData { case 178: { // dailyInstances tag = input.readRepeatedMessage(dailyInstances, tag); - bitField1_ |= 0x00000080; + bitField1_ |= 0x00000100; if (tag != 186) { break; } @@ -4564,7 +4628,7 @@ public final class PlayerData { case 186: { // dictionaries tag = input.readRepeatedMessage(dictionaries, tag); - bitField1_ |= 0x00000100; + bitField1_ |= 0x00000200; if (tag != 194) { break; } @@ -4572,7 +4636,7 @@ public final class PlayerData { case 194: { // activities tag = input.readRepeatedMessage(activities, tag); - bitField1_ |= 0x00000200; + bitField1_ |= 0x00000400; if (tag != 226) { break; } @@ -4580,7 +4644,7 @@ public final class PlayerData { case 226: { // discs tag = input.readRepeatedMessage(discs, tag); - bitField1_ |= 0x00000400; + bitField1_ |= 0x00000800; if (tag != 234) { break; } @@ -4588,7 +4652,7 @@ public final class PlayerData { case 234: { // equipmentInstances tag = input.readRepeatedMessage(equipmentInstances, tag); - bitField1_ |= 0x00000800; + bitField1_ |= 0x00001000; if (tag != 274) { break; } @@ -4596,7 +4660,7 @@ public final class PlayerData { case 274: { // skillInstances tag = input.readRepeatedMessage(skillInstances, tag); - bitField1_ |= 0x00001000; + bitField1_ |= 0x00002000; if (tag != 282) { break; } @@ -4604,7 +4668,7 @@ public final class PlayerData { case 282: { // weekBossLevels tag = input.readRepeatedMessage(weekBossLevels, tag); - bitField1_ |= 0x00002000; + bitField1_ |= 0x00004000; if (tag != 290) { break; } @@ -4612,7 +4676,7 @@ public final class PlayerData { case 290: { // charGemInstances tag = input.readRepeatedMessage(charGemInstances, tag); - bitField1_ |= 0x00004000; + bitField1_ |= 0x00008000; if (tag != 298) { break; } @@ -4620,7 +4684,7 @@ public final class PlayerData { case 298: { // tutorialLevels tag = input.readRepeatedMessage(tutorialLevels, tag); - bitField1_ |= 0x00008000; + bitField1_ |= 0x00010000; if (tag != 314) { break; } @@ -4628,7 +4692,7 @@ public final class PlayerData { case 314: { // assists tag = input.readRepeatedMessage(assists, tag); - bitField1_ |= 0x00010000; + bitField1_ |= 0x00020000; if (tag != 330) { break; } @@ -4636,7 +4700,7 @@ public final class PlayerData { case 330: { // activityHonors tag = input.readRepeatedMessage(activityHonors, tag); - bitField1_ |= 0x00020000; + bitField1_ |= 0x00040000; if (tag != 962) { break; } @@ -4644,7 +4708,7 @@ public final class PlayerData { case 962: { // personalityModels tag = input.readRepeatedMessage(personalityModels, tag); - bitField1_ |= 0x00040000; + bitField1_ |= 0x00080000; if (tag != 994) { break; } @@ -4652,7 +4716,7 @@ public final class PlayerData { case 994: { // honors tag = input.readRepeatedMessage(honors, tag); - bitField1_ |= 0x00080000; + bitField1_ |= 0x00100000; if (tag != 0) { break; } @@ -4670,37 +4734,37 @@ public final class PlayerData { case 80: { // rglPassedIds [packed=false] tag = input.readRepeatedUInt32(rglPassedIds, tag); - bitField0_ |= 0x04000000; + bitField0_ |= 0x08000000; break; } case 128: { // board [packed=false] tag = input.readRepeatedUInt32(board, tag); - bitField0_ |= 0x08000000; + bitField0_ |= 0x10000000; break; } case 136: { // datingCharIds [packed=false] tag = input.readRepeatedUInt32(datingCharIds, tag); - bitField0_ |= 0x10000000; + bitField0_ |= 0x20000000; break; } case 256: { // dailyActiveIds [packed=false] tag = input.readRepeatedUInt32(dailyActiveIds, tag); - bitField0_ |= 0x20000000; + bitField0_ |= 0x40000000; break; } case 304: { // weeklyActiveIds [packed=false] tag = input.readRepeatedUInt32(weeklyActiveIds, tag); - bitField0_ |= 0x40000000; + bitField0_ |= 0x80000000; break; } case 984: { // honorList [packed=false] tag = input.readRepeatedUInt32(honorList, tag); - bitField0_ |= 0x80000000; + bitField1_ |= 0x00000001; break; } } @@ -4735,135 +4799,138 @@ public final class PlayerData { output.writeUInt32(FieldNames.tourGuideQuestGroup, tourGuideQuestGroup); } if ((bitField0_ & 0x00000100) != 0) { - output.writeUInt32(FieldNames.towerTicket, towerTicket); + output.writeUInt32(FieldNames.towerTicketGrowthBonus, towerTicketGrowthBonus); } if ((bitField0_ & 0x00000200) != 0) { - output.writeBool(FieldNames.dailyMallRewardStatus, dailyMallRewardStatus); + output.writeUInt32(FieldNames.towerTicket, towerTicket); } if ((bitField0_ & 0x00000400) != 0) { - output.writeBool(FieldNames.dailyShopRewardStatus, dailyShopRewardStatus); + output.writeBool(FieldNames.dailyMallRewardStatus, dailyMallRewardStatus); } if ((bitField0_ & 0x00000800) != 0) { - output.writeMessage(FieldNames.acc, acc); + output.writeBool(FieldNames.dailyShopRewardStatus, dailyShopRewardStatus); } if ((bitField0_ & 0x00001000) != 0) { - output.writeMessage(FieldNames.formation, formation); + output.writeMessage(FieldNames.acc, acc); } if ((bitField0_ & 0x00002000) != 0) { - output.writeMessage(FieldNames.energy, energy); + output.writeMessage(FieldNames.formation, formation); } if ((bitField0_ & 0x00004000) != 0) { - output.writeMessage(FieldNames.worldClass, worldClass); + output.writeMessage(FieldNames.energy, energy); } if ((bitField0_ & 0x00008000) != 0) { - output.writeMessage(FieldNames.agent, agent); + output.writeMessage(FieldNames.worldClass, worldClass); } if ((bitField0_ & 0x00010000) != 0) { - output.writeMessage(FieldNames.quests, quests); + output.writeMessage(FieldNames.agent, agent); } if ((bitField0_ & 0x00020000) != 0) { - output.writeMessage(FieldNames.state, state); + output.writeMessage(FieldNames.quests, quests); } if ((bitField0_ & 0x00040000) != 0) { - output.writeMessage(FieldNames.phone, phone); + output.writeMessage(FieldNames.state, state); } if ((bitField0_ & 0x00080000) != 0) { - output.writeMessage(FieldNames.story, story); + output.writeMessage(FieldNames.phone, phone); } if ((bitField0_ & 0x00100000) != 0) { - output.writeMessage(FieldNames.vampireSurvivorRecord, vampireSurvivorRecord); + output.writeMessage(FieldNames.story, story); } if ((bitField0_ & 0x00200000) != 0) { - output.writeMessage(FieldNames.huntPermit, huntPermit); + output.writeMessage(FieldNames.vampireSurvivorRecord, vampireSurvivorRecord); } if ((bitField0_ & 0x00400000) != 0) { - output.writeMessage(FieldNames.traceRequest, traceRequest); - } - if ((bitField0_ & 0x00800000) != 0) { output.writeMessage(FieldNames.lastRead, lastRead); } + if ((bitField0_ & 0x00800000) != 0) { + output.writeMessage(FieldNames.huntPermit, huntPermit); + } if ((bitField0_ & 0x01000000) != 0) { - output.writeBytes(FieldNames.achievements, achievements); + output.writeMessage(FieldNames.traceRequest, traceRequest); } if ((bitField0_ & 0x02000000) != 0) { - output.writeBytes(FieldNames.nextPackage, nextPackage); + output.writeBytes(FieldNames.achievements, achievements); } if ((bitField0_ & 0x04000000) != 0) { - output.writeRepeatedUInt32(FieldNames.rglPassedIds, rglPassedIds); + output.writeBytes(FieldNames.nextPackage, nextPackage); } if ((bitField0_ & 0x08000000) != 0) { - output.writeRepeatedUInt32(FieldNames.board, board); + output.writeRepeatedUInt32(FieldNames.rglPassedIds, rglPassedIds); } if ((bitField0_ & 0x10000000) != 0) { - output.writeRepeatedUInt32(FieldNames.datingCharIds, datingCharIds); + output.writeRepeatedUInt32(FieldNames.board, board); } if ((bitField0_ & 0x20000000) != 0) { - output.writeRepeatedUInt32(FieldNames.dailyActiveIds, dailyActiveIds); + output.writeRepeatedUInt32(FieldNames.datingCharIds, datingCharIds); } if ((bitField0_ & 0x40000000) != 0) { - output.writeRepeatedUInt32(FieldNames.weeklyActiveIds, weeklyActiveIds); + output.writeRepeatedUInt32(FieldNames.dailyActiveIds, dailyActiveIds); } if ((bitField0_ & 0x80000000) != 0) { - output.writeRepeatedUInt32(FieldNames.honorList, honorList); + output.writeRepeatedUInt32(FieldNames.weeklyActiveIds, weeklyActiveIds); } if ((bitField1_ & 0x00000001) != 0) { - output.writeRepeatedMessage(FieldNames.res, res); + output.writeRepeatedUInt32(FieldNames.honorList, honorList); } if ((bitField1_ & 0x00000002) != 0) { - output.writeRepeatedMessage(FieldNames.items, items); + output.writeRepeatedMessage(FieldNames.res, res); } if ((bitField1_ & 0x00000004) != 0) { - output.writeRepeatedMessage(FieldNames.chars, chars); + output.writeRepeatedMessage(FieldNames.items, items); } if ((bitField1_ & 0x00000008) != 0) { - output.writeRepeatedMessage(FieldNames.equipments, equipments); + output.writeRepeatedMessage(FieldNames.chars, chars); } if ((bitField1_ & 0x00000010) != 0) { - output.writeRepeatedMessage(FieldNames.regionBossLevels, regionBossLevels); + output.writeRepeatedMessage(FieldNames.equipments, equipments); } if ((bitField1_ & 0x00000020) != 0) { - output.writeRepeatedMessage(FieldNames.handbook, handbook); + output.writeRepeatedMessage(FieldNames.regionBossLevels, regionBossLevels); } if ((bitField1_ & 0x00000040) != 0) { - output.writeRepeatedMessage(FieldNames.titles, titles); + output.writeRepeatedMessage(FieldNames.handbook, handbook); } if ((bitField1_ & 0x00000080) != 0) { - output.writeRepeatedMessage(FieldNames.dailyInstances, dailyInstances); + output.writeRepeatedMessage(FieldNames.titles, titles); } if ((bitField1_ & 0x00000100) != 0) { - output.writeRepeatedMessage(FieldNames.dictionaries, dictionaries); + output.writeRepeatedMessage(FieldNames.dailyInstances, dailyInstances); } if ((bitField1_ & 0x00000200) != 0) { - output.writeRepeatedMessage(FieldNames.activities, activities); + output.writeRepeatedMessage(FieldNames.dictionaries, dictionaries); } if ((bitField1_ & 0x00000400) != 0) { - output.writeRepeatedMessage(FieldNames.discs, discs); + output.writeRepeatedMessage(FieldNames.activities, activities); } if ((bitField1_ & 0x00000800) != 0) { - output.writeRepeatedMessage(FieldNames.equipmentInstances, equipmentInstances); + output.writeRepeatedMessage(FieldNames.discs, discs); } if ((bitField1_ & 0x00001000) != 0) { - output.writeRepeatedMessage(FieldNames.skillInstances, skillInstances); + output.writeRepeatedMessage(FieldNames.equipmentInstances, equipmentInstances); } if ((bitField1_ & 0x00002000) != 0) { - output.writeRepeatedMessage(FieldNames.weekBossLevels, weekBossLevels); + output.writeRepeatedMessage(FieldNames.skillInstances, skillInstances); } if ((bitField1_ & 0x00004000) != 0) { - output.writeRepeatedMessage(FieldNames.charGemInstances, charGemInstances); + output.writeRepeatedMessage(FieldNames.weekBossLevels, weekBossLevels); } if ((bitField1_ & 0x00008000) != 0) { - output.writeRepeatedMessage(FieldNames.tutorialLevels, tutorialLevels); + output.writeRepeatedMessage(FieldNames.charGemInstances, charGemInstances); } if ((bitField1_ & 0x00010000) != 0) { - output.writeRepeatedMessage(FieldNames.assists, assists); + output.writeRepeatedMessage(FieldNames.tutorialLevels, tutorialLevels); } if ((bitField1_ & 0x00020000) != 0) { - output.writeRepeatedMessage(FieldNames.activityHonors, activityHonors); + output.writeRepeatedMessage(FieldNames.assists, assists); } if ((bitField1_ & 0x00040000) != 0) { - output.writeRepeatedMessage(FieldNames.personalityModels, personalityModels); + output.writeRepeatedMessage(FieldNames.activityHonors, activityHonors); } if ((bitField1_ & 0x00080000) != 0) { + output.writeRepeatedMessage(FieldNames.personalityModels, personalityModels); + } + if ((bitField1_ & 0x00100000) != 0) { output.writeRepeatedMessage(FieldNames.honors, honors); } output.endObject(); @@ -4964,11 +5031,22 @@ public final class PlayerData { } break; } + case 50808835: { + if (input.isAtField(FieldNames.towerTicketGrowthBonus)) { + if (!input.trySkipNullValue()) { + towerTicketGrowthBonus = input.readUInt32(); + bitField0_ |= 0x00000100; + } + } else { + input.skipUnknownField(); + } + break; + } case -765674667: { if (input.isAtField(FieldNames.towerTicket)) { if (!input.trySkipNullValue()) { towerTicket = input.readUInt32(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; } } else { input.skipUnknownField(); @@ -4979,7 +5057,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.dailyMallRewardStatus)) { if (!input.trySkipNullValue()) { dailyMallRewardStatus = input.readBool(); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; } } else { input.skipUnknownField(); @@ -4990,7 +5068,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.dailyShopRewardStatus)) { if (!input.trySkipNullValue()) { dailyShopRewardStatus = input.readBool(); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; } } else { input.skipUnknownField(); @@ -5001,7 +5079,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.acc)) { if (!input.trySkipNullValue()) { input.readMessage(acc); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; } } else { input.skipUnknownField(); @@ -5012,7 +5090,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.formation)) { if (!input.trySkipNullValue()) { input.readMessage(formation); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; } } else { input.skipUnknownField(); @@ -5023,7 +5101,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.energy)) { if (!input.trySkipNullValue()) { input.readMessage(energy); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; } } else { input.skipUnknownField(); @@ -5034,7 +5112,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.worldClass)) { if (!input.trySkipNullValue()) { input.readMessage(worldClass); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00008000; } } else { input.skipUnknownField(); @@ -5045,7 +5123,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.agent)) { if (!input.trySkipNullValue()) { input.readMessage(agent); - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; } } else { input.skipUnknownField(); @@ -5056,7 +5134,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.quests)) { if (!input.trySkipNullValue()) { input.readMessage(quests); - bitField0_ |= 0x00010000; + bitField0_ |= 0x00020000; } } else { input.skipUnknownField(); @@ -5067,7 +5145,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.state)) { if (!input.trySkipNullValue()) { input.readMessage(state); - bitField0_ |= 0x00020000; + bitField0_ |= 0x00040000; } } else { input.skipUnknownField(); @@ -5078,7 +5156,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.phone)) { if (!input.trySkipNullValue()) { input.readMessage(phone); - bitField0_ |= 0x00040000; + bitField0_ |= 0x00080000; } } else { input.skipUnknownField(); @@ -5089,7 +5167,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.story)) { if (!input.trySkipNullValue()) { input.readMessage(story); - bitField0_ |= 0x00080000; + bitField0_ |= 0x00100000; } } else { input.skipUnknownField(); @@ -5100,17 +5178,6 @@ public final class PlayerData { if (input.isAtField(FieldNames.vampireSurvivorRecord)) { if (!input.trySkipNullValue()) { input.readMessage(vampireSurvivorRecord); - bitField0_ |= 0x00100000; - } - } else { - input.skipUnknownField(); - } - break; - } - case -1588912722: { - if (input.isAtField(FieldNames.huntPermit)) { - if (!input.trySkipNullValue()) { - input.readMessage(huntPermit); bitField0_ |= 0x00200000; } } else { @@ -5118,21 +5185,21 @@ public final class PlayerData { } break; } - case 1523246506: { - if (input.isAtField(FieldNames.traceRequest)) { - if (!input.trySkipNullValue()) { - input.readMessage(traceRequest); - bitField0_ |= 0x00400000; - } - } else { - input.skipUnknownField(); - } - break; - } case -1394833044: { if (input.isAtField(FieldNames.lastRead)) { if (!input.trySkipNullValue()) { input.readMessage(lastRead); + bitField0_ |= 0x00400000; + } + } else { + input.skipUnknownField(); + } + break; + } + case -1588912722: { + if (input.isAtField(FieldNames.huntPermit)) { + if (!input.trySkipNullValue()) { + input.readMessage(huntPermit); bitField0_ |= 0x00800000; } } else { @@ -5140,11 +5207,22 @@ public final class PlayerData { } break; } + case 1523246506: { + if (input.isAtField(FieldNames.traceRequest)) { + if (!input.trySkipNullValue()) { + input.readMessage(traceRequest); + bitField0_ |= 0x01000000; + } + } else { + input.skipUnknownField(); + } + break; + } case -1494045884: { if (input.isAtField(FieldNames.achievements)) { if (!input.trySkipNullValue()) { input.readBytes(achievements); - bitField0_ |= 0x01000000; + bitField0_ |= 0x02000000; } } else { input.skipUnknownField(); @@ -5155,7 +5233,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.nextPackage)) { if (!input.trySkipNullValue()) { input.readBytes(nextPackage); - bitField0_ |= 0x02000000; + bitField0_ |= 0x04000000; } } else { input.skipUnknownField(); @@ -5166,7 +5244,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.rglPassedIds)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(rglPassedIds); - bitField0_ |= 0x04000000; + bitField0_ |= 0x08000000; } } else { input.skipUnknownField(); @@ -5177,7 +5255,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.board)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(board); - bitField0_ |= 0x08000000; + bitField0_ |= 0x10000000; } } else { input.skipUnknownField(); @@ -5188,7 +5266,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.datingCharIds)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(datingCharIds); - bitField0_ |= 0x10000000; + bitField0_ |= 0x20000000; } } else { input.skipUnknownField(); @@ -5199,7 +5277,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.dailyActiveIds)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(dailyActiveIds); - bitField0_ |= 0x20000000; + bitField0_ |= 0x40000000; } } else { input.skipUnknownField(); @@ -5210,7 +5288,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.weeklyActiveIds)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(weeklyActiveIds); - bitField0_ |= 0x40000000; + bitField0_ |= 0x80000000; } } else { input.skipUnknownField(); @@ -5221,7 +5299,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.honorList)) { if (!input.trySkipNullValue()) { input.readRepeatedUInt32(honorList); - bitField0_ |= 0x80000000; + bitField1_ |= 0x00000001; } } else { input.skipUnknownField(); @@ -5232,7 +5310,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.res)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(res); - bitField1_ |= 0x00000001; + bitField1_ |= 0x00000002; } } else { input.skipUnknownField(); @@ -5243,7 +5321,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.items)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(items); - bitField1_ |= 0x00000002; + bitField1_ |= 0x00000004; } } else { input.skipUnknownField(); @@ -5254,7 +5332,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.chars)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(chars); - bitField1_ |= 0x00000004; + bitField1_ |= 0x00000008; } } else { input.skipUnknownField(); @@ -5265,7 +5343,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.equipments)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(equipments); - bitField1_ |= 0x00000008; + bitField1_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -5276,7 +5354,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.regionBossLevels)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(regionBossLevels); - bitField1_ |= 0x00000010; + bitField1_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -5287,7 +5365,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.handbook)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(handbook); - bitField1_ |= 0x00000020; + bitField1_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -5298,7 +5376,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.titles)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(titles); - bitField1_ |= 0x00000040; + bitField1_ |= 0x00000080; } } else { input.skipUnknownField(); @@ -5309,7 +5387,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.dailyInstances)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(dailyInstances); - bitField1_ |= 0x00000080; + bitField1_ |= 0x00000100; } } else { input.skipUnknownField(); @@ -5320,7 +5398,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.dictionaries)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(dictionaries); - bitField1_ |= 0x00000100; + bitField1_ |= 0x00000200; } } else { input.skipUnknownField(); @@ -5331,7 +5409,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.activities)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(activities); - bitField1_ |= 0x00000200; + bitField1_ |= 0x00000400; } } else { input.skipUnknownField(); @@ -5342,7 +5420,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.discs)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(discs); - bitField1_ |= 0x00000400; + bitField1_ |= 0x00000800; } } else { input.skipUnknownField(); @@ -5353,7 +5431,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.equipmentInstances)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(equipmentInstances); - bitField1_ |= 0x00000800; + bitField1_ |= 0x00001000; } } else { input.skipUnknownField(); @@ -5364,7 +5442,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.skillInstances)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(skillInstances); - bitField1_ |= 0x00001000; + bitField1_ |= 0x00002000; } } else { input.skipUnknownField(); @@ -5375,7 +5453,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.weekBossLevels)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(weekBossLevels); - bitField1_ |= 0x00002000; + bitField1_ |= 0x00004000; } } else { input.skipUnknownField(); @@ -5386,7 +5464,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.charGemInstances)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(charGemInstances); - bitField1_ |= 0x00004000; + bitField1_ |= 0x00008000; } } else { input.skipUnknownField(); @@ -5397,7 +5475,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.tutorialLevels)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(tutorialLevels); - bitField1_ |= 0x00008000; + bitField1_ |= 0x00010000; } } else { input.skipUnknownField(); @@ -5408,7 +5486,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.assists)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(assists); - bitField1_ |= 0x00010000; + bitField1_ |= 0x00020000; } } else { input.skipUnknownField(); @@ -5419,7 +5497,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.activityHonors)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(activityHonors); - bitField1_ |= 0x00020000; + bitField1_ |= 0x00040000; } } else { input.skipUnknownField(); @@ -5430,7 +5508,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.personalityModels)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(personalityModels); - bitField1_ |= 0x00040000; + bitField1_ |= 0x00080000; } } else { input.skipUnknownField(); @@ -5441,7 +5519,7 @@ public final class PlayerData { if (input.isAtField(FieldNames.honors)) { if (!input.trySkipNullValue()) { input.readRepeatedMessage(honors); - bitField1_ |= 0x00080000; + bitField1_ |= 0x00100000; } } else { input.skipUnknownField(); @@ -5516,6 +5594,8 @@ public final class PlayerData { static final FieldName tourGuideQuestGroup = FieldName.forField("TourGuideQuestGroup"); + static final FieldName towerTicketGrowthBonus = FieldName.forField("TowerTicketGrowthBonus"); + static final FieldName towerTicket = FieldName.forField("TowerTicket"); static final FieldName dailyMallRewardStatus = FieldName.forField("DailyMallRewardStatus"); @@ -5542,12 +5622,12 @@ public final class PlayerData { static final FieldName vampireSurvivorRecord = FieldName.forField("VampireSurvivorRecord"); + static final FieldName lastRead = FieldName.forField("LastRead"); + static final FieldName huntPermit = FieldName.forField("HuntPermit"); static final FieldName traceRequest = FieldName.forField("TraceRequest"); - static final FieldName lastRead = FieldName.forField("LastRead"); - static final FieldName achievements = FieldName.forField("Achievements"); static final FieldName nextPackage = FieldName.forField("NextPackage"); diff --git a/src/generated/main/emu/nebula/proto/Public.java b/src/generated/main/emu/nebula/proto/Public.java index 20be4dd..37cc37e 100644 --- a/src/generated/main/emu/nebula/proto/Public.java +++ b/src/generated/main/emu/nebula/proto/Public.java @@ -68970,6 +68970,11 @@ public final class Public { */ private int star; + /** + * optional uint32 RewardType = 6; + */ + private int rewardType; + /** * optional bool First = 3; */ @@ -69106,12 +69111,49 @@ public final class Public { return this; } + /** + * optional uint32 RewardType = 6; + * @return whether the rewardType field is set + */ + public boolean hasRewardType() { + return (bitField0_ & 0x00000008) != 0; + } + + /** + * optional uint32 RewardType = 6; + * @return this + */ + public CharGemInstance clearRewardType() { + bitField0_ &= ~0x00000008; + rewardType = 0; + return this; + } + + /** + * optional uint32 RewardType = 6; + * @return the rewardType + */ + public int getRewardType() { + return rewardType; + } + + /** + * optional uint32 RewardType = 6; + * @param value the rewardType to set + * @return this + */ + public CharGemInstance setRewardType(final int value) { + bitField0_ |= 0x00000008; + rewardType = value; + return this; + } + /** * optional bool First = 3; * @return whether the first field is set */ public boolean hasFirst() { - return (bitField0_ & 0x00000008) != 0; + return (bitField0_ & 0x00000010) != 0; } /** @@ -69119,7 +69161,7 @@ public final class Public { * @return this */ public CharGemInstance clearFirst() { - bitField0_ &= ~0x00000008; + bitField0_ &= ~0x00000010; first = false; return this; } @@ -69138,7 +69180,7 @@ public final class Public { * @return this */ public CharGemInstance setFirst(final boolean value) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; first = value; return this; } @@ -69148,7 +69190,7 @@ public final class Public { * @return whether the threeStar field is set */ public boolean hasThreeStar() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000020) != 0; } /** @@ -69156,7 +69198,7 @@ public final class Public { * @return this */ public CharGemInstance clearThreeStar() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000020; threeStar = false; return this; } @@ -69175,7 +69217,7 @@ public final class Public { * @return this */ public CharGemInstance setThreeStar(final boolean value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; threeStar = value; return this; } @@ -69185,7 +69227,7 @@ public final class Public { * @return whether the nextPackage field is set */ public boolean hasNextPackage() { - return (bitField0_ & 0x00000020) != 0; + return (bitField0_ & 0x00000040) != 0; } /** @@ -69193,7 +69235,7 @@ public final class Public { * @return this */ public CharGemInstance clearNextPackage() { - bitField0_ &= ~0x00000020; + bitField0_ &= ~0x00000040; nextPackage.clear(); return this; } @@ -69222,7 +69264,7 @@ public final class Public { * @return internal storage object for modifications */ public RepeatedByte getMutableNextPackage() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; return nextPackage; } @@ -69232,7 +69274,7 @@ public final class Public { * @return this */ public CharGemInstance addNextPackage(final byte value) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; nextPackage.add(value); return this; } @@ -69243,7 +69285,7 @@ public final class Public { * @return this */ public CharGemInstance addAllNextPackage(final byte... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; nextPackage.addAll(values); return this; } @@ -69254,7 +69296,7 @@ public final class Public { * @return this */ public CharGemInstance setNextPackage(final byte... values) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; nextPackage.copyFrom(values); return this; } @@ -69267,6 +69309,7 @@ public final class Public { buildId = other.buildId; id = other.id; star = other.star; + rewardType = other.rewardType; first = other.first; threeStar = other.threeStar; nextPackage.copyFrom(other.nextPackage); @@ -69289,6 +69332,9 @@ public final class Public { if (other.hasStar()) { setStar(other.star); } + if (other.hasRewardType()) { + setRewardType(other.rewardType); + } if (other.hasFirst()) { setFirst(other.first); } @@ -69311,6 +69357,7 @@ public final class Public { buildId = 0L; id = 0; star = 0; + rewardType = 0; first = false; threeStar = false; nextPackage.clear(); @@ -69341,6 +69388,7 @@ public final class Public { && (!hasBuildId() || buildId == other.buildId) && (!hasId() || id == other.id) && (!hasStar() || star == other.star) + && (!hasRewardType() || rewardType == other.rewardType) && (!hasFirst() || first == other.first) && (!hasThreeStar() || threeStar == other.threeStar) && (!hasNextPackage() || nextPackage.equals(other.nextPackage)); @@ -69361,14 +69409,18 @@ public final class Public { output.writeUInt32NoTag(star); } if ((bitField0_ & 0x00000008) != 0) { + output.writeRawByte((byte) 48); + output.writeUInt32NoTag(rewardType); + } + if ((bitField0_ & 0x00000010) != 0) { output.writeRawByte((byte) 24); output.writeBoolNoTag(first); } - if ((bitField0_ & 0x00000010) != 0) { + if ((bitField0_ & 0x00000020) != 0) { output.writeRawByte((byte) 32); output.writeBoolNoTag(threeStar); } - if ((bitField0_ & 0x00000020) != 0) { + if ((bitField0_ & 0x00000040) != 0) { output.writeRawLittleEndian16((short) 32762); output.writeBytesNoTag(nextPackage); } @@ -69387,12 +69439,15 @@ public final class Public { size += 1 + ProtoSink.computeUInt32SizeNoTag(star); } if ((bitField0_ & 0x00000008) != 0) { - size += 2; + size += 1 + ProtoSink.computeUInt32SizeNoTag(rewardType); } if ((bitField0_ & 0x00000010) != 0) { size += 2; } if ((bitField0_ & 0x00000020) != 0) { + size += 2; + } + if ((bitField0_ & 0x00000040) != 0) { size += 2 + ProtoSink.computeBytesSizeNoTag(nextPackage); } return size; @@ -69428,6 +69483,15 @@ public final class Public { star = input.readUInt32(); bitField0_ |= 0x00000004; tag = input.readTag(); + if (tag != 48) { + break; + } + } + case 48: { + // rewardType + rewardType = input.readUInt32(); + bitField0_ |= 0x00000008; + tag = input.readTag(); if (tag != 24) { break; } @@ -69435,7 +69499,7 @@ public final class Public { case 24: { // first first = input.readBool(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; tag = input.readTag(); if (tag != 32) { break; @@ -69444,7 +69508,7 @@ public final class Public { case 32: { // threeStar threeStar = input.readBool(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 16378) { break; @@ -69453,7 +69517,7 @@ public final class Public { case 16378: { // nextPackage input.readBytes(nextPackage); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; tag = input.readTag(); if (tag != 0) { break; @@ -69486,12 +69550,15 @@ public final class Public { output.writeUInt32(FieldNames.star, star); } if ((bitField0_ & 0x00000008) != 0) { - output.writeBool(FieldNames.first, first); + output.writeUInt32(FieldNames.rewardType, rewardType); } if ((bitField0_ & 0x00000010) != 0) { - output.writeBool(FieldNames.threeStar, threeStar); + output.writeBool(FieldNames.first, first); } if ((bitField0_ & 0x00000020) != 0) { + output.writeBool(FieldNames.threeStar, threeStar); + } + if ((bitField0_ & 0x00000040) != 0) { output.writeBytes(FieldNames.nextPackage, nextPackage); } output.endObject(); @@ -69537,11 +69604,22 @@ public final class Public { } break; } + case -610271447: { + if (input.isAtField(FieldNames.rewardType)) { + if (!input.trySkipNullValue()) { + rewardType = input.readUInt32(); + bitField0_ |= 0x00000008; + } + } else { + input.skipUnknownField(); + } + break; + } case 67887760: { if (input.isAtField(FieldNames.first)) { if (!input.trySkipNullValue()) { first = input.readBool(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; } } else { input.skipUnknownField(); @@ -69552,7 +69630,7 @@ public final class Public { if (input.isAtField(FieldNames.threeStar)) { if (!input.trySkipNullValue()) { threeStar = input.readBool(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -69563,7 +69641,7 @@ public final class Public { if (input.isAtField(FieldNames.nextPackage)) { if (!input.trySkipNullValue()) { input.readBytes(nextPackage); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; } } else { input.skipUnknownField(); @@ -69629,6 +69707,8 @@ public final class Public { static final FieldName star = FieldName.forField("Star"); + static final FieldName rewardType = FieldName.forField("RewardType"); + static final FieldName first = FieldName.forField("First"); static final FieldName threeStar = FieldName.forField("ThreeStar"); diff --git a/src/generated/main/emu/nebula/proto/TraceHuntApply.java b/src/generated/main/emu/nebula/proto/TraceHuntApply.java index c635ef9..07c6db5 100644 --- a/src/generated/main/emu/nebula/proto/TraceHuntApply.java +++ b/src/generated/main/emu/nebula/proto/TraceHuntApply.java @@ -39,6 +39,11 @@ public final class TraceHuntApply { */ private int bossID; + /** + * optional uint32 Difficulty = 5; + */ + private int difficulty; + /** * optional bytes NextPackage = 2047; */ @@ -202,12 +207,49 @@ public final class TraceHuntApply { return this; } + /** + * optional uint32 Difficulty = 5; + * @return whether the difficulty field is set + */ + public boolean hasDifficulty() { + return (bitField0_ & 0x00000010) != 0; + } + + /** + * optional uint32 Difficulty = 5; + * @return this + */ + public TraceHuntApplyReq clearDifficulty() { + bitField0_ &= ~0x00000010; + difficulty = 0; + return this; + } + + /** + * optional uint32 Difficulty = 5; + * @return the difficulty + */ + public int getDifficulty() { + return difficulty; + } + + /** + * optional uint32 Difficulty = 5; + * @param value the difficulty to set + * @return this + */ + public TraceHuntApplyReq setDifficulty(final int value) { + bitField0_ |= 0x00000010; + difficulty = value; + return this; + } + /** * optional bytes NextPackage = 2047; * @return whether the nextPackage field is set */ public boolean hasNextPackage() { - return (bitField0_ & 0x00000010) != 0; + return (bitField0_ & 0x00000020) != 0; } /** @@ -215,7 +257,7 @@ public final class TraceHuntApply { * @return this */ public TraceHuntApplyReq clearNextPackage() { - bitField0_ &= ~0x00000010; + bitField0_ &= ~0x00000020; nextPackage.clear(); return this; } @@ -244,7 +286,7 @@ public final class TraceHuntApply { * @return internal storage object for modifications */ public RepeatedByte getMutableNextPackage() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; return nextPackage; } @@ -254,7 +296,7 @@ public final class TraceHuntApply { * @return this */ public TraceHuntApplyReq addNextPackage(final byte value) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; nextPackage.add(value); return this; } @@ -265,7 +307,7 @@ public final class TraceHuntApply { * @return this */ public TraceHuntApplyReq addAllNextPackage(final byte... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; nextPackage.addAll(values); return this; } @@ -276,7 +318,7 @@ public final class TraceHuntApply { * @return this */ public TraceHuntApplyReq setNextPackage(final byte... values) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; nextPackage.copyFrom(values); return this; } @@ -290,6 +332,7 @@ public final class TraceHuntApply { ownerUID = other.ownerUID; buildID = other.buildID; bossID = other.bossID; + difficulty = other.difficulty; nextPackage.copyFrom(other.nextPackage); } return this; @@ -313,6 +356,9 @@ public final class TraceHuntApply { if (other.hasBossID()) { setBossID(other.bossID); } + if (other.hasDifficulty()) { + setDifficulty(other.difficulty); + } if (other.hasNextPackage()) { getMutableNextPackage().copyFrom(other.nextPackage); } @@ -330,6 +376,7 @@ public final class TraceHuntApply { ownerUID = 0L; buildID = 0L; bossID = 0; + difficulty = 0; nextPackage.clear(); return this; } @@ -359,6 +406,7 @@ public final class TraceHuntApply { && (!hasOwnerUID() || ownerUID == other.ownerUID) && (!hasBuildID() || buildID == other.buildID) && (!hasBossID() || bossID == other.bossID) + && (!hasDifficulty() || difficulty == other.difficulty) && (!hasNextPackage() || nextPackage.equals(other.nextPackage)); } @@ -381,6 +429,10 @@ public final class TraceHuntApply { output.writeUInt32NoTag(bossID); } if ((bitField0_ & 0x00000010) != 0) { + output.writeRawByte((byte) 40); + output.writeUInt32NoTag(difficulty); + } + if ((bitField0_ & 0x00000020) != 0) { output.writeRawLittleEndian16((short) 32762); output.writeBytesNoTag(nextPackage); } @@ -402,6 +454,9 @@ public final class TraceHuntApply { size += 1 + ProtoSink.computeUInt32SizeNoTag(bossID); } if ((bitField0_ & 0x00000010) != 0) { + size += 1 + ProtoSink.computeUInt32SizeNoTag(difficulty); + } + if ((bitField0_ & 0x00000020) != 0) { size += 2 + ProtoSink.computeBytesSizeNoTag(nextPackage); } return size; @@ -446,6 +501,15 @@ public final class TraceHuntApply { bossID = input.readUInt32(); bitField0_ |= 0x00000008; tag = input.readTag(); + if (tag != 40) { + break; + } + } + case 40: { + // difficulty + difficulty = input.readUInt32(); + bitField0_ |= 0x00000010; + tag = input.readTag(); if (tag != 16378) { break; } @@ -453,7 +517,7 @@ public final class TraceHuntApply { case 16378: { // nextPackage input.readBytes(nextPackage); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; tag = input.readTag(); if (tag != 0) { break; @@ -489,6 +553,9 @@ public final class TraceHuntApply { output.writeUInt32(FieldNames.bossID, bossID); } if ((bitField0_ & 0x00000010) != 0) { + output.writeUInt32(FieldNames.difficulty, difficulty); + } + if ((bitField0_ & 0x00000020) != 0) { output.writeBytes(FieldNames.nextPackage, nextPackage); } output.endObject(); @@ -545,11 +612,22 @@ public final class TraceHuntApply { } break; } + case -472001573: { + if (input.isAtField(FieldNames.difficulty)) { + if (!input.trySkipNullValue()) { + difficulty = input.readUInt32(); + bitField0_ |= 0x00000010; + } + } else { + input.skipUnknownField(); + } + break; + } case -2082324045: { if (input.isAtField(FieldNames.nextPackage)) { if (!input.trySkipNullValue()) { input.readBytes(nextPackage); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; } } else { input.skipUnknownField(); @@ -617,6 +695,8 @@ public final class TraceHuntApply { static final FieldName bossID = FieldName.forField("BossID"); + static final FieldName difficulty = FieldName.forField("Difficulty"); + static final FieldName nextPackage = FieldName.forField("NextPackage"); } } diff --git a/src/main/java/emu/nebula/GameConstants.java b/src/main/java/emu/nebula/GameConstants.java index 03740eb..3de783f 100644 --- a/src/main/java/emu/nebula/GameConstants.java +++ b/src/main/java/emu/nebula/GameConstants.java @@ -7,7 +7,7 @@ import emu.nebula.game.inventory.ItemParamMap; import emu.nebula.util.WeightedList; public class GameConstants { - public static final String VERSION = "1.14.0"; + public static final String VERSION = "1.15.0"; public static int DATA_VERSION = 0; public static final ZoneId UTC_ZONE = ZoneId.of("UTC"); diff --git a/src/main/java/emu/nebula/game/achievement/AchievementCondition.java b/src/main/java/emu/nebula/game/achievement/AchievementCondition.java index a15243d..8e0346f 100644 --- a/src/main/java/emu/nebula/game/achievement/AchievementCondition.java +++ b/src/main/java/emu/nebula/game/achievement/AchievementCondition.java @@ -99,6 +99,8 @@ public enum AchievementCondition { TutorialLevelSpecificClearTotal (121), DiscWithSpecificQuantityPhaseAndAttr (122), WeekBossClearTotal (123), + TraceHuntTraceComplete (159), + TraceHuntAssistHunt (160), ClientReport (200), TowerBattleTimes (501), TowerBossChallengeSpecificHighRewardWithTotal (502), diff --git a/src/main/java/emu/nebula/game/activity/ActivityModule.java b/src/main/java/emu/nebula/game/activity/ActivityModule.java index ff5a05a..3100192 100644 --- a/src/main/java/emu/nebula/game/activity/ActivityModule.java +++ b/src/main/java/emu/nebula/game/activity/ActivityModule.java @@ -75,9 +75,14 @@ public class ActivityModule extends GameContextModule { //this.activities.add(2010304); // Surfing Splash: A Sparkling Holiday Adventure! - this.activities.add(1011001); - this.activities.add(1011003); - this.activities.add(1011004); + //this.activities.add(1011001); + //this.activities.add(1011003); + //this.activities.add(1011004); + + // Go, My Lady! Training Handbook Plus! + this.activities.add(1011101); + this.activities.add(1011103); + this.activities.add(1011104); // ===== Joint Drills (Finale Echoing) ===== //this.activities.add(510003); // Causes soft lock in event screen @@ -85,11 +90,11 @@ public class ActivityModule extends GameContextModule { // ===== Etc Events ===== // Trial activities - this.activities.add(700127); this.activities.add(700128); + this.activities.add(700129); // Tower defense activity - this.activities.add(102002); // Broken + //this.activities.add(102002); // Missing image on client - probably removed // Login events //this.activities.add(301011); // Christmas 2025 diff --git a/src/main/java/emu/nebula/game/activity/ActivityType.java b/src/main/java/emu/nebula/game/activity/ActivityType.java index 0145b5b..a86dfa0 100644 --- a/src/main/java/emu/nebula/game/activity/ActivityType.java +++ b/src/main/java/emu/nebula/game/activity/ActivityType.java @@ -30,7 +30,8 @@ public enum ActivityType { HistoryStory (22), IceCream (23), FollowSocialMedia (24), - Soldier (25); + Soldier (25), + NewStory (30); @Getter private final int value; diff --git a/src/main/java/emu/nebula/net/NetMsgId.java b/src/main/java/emu/nebula/net/NetMsgId.java index 712816a..b1c6dbc 100644 --- a/src/main/java/emu/nebula/net/NetMsgId.java +++ b/src/main/java/emu/nebula/net/NetMsgId.java @@ -532,6 +532,9 @@ public class NetMsgId { public static final int gacha_newbie_info_succeed_ack = 6023; public static final int gacha_newbie_info_failed_ack = 6024; public static final int gacha_spin_sync_ack = 6025; + public static final int gacha_reward_get_req = 6026; + public static final int gacha_reward_get_succeed_ack = 6027; + public static final int gacha_reward_get_failed_ack = 6028; public static final int tower_book_fate_card_detail_req = 6101; public static final int tower_book_fate_card_detail_succeed_ack = 6102; public static final int tower_book_fate_card_detail_failed_ack = 6103; @@ -751,6 +754,9 @@ public class NetMsgId { public static final int activity_ice_cream_level_settle_req = 8411; public static final int activity_ice_cream_level_settle_succeed_ack = 8412; public static final int activity_ice_cream_level_settle_failed_ack = 8413; + public static final int activity_penguin_card_endless_level_save_req = 8416; + public static final int activity_penguin_card_endless_level_save_succeed_ack = 8417; + public static final int activity_penguin_card_endless_level_save_failed_ack = 8418; public static final int mail_list_req = 9001; public static final int mail_list_succeed_ack = 9002; public static final int mail_list_failed_ack = 9003; diff --git a/src/main/resources/versions.json b/src/main/resources/versions.json index fbd78e6..3a647f9 100644 --- a/src/main/resources/versions.json +++ b/src/main/resources/versions.json @@ -1,7 +1,7 @@ { - "global": 131, - "kr": 137, - "jp": 135, - "tw": 141, - "cn": 131 + "global": 134, + "kr": 139, + "jp": 137, + "tw": 142, + "cn": 133 } \ No newline at end of file