Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-20 10:39:57 +08:00
Code Issues Projects Releases Wiki Activity

Update gc to 3.3 (#1981)

Browse Source 
* replace the deprecated api

* update proto

* delete music game

* fixed codes

* fix costume switch

* fix mail bug

* Bump version number.

* Re-add max boss chest number

Co-authored-by: GanyusLeftHorn <1244229+GanyusLeftHorn@users.noreply.github.com>
This commit is contained in:
Simplxs
2022-12-24 05:12:02 +08:00
committed by GitHub
Unverified
parent 8b83dbf58c
commit 92fbaa8670
1142 changed files with 474411 additions and 169883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/ActivityTakeWatcherRewardRspOuterClass.java
+106 -100
View File
@@ -19,29 +19,32 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 activity_id = 14;</code>
* <code>int32 retcode = 14;</code>
* @return The retcode.
*/
int getRetcode();
/**
* <code>uint32 activity_id = 10;</code>
* @return The activityId.
*/
int getActivityId();
/**
* <code>uint32 watcher_id = 7;</code>
* <code>uint32 watcher_id = 15;</code>
* @return The watcherId.
*/
int getWatcherId();
/**
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
int getRetcode();
}
/**
* <pre>
* CmdId: 2034
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 2109;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code ActivityTakeWatcherRewardRsp}
@@ -88,19 +91,19 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
case 0:
done = true;
break;
case 56: {
case 80: {
watcherId_ = input.readUInt32();
break;
}
case 72: {
retcode_ = input.readInt32();
activityId_ = input.readUInt32();
break;
}
case 112: {
activityId_ = input.readUInt32();
retcode_ = input.readInt32();
break;
}
case 120: {
watcherId_ = input.readUInt32();
break;
}
default: {
@@ -135,10 +138,21 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp.class, emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp.Builder.class);
}
public static final int ACTIVITY_ID_FIELD_NUMBER = 14;
public static final int RETCODE_FIELD_NUMBER = 14;
private int retcode_;
/**
* <code>int32 retcode = 14;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
public static final int ACTIVITY_ID_FIELD_NUMBER = 10;
private int activityId_;
/**
* <code>uint32 activity_id = 14;</code>
* <code>uint32 activity_id = 10;</code>
* @return The activityId.
*/
@java.lang.Override
@@ -146,10 +160,10 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return activityId_;
}
public static final int WATCHER_ID_FIELD_NUMBER = 7;
public static final int WATCHER_ID_FIELD_NUMBER = 15;
private int watcherId_;
/**
* <code>uint32 watcher_id = 7;</code>
* <code>uint32 watcher_id = 15;</code>
* @return The watcherId.
*/
@java.lang.Override
@@ -157,17 +171,6 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return watcherId_;
}
public static final int RETCODE_FIELD_NUMBER = 9;
private int retcode_;
/**
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -182,14 +185,14 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
if (watcherId_ != 0) {
output.writeUInt32(7, watcherId_);
if (activityId_ != 0) {
output.writeUInt32(10, activityId_);
}
if (retcode_ != 0) {
output.writeInt32(9, retcode_);
output.writeInt32(14, retcode_);
}
if (activityId_ != 0) {
output.writeUInt32(14, activityId_);
if (watcherId_ != 0) {
output.writeUInt32(15, watcherId_);
}
unknownFields.writeTo(output);
}
@@ -200,17 +203,17 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
if (size != -1) return size;
size = 0;
if (watcherId_ != 0) {
if (activityId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(7, watcherId_);
.computeUInt32Size(10, activityId_);
}
if (retcode_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(9, retcode_);
.computeInt32Size(14, retcode_);
}
if (activityId_ != 0) {
if (watcherId_ != 0) {
size += com.google.protobuf.CodedOutputStream
.computeUInt32Size(14, activityId_);
.computeUInt32Size(15, watcherId_);
}
size += unknownFields.getSerializedSize();
memoizedSize = size;
@@ -227,12 +230,12 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
}
emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp other = (emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp) obj;
if (getRetcode()
!= other.getRetcode()) return false;
if (getActivityId()
!= other.getActivityId()) return false;
if (getWatcherId()
!= other.getWatcherId()) return false;
if (getRetcode()
!= other.getRetcode()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -244,12 +247,12 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getActivityId();
hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
hash = (53 * hash) + getWatcherId();
hash = (37 * hash) + RETCODE_FIELD_NUMBER;
hash = (53 * hash) + getRetcode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -347,10 +350,13 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
}
/**
* <pre>
* CmdId: 2034
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 2109;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* }
* </pre>
*
* Protobuf type {@code ActivityTakeWatcherRewardRsp}
@@ -390,12 +396,12 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
retcode_ = 0;
activityId_ = 0;
watcherId_ = 0;
retcode_ = 0;
return this;
}
@@ -422,9 +428,9 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp buildPartial() {
emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp result = new emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp(this);
result.retcode_ = retcode_;
result.activityId_ = activityId_;
result.watcherId_ = watcherId_;
result.retcode_ = retcode_;
onBuilt();
return result;
}
@@ -473,15 +479,15 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp other) {
if (other == emu.grasscutter.net.proto.ActivityTakeWatcherRewardRspOuterClass.ActivityTakeWatcherRewardRsp.getDefaultInstance()) return this;
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
if (other.getActivityId() != 0) {
setActivityId(other.getActivityId());
}
if (other.getWatcherId() != 0) {
setWatcherId(other.getWatcherId());
}
if (other.getRetcode() != 0) {
setRetcode(other.getRetcode());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -511,9 +517,40 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 14;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 14;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 14;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
private int activityId_ ;
/**
* <code>uint32 activity_id = 14;</code>
* <code>uint32 activity_id = 10;</code>
* @return The activityId.
*/
@java.lang.Override
@@ -521,7 +558,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return activityId_;
}
/**
* <code>uint32 activity_id = 14;</code>
* <code>uint32 activity_id = 10;</code>
* @param value The activityId to set.
* @return This builder for chaining.
*/
@@ -532,7 +569,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return this;
}
/**
* <code>uint32 activity_id = 14;</code>
* <code>uint32 activity_id = 10;</code>
* @return This builder for chaining.
*/
public Builder clearActivityId() {
@@ -544,7 +581,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
private int watcherId_ ;
/**
* <code>uint32 watcher_id = 7;</code>
* <code>uint32 watcher_id = 15;</code>
* @return The watcherId.
*/
@java.lang.Override
@@ -552,7 +589,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return watcherId_;
}
/**
* <code>uint32 watcher_id = 7;</code>
* <code>uint32 watcher_id = 15;</code>
* @param value The watcherId to set.
* @return This builder for chaining.
*/
@@ -563,7 +600,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
return this;
}
/**
* <code>uint32 watcher_id = 7;</code>
* <code>uint32 watcher_id = 15;</code>
* @return This builder for chaining.
*/
public Builder clearWatcherId() {
@@ -572,37 +609,6 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
onChanged();
return this;
}
private int retcode_ ;
/**
* <code>int32 retcode = 9;</code>
* @return The retcode.
*/
@java.lang.Override
public int getRetcode() {
return retcode_;
}
/**
* <code>int32 retcode = 9;</code>
* @param value The retcode to set.
* @return This builder for chaining.
*/
public Builder setRetcode(int value) {
retcode_ = value;
onChanged();
return this;
}
/**
* <code>int32 retcode = 9;</code>
* @return This builder for chaining.
*/
public Builder clearRetcode() {
retcode_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -671,9 +677,9 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\"ActivityTakeWatcherRewardRsp.proto\"X\n\034" +
"ActivityTakeWatcherRewardRsp\022\023\n\013activity" +
"_id\030\016 \001(\r\022\022\n\nwatcher_id\030\007 \001(\r\022\017\n\007retcode" +
"\030\t \001(\005B\033\n\031emu.grasscutter.net.protob\006pro" +
"ActivityTakeWatcherRewardRsp\022\017\n\007retcode\030" +
"\016 \001(\005\022\023\n\013activity_id\030\n \001(\r\022\022\n\nwatcher_id" +
"\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
"to3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -685,7 +691,7 @@ public final class ActivityTakeWatcherRewardRspOuterClass {
internal_static_ActivityTakeWatcherRewardRsp_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ActivityTakeWatcherRewardRsp_descriptor,
new java.lang.String[] { "ActivityId", "WatcherId", "Retcode", });
new java.lang.String[] { "Retcode", "ActivityId", "WatcherId", });
}
// @@protoc_insertion_point(outer_class_scope)