Commit d575d1cc authored by Benj's avatar Benj Committed by Luke H-W
Browse files

Update 3.0 protos

parent 5db73d28
......@@ -46,7 +46,8 @@ public final class AvatarUnlockTalentNotifyOuterClass {
* <pre>
* CmdId: 1012
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code AvatarUnlockTalentNotify}
......@@ -382,7 +383,8 @@ public final class AvatarUnlockTalentNotifyOuterClass {
* <pre>
* CmdId: 1012
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code AvatarUnlockTalentNotify}
......
......@@ -40,7 +40,7 @@ public final class AvatarUpgradeReqOuterClass {
* <pre>
* CmdId: 1770
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......@@ -350,7 +350,7 @@ public final class AvatarUpgradeReqOuterClass {
* <pre>
* CmdId: 1770
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......
......@@ -114,7 +114,8 @@ public final class AvatarUpgradeRspOuterClass {
* <pre>
* CmdId: 1701
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code AvatarUpgradeRsp}
......@@ -697,7 +698,8 @@ public final class AvatarUpgradeRspOuterClass {
* <pre>
* CmdId: 1701
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code AvatarUpgradeRsp}
......
......@@ -34,7 +34,7 @@ public final class AvatarWearFlycloakReqOuterClass {
* <pre>
* CmdId: 1737
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......@@ -317,7 +317,7 @@ public final class AvatarWearFlycloakReqOuterClass {
* <pre>
* CmdId: 1737
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......
......@@ -40,7 +40,8 @@ public final class AvatarWearFlycloakRspOuterClass {
* <pre>
* CmdId: 1698
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code AvatarWearFlycloakRsp}
......@@ -349,7 +350,8 @@ public final class AvatarWearFlycloakRspOuterClass {
* <pre>
* CmdId: 1698
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code AvatarWearFlycloakRsp}
......
......@@ -24,21 +24,6 @@ public final class BattlePassAllDataNotifyOuterClass {
*/
boolean getHaveCurSchedule();
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return Whether the curSchedule field is set.
*/
boolean hasCurSchedule();
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return The curSchedule.
*/
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule getCurSchedule();
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder();
/**
* <code>repeated .BattlePassMission mission_list = 4;</code>
*/
......@@ -62,12 +47,28 @@ public final class BattlePassAllDataNotifyOuterClass {
*/
emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder getMissionListOrBuilder(
int index);
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return Whether the curSchedule field is set.
*/
boolean hasCurSchedule();
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return The curSchedule.
*/
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule getCurSchedule();
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder();
}
/**
* <pre>
* CmdId: 2618
* CmdId: 2626
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BattlePassAllDataNotify}
......@@ -189,32 +190,6 @@ public final class BattlePassAllDataNotifyOuterClass {
return haveCurSchedule_;
}
public static final int CUR_SCHEDULE_FIELD_NUMBER = 1;
private emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule curSchedule_;
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return Whether the curSchedule field is set.
*/
@java.lang.Override
public boolean hasCurSchedule() {
return curSchedule_ != null;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return The curSchedule.
*/
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule getCurSchedule() {
return curSchedule_ == null ? emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.getDefaultInstance() : curSchedule_;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder() {
return getCurSchedule();
}
public static final int MISSION_LIST_FIELD_NUMBER = 4;
private java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> missionList_;
/**
......@@ -255,6 +230,32 @@ public final class BattlePassAllDataNotifyOuterClass {
return missionList_.get(index);
}
public static final int CUR_SCHEDULE_FIELD_NUMBER = 1;
private emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule curSchedule_;
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return Whether the curSchedule field is set.
*/
@java.lang.Override
public boolean hasCurSchedule() {
return curSchedule_ != null;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return The curSchedule.
*/
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule getCurSchedule() {
return curSchedule_ == null ? emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.getDefaultInstance() : curSchedule_;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder() {
return getCurSchedule();
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
......@@ -316,13 +317,13 @@ public final class BattlePassAllDataNotifyOuterClass {
if (getHaveCurSchedule()
!= other.getHaveCurSchedule()) return false;
if (!getMissionListList()
.equals(other.getMissionListList())) return false;
if (hasCurSchedule() != other.hasCurSchedule()) return false;
if (hasCurSchedule()) {
if (!getCurSchedule()
.equals(other.getCurSchedule())) return false;
}
if (!getMissionListList()
.equals(other.getMissionListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
......@@ -337,14 +338,14 @@ public final class BattlePassAllDataNotifyOuterClass {
hash = (37 * hash) + HAVE_CUR_SCHEDULE_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getHaveCurSchedule());
if (hasCurSchedule()) {
hash = (37 * hash) + CUR_SCHEDULE_FIELD_NUMBER;
hash = (53 * hash) + getCurSchedule().hashCode();
}
if (getMissionListCount() > 0) {
hash = (37 * hash) + MISSION_LIST_FIELD_NUMBER;
hash = (53 * hash) + getMissionListList().hashCode();
}
if (hasCurSchedule()) {
hash = (37 * hash) + CUR_SCHEDULE_FIELD_NUMBER;
hash = (53 * hash) + getCurSchedule().hashCode();
}
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
......@@ -442,9 +443,10 @@ public final class BattlePassAllDataNotifyOuterClass {
}
/**
* <pre>
* CmdId: 2618
* CmdId: 2626
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BattlePassAllDataNotify}
......@@ -487,18 +489,18 @@ public final class BattlePassAllDataNotifyOuterClass {
super.clear();
haveCurSchedule_ = false;
if (curScheduleBuilder_ == null) {
curSchedule_ = null;
} else {
curSchedule_ = null;
curScheduleBuilder_ = null;
}
if (missionListBuilder_ == null) {
missionList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
missionListBuilder_.clear();
}
if (curScheduleBuilder_ == null) {
curSchedule_ = null;
} else {
curSchedule_ = null;
curScheduleBuilder_ = null;
}
return this;
}
......@@ -527,11 +529,6 @@ public final class BattlePassAllDataNotifyOuterClass {
emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify result = new emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify(this);
int from_bitField0_ = bitField0_;
result.haveCurSchedule_ = haveCurSchedule_;
if (curScheduleBuilder_ == null) {
result.curSchedule_ = curSchedule_;
} else {
result.curSchedule_ = curScheduleBuilder_.build();
}
if (missionListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
missionList_ = java.util.Collections.unmodifiableList(missionList_);
......@@ -541,6 +538,11 @@ public final class BattlePassAllDataNotifyOuterClass {
} else {
result.missionList_ = missionListBuilder_.build();
}
if (curScheduleBuilder_ == null) {
result.curSchedule_ = curSchedule_;
} else {
result.curSchedule_ = curScheduleBuilder_.build();
}
onBuilt();
return result;
}
......@@ -592,9 +594,6 @@ public final class BattlePassAllDataNotifyOuterClass {
if (other.getHaveCurSchedule() != false) {
setHaveCurSchedule(other.getHaveCurSchedule());
}
if (other.hasCurSchedule()) {
mergeCurSchedule(other.getCurSchedule());
}
if (missionListBuilder_ == null) {
if (!other.missionList_.isEmpty()) {
if (missionList_.isEmpty()) {
......@@ -621,6 +620,9 @@ public final class BattlePassAllDataNotifyOuterClass {
}
}
}
if (other.hasCurSchedule()) {
mergeCurSchedule(other.getCurSchedule());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
......@@ -682,125 +684,6 @@ public final class BattlePassAllDataNotifyOuterClass {
return this;
}
private emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule curSchedule_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder> curScheduleBuilder_;
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return Whether the curSchedule field is set.
*/
public boolean hasCurSchedule() {
return curScheduleBuilder_ != null || curSchedule_ != null;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return The curSchedule.
*/
public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule getCurSchedule() {
if (curScheduleBuilder_ == null) {
return curSchedule_ == null ? emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.getDefaultInstance() : curSchedule_;
} else {
return curScheduleBuilder_.getMessage();
}
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public Builder setCurSchedule(emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule value) {
if (curScheduleBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
curSchedule_ = value;
onChanged();
} else {
curScheduleBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public Builder setCurSchedule(
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder builderForValue) {
if (curScheduleBuilder_ == null) {
curSchedule_ = builderForValue.build();
onChanged();
} else {
curScheduleBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public Builder mergeCurSchedule(emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule value) {
if (curScheduleBuilder_ == null) {
if (curSchedule_ != null) {
curSchedule_ =
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.newBuilder(curSchedule_).mergeFrom(value).buildPartial();
} else {
curSchedule_ = value;
}
onChanged();
} else {
curScheduleBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public Builder clearCurSchedule() {
if (curScheduleBuilder_ == null) {
curSchedule_ = null;
onChanged();
} else {
curSchedule_ = null;
curScheduleBuilder_ = null;
}
return this;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder getCurScheduleBuilder() {
onChanged();
return getCurScheduleFieldBuilder().getBuilder();
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder() {
if (curScheduleBuilder_ != null) {
return curScheduleBuilder_.getMessageOrBuilder();
} else {
return curSchedule_ == null ?
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.getDefaultInstance() : curSchedule_;
}
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder>
getCurScheduleFieldBuilder() {
if (curScheduleBuilder_ == null) {
curScheduleBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder>(
getCurSchedule(),
getParentForChildren(),
isClean());
curSchedule_ = null;
}
return curScheduleBuilder_;
}
private java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> missionList_ =
java.util.Collections.emptyList();
private void ensureMissionListIsMutable() {
......@@ -1040,6 +923,125 @@ public final class BattlePassAllDataNotifyOuterClass {
}
return missionListBuilder_;
}
private emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule curSchedule_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder> curScheduleBuilder_;
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return Whether the curSchedule field is set.
*/
public boolean hasCurSchedule() {
return curScheduleBuilder_ != null || curSchedule_ != null;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
* @return The curSchedule.
*/
public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule getCurSchedule() {
if (curScheduleBuilder_ == null) {
return curSchedule_ == null ? emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.getDefaultInstance() : curSchedule_;
} else {
return curScheduleBuilder_.getMessage();
}
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public Builder setCurSchedule(emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule value) {
if (curScheduleBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
curSchedule_ = value;
onChanged();
} else {
curScheduleBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public Builder setCurSchedule(
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder builderForValue) {
if (curScheduleBuilder_ == null) {
curSchedule_ = builderForValue.build();
onChanged();
} else {
curScheduleBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public Builder mergeCurSchedule(emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule value) {
if (curScheduleBuilder_ == null) {
if (curSchedule_ != null) {
curSchedule_ =
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.newBuilder(curSchedule_).mergeFrom(value).buildPartial();
} else {
curSchedule_ = value;
}
onChanged();
} else {
curScheduleBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public Builder clearCurSchedule() {
if (curScheduleBuilder_ == null) {
curSchedule_ = null;
onChanged();
} else {
curSchedule_ = null;
curScheduleBuilder_ = null;
}
return this;
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder getCurScheduleBuilder() {
onChanged();
return getCurScheduleFieldBuilder().getBuilder();
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder() {
if (curScheduleBuilder_ != null) {
return curScheduleBuilder_.getMessageOrBuilder();
} else {
return curSchedule_ == null ?
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.getDefaultInstance() : curSchedule_;
}
}
/**
* <code>.BattlePassSchedule cur_schedule = 1;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder>
getCurScheduleFieldBuilder() {
if (curScheduleBuilder_ == null) {
curScheduleBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder>(
getCurSchedule(),
getParentForChildren(),
isClean());
curSchedule_ = null;
}
return curScheduleBuilder_;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
......@@ -1110,9 +1112,9 @@ public final class BattlePassAllDataNotifyOuterClass {
"\n\035BattlePassAllDataNotify.proto\032\027BattleP" +
"assMission.proto\032\030BattlePassSchedule.pro" +
"to\"\211\001\n\027BattlePassAllDataNotify\022\031\n\021have_c" +
"ur_schedule\030\002 \001(\010\022)\n\014cur_schedule\030\001 \001(\0132" +
"\023.BattlePassSchedule\022(\n\014mission_list\030\004 \003" +
"(\0132\022.BattlePassMissionB\033\n\031emu.grasscutte" +
"ur_schedule\030\002 \001(\010\022(\n\014mission_list\030\004 \003(\0132" +
"\022.BattlePassMission\022)\n\014cur_schedule\030\001 \001(" +
"\0132\023.BattlePassScheduleB\033\n\031emu.grasscutte" +
"r.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
......@@ -1126,7 +1128,7 @@ public final class BattlePassAllDataNotifyOuterClass {
internal_static_BattlePassAllDataNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_BattlePassAllDataNotify_descriptor,
new java.lang.String[] { "HaveCurSchedule", "CurSchedule", "MissionList", });
new java.lang.String[] { "HaveCurSchedule", "MissionList", "CurSchedule", });
emu.grasscutter.net.proto.BattlePassMissionOuterClass.getDescriptor();
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.getDescriptor();
}
......
......@@ -30,6 +30,12 @@ public final class BattlePassBuySuccNotifyOuterClass {
*/
int getProductPlayType();
/**
* <code>uint32 add_point = 12;</code>
* @return The addPoint.
*/
int getAddPoint();
/**
* <code>repeated .ItemParam item_list = 9;</code>
*/
......@@ -53,18 +59,13 @@ public final class BattlePassBuySuccNotifyOuterClass {
*/
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
int index);
/**
* <code>uint32 add_point = 12;</code>
* @return The addPoint.
*/
int getAddPoint();
}
/**
* <pre>
* CmdId: 2614
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BattlePassBuySuccNotify}
......@@ -194,6 +195,17 @@ public final class BattlePassBuySuccNotifyOuterClass {
return productPlayType_;
}
public static final int ADD_POINT_FIELD_NUMBER = 12;
private int addPoint_;
/**
* <code>uint32 add_point = 12;</code>
* @return The addPoint.
*/
@java.lang.Override
public int getAddPoint() {
return addPoint_;
}
public static final int ITEM_LIST_FIELD_NUMBER = 9;
private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemList_;
/**
......@@ -234,17 +246,6 @@ public final class BattlePassBuySuccNotifyOuterClass {
return itemList_.get(index);
}
public static final int ADD_POINT_FIELD_NUMBER = 12;
private int addPoint_;
/**
* <code>uint32 add_point = 12;</code>
* @return The addPoint.
*/
@java.lang.Override
public int getAddPoint() {
return addPoint_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
......@@ -315,10 +316,10 @@ public final class BattlePassBuySuccNotifyOuterClass {
!= other.getScheduleId()) return false;
if (getProductPlayType()
!= other.getProductPlayType()) return false;
if (!getItemListList()
.equals(other.getItemListList())) return false;
if (getAddPoint()
!= other.getAddPoint()) return false;
if (!getItemListList()
.equals(other.getItemListList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
......@@ -334,12 +335,12 @@ public final class BattlePassBuySuccNotifyOuterClass {
hash = (53 * hash) + getScheduleId();
hash = (37 * hash) + PRODUCT_PLAY_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getProductPlayType();
hash = (37 * hash) + ADD_POINT_FIELD_NUMBER;
hash = (53 * hash) + getAddPoint();
if (getItemListCount() > 0) {
hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER;
hash = (53 * hash) + getItemListList().hashCode();
}
hash = (37 * hash) + ADD_POINT_FIELD_NUMBER;
hash = (53 * hash) + getAddPoint();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
......@@ -439,7 +440,8 @@ public final class BattlePassBuySuccNotifyOuterClass {
* <pre>
* CmdId: 2614
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BattlePassBuySuccNotify}
......@@ -484,14 +486,14 @@ public final class BattlePassBuySuccNotifyOuterClass {
productPlayType_ = 0;
addPoint_ = 0;
if (itemListBuilder_ == null) {
itemList_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
itemListBuilder_.clear();
}
addPoint_ = 0;
return this;
}
......@@ -521,6 +523,7 @@ public final class BattlePassBuySuccNotifyOuterClass {
int from_bitField0_ = bitField0_;
result.scheduleId_ = scheduleId_;
result.productPlayType_ = productPlayType_;
result.addPoint_ = addPoint_;
if (itemListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
itemList_ = java.util.Collections.unmodifiableList(itemList_);
......@@ -530,7 +533,6 @@ public final class BattlePassBuySuccNotifyOuterClass {
} else {
result.itemList_ = itemListBuilder_.build();
}
result.addPoint_ = addPoint_;
onBuilt();
return result;
}
......@@ -585,6 +587,9 @@ public final class BattlePassBuySuccNotifyOuterClass {
if (other.getProductPlayType() != 0) {
setProductPlayType(other.getProductPlayType());
}
if (other.getAddPoint() != 0) {
setAddPoint(other.getAddPoint());
}
if (itemListBuilder_ == null) {
if (!other.itemList_.isEmpty()) {
if (itemList_.isEmpty()) {
......@@ -611,9 +616,6 @@ public final class BattlePassBuySuccNotifyOuterClass {
}
}
}
if (other.getAddPoint() != 0) {
setAddPoint(other.getAddPoint());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
......@@ -706,6 +708,37 @@ public final class BattlePassBuySuccNotifyOuterClass {
return this;
}
private int addPoint_ ;
/**
* <code>uint32 add_point = 12;</code>
* @return The addPoint.
*/
@java.lang.Override
public int getAddPoint() {
return addPoint_;
}
/**
* <code>uint32 add_point = 12;</code>
* @param value The addPoint to set.
* @return This builder for chaining.
*/
public Builder setAddPoint(int value) {
addPoint_ = value;
onChanged();
return this;
}
/**
* <code>uint32 add_point = 12;</code>
* @return This builder for chaining.
*/
public Builder clearAddPoint() {
addPoint_ = 0;
onChanged();
return this;
}
private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemList_ =
java.util.Collections.emptyList();
private void ensureItemListIsMutable() {
......@@ -945,37 +978,6 @@ public final class BattlePassBuySuccNotifyOuterClass {
}
return itemListBuilder_;
}
private int addPoint_ ;
/**
* <code>uint32 add_point = 12;</code>
* @return The addPoint.
*/
@java.lang.Override
public int getAddPoint() {
return addPoint_;
}
/**
* <code>uint32 add_point = 12;</code>
* @param value The addPoint to set.
* @return This builder for chaining.
*/
public Builder setAddPoint(int value) {
addPoint_ = value;
onChanged();
return this;
}
/**
* <code>uint32 add_point = 12;</code>
* @return This builder for chaining.
*/
public Builder clearAddPoint() {
addPoint_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
......@@ -1046,8 +1048,8 @@ public final class BattlePassBuySuccNotifyOuterClass {
"\n\035BattlePassBuySuccNotify.proto\032\017ItemPar" +
"am.proto\"{\n\027BattlePassBuySuccNotify\022\023\n\013s" +
"chedule_id\030\004 \001(\r\022\031\n\021product_play_type\030\013 " +
"\001(\r\022\035\n\titem_list\030\t \003(\0132\n.ItemParam\022\021\n\tad" +
"d_point\030\014 \001(\rB\033\n\031emu.grasscutter.net.pro" +
"\001(\r\022\021\n\tadd_point\030\014 \001(\r\022\035\n\titem_list\030\t \003(" +
"\0132\n.ItemParamB\033\n\031emu.grasscutter.net.pro" +
"tob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
......@@ -1060,7 +1062,7 @@ public final class BattlePassBuySuccNotifyOuterClass {
internal_static_BattlePassBuySuccNotify_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_BattlePassBuySuccNotify_descriptor,
new java.lang.String[] { "ScheduleId", "ProductPlayType", "ItemList", "AddPoint", });
new java.lang.String[] { "ScheduleId", "ProductPlayType", "AddPoint", "ItemList", });
emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
}
......
......@@ -41,9 +41,10 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
}
/**
* <pre>
* CmdId: 2604
* CmdId: 2607
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BattlePassCurScheduleUpdateNotify}
......@@ -351,9 +352,10 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
}
/**
* <pre>
* CmdId: 2604
* CmdId: 2607
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BattlePassCurScheduleUpdateNotify}
......
......@@ -24,17 +24,17 @@ public final class BattlePassCycleOuterClass {
*/
int getCycleIdx();
/**
* <code>uint32 begin_time = 13;</code>
* @return The beginTime.
*/
int getBeginTime();
/**
* <code>uint32 end_time = 10;</code>
* @return The endTime.
*/
int getEndTime();
/**
* <code>uint32 begin_time = 13;</code>
* @return The beginTime.
*/
int getBeginTime();
}
/**
* Protobuf type {@code BattlePassCycle}
......@@ -139,17 +139,6 @@ public final class BattlePassCycleOuterClass {
return cycleIdx_;
}
public static final int BEGIN_TIME_FIELD_NUMBER = 13;
private int beginTime_;
/**
* <code>uint32 begin_time = 13;</code>
* @return The beginTime.
*/
@java.lang.Override
public int getBeginTime() {
return beginTime_;
}
public static final int END_TIME_FIELD_NUMBER = 10;
private int endTime_;
/**
......@@ -161,6 +150,17 @@ public final class BattlePassCycleOuterClass {
return endTime_;
}
public static final int BEGIN_TIME_FIELD_NUMBER = 13;
private int beginTime_;
/**
* <code>uint32 begin_time = 13;</code>
* @return The beginTime.
*/
@java.lang.Override
public int getBeginTime() {
return beginTime_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
......@@ -222,10 +222,10 @@ public final class BattlePassCycleOuterClass {
if (getCycleIdx()
!= other.getCycleIdx()) return false;
if (getBeginTime()
!= other.getBeginTime()) return false;
if (getEndTime()
!= other.getEndTime()) return false;
if (getBeginTime()
!= other.getBeginTime()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
......@@ -239,10 +239,10 @@ public final class BattlePassCycleOuterClass {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + CYCLE_IDX_FIELD_NUMBER;
hash = (53 * hash) + getCycleIdx();
hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
hash = (53 * hash) + getBeginTime();
hash = (37 * hash) + END_TIME_FIELD_NUMBER;
hash = (53 * hash) + getEndTime();
hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
hash = (53 * hash) + getBeginTime();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
......@@ -378,10 +378,10 @@ public final class BattlePassCycleOuterClass {
super.clear();
cycleIdx_ = 0;
beginTime_ = 0;
endTime_ = 0;
beginTime_ = 0;
return this;
}
......@@ -409,8 +409,8 @@ public final class BattlePassCycleOuterClass {
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle buildPartial() {
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle result = new emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle(this);
result.cycleIdx_ = cycleIdx_;
result.beginTime_ = beginTime_;
result.endTime_ = endTime_;
result.beginTime_ = beginTime_;
onBuilt();
return result;
}
......@@ -462,12 +462,12 @@ public final class BattlePassCycleOuterClass {
if (other.getCycleIdx() != 0) {
setCycleIdx(other.getCycleIdx());
}
if (other.getBeginTime() != 0) {
setBeginTime(other.getBeginTime());
}
if (other.getEndTime() != 0) {
setEndTime(other.getEndTime());
}
if (other.getBeginTime() != 0) {
setBeginTime(other.getBeginTime());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
......@@ -528,64 +528,64 @@ public final class BattlePassCycleOuterClass {
return this;
}
private int beginTime_ ;
private int endTime_ ;
/**
* <code>uint32 begin_time = 13;</code>
* @return The beginTime.
* <code>uint32 end_time = 10;</code>
* @return The endTime.
*/
@java.lang.Override
public int getBeginTime() {
return beginTime_;
public int getEndTime() {
return endTime_;
}
/**
* <code>uint32 begin_time = 13;</code>
* @param value The beginTime to set.
* <code>uint32 end_time = 10;</code>
* @param value The endTime to set.
* @return This builder for chaining.
*/
public Builder setBeginTime(int value) {
public Builder setEndTime(int value) {
beginTime_ = value;
endTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 begin_time = 13;</code>
* <code>uint32 end_time = 10;</code>
* @return This builder for chaining.
*/
public Builder clearBeginTime() {
public Builder clearEndTime() {
beginTime_ = 0;
endTime_ = 0;
onChanged();
return this;
}
private int endTime_ ;
private int beginTime_ ;
/**
* <code>uint32 end_time = 10;</code>
* @return The endTime.
* <code>uint32 begin_time = 13;</code>
* @return The beginTime.
*/
@java.lang.Override
public int getEndTime() {
return endTime_;
public int getBeginTime() {
return beginTime_;
}
/**
* <code>uint32 end_time = 10;</code>
* @param value The endTime to set.
* <code>uint32 begin_time = 13;</code>
* @param value The beginTime to set.
* @return This builder for chaining.
*/
public Builder setEndTime(int value) {
public Builder setBeginTime(int value) {
endTime_ = value;
beginTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 end_time = 10;</code>
* <code>uint32 begin_time = 13;</code>
* @return This builder for chaining.
*/
public Builder clearEndTime() {
public Builder clearBeginTime() {
endTime_ = 0;
beginTime_ = 0;
onChanged();
return this;
}
......@@ -657,8 +657,8 @@ public final class BattlePassCycleOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\025BattlePassCycle.proto\"J\n\017BattlePassCyc" +
"le\022\021\n\tcycle_idx\030\003 \001(\r\022\022\n\nbegin_time\030\r \001(" +
"\r\022\020\n\010end_time\030\n \001(\rB\033\n\031emu.grasscutter.n" +
"le\022\021\n\tcycle_idx\030\003 \001(\r\022\020\n\010end_time\030\n \001(\r\022" +
"\022\n\nbegin_time\030\r \001(\rB\033\n\031emu.grasscutter.n" +
"et.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
......@@ -670,7 +670,7 @@ public final class BattlePassCycleOuterClass {
internal_static_BattlePassCycle_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_BattlePassCycle_descriptor,
new java.lang.String[] { "CycleIdx", "BeginTime", "EndTime", });
new java.lang.String[] { "CycleIdx", "EndTime", "BeginTime", });
}
// @@protoc_insertion_point(outer_class_scope)
......
......@@ -37,9 +37,10 @@ public final class BattlePassMissionDelNotifyOuterClass {
}
/**
* <pre>
* CmdId: 2643
* CmdId: 2625
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BattlePassMissionDelNotify}
......@@ -346,9 +347,10 @@ public final class BattlePassMissionDelNotifyOuterClass {
}
/**
* <pre>
* CmdId: 2643
* CmdId: 2625
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BattlePassMissionDelNotify}
......
......@@ -18,12 +18,6 @@ public final class BattlePassMissionOuterClass {
// @@protoc_insertion_point(interface_extends:BattlePassMission)
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 mission_id = 11;</code>
* @return The missionId.
*/
int getMissionId();
/**
* <code>uint32 cur_progress = 13;</code>
* @return The curProgress.
......@@ -31,10 +25,21 @@ public final class BattlePassMissionOuterClass {
int getCurProgress();
/**
* <code>uint32 total_progress = 6;</code>
* @return The totalProgress.
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The enum numeric value on the wire for missionStatus.
*/
int getTotalProgress();
int getMissionStatusValue();
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The missionStatus.
*/
emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus getMissionStatus();
/**
* <code>uint32 mission_id = 11;</code>
* @return The missionId.
*/
int getMissionId();
/**
* <code>uint32 reward_battle_pass_point = 3;</code>
......@@ -49,15 +54,10 @@ public final class BattlePassMissionOuterClass {
int getMissionType();
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The enum numeric value on the wire for missionStatus.
*/
int getMissionStatusValue();
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The missionStatus.
* <code>uint32 total_progress = 6;</code>
* @return The totalProgress.
*/
emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus getMissionStatus();
int getTotalProgress();
}
/**
* Protobuf type {@code BattlePassMission}
......@@ -294,17 +294,6 @@ public final class BattlePassMissionOuterClass {
// @@protoc_insertion_point(enum_scope:BattlePassMission.MissionStatus)
}
public static final int MISSION_ID_FIELD_NUMBER = 11;
private int missionId_;
/**
* <code>uint32 mission_id = 11;</code>
* @return The missionId.
*/
@java.lang.Override
public int getMissionId() {
return missionId_;
}
public static final int CUR_PROGRESS_FIELD_NUMBER = 13;
private int curProgress_;
/**
......@@ -316,15 +305,34 @@ public final class BattlePassMissionOuterClass {
return curProgress_;
}
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 6;
private int totalProgress_;
public static final int MISSION_STATUS_FIELD_NUMBER = 15;
private int missionStatus_;
/**
* <code>uint32 total_progress = 6;</code>
* @return The totalProgress.
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The enum numeric value on the wire for missionStatus.
*/
@java.lang.Override public int getMissionStatusValue() {
return missionStatus_;
}
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The missionStatus.
*/
@java.lang.Override public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus getMissionStatus() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus result = emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.valueOf(missionStatus_);
return result == null ? emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.UNRECOGNIZED : result;
}
public static final int MISSION_ID_FIELD_NUMBER = 11;
private int missionId_;
/**
* <code>uint32 mission_id = 11;</code>
* @return The missionId.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
public int getMissionId() {
return missionId_;
}
public static final int REWARD_BATTLE_PASS_POINT_FIELD_NUMBER = 3;
......@@ -349,23 +357,15 @@ public final class BattlePassMissionOuterClass {
return missionType_;
}
public static final int MISSION_STATUS_FIELD_NUMBER = 15;
private int missionStatus_;
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The enum numeric value on the wire for missionStatus.
*/
@java.lang.Override public int getMissionStatusValue() {
return missionStatus_;
}
public static final int TOTAL_PROGRESS_FIELD_NUMBER = 6;
private int totalProgress_;
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The missionStatus.
* <code>uint32 total_progress = 6;</code>
* @return The totalProgress.
*/
@java.lang.Override public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus getMissionStatus() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus result = emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.valueOf(missionStatus_);
return result == null ? emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.UNRECOGNIZED : result;
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
}
private byte memoizedIsInitialized = -1;
......@@ -448,17 +448,17 @@ public final class BattlePassMissionOuterClass {
}
emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission other = (emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission) obj;
if (getMissionId()
!= other.getMissionId()) return false;
if (getCurProgress()
!= other.getCurProgress()) return false;
if (getTotalProgress()
!= other.getTotalProgress()) return false;
if (missionStatus_ != other.missionStatus_) return false;
if (getMissionId()
!= other.getMissionId()) return false;
if (getRewardBattlePassPoint()
!= other.getRewardBattlePassPoint()) return false;
if (getMissionType()
!= other.getMissionType()) return false;
if (missionStatus_ != other.missionStatus_) return false;
if (getTotalProgress()
!= other.getTotalProgress()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
......@@ -470,18 +470,18 @@ public final class BattlePassMissionOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + MISSION_ID_FIELD_NUMBER;
hash = (53 * hash) + getMissionId();
hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getCurProgress();
hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getTotalProgress();
hash = (37 * hash) + MISSION_STATUS_FIELD_NUMBER;
hash = (53 * hash) + missionStatus_;
hash = (37 * hash) + MISSION_ID_FIELD_NUMBER;
hash = (53 * hash) + getMissionId();
hash = (37 * hash) + REWARD_BATTLE_PASS_POINT_FIELD_NUMBER;
hash = (53 * hash) + getRewardBattlePassPoint();
hash = (37 * hash) + MISSION_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getMissionType();
hash = (37 * hash) + MISSION_STATUS_FIELD_NUMBER;
hash = (53 * hash) + missionStatus_;
hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
hash = (53 * hash) + getTotalProgress();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
......@@ -615,17 +615,17 @@ public final class BattlePassMissionOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
missionId_ = 0;
curProgress_ = 0;
totalProgress_ = 0;
missionStatus_ = 0;
missionId_ = 0;
rewardBattlePassPoint_ = 0;
missionType_ = 0;
missionStatus_ = 0;
totalProgress_ = 0;
return this;
}
......@@ -653,12 +653,12 @@ public final class BattlePassMissionOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission buildPartial() {
emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission result = new emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission(this);
result.missionId_ = missionId_;
result.curProgress_ = curProgress_;
result.totalProgress_ = totalProgress_;
result.missionStatus_ = missionStatus_;
result.missionId_ = missionId_;
result.rewardBattlePassPoint_ = rewardBattlePassPoint_;
result.missionType_ = missionType_;
result.missionStatus_ = missionStatus_;
result.totalProgress_ = totalProgress_;
onBuilt();
return result;
}
......@@ -707,14 +707,14 @@ public final class BattlePassMissionOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission other) {
if (other == emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.getDefaultInstance()) return this;
if (other.getMissionId() != 0) {
setMissionId(other.getMissionId());
}
if (other.getCurProgress() != 0) {
setCurProgress(other.getCurProgress());
}
if (other.getTotalProgress() != 0) {
setTotalProgress(other.getTotalProgress());
if (other.missionStatus_ != 0) {
setMissionStatusValue(other.getMissionStatusValue());
}
if (other.getMissionId() != 0) {
setMissionId(other.getMissionId());
}
if (other.getRewardBattlePassPoint() != 0) {
setRewardBattlePassPoint(other.getRewardBattlePassPoint());
......@@ -722,8 +722,8 @@ public final class BattlePassMissionOuterClass {
if (other.getMissionType() != 0) {
setMissionType(other.getMissionType());
}
if (other.missionStatus_ != 0) {
setMissionStatusValue(other.getMissionStatusValue());
if (other.getTotalProgress() != 0) {
setTotalProgress(other.getTotalProgress());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
......@@ -754,95 +754,118 @@ public final class BattlePassMissionOuterClass {
return this;
}
private int missionId_ ;
private int curProgress_ ;
/**
* <code>uint32 mission_id = 11;</code>
* @return The missionId.
* <code>uint32 cur_progress = 13;</code>
* @return The curProgress.
*/
@java.lang.Override
public int getMissionId() {
return missionId_;
public int getCurProgress() {
return curProgress_;
}
/**
* <code>uint32 mission_id = 11;</code>
* @param value The missionId to set.
* <code>uint32 cur_progress = 13;</code>
* @param value The curProgress to set.
* @return This builder for chaining.
*/
public Builder setMissionId(int value) {
public Builder setCurProgress(int value) {
missionId_ = value;
curProgress_ = value;
onChanged();
return this;
}
/**
* <code>uint32 mission_id = 11;</code>
* <code>uint32 cur_progress = 13;</code>
* @return This builder for chaining.
*/
public Builder clearMissionId() {
public Builder clearCurProgress() {
missionId_ = 0;
curProgress_ = 0;
onChanged();
return this;
}
private int curProgress_ ;
private int missionStatus_ = 0;
/**
* <code>uint32 cur_progress = 13;</code>
* @return The curProgress.
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The enum numeric value on the wire for missionStatus.
*/
@java.lang.Override public int getMissionStatusValue() {
return missionStatus_;
}
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @param value The enum numeric value on the wire for missionStatus to set.
* @return This builder for chaining.
*/
public Builder setMissionStatusValue(int value) {
missionStatus_ = value;
onChanged();
return this;
}
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The missionStatus.
*/
@java.lang.Override
public int getCurProgress() {
return curProgress_;
public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus getMissionStatus() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus result = emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.valueOf(missionStatus_);
return result == null ? emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.UNRECOGNIZED : result;
}
/**
* <code>uint32 cur_progress = 13;</code>
* @param value The curProgress to set.
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @param value The missionStatus to set.
* @return This builder for chaining.
*/
public Builder setCurProgress(int value) {
public Builder setMissionStatus(emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus value) {
if (value == null) {
throw new NullPointerException();
}
curProgress_ = value;
missionStatus_ = value.getNumber();
onChanged();
return this;
}
/**
* <code>uint32 cur_progress = 13;</code>
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return This builder for chaining.
*/
public Builder clearCurProgress() {
public Builder clearMissionStatus() {
curProgress_ = 0;
missionStatus_ = 0;
onChanged();
return this;
}
private int totalProgress_ ;
private int missionId_ ;
/**
* <code>uint32 total_progress = 6;</code>
* @return The totalProgress.
* <code>uint32 mission_id = 11;</code>
* @return The missionId.
*/
@java.lang.Override
public int getTotalProgress() {
return totalProgress_;
public int getMissionId() {
return missionId_;
}
/**
* <code>uint32 total_progress = 6;</code>
* @param value The totalProgress to set.
* <code>uint32 mission_id = 11;</code>
* @param value The missionId to set.
* @return This builder for chaining.
*/
public Builder setTotalProgress(int value) {
public Builder setMissionId(int value) {
totalProgress_ = value;
missionId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 total_progress = 6;</code>
* <code>uint32 mission_id = 11;</code>
* @return This builder for chaining.
*/
public Builder clearTotalProgress() {
public Builder clearMissionId() {
totalProgress_ = 0;
missionId_ = 0;
onChanged();
return this;
}
......@@ -909,56 +932,33 @@ public final class BattlePassMissionOuterClass {
return this;
}
private int missionStatus_ = 0;
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The enum numeric value on the wire for missionStatus.
*/
@java.lang.Override public int getMissionStatusValue() {
return missionStatus_;
}
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @param value The enum numeric value on the wire for missionStatus to set.
* @return This builder for chaining.
*/
public Builder setMissionStatusValue(int value) {
missionStatus_ = value;
onChanged();
return this;
}
private int totalProgress_ ;
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @return The missionStatus.
* <code>uint32 total_progress = 6;</code>
* @return The totalProgress.
*/
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus getMissionStatus() {
@SuppressWarnings("deprecation")
emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus result = emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.valueOf(missionStatus_);
return result == null ? emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.UNRECOGNIZED : result;
public int getTotalProgress() {
return totalProgress_;
}
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* @param value The missionStatus to set.
* <code>uint32 total_progress = 6;</code>
* @param value The totalProgress to set.
* @return This builder for chaining.
*/
public Builder setMissionStatus(emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus value) {
if (value == null) {
throw new NullPointerException();
}
public Builder setTotalProgress(int value) {
missionStatus_ = value.getNumber();
totalProgress_ = value;
onChanged();
return this;
}
/**
* <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
* <code>uint32 total_progress = 6;</code>
* @return This builder for chaining.
*/
public Builder clearMissionStatus() {
public Builder clearTotalProgress() {
missionStatus_ = 0;
totalProgress_ = 0;
onChanged();
return this;
}
......@@ -1030,11 +1030,11 @@ public final class BattlePassMissionOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\027BattlePassMission.proto\"\321\002\n\021BattlePass" +
"Mission\022\022\n\nmission_id\030\013 \001(\r\022\024\n\014cur_progr" +
"ess\030\r \001(\r\022\026\n\016total_progress\030\006 \001(\r\022 \n\030rew" +
"ard_battle_pass_point\030\003 \001(\r\022\024\n\014mission_t" +
"ype\030\014 \001(\r\0228\n\016mission_status\030\017 \001(\0162 .Batt" +
"lePassMission.MissionStatus\"\207\001\n\rMissionS" +
"Mission\022\024\n\014cur_progress\030\r \001(\r\0228\n\016mission" +
"_status\030\017 \001(\0162 .BattlePassMission.Missio" +
"nStatus\022\022\n\nmission_id\030\013 \001(\r\022 \n\030reward_ba" +
"ttle_pass_point\030\003 \001(\r\022\024\n\014mission_type\030\014 " +
"\001(\r\022\026\n\016total_progress\030\006 \001(\r\"\207\001\n\rMissionS" +
"tatus\022\032\n\026MISSION_STATUS_INVALID\020\000\022\035\n\031MIS" +
"SION_STATUS_UNFINISHED\020\001\022\033\n\027MISSION_STAT" +
"US_FINISHED\020\002\022\036\n\032MISSION_STATUS_POINT_TA" +
......@@ -1050,7 +1050,7 @@ public final class BattlePassMissionOuterClass {
internal_static_BattlePassMission_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_BattlePassMission_descriptor,
new java.lang.String[] { "MissionId", "CurProgress", "TotalProgress", "RewardBattlePassPoint", "MissionType", "MissionStatus", });
new java.lang.String[] { "CurProgress", "MissionStatus", "MissionId", "RewardBattlePassPoint", "MissionType", "TotalProgress", });
}
// @@protoc_insertion_point(outer_class_scope)
......
......@@ -44,9 +44,10 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
}
/**
* <pre>
* CmdId: 2609
* CmdId: 2618
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BattlePassMissionUpdateNotify}
......@@ -338,9 +339,10 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
}
/**
* <pre>
* CmdId: 2609
* CmdId: 2618
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BattlePassMissionUpdateNotify}
......
......@@ -18,6 +18,12 @@ public final class BattlePassRewardTagOuterClass {
// @@protoc_insertion_point(interface_extends:BattlePassRewardTag)
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 level = 4;</code>
* @return The level.
*/
int getLevel();
/**
* <code>.BattlePassUnlockStatus unlock_status = 2;</code>
* @return The enum numeric value on the wire for unlockStatus.
......@@ -29,12 +35,6 @@ public final class BattlePassRewardTagOuterClass {
*/
emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus getUnlockStatus();
/**
* <code>uint32 level = 4;</code>
* @return The level.
*/
int getLevel();
/**
* <code>uint32 reward_id = 7;</code>
* @return The rewardId.
......@@ -135,6 +135,17 @@ public final class BattlePassRewardTagOuterClass {
emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.class, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder.class);
}
public static final int LEVEL_FIELD_NUMBER = 4;
private int level_;
/**
* <code>uint32 level = 4;</code>
* @return The level.
*/
@java.lang.Override
public int getLevel() {
return level_;
}
public static final int UNLOCK_STATUS_FIELD_NUMBER = 2;
private int unlockStatus_;
/**
......@@ -154,17 +165,6 @@ public final class BattlePassRewardTagOuterClass {
return result == null ? emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.UNRECOGNIZED : result;
}
public static final int LEVEL_FIELD_NUMBER = 4;
private int level_;
/**
* <code>uint32 level = 4;</code>
* @return The level.
*/
@java.lang.Override
public int getLevel() {
return level_;
}
public static final int REWARD_ID_FIELD_NUMBER = 7;
private int rewardId_;
/**
......@@ -235,9 +235,9 @@ public final class BattlePassRewardTagOuterClass {
}
emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag other = (emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag) obj;
if (unlockStatus_ != other.unlockStatus_) return false;
if (getLevel()
!= other.getLevel()) return false;
if (unlockStatus_ != other.unlockStatus_) return false;
if (getRewardId()
!= other.getRewardId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
......@@ -251,10 +251,10 @@ public final class BattlePassRewardTagOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + UNLOCK_STATUS_FIELD_NUMBER;
hash = (53 * hash) + unlockStatus_;
hash = (37 * hash) + LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getLevel();
hash = (37 * hash) + UNLOCK_STATUS_FIELD_NUMBER;
hash = (53 * hash) + unlockStatus_;
hash = (37 * hash) + REWARD_ID_FIELD_NUMBER;
hash = (53 * hash) + getRewardId();
hash = (29 * hash) + unknownFields.hashCode();
......@@ -390,10 +390,10 @@ public final class BattlePassRewardTagOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
unlockStatus_ = 0;
level_ = 0;
unlockStatus_ = 0;
rewardId_ = 0;
return this;
......@@ -422,8 +422,8 @@ public final class BattlePassRewardTagOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag buildPartial() {
emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag result = new emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag(this);
result.unlockStatus_ = unlockStatus_;
result.level_ = level_;
result.unlockStatus_ = unlockStatus_;
result.rewardId_ = rewardId_;
onBuilt();
return result;
......@@ -473,12 +473,12 @@ public final class BattlePassRewardTagOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag other) {
if (other == emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.getDefaultInstance()) return this;
if (other.unlockStatus_ != 0) {
setUnlockStatusValue(other.getUnlockStatusValue());
}
if (other.getLevel() != 0) {
setLevel(other.getLevel());
}
if (other.unlockStatus_ != 0) {
setUnlockStatusValue(other.getUnlockStatusValue());
}
if (other.getRewardId() != 0) {
setRewardId(other.getRewardId());
}
......@@ -511,6 +511,37 @@ public final class BattlePassRewardTagOuterClass {
return this;
}
private int level_ ;
/**
* <code>uint32 level = 4;</code>
* @return The level.
*/
@java.lang.Override
public int getLevel() {
return level_;
}
/**
* <code>uint32 level = 4;</code>
* @param value The level to set.
* @return This builder for chaining.
*/
public Builder setLevel(int value) {
level_ = value;
onChanged();
return this;
}
/**
* <code>uint32 level = 4;</code>
* @return This builder for chaining.
*/
public Builder clearLevel() {
level_ = 0;
onChanged();
return this;
}
private int unlockStatus_ = 0;
/**
* <code>.BattlePassUnlockStatus unlock_status = 2;</code>
......@@ -565,37 +596,6 @@ public final class BattlePassRewardTagOuterClass {
return this;
}
private int level_ ;
/**
* <code>uint32 level = 4;</code>
* @return The level.
*/
@java.lang.Override
public int getLevel() {
return level_;
}
/**
* <code>uint32 level = 4;</code>
* @param value The level to set.
* @return This builder for chaining.
*/
public Builder setLevel(int value) {
level_ = value;
onChanged();
return this;
}
/**
* <code>uint32 level = 4;</code>
* @return This builder for chaining.
*/
public Builder clearLevel() {
level_ = 0;
onChanged();
return this;
}
private int rewardId_ ;
/**
* <code>uint32 reward_id = 7;</code>
......@@ -695,8 +695,8 @@ public final class BattlePassRewardTagOuterClass {
java.lang.String[] descriptorData = {
"\n\031BattlePassRewardTag.proto\032\034BattlePassU" +
"nlockStatus.proto\"g\n\023BattlePassRewardTag" +
"\022.\n\runlock_status\030\002 \001(\0162\027.BattlePassUnlo" +
"ckStatus\022\r\n\005level\030\004 \001(\r\022\021\n\treward_id\030\007 \001" +
"\022\r\n\005level\030\004 \001(\r\022.\n\runlock_status\030\002 \001(\0162\027" +
".BattlePassUnlockStatus\022\021\n\treward_id\030\007 \001" +
"(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
......@@ -709,7 +709,7 @@ public final class BattlePassRewardTagOuterClass {
internal_static_BattlePassRewardTag_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_BattlePassRewardTag_descriptor,
new java.lang.String[] { "UnlockStatus", "Level", "RewardId", });
new java.lang.String[] { "Level", "UnlockStatus", "RewardId", });
emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.getDescriptor();
}
......
......@@ -18,24 +18,45 @@ public final class BattlePassScheduleOuterClass {
// @@protoc_insertion_point(interface_extends:BattlePassSchedule)
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 schedule_id = 9;</code>
* @return The scheduleId.
*/
int getScheduleId();
/**
* <code>uint32 level = 14;</code>
* @return The level.
*/
int getLevel();
/**
* <code>uint32 begin_time = 2;</code>
* @return The beginTime.
*/
int getBeginTime();
/**
* <code>uint32 end_time = 15;</code>
* @return The endTime.
*/
int getEndTime();
/**
* <code>uint32 point = 1;</code>
* @return The point.
*/
int getPoint();
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return Whether the curCycle field is set.
*/
boolean hasCurCycle();
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return The curCycle.
*/
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle getCurCycle();
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder getCurCycleOrBuilder();
/**
* <code>.BattlePassUnlockStatus unlock_status = 7;</code>
* @return The enum numeric value on the wire for unlockStatus.
......@@ -72,37 +93,16 @@ public final class BattlePassScheduleOuterClass {
int index);
/**
* <code>uint32 begin_time = 2;</code>
* @return The beginTime.
*/
int getBeginTime();
/**
* <code>uint32 end_time = 15;</code>
* @return The endTime.
*/
int getEndTime();
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return Whether the curCycle field is set.
*/
boolean hasCurCycle();
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return The curCycle.
*/
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle getCurCycle();
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* <code>uint32 cur_cycle_points = 10;</code>
* @return The curCyclePoints.
*/
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder getCurCycleOrBuilder();
int getCurCyclePoints();
/**
* <code>bool is_extra_paid_reward_taken = 6;</code>
* @return The isExtraPaidRewardTaken.
* <code>uint32 Unk2700_ODHAAHEPFAG = 12;</code>
* @return The unk2700ODHAAHEPFAG.
*/
boolean getIsExtraPaidRewardTaken();
int getUnk2700ODHAAHEPFAG();
/**
* <code>.BattlePassProduct product_info = 13;</code>
......@@ -120,22 +120,22 @@ public final class BattlePassScheduleOuterClass {
emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder getProductInfoOrBuilder();
/**
* <code>bool is_viewed = 3;</code>
* @return The isViewed.
* <code>bool is_extra_paid_reward_taken = 6;</code>
* @return The isExtraPaidRewardTaken.
*/
boolean getIsViewed();
boolean getIsExtraPaidRewardTaken();
/**
* <code>uint32 cur_cycle_points = 10;</code>
* @return The curCyclePoints.
* <code>bool is_viewed = 3;</code>
* @return The isViewed.
*/
int getCurCyclePoints();
boolean getIsViewed();
/**
* <code>uint32 JPFMGBEBBBJ = 12;</code>
* @return The jPFMGBEBBBJ.
* <code>uint32 schedule_id = 9;</code>
* @return The scheduleId.
*/
int getJPFMGBEBBBJ();
int getScheduleId();
}
/**
* Protobuf type {@code BattlePassSchedule}
......@@ -245,7 +245,7 @@ public final class BattlePassScheduleOuterClass {
}
case 96: {
jPFMGBEBBBJ_ = input.readUInt32();
unk2700ODHAAHEPFAG_ = input.readUInt32();
break;
}
case 106: {
......@@ -306,17 +306,6 @@ public final class BattlePassScheduleOuterClass {
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.class, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder.class);
}
public static final int SCHEDULE_ID_FIELD_NUMBER = 9;
private int scheduleId_;
/**
* <code>uint32 schedule_id = 9;</code>
* @return The scheduleId.
*/
@java.lang.Override
public int getScheduleId() {
return scheduleId_;
}
public static final int LEVEL_FIELD_NUMBER = 14;
private int level_;
/**
......@@ -328,6 +317,28 @@ public final class BattlePassScheduleOuterClass {
return level_;
}
public static final int BEGIN_TIME_FIELD_NUMBER = 2;
private int beginTime_;
/**
* <code>uint32 begin_time = 2;</code>
* @return The beginTime.
*/
@java.lang.Override
public int getBeginTime() {
return beginTime_;
}
public static final int END_TIME_FIELD_NUMBER = 15;
private int endTime_;
/**
* <code>uint32 end_time = 15;</code>
* @return The endTime.
*/
@java.lang.Override
public int getEndTime() {
return endTime_;
}
public static final int POINT_FIELD_NUMBER = 1;
private int point_;
/**
......@@ -339,6 +350,32 @@ public final class BattlePassScheduleOuterClass {
return point_;
}
public static final int CUR_CYCLE_FIELD_NUMBER = 4;
private emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle curCycle_;
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return Whether the curCycle field is set.
*/
@java.lang.Override
public boolean hasCurCycle() {
return curCycle_ != null;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return The curCycle.
*/
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle getCurCycle() {
return curCycle_ == null ? emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.getDefaultInstance() : curCycle_;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder getCurCycleOrBuilder() {
return getCurCycle();
}
public static final int UNLOCK_STATUS_FIELD_NUMBER = 7;
private int unlockStatus_;
/**
......@@ -398,63 +435,26 @@ public final class BattlePassScheduleOuterClass {
return rewardTakenList_.get(index);
}
public static final int BEGIN_TIME_FIELD_NUMBER = 2;
private int beginTime_;
/**
* <code>uint32 begin_time = 2;</code>
* @return The beginTime.
*/
@java.lang.Override
public int getBeginTime() {
return beginTime_;
}
public static final int END_TIME_FIELD_NUMBER = 15;
private int endTime_;
/**
* <code>uint32 end_time = 15;</code>
* @return The endTime.
*/
@java.lang.Override
public int getEndTime() {
return endTime_;
}
public static final int CUR_CYCLE_FIELD_NUMBER = 4;
private emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle curCycle_;
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return Whether the curCycle field is set.
*/
@java.lang.Override
public boolean hasCurCycle() {
return curCycle_ != null;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return The curCycle.
*/
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle getCurCycle() {
return curCycle_ == null ? emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.getDefaultInstance() : curCycle_;
}
public static final int CUR_CYCLE_POINTS_FIELD_NUMBER = 10;
private int curCyclePoints_;
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* <code>uint32 cur_cycle_points = 10;</code>
* @return The curCyclePoints.
*/
@java.lang.Override
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder getCurCycleOrBuilder() {
return getCurCycle();
public int getCurCyclePoints() {
return curCyclePoints_;
}
public static final int IS_EXTRA_PAID_REWARD_TAKEN_FIELD_NUMBER = 6;
private boolean isExtraPaidRewardTaken_;
public static final int UNK2700_ODHAAHEPFAG_FIELD_NUMBER = 12;
private int unk2700ODHAAHEPFAG_;
/**
* <code>bool is_extra_paid_reward_taken = 6;</code>
* @return The isExtraPaidRewardTaken.
* <code>uint32 Unk2700_ODHAAHEPFAG = 12;</code>
* @return The unk2700ODHAAHEPFAG.
*/
@java.lang.Override
public boolean getIsExtraPaidRewardTaken() {
return isExtraPaidRewardTaken_;
public int getUnk2700ODHAAHEPFAG() {
return unk2700ODHAAHEPFAG_;
}
public static final int PRODUCT_INFO_FIELD_NUMBER = 13;
......@@ -483,6 +483,17 @@ public final class BattlePassScheduleOuterClass {
return getProductInfo();
}
public static final int IS_EXTRA_PAID_REWARD_TAKEN_FIELD_NUMBER = 6;
private boolean isExtraPaidRewardTaken_;
/**
* <code>bool is_extra_paid_reward_taken = 6;</code>
* @return The isExtraPaidRewardTaken.
*/
@java.lang.Override
public boolean getIsExtraPaidRewardTaken() {
return isExtraPaidRewardTaken_;
}
public static final int IS_VIEWED_FIELD_NUMBER = 3;
private boolean isViewed_;
/**
......@@ -494,26 +505,15 @@ public final class BattlePassScheduleOuterClass {
return isViewed_;
}
public static final int CUR_CYCLE_POINTS_FIELD_NUMBER = 10;
private int curCyclePoints_;
/**
* <code>uint32 cur_cycle_points = 10;</code>
* @return The curCyclePoints.
*/
@java.lang.Override
public int getCurCyclePoints() {
return curCyclePoints_;
}
public static final int JPFMGBEBBBJ_FIELD_NUMBER = 12;
private int jPFMGBEBBBJ_;
public static final int SCHEDULE_ID_FIELD_NUMBER = 9;
private int scheduleId_;
/**
* <code>uint32 JPFMGBEBBBJ = 12;</code>
* @return The jPFMGBEBBBJ.
* <code>uint32 schedule_id = 9;</code>
* @return The scheduleId.
*/
@java.lang.Override
public int getJPFMGBEBBBJ() {
return jPFMGBEBBBJ_;
public int getScheduleId() {
return scheduleId_;
}
private byte memoizedIsInitialized = -1;
......@@ -557,8 +557,8 @@ public final class BattlePassScheduleOuterClass {
for (int i = 0; i < rewardTakenList_.size(); i++) {
output.writeMessage(11, rewardTakenList_.get(i));
}
if (jPFMGBEBBBJ_ != 0) {
output.writeUInt32(12, jPFMGBEBBBJ_);
if (unk2700ODHAAHEPFAG_ != 0) {
output.writeUInt32(12, unk2700ODHAAHEPFAG_);
}
if (productInfo_ != null) {
output.writeMessage(13, getProductInfo());
......@@ -614,9 +614,9 @@ public final class BattlePassScheduleOuterClass {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(11, rewardTakenList_.get(i));
}
if (jPFMGBEBBBJ_ != 0) {
if (unk2700ODHAAHEPFAG_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(12, jPFMGBEBBBJ_);
.computeUInt32Size(12, unk2700ODHAAHEPFAG_);
}
if (productInfo_ != null) {
size += com.google.protobuf.CodedOutputStream
......@@ -645,37 +645,37 @@ public final class BattlePassScheduleOuterClass {
}
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule other = (emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule) obj;
if (getScheduleId()
!= other.getScheduleId()) return false;
if (getLevel()
!= other.getLevel()) return false;
if (getPoint()
!= other.getPoint()) return false;
if (unlockStatus_ != other.unlockStatus_) return false;
if (!getRewardTakenListList()
.equals(other.getRewardTakenListList())) return false;
if (getBeginTime()
!= other.getBeginTime()) return false;
if (getEndTime()
!= other.getEndTime()) return false;
if (getPoint()
!= other.getPoint()) return false;
if (hasCurCycle() != other.hasCurCycle()) return false;
if (hasCurCycle()) {
if (!getCurCycle()
.equals(other.getCurCycle())) return false;
}
if (getIsExtraPaidRewardTaken()
!= other.getIsExtraPaidRewardTaken()) return false;
if (unlockStatus_ != other.unlockStatus_) return false;
if (!getRewardTakenListList()
.equals(other.getRewardTakenListList())) return false;
if (getCurCyclePoints()
!= other.getCurCyclePoints()) return false;
if (getUnk2700ODHAAHEPFAG()
!= other.getUnk2700ODHAAHEPFAG()) return false;
if (hasProductInfo() != other.hasProductInfo()) return false;
if (hasProductInfo()) {
if (!getProductInfo()
.equals(other.getProductInfo())) return false;
}
if (getIsExtraPaidRewardTaken()
!= other.getIsExtraPaidRewardTaken()) return false;
if (getIsViewed()
!= other.getIsViewed()) return false;
if (getCurCyclePoints()
!= other.getCurCyclePoints()) return false;
if (getJPFMGBEBBBJ()
!= other.getJPFMGBEBBBJ()) return false;
if (getScheduleId()
!= other.getScheduleId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
......@@ -687,40 +687,40 @@ public final class BattlePassScheduleOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
hash = (53 * hash) + getScheduleId();
hash = (37 * hash) + LEVEL_FIELD_NUMBER;
hash = (53 * hash) + getLevel();
hash = (37 * hash) + POINT_FIELD_NUMBER;
hash = (53 * hash) + getPoint();
hash = (37 * hash) + UNLOCK_STATUS_FIELD_NUMBER;
hash = (53 * hash) + unlockStatus_;
if (getRewardTakenListCount() > 0) {
hash = (37 * hash) + REWARD_TAKEN_LIST_FIELD_NUMBER;
hash = (53 * hash) + getRewardTakenListList().hashCode();
}
hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
hash = (53 * hash) + getBeginTime();
hash = (37 * hash) + END_TIME_FIELD_NUMBER;
hash = (53 * hash) + getEndTime();
hash = (37 * hash) + POINT_FIELD_NUMBER;
hash = (53 * hash) + getPoint();
if (hasCurCycle()) {
hash = (37 * hash) + CUR_CYCLE_FIELD_NUMBER;
hash = (53 * hash) + getCurCycle().hashCode();
}
hash = (37 * hash) + IS_EXTRA_PAID_REWARD_TAKEN_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsExtraPaidRewardTaken());
hash = (37 * hash) + UNLOCK_STATUS_FIELD_NUMBER;
hash = (53 * hash) + unlockStatus_;
if (getRewardTakenListCount() > 0) {
hash = (37 * hash) + REWARD_TAKEN_LIST_FIELD_NUMBER;
hash = (53 * hash) + getRewardTakenListList().hashCode();
}
hash = (37 * hash) + CUR_CYCLE_POINTS_FIELD_NUMBER;
hash = (53 * hash) + getCurCyclePoints();
hash = (37 * hash) + UNK2700_ODHAAHEPFAG_FIELD_NUMBER;
hash = (53 * hash) + getUnk2700ODHAAHEPFAG();
if (hasProductInfo()) {
hash = (37 * hash) + PRODUCT_INFO_FIELD_NUMBER;
hash = (53 * hash) + getProductInfo().hashCode();
}
hash = (37 * hash) + IS_EXTRA_PAID_REWARD_TAKEN_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsExtraPaidRewardTaken());
hash = (37 * hash) + IS_VIEWED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
getIsViewed());
hash = (37 * hash) + CUR_CYCLE_POINTS_FIELD_NUMBER;
hash = (53 * hash) + getCurCyclePoints();
hash = (37 * hash) + JPFMGBEBBBJ_FIELD_NUMBER;
hash = (53 * hash) + getJPFMGBEBBBJ();
hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
hash = (53 * hash) + getScheduleId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
......@@ -855,12 +855,20 @@ public final class BattlePassScheduleOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
scheduleId_ = 0;
level_ = 0;
beginTime_ = 0;
endTime_ = 0;
point_ = 0;
if (curCycleBuilder_ == null) {
curCycle_ = null;
} else {
curCycle_ = null;
curCycleBuilder_ = null;
}
unlockStatus_ = 0;
if (rewardTakenListBuilder_ == null) {
......@@ -869,17 +877,9 @@ public final class BattlePassScheduleOuterClass {
} else {
rewardTakenListBuilder_.clear();
}
beginTime_ = 0;
endTime_ = 0;
curCyclePoints_ = 0;
if (curCycleBuilder_ == null) {
curCycle_ = null;
} else {
curCycle_ = null;
curCycleBuilder_ = null;
}
isExtraPaidRewardTaken_ = false;
unk2700ODHAAHEPFAG_ = 0;
if (productInfoBuilder_ == null) {
productInfo_ = null;
......@@ -887,11 +887,11 @@ public final class BattlePassScheduleOuterClass {
productInfo_ = null;
productInfoBuilder_ = null;
}
isViewed_ = false;
isExtraPaidRewardTaken_ = false;
curCyclePoints_ = 0;
isViewed_ = false;
jPFMGBEBBBJ_ = 0;
scheduleId_ = 0;
return this;
}
......@@ -920,9 +920,15 @@ public final class BattlePassScheduleOuterClass {
public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule buildPartial() {
emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule result = new emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule(this);
int from_bitField0_ = bitField0_;
result.scheduleId_ = scheduleId_;
result.level_ = level_;
result.beginTime_ = beginTime_;
result.endTime_ = endTime_;
result.point_ = point_;
if (curCycleBuilder_ == null) {
result.curCycle_ = curCycle_;
} else {
result.curCycle_ = curCycleBuilder_.build();
}
result.unlockStatus_ = unlockStatus_;
if (rewardTakenListBuilder_ == null) {
if (((bitField0_ & 0x00000001) != 0)) {
......@@ -933,22 +939,16 @@ public final class BattlePassScheduleOuterClass {
} else {
result.rewardTakenList_ = rewardTakenListBuilder_.build();
}
result.beginTime_ = beginTime_;
result.endTime_ = endTime_;
if (curCycleBuilder_ == null) {
result.curCycle_ = curCycle_;
} else {
result.curCycle_ = curCycleBuilder_.build();
}
result.isExtraPaidRewardTaken_ = isExtraPaidRewardTaken_;
result.curCyclePoints_ = curCyclePoints_;
result.unk2700ODHAAHEPFAG_ = unk2700ODHAAHEPFAG_;
if (productInfoBuilder_ == null) {
result.productInfo_ = productInfo_;
} else {
result.productInfo_ = productInfoBuilder_.build();
}
result.isExtraPaidRewardTaken_ = isExtraPaidRewardTaken_;
result.isViewed_ = isViewed_;
result.curCyclePoints_ = curCyclePoints_;
result.jPFMGBEBBBJ_ = jPFMGBEBBBJ_;
result.scheduleId_ = scheduleId_;
onBuilt();
return result;
}
......@@ -997,15 +997,21 @@ public final class BattlePassScheduleOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule other) {
if (other == emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.getDefaultInstance()) return this;
if (other.getScheduleId() != 0) {
setScheduleId(other.getScheduleId());
}
if (other.getLevel() != 0) {
setLevel(other.getLevel());
}
if (other.getBeginTime() != 0) {
setBeginTime(other.getBeginTime());
}
if (other.getEndTime() != 0) {
setEndTime(other.getEndTime());
}
if (other.getPoint() != 0) {
setPoint(other.getPoint());
}
if (other.hasCurCycle()) {
mergeCurCycle(other.getCurCycle());
}
if (other.unlockStatus_ != 0) {
setUnlockStatusValue(other.getUnlockStatusValue());
}
......@@ -1035,29 +1041,23 @@ public final class BattlePassScheduleOuterClass {
}
}
}
if (other.getBeginTime() != 0) {
setBeginTime(other.getBeginTime());
if (other.getCurCyclePoints() != 0) {
setCurCyclePoints(other.getCurCyclePoints());
}
if (other.getEndTime() != 0) {
setEndTime(other.getEndTime());
if (other.getUnk2700ODHAAHEPFAG() != 0) {
setUnk2700ODHAAHEPFAG(other.getUnk2700ODHAAHEPFAG());
}
if (other.hasCurCycle()) {
mergeCurCycle(other.getCurCycle());
if (other.hasProductInfo()) {
mergeProductInfo(other.getProductInfo());
}
if (other.getIsExtraPaidRewardTaken() != false) {
setIsExtraPaidRewardTaken(other.getIsExtraPaidRewardTaken());
}
if (other.hasProductInfo()) {
mergeProductInfo(other.getProductInfo());
}
if (other.getIsViewed() != false) {
setIsViewed(other.getIsViewed());
}
if (other.getCurCyclePoints() != 0) {
setCurCyclePoints(other.getCurCyclePoints());
}
if (other.getJPFMGBEBBBJ() != 0) {
setJPFMGBEBBBJ(other.getJPFMGBEBBBJ());
if (other.getScheduleId() != 0) {
setScheduleId(other.getScheduleId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
......@@ -1089,64 +1089,95 @@ public final class BattlePassScheduleOuterClass {
}
private int bitField0_;
private int scheduleId_ ;
private int level_ ;
/**
* <code>uint32 schedule_id = 9;</code>
* @return The scheduleId.
* <code>uint32 level = 14;</code>
* @return The level.
*/
@java.lang.Override
public int getScheduleId() {
return scheduleId_;
public int getLevel() {
return level_;
}
/**
* <code>uint32 schedule_id = 9;</code>
* @param value The scheduleId to set.
* <code>uint32 level = 14;</code>
* @param value The level to set.
* @return This builder for chaining.
*/
public Builder setScheduleId(int value) {
public Builder setLevel(int value) {
scheduleId_ = value;
level_ = value;
onChanged();
return this;
}
/**
* <code>uint32 schedule_id = 9;</code>
* <code>uint32 level = 14;</code>
* @return This builder for chaining.
*/
public Builder clearScheduleId() {
public Builder clearLevel() {
scheduleId_ = 0;
level_ = 0;
onChanged();
return this;
}
private int level_ ;
private int beginTime_ ;
/**
* <code>uint32 level = 14;</code>
* @return The level.
* <code>uint32 begin_time = 2;</code>
* @return The beginTime.
*/
@java.lang.Override
public int getLevel() {
return level_;
public int getBeginTime() {
return beginTime_;
}
/**
* <code>uint32 level = 14;</code>
* @param value The level to set.
* <code>uint32 begin_time = 2;</code>
* @param value The beginTime to set.
* @return This builder for chaining.
*/
public Builder setLevel(int value) {
public Builder setBeginTime(int value) {
level_ = value;
beginTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 level = 14;</code>
* <code>uint32 begin_time = 2;</code>
* @return This builder for chaining.
*/
public Builder clearLevel() {
public Builder clearBeginTime() {
level_ = 0;
beginTime_ = 0;
onChanged();
return this;
}
private int endTime_ ;
/**
* <code>uint32 end_time = 15;</code>
* @return The endTime.
*/
@java.lang.Override
public int getEndTime() {
return endTime_;
}
/**
* <code>uint32 end_time = 15;</code>
* @param value The endTime to set.
* @return This builder for chaining.
*/
public Builder setEndTime(int value) {
endTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 end_time = 15;</code>
* @return This builder for chaining.
*/
public Builder clearEndTime() {
endTime_ = 0;
onChanged();
return this;
}
......@@ -1182,6 +1213,125 @@ public final class BattlePassScheduleOuterClass {
return this;
}
private emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle curCycle_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder> curCycleBuilder_;
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return Whether the curCycle field is set.
*/
public boolean hasCurCycle() {
return curCycleBuilder_ != null || curCycle_ != null;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return The curCycle.
*/
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle getCurCycle() {
if (curCycleBuilder_ == null) {
return curCycle_ == null ? emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.getDefaultInstance() : curCycle_;
} else {
return curCycleBuilder_.getMessage();
}
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public Builder setCurCycle(emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle value) {
if (curCycleBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
curCycle_ = value;
onChanged();
} else {
curCycleBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public Builder setCurCycle(
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder builderForValue) {
if (curCycleBuilder_ == null) {
curCycle_ = builderForValue.build();
onChanged();
} else {
curCycleBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public Builder mergeCurCycle(emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle value) {
if (curCycleBuilder_ == null) {
if (curCycle_ != null) {
curCycle_ =
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.newBuilder(curCycle_).mergeFrom(value).buildPartial();
} else {
curCycle_ = value;
}
onChanged();
} else {
curCycleBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public Builder clearCurCycle() {
if (curCycleBuilder_ == null) {
curCycle_ = null;
onChanged();
} else {
curCycle_ = null;
curCycleBuilder_ = null;
}
return this;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder getCurCycleBuilder() {
onChanged();
return getCurCycleFieldBuilder().getBuilder();
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder getCurCycleOrBuilder() {
if (curCycleBuilder_ != null) {
return curCycleBuilder_.getMessageOrBuilder();
} else {
return curCycle_ == null ?
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.getDefaultInstance() : curCycle_;
}
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder>
getCurCycleFieldBuilder() {
if (curCycleBuilder_ == null) {
curCycleBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder>(
getCurCycle(),
getParentForChildren(),
isClean());
curCycle_ = null;
}
return curCycleBuilder_;
}
private int unlockStatus_ = 0;
/**
* <code>.BattlePassUnlockStatus unlock_status = 7;</code>
......@@ -1476,214 +1626,64 @@ public final class BattlePassScheduleOuterClass {
return rewardTakenListBuilder_;
}
private int beginTime_ ;
/**
* <code>uint32 begin_time = 2;</code>
* @return The beginTime.
*/
@java.lang.Override
public int getBeginTime() {
return beginTime_;
}
/**
* <code>uint32 begin_time = 2;</code>
* @param value The beginTime to set.
* @return This builder for chaining.
*/
public Builder setBeginTime(int value) {
beginTime_ = value;
onChanged();
return this;
}
/**
* <code>uint32 begin_time = 2;</code>
* @return This builder for chaining.
*/
public Builder clearBeginTime() {
beginTime_ = 0;
onChanged();
return this;
}
private int endTime_ ;
private int curCyclePoints_ ;
/**
* <code>uint32 end_time = 15;</code>
* @return The endTime.
* <code>uint32 cur_cycle_points = 10;</code>
* @return The curCyclePoints.
*/
@java.lang.Override
public int getEndTime() {
return endTime_;
public int getCurCyclePoints() {
return curCyclePoints_;
}
/**
* <code>uint32 end_time = 15;</code>
* @param value The endTime to set.
* <code>uint32 cur_cycle_points = 10;</code>
* @param value The curCyclePoints to set.
* @return This builder for chaining.
*/
public Builder setEndTime(int value) {
public Builder setCurCyclePoints(int value) {
endTime_ = value;
curCyclePoints_ = value;
onChanged();
return this;
}
/**
* <code>uint32 end_time = 15;</code>
* <code>uint32 cur_cycle_points = 10;</code>
* @return This builder for chaining.
*/
public Builder clearEndTime() {
public Builder clearCurCyclePoints() {
endTime_ = 0;
curCyclePoints_ = 0;
onChanged();
return this;
}
private emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle curCycle_;
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder> curCycleBuilder_;
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return Whether the curCycle field is set.
*/
public boolean hasCurCycle() {
return curCycleBuilder_ != null || curCycle_ != null;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
* @return The curCycle.
*/
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle getCurCycle() {
if (curCycleBuilder_ == null) {
return curCycle_ == null ? emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.getDefaultInstance() : curCycle_;
} else {
return curCycleBuilder_.getMessage();
}
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public Builder setCurCycle(emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle value) {
if (curCycleBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
curCycle_ = value;
onChanged();
} else {
curCycleBuilder_.setMessage(value);
}
return this;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public Builder setCurCycle(
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder builderForValue) {
if (curCycleBuilder_ == null) {
curCycle_ = builderForValue.build();
onChanged();
} else {
curCycleBuilder_.setMessage(builderForValue.build());
}
return this;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public Builder mergeCurCycle(emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle value) {
if (curCycleBuilder_ == null) {
if (curCycle_ != null) {
curCycle_ =
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.newBuilder(curCycle_).mergeFrom(value).buildPartial();
} else {
curCycle_ = value;
}
onChanged();
} else {
curCycleBuilder_.mergeFrom(value);
}
return this;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public Builder clearCurCycle() {
if (curCycleBuilder_ == null) {
curCycle_ = null;
onChanged();
} else {
curCycle_ = null;
curCycleBuilder_ = null;
}
return this;
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder getCurCycleBuilder() {
onChanged();
return getCurCycleFieldBuilder().getBuilder();
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder getCurCycleOrBuilder() {
if (curCycleBuilder_ != null) {
return curCycleBuilder_.getMessageOrBuilder();
} else {
return curCycle_ == null ?
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.getDefaultInstance() : curCycle_;
}
}
/**
* <code>.BattlePassCycle cur_cycle = 4;</code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder>
getCurCycleFieldBuilder() {
if (curCycleBuilder_ == null) {
curCycleBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder>(
getCurCycle(),
getParentForChildren(),
isClean());
curCycle_ = null;
}
return curCycleBuilder_;
}
private boolean isExtraPaidRewardTaken_ ;
private int unk2700ODHAAHEPFAG_ ;
/**
* <code>bool is_extra_paid_reward_taken = 6;</code>
* @return The isExtraPaidRewardTaken.
* <code>uint32 Unk2700_ODHAAHEPFAG = 12;</code>
* @return The unk2700ODHAAHEPFAG.
*/
@java.lang.Override
public boolean getIsExtraPaidRewardTaken() {
return isExtraPaidRewardTaken_;
public int getUnk2700ODHAAHEPFAG() {
return unk2700ODHAAHEPFAG_;
}
/**
* <code>bool is_extra_paid_reward_taken = 6;</code>
* @param value The isExtraPaidRewardTaken to set.
* <code>uint32 Unk2700_ODHAAHEPFAG = 12;</code>
* @param value The unk2700ODHAAHEPFAG to set.
* @return This builder for chaining.
*/
public Builder setIsExtraPaidRewardTaken(boolean value) {
public Builder setUnk2700ODHAAHEPFAG(int value) {
isExtraPaidRewardTaken_ = value;
unk2700ODHAAHEPFAG_ = value;
onChanged();
return this;
}
/**
* <code>bool is_extra_paid_reward_taken = 6;</code>
* <code>uint32 Unk2700_ODHAAHEPFAG = 12;</code>
* @return This builder for chaining.
*/
public Builder clearIsExtraPaidRewardTaken() {
public Builder clearUnk2700ODHAAHEPFAG() {
isExtraPaidRewardTaken_ = false;
unk2700ODHAAHEPFAG_ = 0;
onChanged();
return this;
}
......@@ -1807,95 +1807,95 @@ public final class BattlePassScheduleOuterClass {
return productInfoBuilder_;
}
private boolean isViewed_ ;
private boolean isExtraPaidRewardTaken_ ;
/**
* <code>bool is_viewed = 3;</code>
* @return The isViewed.
* <code>bool is_extra_paid_reward_taken = 6;</code>
* @return The isExtraPaidRewardTaken.
*/
@java.lang.Override
public boolean getIsViewed() {
return isViewed_;
public boolean getIsExtraPaidRewardTaken() {
return isExtraPaidRewardTaken_;
}
/**
* <code>bool is_viewed = 3;</code>
* @param value The isViewed to set.
* <code>bool is_extra_paid_reward_taken = 6;</code>
* @param value The isExtraPaidRewardTaken to set.
* @return This builder for chaining.
*/
public Builder setIsViewed(boolean value) {
public Builder setIsExtraPaidRewardTaken(boolean value) {
isViewed_ = value;
isExtraPaidRewardTaken_ = value;
onChanged();
return this;
}
/**
* <code>bool is_viewed = 3;</code>
* <code>bool is_extra_paid_reward_taken = 6;</code>
* @return This builder for chaining.
*/
public Builder clearIsViewed() {
public Builder clearIsExtraPaidRewardTaken() {
isViewed_ = false;
isExtraPaidRewardTaken_ = false;
onChanged();
return this;
}
private int curCyclePoints_ ;
private boolean isViewed_ ;
/**
* <code>uint32 cur_cycle_points = 10;</code>
* @return The curCyclePoints.
* <code>bool is_viewed = 3;</code>
* @return The isViewed.
*/
@java.lang.Override
public int getCurCyclePoints() {
return curCyclePoints_;
public boolean getIsViewed() {
return isViewed_;
}
/**
* <code>uint32 cur_cycle_points = 10;</code>
* @param value The curCyclePoints to set.
* <code>bool is_viewed = 3;</code>
* @param value The isViewed to set.
* @return This builder for chaining.
*/
public Builder setCurCyclePoints(int value) {
public Builder setIsViewed(boolean value) {
curCyclePoints_ = value;
isViewed_ = value;
onChanged();
return this;
}
/**
* <code>uint32 cur_cycle_points = 10;</code>
* <code>bool is_viewed = 3;</code>
* @return This builder for chaining.
*/
public Builder clearCurCyclePoints() {
public Builder clearIsViewed() {
curCyclePoints_ = 0;
isViewed_ = false;
onChanged();
return this;
}
private int jPFMGBEBBBJ_ ;
private int scheduleId_ ;
/**
* <code>uint32 JPFMGBEBBBJ = 12;</code>
* @return The jPFMGBEBBBJ.
* <code>uint32 schedule_id = 9;</code>
* @return The scheduleId.
*/
@java.lang.Override
public int getJPFMGBEBBBJ() {
return jPFMGBEBBBJ_;
public int getScheduleId() {
return scheduleId_;
}
/**
* <code>uint32 JPFMGBEBBBJ = 12;</code>
* @param value The jPFMGBEBBBJ to set.
* <code>uint32 schedule_id = 9;</code>
* @param value The scheduleId to set.
* @return This builder for chaining.
*/
public Builder setJPFMGBEBBBJ(int value) {
public Builder setScheduleId(int value) {
jPFMGBEBBBJ_ = value;
scheduleId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 JPFMGBEBBBJ = 12;</code>
* <code>uint32 schedule_id = 9;</code>
* @return This builder for chaining.
*/
public Builder clearJPFMGBEBBBJ() {
public Builder clearScheduleId() {
jPFMGBEBBBJ_ = 0;
scheduleId_ = 0;
onChanged();
return this;
}
......@@ -1966,39 +1966,40 @@ public final class BattlePassScheduleOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\030BattlePassSchedule.proto\032\034BattlePassUn" +
"lockStatus.proto\032\025BattlePassCycle.proto\032" +
"\027BattlePassProduct.proto\032\031BattlePassRewa" +
"rdTag.proto\"\203\003\n\022BattlePassSchedule\022\023\n\013sc" +
"hedule_id\030\t \001(\r\022\r\n\005level\030\016 \001(\r\022\r\n\005point\030" +
"\001 \001(\r\022.\n\runlock_status\030\007 \001(\0162\027.BattlePas" +
"sUnlockStatus\022/\n\021reward_taken_list\030\013 \003(\013" +
"2\024.BattlePassRewardTag\022\022\n\nbegin_time\030\002 \001" +
"(\r\022\020\n\010end_time\030\017 \001(\r\022#\n\tcur_cycle\030\004 \001(\0132" +
"\020.BattlePassCycle\022\"\n\032is_extra_paid_rewar" +
"d_taken\030\006 \001(\010\022(\n\014product_info\030\r \001(\0132\022.Ba" +
"ttlePassProduct\022\021\n\tis_viewed\030\003 \001(\010\022\030\n\020cu" +
"r_cycle_points\030\n \001(\r\022\023\n\013JPFMGBEBBBJ\030\014 \001(" +
"\rB\033\n\031emu.grasscutter.net.protob\006proto3"
"\n\030BattlePassSchedule.proto\032\025BattlePassCy" +
"cle.proto\032\027BattlePassProduct.proto\032\031Batt" +
"lePassRewardTag.proto\032\034BattlePassUnlockS" +
"tatus.proto\"\213\003\n\022BattlePassSchedule\022\r\n\005le" +
"vel\030\016 \001(\r\022\022\n\nbegin_time\030\002 \001(\r\022\020\n\010end_tim" +
"e\030\017 \001(\r\022\r\n\005point\030\001 \001(\r\022#\n\tcur_cycle\030\004 \001(" +
"\0132\020.BattlePassCycle\022.\n\runlock_status\030\007 \001" +
"(\0162\027.BattlePassUnlockStatus\022/\n\021reward_ta" +
"ken_list\030\013 \003(\0132\024.BattlePassRewardTag\022\030\n\020" +
"cur_cycle_points\030\n \001(\r\022\033\n\023Unk2700_ODHAAH" +
"EPFAG\030\014 \001(\r\022(\n\014product_info\030\r \001(\0132\022.Batt" +
"lePassProduct\022\"\n\032is_extra_paid_reward_ta" +
"ken\030\006 \001(\010\022\021\n\tis_viewed\030\003 \001(\010\022\023\n\013schedule" +
"_id\030\t \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
"proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.getDescriptor(),
emu.grasscutter.net.proto.BattlePassCycleOuterClass.getDescriptor(),
emu.grasscutter.net.proto.BattlePassProductOuterClass.getDescriptor(),
emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.getDescriptor(),
emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.getDescriptor(),
});
internal_static_BattlePassSchedule_descriptor =
getDescriptor().getMessageTypes().get(0);
internal_static_BattlePassSchedule_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_BattlePassSchedule_descriptor,
new java.lang.String[] { "ScheduleId", "Level", "Point", "UnlockStatus", "RewardTakenList", "BeginTime", "EndTime", "CurCycle", "IsExtraPaidRewardTaken", "ProductInfo", "IsViewed", "CurCyclePoints", "JPFMGBEBBBJ", });
emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.getDescriptor();
new java.lang.String[] { "Level", "BeginTime", "EndTime", "Point", "CurCycle", "UnlockStatus", "RewardTakenList", "CurCyclePoints", "Unk2700ODHAAHEPFAG", "ProductInfo", "IsExtraPaidRewardTaken", "IsViewed", "ScheduleId", });
emu.grasscutter.net.proto.BattlePassCycleOuterClass.getDescriptor();
emu.grasscutter.net.proto.BattlePassProductOuterClass.getDescriptor();
emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.getDescriptor();
emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.getDescriptor();
}
// @@protoc_insertion_point(outer_class_scope)
......
......@@ -46,7 +46,7 @@ public final class BlossomBriefInfoNotifyOuterClass {
* <pre>
* CmdId: 2712
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......@@ -341,7 +341,7 @@ public final class BlossomBriefInfoNotifyOuterClass {
* <pre>
* CmdId: 2712
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......
......@@ -28,7 +28,7 @@ public final class BuyBattlePassLevelReqOuterClass {
* <pre>
* CmdId: 2647
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......@@ -283,7 +283,7 @@ public final class BuyBattlePassLevelReqOuterClass {
* <pre>
* CmdId: 2647
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......
......@@ -34,7 +34,8 @@ public final class BuyBattlePassLevelRspOuterClass {
* <pre>
* CmdId: 2637
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BuyBattlePassLevelRsp}
......@@ -315,7 +316,8 @@ public final class BuyBattlePassLevelRspOuterClass {
* <pre>
* CmdId: 2637
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BuyBattlePassLevelRsp}
......
......@@ -49,7 +49,7 @@ public final class BuyGoodsReqOuterClass {
* <pre>
* CmdId: 712
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......@@ -386,7 +386,7 @@ public final class BuyGoodsReqOuterClass {
* <pre>
* CmdId: 712
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......
......@@ -79,7 +79,8 @@ public final class BuyGoodsRspOuterClass {
* <pre>
* CmdId: 735
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BuyGoodsRsp}
......@@ -509,7 +510,8 @@ public final class BuyGoodsRspOuterClass {
* <pre>
* CmdId: 735
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
* Protobuf type {@code BuyGoodsRsp}
......
......@@ -69,7 +69,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
* <pre>
* CmdId: 633
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......@@ -473,7 +473,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
* <pre>
* CmdId: 633
* EnetChannelId: 0
* EnetIsReliable: true
* EnetIsReliable: false
* IsAllowClient: true
* </pre>
*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment