Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-21 05:19:50 +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/ActivityTakeWatcherRewardReqOuterClass.java
+77 -69
View File
@@ -18,24 +18,28 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
// @@protoc_insertion_point(interface_extends:ActivityTakeWatcherRewardReq)
com.google.protobuf.MessageOrBuilder {
/**
* <code>uint32 activity_id = 4;</code>
* @return The activityId.
*/
int getActivityId();
/**
* <code>uint32 watcher_id = 14;</code>
* @return The watcherId.
*/
int getWatcherId();
/**
* <code>uint32 activity_id = 4;</code>
* @return The activityId.
*/
int getActivityId();
}
/**
* <pre>
* CmdId: 2038
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 2073;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code ActivityTakeWatcherRewardReq}
@@ -124,17 +128,6 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq.class, emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq.Builder.class);
}
public static final int ACTIVITY_ID_FIELD_NUMBER = 4;
private int activityId_;
/**
* <code>uint32 activity_id = 4;</code>
* @return The activityId.
*/
@java.lang.Override
public int getActivityId() {
return activityId_;
}
public static final int WATCHER_ID_FIELD_NUMBER = 14;
private int watcherId_;
/**
@@ -146,6 +139,17 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
return watcherId_;
}
public static final int ACTIVITY_ID_FIELD_NUMBER = 4;
private int activityId_;
/**
* <code>uint32 activity_id = 4;</code>
* @return The activityId.
*/
@java.lang.Override
public int getActivityId() {
return activityId_;
}
private byte memoizedIsInitialized = -1;
@java.lang.Override
public final boolean isInitialized() {
@@ -198,10 +202,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
}
emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq other = (emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq) obj;
if (getActivityId()
!= other.getActivityId()) return false;
if (getWatcherId()
!= other.getWatcherId()) return false;
if (getActivityId()
!= other.getActivityId()) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -213,10 +217,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
}
int hash = 41;
hash = (19 * hash) + getDescriptor().hashCode();
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) + ACTIVITY_ID_FIELD_NUMBER;
hash = (53 * hash) + getActivityId();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -314,10 +318,14 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
}
/**
* <pre>
* CmdId: 2038
* EnetChannelId: 0
* EnetIsReliable: false
* IsAllowClient: true
* enum CmdId {
* option allow_alias = true;
* NONE = 0;
* CMD_ID = 2073;
* ENET_CHANNEL_ID = 0;
* ENET_IS_RELIABLE = 1;
* IS_ALLOW_CLIENT = 1;
* }
* </pre>
*
* Protobuf type {@code ActivityTakeWatcherRewardReq}
@@ -357,10 +365,10 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
@java.lang.Override
public Builder clear() {
super.clear();
activityId_ = 0;
watcherId_ = 0;
activityId_ = 0;
return this;
}
@@ -387,8 +395,8 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
@java.lang.Override
public emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq buildPartial() {
emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq result = new emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq(this);
result.activityId_ = activityId_;
result.watcherId_ = watcherId_;
result.activityId_ = activityId_;
onBuilt();
return result;
}
@@ -437,12 +445,12 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
public Builder mergeFrom(emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq other) {
if (other == emu.grasscutter.net.proto.ActivityTakeWatcherRewardReqOuterClass.ActivityTakeWatcherRewardReq.getDefaultInstance()) return this;
if (other.getActivityId() != 0) {
setActivityId(other.getActivityId());
}
if (other.getWatcherId() != 0) {
setWatcherId(other.getWatcherId());
}
if (other.getActivityId() != 0) {
setActivityId(other.getActivityId());
}
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -472,37 +480,6 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
return this;
}
private int activityId_ ;
/**
* <code>uint32 activity_id = 4;</code>
* @return The activityId.
*/
@java.lang.Override
public int getActivityId() {
return activityId_;
}
/**
* <code>uint32 activity_id = 4;</code>
* @param value The activityId to set.
* @return This builder for chaining.
*/
public Builder setActivityId(int value) {
activityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 activity_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearActivityId() {
activityId_ = 0;
onChanged();
return this;
}
private int watcherId_ ;
/**
* <code>uint32 watcher_id = 14;</code>
@@ -533,6 +510,37 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
onChanged();
return this;
}
private int activityId_ ;
/**
* <code>uint32 activity_id = 4;</code>
* @return The activityId.
*/
@java.lang.Override
public int getActivityId() {
return activityId_;
}
/**
* <code>uint32 activity_id = 4;</code>
* @param value The activityId to set.
* @return This builder for chaining.
*/
public Builder setActivityId(int value) {
activityId_ = value;
onChanged();
return this;
}
/**
* <code>uint32 activity_id = 4;</code>
* @return This builder for chaining.
*/
public Builder clearActivityId() {
activityId_ = 0;
onChanged();
return this;
}
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -601,8 +609,8 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
static {
java.lang.String[] descriptorData = {
"\n\"ActivityTakeWatcherRewardReq.proto\"G\n\034" +
"ActivityTakeWatcherRewardReq\022\023\n\013activity" +
"_id\030\004 \001(\r\022\022\n\nwatcher_id\030\016 \001(\rB\033\n\031emu.gra" +
"ActivityTakeWatcherRewardReq\022\022\n\nwatcher_" +
"id\030\016 \001(\r\022\023\n\013activity_id\030\004 \001(\rB\033\n\031emu.gra" +
"sscutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -614,7 +622,7 @@ public final class ActivityTakeWatcherRewardReqOuterClass {
internal_static_ActivityTakeWatcherRewardReq_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_ActivityTakeWatcherRewardReq_descriptor,
new java.lang.String[] { "ActivityId", "WatcherId", });
new java.lang.String[] { "WatcherId", "ActivityId", });
}
// @@protoc_insertion_point(outer_class_scope)