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

Add support for v3.5.0 (#2090)

Browse Source 
* Fix Dvalin battle

See https://github.com/Anime-Game-Servers/Grasscutter-Quests/pull/25.

This is entirely untested and there's a 99% chance it's broken, I'm just submitting it as a draft PR so that I don't forget about its existence.

Co-Authored-By: mjolsic <21289772+mjolsic@users.noreply.github.com>

* Update protos

* 3.4 protos

* Fix

Now builds successfully, don't have the time to check if I should have specified true instead of false for withChildQuests, or if this functions as intended.

* Change from false to true

Per what smileoflove has been told on Discord

* 3.5

* Remove the Dvalin crap from this PR

Git is so confusing

* Update version

* Apply README changes from `origin/development`

* Remove unnecessary debugging information

---------

Co-authored-by: mjolsic <21289772+mjolsic@users.noreply.github.com>
Co-authored-by: KingRainbow44 <kobedo11@gmail.com>
This commit is contained in:
Colleiflower
2023-03-31 19:13:32 +00:00
committed by GitHub
Unverified
parent 922f7bca51
commit 516e5975e1
1383 changed files with 167226 additions and 586936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionStateOuterClass.java
+36 -33
View File
@@ -15,53 +15,57 @@ public final class AvatarExpeditionStateOuterClass {
(com.google.protobuf.ExtensionRegistryLite) registry);
}
/**
* <pre>
* Name: ALJEMELPDLN
* </pre>
*
* Protobuf enum {@code AvatarExpeditionState}
*/
public enum AvatarExpeditionState
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>AVATAR_EXPEDITION_STATE_NONE = 0;</code>
* <code>AVATAR_EXPEDITION_NONE = 0;</code>
*/
AVATAR_EXPEDITION_STATE_NONE(0),
AVATAR_EXPEDITION_NONE(0),
/**
* <code>AVATAR_EXPEDITION_STATE_DOING = 1;</code>
* <code>AVATAR_EXPEDITION_DOING = 1;</code>
*/
AVATAR_EXPEDITION_STATE_DOING(1),
AVATAR_EXPEDITION_DOING(1),
/**
* <code>AVATAR_EXPEDITION_STATE_FINISH_WAIT_REWARD = 2;</code>
* <code>AVATAR_EXPEDITION_FINISH_WAIT_REWARD = 2;</code>
*/
AVATAR_EXPEDITION_STATE_FINISH_WAIT_REWARD(2),
AVATAR_EXPEDITION_FINISH_WAIT_REWARD(2),
/**
* <code>AVATAR_EXPEDITION_STATE_CALLBACK_WAIT_REWARD = 3;</code>
* <code>AVATAR_EXPEDITION_CALLBACK_WAIT_REWARD = 3;</code>
*/
AVATAR_EXPEDITION_STATE_CALLBACK_WAIT_REWARD(3),
AVATAR_EXPEDITION_CALLBACK_WAIT_REWARD(3),
/**
* <code>AVATAR_EXPEDITION_STATE_LOCKED = 4;</code>
* <code>AVATAR_EXPEDITION_LOCKED = 4;</code>
*/
AVATAR_EXPEDITION_STATE_LOCKED(4),
AVATAR_EXPEDITION_LOCKED(4),
UNRECOGNIZED(-1),
;
/**
* <code>AVATAR_EXPEDITION_STATE_NONE = 0;</code>
* <code>AVATAR_EXPEDITION_NONE = 0;</code>
*/
public static final int AVATAR_EXPEDITION_STATE_NONE_VALUE = 0;
public static final int AVATAR_EXPEDITION_NONE_VALUE = 0;
/**
* <code>AVATAR_EXPEDITION_STATE_DOING = 1;</code>
* <code>AVATAR_EXPEDITION_DOING = 1;</code>
*/
public static final int AVATAR_EXPEDITION_STATE_DOING_VALUE = 1;
public static final int AVATAR_EXPEDITION_DOING_VALUE = 1;
/**
* <code>AVATAR_EXPEDITION_STATE_FINISH_WAIT_REWARD = 2;</code>
* <code>AVATAR_EXPEDITION_FINISH_WAIT_REWARD = 2;</code>
*/
public static final int AVATAR_EXPEDITION_STATE_FINISH_WAIT_REWARD_VALUE = 2;
public static final int AVATAR_EXPEDITION_FINISH_WAIT_REWARD_VALUE = 2;
/**
* <code>AVATAR_EXPEDITION_STATE_CALLBACK_WAIT_REWARD = 3;</code>
* <code>AVATAR_EXPEDITION_CALLBACK_WAIT_REWARD = 3;</code>
*/
public static final int AVATAR_EXPEDITION_STATE_CALLBACK_WAIT_REWARD_VALUE = 3;
public static final int AVATAR_EXPEDITION_CALLBACK_WAIT_REWARD_VALUE = 3;
/**
* <code>AVATAR_EXPEDITION_STATE_LOCKED = 4;</code>
* <code>AVATAR_EXPEDITION_LOCKED = 4;</code>
*/
public static final int AVATAR_EXPEDITION_STATE_LOCKED_VALUE = 4;
public static final int AVATAR_EXPEDITION_LOCKED_VALUE = 4;
public final int getNumber() {
@@ -88,11 +92,11 @@ public final class AvatarExpeditionStateOuterClass {
*/
public static AvatarExpeditionState forNumber(int value) {
switch (value) {
case 0: return AVATAR_EXPEDITION_STATE_NONE;
case 1: return AVATAR_EXPEDITION_STATE_DOING;
case 2: return AVATAR_EXPEDITION_STATE_FINISH_WAIT_REWARD;
case 3: return AVATAR_EXPEDITION_STATE_CALLBACK_WAIT_REWARD;
case 4: return AVATAR_EXPEDITION_STATE_LOCKED;
case 0: return AVATAR_EXPEDITION_NONE;
case 1: return AVATAR_EXPEDITION_DOING;
case 2: return AVATAR_EXPEDITION_FINISH_WAIT_REWARD;
case 3: return AVATAR_EXPEDITION_CALLBACK_WAIT_REWARD;
case 4: return AVATAR_EXPEDITION_LOCKED;
default: return null;
}
}
@@ -158,14 +162,13 @@ public final class AvatarExpeditionStateOuterClass {
descriptor;
static {
java.lang.String[] descriptorData = {
"\n\033AvatarExpeditionState.proto*\342\001\n\025Avatar" +
"ExpeditionState\022 \n\034AVATAR_EXPEDITION_STA" +
"TE_NONE\020\000\022!\n\035AVATAR_EXPEDITION_STATE_DOI" +
"NG\020\001\022.\n*AVATAR_EXPEDITION_STATE_FINISH_W" +
"AIT_REWARD\020\002\0220\n,AVATAR_EXPEDITION_STATE_" +
"CALLBACK_WAIT_REWARD\020\003\022\"\n\036AVATAR_EXPEDIT" +
"ION_STATE_LOCKED\020\004B\033\n\031emu.grasscutter.ne" +
"t.protob\006proto3"
"\n\033AvatarExpeditionState.proto*\304\001\n\025Avatar" +
"ExpeditionState\022\032\n\026AVATAR_EXPEDITION_NON" +
"E\020\000\022\033\n\027AVATAR_EXPEDITION_DOING\020\001\022(\n$AVAT" +
"AR_EXPEDITION_FINISH_WAIT_REWARD\020\002\022*\n&AV" +
"ATAR_EXPEDITION_CALLBACK_WAIT_REWARD\020\003\022\034" +
"\n\030AVATAR_EXPEDITION_LOCKED\020\004B\033\n\031emu.gras" +
"scutter.net.protob\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,