Skip to content

N
Neos
Commit 71871e17 authored by Chunchi Che's avatar Chunchi Che
Browse files
Options

sync neos-protobuf

parent 5a6f4933
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 344 deletions
neos-protobuf @ be66d514
Subproject commit 1648b05d2e0bf0fc84c9e98104b8d9ca6a014c1a Subproject commit be66d514be6d1224163f55bca85dc361d0c9fe6a
src/api/ocgcore/idl/ocgcore.ts
View file @ 71871e17
...@@ -2668,7 +2668,7 @@ export namespace ygopro { ...@@ -2668,7 +2668,7 @@ export namespace ygopro {
} }
} }
export class CtosGameMsgResponse extends pb_1.Message { export class CtosGameMsgResponse extends pb_1.Message {
#one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]]; #one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]];
constructor( constructor(
data?: data?:
| any[] | any[]
...@@ -2676,143 +2676,120 @@ export namespace ygopro { ...@@ -2676,143 +2676,120 @@ export namespace ygopro {
| { | {
select_idle_cmd?: CtosGameMsgResponse.SelectIdleCmdResponse; select_idle_cmd?: CtosGameMsgResponse.SelectIdleCmdResponse;
select_place?: never; select_place?: never;
select_card?: never; select_multi?: never;
select_chain?: never; select_single?: never;
select_effect_yn?: never; select_effect_yn?: never;
select_position?: never; select_position?: never;
select_option?: never; select_option?: never;
select_battle_cmd?: never; select_battle_cmd?: never;
select_unselect_card?: never;
select_counter_response?: never; select_counter_response?: never;
sort_card?: never; sort_card?: never;
} }
| { | {
select_idle_cmd?: never; select_idle_cmd?: never;
select_place?: CtosGameMsgResponse.SelectPlaceResponse; select_place?: CtosGameMsgResponse.SelectPlaceResponse;
select_card?: never; select_multi?: never;
select_chain?: never; select_single?: never;
select_effect_yn?: never; select_effect_yn?: never;
select_position?: never; select_position?: never;
select_option?: never; select_option?: never;
select_battle_cmd?: never; select_battle_cmd?: never;
select_unselect_card?: never;
select_counter_response?: never; select_counter_response?: never;
sort_card?: never; sort_card?: never;
} }
| { | {
select_idle_cmd?: never; select_idle_cmd?: never;
select_place?: never; select_place?: never;
select_card?: CtosGameMsgResponse.SelectCardResponse; select_multi?: CtosGameMsgResponse.SelectMultiResponse;
select_chain?: never; select_single?: never;
select_effect_yn?: never; select_effect_yn?: never;
select_position?: never; select_position?: never;
select_option?: never; select_option?: never;
select_battle_cmd?: never; select_battle_cmd?: never;
select_unselect_card?: never;
select_counter_response?: never; select_counter_response?: never;
sort_card?: never; sort_card?: never;
} }
| { | {
select_idle_cmd?: never; select_idle_cmd?: never;
select_place?: never; select_place?: never;
select_card?: never; select_multi?: never;
select_chain?: CtosGameMsgResponse.SelectChainResponse; select_single?: CtosGameMsgResponse.SelectSingleResponse;
select_effect_yn?: never; select_effect_yn?: never;
select_position?: never; select_position?: never;
select_option?: never; select_option?: never;
select_battle_cmd?: never; select_battle_cmd?: never;
select_unselect_card?: never;
select_counter_response?: never; select_counter_response?: never;
sort_card?: never; sort_card?: never;
} }
| { | {
select_idle_cmd?: never; select_idle_cmd?: never;
select_place?: never; select_place?: never;
select_card?: never; select_multi?: never;
select_chain?: never; select_single?: never;
select_effect_yn?: CtosGameMsgResponse.SelectEffectYnResponse; select_effect_yn?: CtosGameMsgResponse.SelectEffectYnResponse;
select_position?: never; select_position?: never;
select_option?: never; select_option?: never;
select_battle_cmd?: never; select_battle_cmd?: never;
select_unselect_card?: never;
select_counter_response?: never; select_counter_response?: never;
sort_card?: never; sort_card?: never;
} }
| { | {
select_idle_cmd?: never; select_idle_cmd?: never;
select_place?: never; select_place?: never;
select_card?: never; select_multi?: never;
select_chain?: never; select_single?: never;
select_effect_yn?: never; select_effect_yn?: never;
select_position?: CtosGameMsgResponse.SelectPositionResponse; select_position?: CtosGameMsgResponse.SelectPositionResponse;
select_option?: never; select_option?: never;
select_battle_cmd?: never; select_battle_cmd?: never;
select_unselect_card?: never;
select_counter_response?: never; select_counter_response?: never;
sort_card?: never; sort_card?: never;
} }
| { | {
select_idle_cmd?: never; select_idle_cmd?: never;
select_place?: never; select_place?: never;
select_card?: never; select_multi?: never;
select_chain?: never; select_single?: never;
select_effect_yn?: never; select_effect_yn?: never;
select_position?: never; select_position?: never;
select_option?: CtosGameMsgResponse.SelectOptionResponse; select_option?: CtosGameMsgResponse.SelectOptionResponse;
select_battle_cmd?: never; select_battle_cmd?: never;
select_unselect_card?: never;
select_counter_response?: never; select_counter_response?: never;
sort_card?: never; sort_card?: never;
} }
| { | {
select_idle_cmd?: never; select_idle_cmd?: never;
select_place?: never; select_place?: never;
select_card?: never; select_multi?: never;
select_chain?: never; select_single?: never;
select_effect_yn?: never; select_effect_yn?: never;
select_position?: never; select_position?: never;
select_option?: never; select_option?: never;
select_battle_cmd?: CtosGameMsgResponse.SelectBattleCmdResponse; select_battle_cmd?: CtosGameMsgResponse.SelectBattleCmdResponse;
select_unselect_card?: never;
select_counter_response?: never; select_counter_response?: never;
sort_card?: never; sort_card?: never;
} }
| { | {
select_idle_cmd?: never; select_idle_cmd?: never;
select_place?: never; select_place?: never;
select_card?: never; select_multi?: never;
select_chain?: never; select_single?: never;
select_effect_yn?: never; select_effect_yn?: never;
select_position?: never; select_position?: never;
select_option?: never; select_option?: never;
select_battle_cmd?: never; select_battle_cmd?: never;
select_unselect_card?: CtosGameMsgResponse.SelectUnselectCardResponse;
select_counter_response?: never;
sort_card?: never;
}
| {
select_idle_cmd?: never;
select_place?: never;
select_card?: never;
select_chain?: never;
select_effect_yn?: never;
select_position?: never;
select_option?: never;
select_battle_cmd?: never;
select_unselect_card?: never;
select_counter_response?: CtosGameMsgResponse.SelectCounterResponse; select_counter_response?: CtosGameMsgResponse.SelectCounterResponse;
sort_card?: never; sort_card?: never;
} }
| { | {
select_idle_cmd?: never; select_idle_cmd?: never;
select_place?: never; select_place?: never;
select_card?: never; select_multi?: never;
select_chain?: never; select_single?: never;
select_effect_yn?: never; select_effect_yn?: never;
select_position?: never; select_position?: never;
select_option?: never; select_option?: never;
select_battle_cmd?: never; select_battle_cmd?: never;
select_unselect_card?: never;
select_counter_response?: never; select_counter_response?: never;
sort_card?: CtosGameMsgResponse.SortCardResponse; sort_card?: CtosGameMsgResponse.SortCardResponse;
} }
...@@ -2834,11 +2811,11 @@ export namespace ygopro { ...@@ -2834,11 +2811,11 @@ export namespace ygopro {
if ("select_place" in data && data.select_place != undefined) { if ("select_place" in data && data.select_place != undefined) {
this.select_place = data.select_place; this.select_place = data.select_place;
} }
if ("select_card" in data && data.select_card != undefined) { if ("select_multi" in data && data.select_multi != undefined) {
this.select_card = data.select_card; this.select_multi = data.select_multi;
} }
if ("select_chain" in data && data.select_chain != undefined) { if ("select_single" in data && data.select_single != undefined) {
this.select_chain = data.select_chain; this.select_single = data.select_single;
} }
if ("select_effect_yn" in data && data.select_effect_yn != undefined) { if ("select_effect_yn" in data && data.select_effect_yn != undefined) {
this.select_effect_yn = data.select_effect_yn; this.select_effect_yn = data.select_effect_yn;
...@@ -2855,12 +2832,6 @@ export namespace ygopro { ...@@ -2855,12 +2832,6 @@ export namespace ygopro {
) { ) {
this.select_battle_cmd = data.select_battle_cmd; this.select_battle_cmd = data.select_battle_cmd;
} }
if (
"select_unselect_card" in data &&
data.select_unselect_card != undefined
) {
this.select_unselect_card = data.select_unselect_card;
}
if ( if (
"select_counter_response" in data && "select_counter_response" in data &&
data.select_counter_response != undefined data.select_counter_response != undefined
...@@ -2898,30 +2869,30 @@ export namespace ygopro { ...@@ -2898,30 +2869,30 @@ export namespace ygopro {
get has_select_place() { get has_select_place() {
return pb_1.Message.getField(this, 2) != null; return pb_1.Message.getField(this, 2) != null;
} }
get select_card() { get select_multi() {
return pb_1.Message.getWrapperField( return pb_1.Message.getWrapperField(
this, this,
CtosGameMsgResponse.SelectCardResponse, CtosGameMsgResponse.SelectMultiResponse,
3 3
) as CtosGameMsgResponse.SelectCardResponse; ) as CtosGameMsgResponse.SelectMultiResponse;
} }
set select_card(value: CtosGameMsgResponse.SelectCardResponse) { set select_multi(value: CtosGameMsgResponse.SelectMultiResponse) {
pb_1.Message.setOneofWrapperField(this, 3, this.#one_of_decls[0], value); pb_1.Message.setOneofWrapperField(this, 3, this.#one_of_decls[0], value);
} }
get has_select_card() { get has_select_multi() {
return pb_1.Message.getField(this, 3) != null; return pb_1.Message.getField(this, 3) != null;
} }
get select_chain() { get select_single() {
return pb_1.Message.getWrapperField( return pb_1.Message.getWrapperField(
this, this,
CtosGameMsgResponse.SelectChainResponse, CtosGameMsgResponse.SelectSingleResponse,
4 4
) as CtosGameMsgResponse.SelectChainResponse; ) as CtosGameMsgResponse.SelectSingleResponse;
} }
set select_chain(value: CtosGameMsgResponse.SelectChainResponse) { set select_single(value: CtosGameMsgResponse.SelectSingleResponse) {
pb_1.Message.setOneofWrapperField(this, 4, this.#one_of_decls[0], value); pb_1.Message.setOneofWrapperField(this, 4, this.#one_of_decls[0], value);
} }
get has_select_chain() { get has_select_single() {
return pb_1.Message.getField(this, 4) != null; return pb_1.Message.getField(this, 4) != null;
} }
get select_effect_yn() { get select_effect_yn() {
...@@ -2976,48 +2947,33 @@ export namespace ygopro { ...@@ -2976,48 +2947,33 @@ export namespace ygopro {
get has_select_battle_cmd() { get has_select_battle_cmd() {
return pb_1.Message.getField(this, 8) != null; return pb_1.Message.getField(this, 8) != null;
} }
get select_unselect_card() {
return pb_1.Message.getWrapperField(
this,
CtosGameMsgResponse.SelectUnselectCardResponse,
9
) as CtosGameMsgResponse.SelectUnselectCardResponse;
}
set select_unselect_card(
value: CtosGameMsgResponse.SelectUnselectCardResponse
) {
pb_1.Message.setOneofWrapperField(this, 9, this.#one_of_decls[0], value);
}
get has_select_unselect_card() {
return pb_1.Message.getField(this, 9) != null;
}
get select_counter_response() { get select_counter_response() {
return pb_1.Message.getWrapperField( return pb_1.Message.getWrapperField(
this, this,
CtosGameMsgResponse.SelectCounterResponse, CtosGameMsgResponse.SelectCounterResponse,
10 9
) as CtosGameMsgResponse.SelectCounterResponse; ) as CtosGameMsgResponse.SelectCounterResponse;
} }
set select_counter_response( set select_counter_response(
value: CtosGameMsgResponse.SelectCounterResponse value: CtosGameMsgResponse.SelectCounterResponse
) { ) {
pb_1.Message.setOneofWrapperField(this, 10, this.#one_of_decls[0], value); pb_1.Message.setOneofWrapperField(this, 9, this.#one_of_decls[0], value);
} }
get has_select_counter_response() { get has_select_counter_response() {
return pb_1.Message.getField(this, 10) != null; return pb_1.Message.getField(this, 9) != null;
} }
get sort_card() { get sort_card() {
return pb_1.Message.getWrapperField( return pb_1.Message.getWrapperField(
this, this,
CtosGameMsgResponse.SortCardResponse, CtosGameMsgResponse.SortCardResponse,
11 10
) as CtosGameMsgResponse.SortCardResponse; ) as CtosGameMsgResponse.SortCardResponse;
} }
set sort_card(value: CtosGameMsgResponse.SortCardResponse) { set sort_card(value: CtosGameMsgResponse.SortCardResponse) {
pb_1.Message.setOneofWrapperField(this, 11, this.#one_of_decls[0], value); pb_1.Message.setOneofWrapperField(this, 10, this.#one_of_decls[0], value);
} }
get has_sort_card() { get has_sort_card() {
return pb_1.Message.getField(this, 11) != null; return pb_1.Message.getField(this, 10) != null;
} }
get gameMsgResponse() { get gameMsgResponse() {
const cases: { const cases: {
...@@ -3025,31 +2981,29 @@ export namespace ygopro { ...@@ -3025,31 +2981,29 @@ export namespace ygopro {
| "none" | "none"
| "select_idle_cmd" | "select_idle_cmd"
| "select_place" | "select_place"
| "select_card" | "select_multi"
| "select_chain" | "select_single"
| "select_effect_yn" | "select_effect_yn"
| "select_position" | "select_position"
| "select_option" | "select_option"
| "select_battle_cmd" | "select_battle_cmd"
| "select_unselect_card"
| "select_counter_response" | "select_counter_response"
| "sort_card"; | "sort_card";
} = { } = {
0: "none", 0: "none",
1: "select_idle_cmd", 1: "select_idle_cmd",
2: "select_place", 2: "select_place",
3: "select_card", 3: "select_multi",
4: "select_chain", 4: "select_single",
5: "select_effect_yn", 5: "select_effect_yn",
6: "select_position", 6: "select_position",
7: "select_option", 7: "select_option",
8: "select_battle_cmd", 8: "select_battle_cmd",
9: "select_unselect_card", 9: "select_counter_response",
10: "select_counter_response", 10: "sort_card",
11: "sort_card",
}; };
return cases[ return cases[
pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]) pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
]; ];
} }
static fromObject(data: { static fromObject(data: {
...@@ -3059,11 +3013,11 @@ export namespace ygopro { ...@@ -3059,11 +3013,11 @@ export namespace ygopro {
select_place?: ReturnType< select_place?: ReturnType<
typeof CtosGameMsgResponse.SelectPlaceResponse.prototype.toObject typeof CtosGameMsgResponse.SelectPlaceResponse.prototype.toObject
>; >;
select_card?: ReturnType< select_multi?: ReturnType<
typeof CtosGameMsgResponse.SelectCardResponse.prototype.toObject typeof CtosGameMsgResponse.SelectMultiResponse.prototype.toObject
>; >;
select_chain?: ReturnType< select_single?: ReturnType<
typeof CtosGameMsgResponse.SelectChainResponse.prototype.toObject typeof CtosGameMsgResponse.SelectSingleResponse.prototype.toObject
>; >;
select_effect_yn?: ReturnType< select_effect_yn?: ReturnType<
typeof CtosGameMsgResponse.SelectEffectYnResponse.prototype.toObject typeof CtosGameMsgResponse.SelectEffectYnResponse.prototype.toObject
...@@ -3077,9 +3031,6 @@ export namespace ygopro { ...@@ -3077,9 +3031,6 @@ export namespace ygopro {
select_battle_cmd?: ReturnType< select_battle_cmd?: ReturnType<
typeof CtosGameMsgResponse.SelectBattleCmdResponse.prototype.toObject typeof CtosGameMsgResponse.SelectBattleCmdResponse.prototype.toObject
>; >;
select_unselect_card?: ReturnType<
typeof CtosGameMsgResponse.SelectUnselectCardResponse.prototype.toObject
>;
select_counter_response?: ReturnType< select_counter_response?: ReturnType<
typeof CtosGameMsgResponse.SelectCounterResponse.prototype.toObject typeof CtosGameMsgResponse.SelectCounterResponse.prototype.toObject
>; >;
...@@ -3098,14 +3049,15 @@ export namespace ygopro { ...@@ -3098,14 +3049,15 @@ export namespace ygopro {
message.select_place = message.select_place =
CtosGameMsgResponse.SelectPlaceResponse.fromObject(data.select_place); CtosGameMsgResponse.SelectPlaceResponse.fromObject(data.select_place);
} }
if (data.select_card != null) { if (data.select_multi != null) {
message.select_card = CtosGameMsgResponse.SelectCardResponse.fromObject( message.select_multi =
data.select_card CtosGameMsgResponse.SelectMultiResponse.fromObject(data.select_multi);
);
} }
if (data.select_chain != null) { if (data.select_single != null) {
message.select_chain = message.select_single =
CtosGameMsgResponse.SelectChainResponse.fromObject(data.select_chain); CtosGameMsgResponse.SelectSingleResponse.fromObject(
data.select_single
);
} }
if (data.select_effect_yn != null) { if (data.select_effect_yn != null) {
message.select_effect_yn = message.select_effect_yn =
...@@ -3131,12 +3083,6 @@ export namespace ygopro { ...@@ -3131,12 +3083,6 @@ export namespace ygopro {
data.select_battle_cmd data.select_battle_cmd
); );
} }
if (data.select_unselect_card != null) {
message.select_unselect_card =
CtosGameMsgResponse.SelectUnselectCardResponse.fromObject(
data.select_unselect_card
);
}
if (data.select_counter_response != null) { if (data.select_counter_response != null) {
message.select_counter_response = message.select_counter_response =
CtosGameMsgResponse.SelectCounterResponse.fromObject( CtosGameMsgResponse.SelectCounterResponse.fromObject(
...@@ -3158,11 +3104,11 @@ export namespace ygopro { ...@@ -3158,11 +3104,11 @@ export namespace ygopro {
select_place?: ReturnType< select_place?: ReturnType<
typeof CtosGameMsgResponse.SelectPlaceResponse.prototype.toObject typeof CtosGameMsgResponse.SelectPlaceResponse.prototype.toObject
>; >;
select_card?: ReturnType< select_multi?: ReturnType<
typeof CtosGameMsgResponse.SelectCardResponse.prototype.toObject typeof CtosGameMsgResponse.SelectMultiResponse.prototype.toObject
>; >;
select_chain?: ReturnType< select_single?: ReturnType<
typeof CtosGameMsgResponse.SelectChainResponse.prototype.toObject typeof CtosGameMsgResponse.SelectSingleResponse.prototype.toObject
>; >;
select_effect_yn?: ReturnType< select_effect_yn?: ReturnType<
typeof CtosGameMsgResponse.SelectEffectYnResponse.prototype.toObject typeof CtosGameMsgResponse.SelectEffectYnResponse.prototype.toObject
...@@ -3176,9 +3122,6 @@ export namespace ygopro { ...@@ -3176,9 +3122,6 @@ export namespace ygopro {
select_battle_cmd?: ReturnType< select_battle_cmd?: ReturnType<
typeof CtosGameMsgResponse.SelectBattleCmdResponse.prototype.toObject typeof CtosGameMsgResponse.SelectBattleCmdResponse.prototype.toObject
>; >;
select_unselect_card?: ReturnType<
typeof CtosGameMsgResponse.SelectUnselectCardResponse.prototype.toObject
>;
select_counter_response?: ReturnType< select_counter_response?: ReturnType<
typeof CtosGameMsgResponse.SelectCounterResponse.prototype.toObject typeof CtosGameMsgResponse.SelectCounterResponse.prototype.toObject
>; >;
...@@ -3192,11 +3135,11 @@ export namespace ygopro { ...@@ -3192,11 +3135,11 @@ export namespace ygopro {
if (this.select_place != null) { if (this.select_place != null) {
data.select_place = this.select_place.toObject(); data.select_place = this.select_place.toObject();
} }
if (this.select_card != null) { if (this.select_multi != null) {
data.select_card = this.select_card.toObject(); data.select_multi = this.select_multi.toObject();
} }
if (this.select_chain != null) { if (this.select_single != null) {
data.select_chain = this.select_chain.toObject(); data.select_single = this.select_single.toObject();
} }
if (this.select_effect_yn != null) { if (this.select_effect_yn != null) {
data.select_effect_yn = this.select_effect_yn.toObject(); data.select_effect_yn = this.select_effect_yn.toObject();
...@@ -3210,9 +3153,6 @@ export namespace ygopro { ...@@ -3210,9 +3153,6 @@ export namespace ygopro {
if (this.select_battle_cmd != null) { if (this.select_battle_cmd != null) {
data.select_battle_cmd = this.select_battle_cmd.toObject(); data.select_battle_cmd = this.select_battle_cmd.toObject();
} }
if (this.select_unselect_card != null) {
data.select_unselect_card = this.select_unselect_card.toObject();
}
if (this.select_counter_response != null) { if (this.select_counter_response != null) {
data.select_counter_response = this.select_counter_response.toObject(); data.select_counter_response = this.select_counter_response.toObject();
} }
...@@ -3233,13 +3173,13 @@ export namespace ygopro { ...@@ -3233,13 +3173,13 @@ export namespace ygopro {
writer.writeMessage(2, this.select_place, () => writer.writeMessage(2, this.select_place, () =>
this.select_place.serialize(writer) this.select_place.serialize(writer)
); );
if (this.has_select_card) if (this.has_select_multi)
writer.writeMessage(3, this.select_card, () => writer.writeMessage(3, this.select_multi, () =>
this.select_card.serialize(writer) this.select_multi.serialize(writer)
); );
if (this.has_select_chain) if (this.has_select_single)
writer.writeMessage(4, this.select_chain, () => writer.writeMessage(4, this.select_single, () =>
this.select_chain.serialize(writer) this.select_single.serialize(writer)
); );
if (this.has_select_effect_yn) if (this.has_select_effect_yn)
writer.writeMessage(5, this.select_effect_yn, () => writer.writeMessage(5, this.select_effect_yn, () =>
...@@ -3257,16 +3197,12 @@ export namespace ygopro { ...@@ -3257,16 +3197,12 @@ export namespace ygopro {
writer.writeMessage(8, this.select_battle_cmd, () => writer.writeMessage(8, this.select_battle_cmd, () =>
this.select_battle_cmd.serialize(writer) this.select_battle_cmd.serialize(writer)
); );
if (this.has_select_unselect_card)
writer.writeMessage(9, this.select_unselect_card, () =>
this.select_unselect_card.serialize(writer)
);
if (this.has_select_counter_response) if (this.has_select_counter_response)
writer.writeMessage(10, this.select_counter_response, () => writer.writeMessage(9, this.select_counter_response, () =>
this.select_counter_response.serialize(writer) this.select_counter_response.serialize(writer)
); );
if (this.has_sort_card) if (this.has_sort_card)
writer.writeMessage(11, this.sort_card, () => writer.writeMessage(10, this.sort_card, () =>
this.sort_card.serialize(writer) this.sort_card.serialize(writer)
); );
if (!w) return writer.getResultBuffer(); if (!w) return writer.getResultBuffer();
...@@ -3300,18 +3236,18 @@ export namespace ygopro { ...@@ -3300,18 +3236,18 @@ export namespace ygopro {
break; break;
case 3: case 3:
reader.readMessage( reader.readMessage(
message.select_card, message.select_multi,
() => () =>
(message.select_card = (message.select_multi =
CtosGameMsgResponse.SelectCardResponse.deserialize(reader)) CtosGameMsgResponse.SelectMultiResponse.deserialize(reader))
); );
break; break;
case 4: case 4:
reader.readMessage( reader.readMessage(
message.select_chain, message.select_single,
() => () =>
(message.select_chain = (message.select_single =
CtosGameMsgResponse.SelectChainResponse.deserialize(reader)) CtosGameMsgResponse.SelectSingleResponse.deserialize(reader))
); );
break; break;
case 5: case 5:
...@@ -3353,16 +3289,6 @@ export namespace ygopro { ...@@ -3353,16 +3289,6 @@ export namespace ygopro {
); );
break; break;
case 9: case 9:
reader.readMessage(
message.select_unselect_card,
() =>
(message.select_unselect_card =
CtosGameMsgResponse.SelectUnselectCardResponse.deserialize(
reader
))
);
break;
case 10:
reader.readMessage( reader.readMessage(
message.select_counter_response, message.select_counter_response,
() => () =>
...@@ -3370,7 +3296,7 @@ export namespace ygopro { ...@@ -3370,7 +3296,7 @@ export namespace ygopro {
CtosGameMsgResponse.SelectCounterResponse.deserialize(reader)) CtosGameMsgResponse.SelectCounterResponse.deserialize(reader))
); );
break; break;
case 11: case 10:
reader.readMessage( reader.readMessage(
message.sort_card, message.sort_card,
() => () =>
...@@ -3602,7 +3528,7 @@ export namespace ygopro { ...@@ -3602,7 +3528,7 @@ export namespace ygopro {
return SelectPlaceResponse.deserialize(bytes); return SelectPlaceResponse.deserialize(bytes);
} }
} }
export class SelectCardResponse extends pb_1.Message { export class SelectMultiResponse extends pb_1.Message {
#one_of_decls: number[][] = []; #one_of_decls: number[][] = [];
constructor( constructor(
data?: data?:
...@@ -3634,8 +3560,8 @@ export namespace ygopro { ...@@ -3634,8 +3560,8 @@ export namespace ygopro {
} }
static fromObject(data: { static fromObject(data: {
selected_ptrs?: number[]; selected_ptrs?: number[];
}): SelectCardResponse { }): SelectMultiResponse {
const message = new SelectCardResponse({}); const message = new SelectMultiResponse({});
if (data.selected_ptrs != null) { if (data.selected_ptrs != null) {
message.selected_ptrs = data.selected_ptrs; message.selected_ptrs = data.selected_ptrs;
} }
...@@ -3660,12 +3586,12 @@ export namespace ygopro { ...@@ -3660,12 +3586,12 @@ export namespace ygopro {
} }
static deserialize( static deserialize(
bytes: Uint8Array | pb_1.BinaryReader bytes: Uint8Array | pb_1.BinaryReader
): SelectCardResponse { ): SelectMultiResponse {
const reader = const reader =
bytes instanceof pb_1.BinaryReader bytes instanceof pb_1.BinaryReader
? bytes ? bytes
: new pb_1.BinaryReader(bytes), : new pb_1.BinaryReader(bytes),
message = new SelectCardResponse(); message = new SelectMultiResponse();
while (reader.nextField()) { while (reader.nextField()) {
if (reader.isEndGroup()) break; if (reader.isEndGroup()) break;
switch (reader.getFieldNumber()) { switch (reader.getFieldNumber()) {
...@@ -3681,11 +3607,11 @@ export namespace ygopro { ...@@ -3681,11 +3607,11 @@ export namespace ygopro {
serializeBinary(): Uint8Array { serializeBinary(): Uint8Array {
return this.serialize(); return this.serialize();
} }
static deserializeBinary(bytes: Uint8Array): SelectCardResponse { static deserializeBinary(bytes: Uint8Array): SelectMultiResponse {
return SelectCardResponse.deserialize(bytes); return SelectMultiResponse.deserialize(bytes);
} }
} }
export class SelectChainResponse extends pb_1.Message { export class SelectSingleResponse extends pb_1.Message {
#one_of_decls: number[][] = []; #one_of_decls: number[][] = [];
constructor( constructor(
data?: data?:
...@@ -3715,8 +3641,8 @@ export namespace ygopro { ...@@ -3715,8 +3641,8 @@ export namespace ygopro {
set selected_ptr(value: number) { set selected_ptr(value: number) {
pb_1.Message.setField(this, 1, value); pb_1.Message.setField(this, 1, value);
} }
static fromObject(data: { selected_ptr?: number }): SelectChainResponse { static fromObject(data: { selected_ptr?: number }): SelectSingleResponse {
const message = new SelectChainResponse({}); const message = new SelectSingleResponse({});
if (data.selected_ptr != null) { if (data.selected_ptr != null) {
message.selected_ptr = data.selected_ptr; message.selected_ptr = data.selected_ptr;
} }
...@@ -3740,12 +3666,12 @@ export namespace ygopro { ...@@ -3740,12 +3666,12 @@ export namespace ygopro {
} }
static deserialize( static deserialize(
bytes: Uint8Array | pb_1.BinaryReader bytes: Uint8Array | pb_1.BinaryReader
): SelectChainResponse { ): SelectSingleResponse {
const reader = const reader =
bytes instanceof pb_1.BinaryReader bytes instanceof pb_1.BinaryReader
? bytes ? bytes
: new pb_1.BinaryReader(bytes), : new pb_1.BinaryReader(bytes),
message = new SelectChainResponse(); message = new SelectSingleResponse();
while (reader.nextField()) { while (reader.nextField()) {
if (reader.isEndGroup()) break; if (reader.isEndGroup()) break;
switch (reader.getFieldNumber()) { switch (reader.getFieldNumber()) {
...@@ -3761,8 +3687,8 @@ export namespace ygopro { ...@@ -3761,8 +3687,8 @@ export namespace ygopro {
serializeBinary(): Uint8Array { serializeBinary(): Uint8Array {
return this.serialize(); return this.serialize();
} }
static deserializeBinary(bytes: Uint8Array): SelectChainResponse { static deserializeBinary(bytes: Uint8Array): SelectSingleResponse {
return SelectChainResponse.deserialize(bytes); return SelectSingleResponse.deserialize(bytes);
} }
} }
export class SelectEffectYnResponse extends pb_1.Message { export class SelectEffectYnResponse extends pb_1.Message {
...@@ -4094,114 +4020,6 @@ export namespace ygopro { ...@@ -4094,114 +4020,6 @@ export namespace ygopro {
return SelectBattleCmdResponse.deserialize(bytes); return SelectBattleCmdResponse.deserialize(bytes);
} }
} }
export class SelectUnselectCardResponse extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(
data?:
| any[]
| {
cancel_or_finish?: boolean;
selected_ptr?: number;
}
) {
super();
pb_1.Message.initialize(
this,
Array.isArray(data) ? data : [],
0,
-1,
[],
this.#one_of_decls
);
if (!Array.isArray(data) && typeof data == "object") {
if (
"cancel_or_finish" in data &&
data.cancel_or_finish != undefined
) {
this.cancel_or_finish = data.cancel_or_finish;
}
if ("selected_ptr" in data && data.selected_ptr != undefined) {
this.selected_ptr = data.selected_ptr;
}
}
}
get cancel_or_finish() {
return pb_1.Message.getFieldWithDefault(this, 1, false) as boolean;
}
set cancel_or_finish(value: boolean) {
pb_1.Message.setField(this, 1, value);
}
get selected_ptr() {
return pb_1.Message.getFieldWithDefault(this, 2, 0) as number;
}
set selected_ptr(value: number) {
pb_1.Message.setField(this, 2, value);
}
static fromObject(data: {
cancel_or_finish?: boolean;
selected_ptr?: number;
}): SelectUnselectCardResponse {
const message = new SelectUnselectCardResponse({});
if (data.cancel_or_finish != null) {
message.cancel_or_finish = data.cancel_or_finish;
}
if (data.selected_ptr != null) {
message.selected_ptr = data.selected_ptr;
}
return message;
}
toObject() {
const data: {
cancel_or_finish?: boolean;
selected_ptr?: number;
} = {};
if (this.cancel_or_finish != null) {
data.cancel_or_finish = this.cancel_or_finish;
}
if (this.selected_ptr != null) {
data.selected_ptr = this.selected_ptr;
}
return data;
}
serialize(): Uint8Array;
serialize(w: pb_1.BinaryWriter): void;
serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
const writer = w || new pb_1.BinaryWriter();
if (this.cancel_or_finish != false)
writer.writeBool(1, this.cancel_or_finish);
if (this.selected_ptr != 0) writer.writeInt32(2, this.selected_ptr);
if (!w) return writer.getResultBuffer();
}
static deserialize(
bytes: Uint8Array | pb_1.BinaryReader
): SelectUnselectCardResponse {
const reader =
bytes instanceof pb_1.BinaryReader
? bytes
: new pb_1.BinaryReader(bytes),
message = new SelectUnselectCardResponse();
while (reader.nextField()) {
if (reader.isEndGroup()) break;
switch (reader.getFieldNumber()) {
case 1:
message.cancel_or_finish = reader.readBool();
break;
case 2:
message.selected_ptr = reader.readInt32();
break;
default:
reader.skipField();
}
}
return message;
}
serializeBinary(): Uint8Array {
return this.serialize();
}
static deserializeBinary(bytes: Uint8Array): SelectUnselectCardResponse {
return SelectUnselectCardResponse.deserialize(bytes);
}
}
export class SelectCounterResponse extends pb_1.Message { export class SelectCounterResponse extends pb_1.Message {
#one_of_decls: number[][] = []; #one_of_decls: number[][] = [];
constructor( constructor(
......
src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/mod.ts
View file @ 71871e17
...@@ -2,15 +2,14 @@ import { ygopro } from "../../../idl/ocgcore"; ...@@ -2,15 +2,14 @@ import { ygopro } from "../../../idl/ocgcore";
import { YgoProPacket } from "../../packet"; import { YgoProPacket } from "../../packet";
import { CTOS_RESPONSE } from "../../protoDecl"; import { CTOS_RESPONSE } from "../../protoDecl";
import adaptSelectBattleCmdResponse from "./selectBattleCmd"; import adaptSelectBattleCmdResponse from "./selectBattleCmd";
import adaptSelectCardResponse from "./selectCard";
import adaptSelectChainResponse from "./selectChain";
import adaptSelectCounterResponse from "./selectCounter"; import adaptSelectCounterResponse from "./selectCounter";
import adaptSelectEffectYnResponse from "./selectEffectYn"; import adaptSelectEffectYnResponse from "./selectEffectYn";
import adaptSelectIdleCmdResponse from "./selectIdleCmd"; import adaptSelectIdleCmdResponse from "./selectIdleCmd";
import adaptSelectMultiResponse from "./selectMulti";
import adaptSelectOptionResponse from "./selectOption"; import adaptSelectOptionResponse from "./selectOption";
import adaptSelectPlaceResponse from "./selectPlace"; import adaptSelectPlaceResponse from "./selectPlace";
import adaptSelectPositionResponse from "./selectPosition"; import adaptSelectPositionResponse from "./selectPosition";
import adaptSelectUnselectCardResponse from "./selectUnselectCard"; import adaptSelectSingleResponse from "./selectSingle";
import adaptSortCardResponse from "./sortCard"; import adaptSortCardResponse from "./sortCard";
/* /*
...@@ -37,13 +36,13 @@ export default class CtosResponsePacket extends YgoProPacket { ...@@ -37,13 +36,13 @@ export default class CtosResponsePacket extends YgoProPacket {
break; break;
} }
case "select_card": { case "select_multi": {
extraData = adaptSelectCardResponse(response.select_card); extraData = adaptSelectMultiResponse(response.select_multi);
break; break;
} }
case "select_chain": { case "select_single": {
extraData = adaptSelectChainResponse(response.select_chain); extraData = adaptSelectSingleResponse(response.select_single);
break; break;
} }
...@@ -67,13 +66,6 @@ export default class CtosResponsePacket extends YgoProPacket { ...@@ -67,13 +66,6 @@ export default class CtosResponsePacket extends YgoProPacket {
break; break;
} }
case "select_unselect_card": {
extraData = adaptSelectUnselectCardResponse(
response.select_unselect_card
);
break;
}
case "select_counter_response": { case "select_counter_response": {
extraData = adaptSelectCounterResponse( extraData = adaptSelectCounterResponse(
response.select_counter_response response.select_counter_response
......
src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectCard.ts → src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectMulti.ts
View file @ 71871e17
...@@ -2,7 +2,7 @@ import { BufferWriter } from "rust-src"; ...@@ -2,7 +2,7 @@ import { BufferWriter } from "rust-src";
import { ygopro } from "../../../idl/ocgcore"; import { ygopro } from "../../../idl/ocgcore";
export default (response: ygopro.CtosGameMsgResponse.SelectCardResponse) => { export default (response: ygopro.CtosGameMsgResponse.SelectMultiResponse) => {
const writer = new BufferWriter(); const writer = new BufferWriter();
writer.writeUint8(response.selected_ptrs.length); writer.writeUint8(response.selected_ptrs.length);
......
src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectChain.ts → src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectSingle.ts
View file @ 71871e17
...@@ -2,7 +2,7 @@ import { BufferWriter } from "rust-src"; ...@@ -2,7 +2,7 @@ import { BufferWriter } from "rust-src";
import { ygopro } from "../../../idl/ocgcore"; import { ygopro } from "../../../idl/ocgcore";
export default (response: ygopro.CtosGameMsgResponse.SelectChainResponse) => { export default (response: ygopro.CtosGameMsgResponse.SelectSingleResponse) => {
const writer = new BufferWriter(); const writer = new BufferWriter();
writer.writeInt32(response.selected_ptr); writer.writeInt32(response.selected_ptr);
......
src/api/ocgcore/ocgAdapter/ctos/ctosGameMsgResponse/selectUnselectCard.ts deleted 100644 → 0
View file @ 5a6f4933
import { BufferWriter } from "rust-src";
import { ygopro } from "../../../idl/ocgcore";
export default (
response: ygopro.CtosGameMsgResponse.SelectUnselectCardResponse
) => {
const writer = new BufferWriter();
if (response.cancel_or_finish) {
writer.writeInt32(-1);
} else {
writer.writeUint8(1);
writer.writeUint8(response.selected_ptr);
}
return writer.toArray();
};
src/api/ocgcore/ocgHelper.ts
View file @ 71871e17
...@@ -172,10 +172,10 @@ export function sendSelectPlaceResponse(value: { ...@@ -172,10 +172,10 @@ export function sendSelectPlaceResponse(value: {
socketMiddleWare({ cmd: socketCmd.SEND, payload }); socketMiddleWare({ cmd: socketCmd.SEND, payload });
} }
export function sendSelectCardResponse(value: number[]) { export function sendSelectMultiResponse(value: number[]) {
const response = new ygopro.YgoCtosMsg({ const response = new ygopro.YgoCtosMsg({
ctos_response: new ygopro.CtosGameMsgResponse({ ctos_response: new ygopro.CtosGameMsgResponse({
select_card: new ygopro.CtosGameMsgResponse.SelectCardResponse({ select_multi: new ygopro.CtosGameMsgResponse.SelectMultiResponse({
selected_ptrs: value, selected_ptrs: value,
}), }),
}), }),
...@@ -185,10 +185,10 @@ export function sendSelectCardResponse(value: number[]) { ...@@ -185,10 +185,10 @@ export function sendSelectCardResponse(value: number[]) {
socketMiddleWare({ cmd: socketCmd.SEND, payload }); socketMiddleWare({ cmd: socketCmd.SEND, payload });
} }
export function sendSelectChainResponse(value: number) { export function sendSelectSingleResponse(value: number) {
const response = new ygopro.YgoCtosMsg({ const response = new ygopro.YgoCtosMsg({
ctos_response: new ygopro.CtosGameMsgResponse({ ctos_response: new ygopro.CtosGameMsgResponse({
select_chain: new ygopro.CtosGameMsgResponse.SelectChainResponse({ select_single: new ygopro.CtosGameMsgResponse.SelectSingleResponse({
selected_ptr: value, selected_ptr: value,
}), }),
}), }),
...@@ -252,24 +252,6 @@ export function sendSelectBattleCmdResponse(value: number) { ...@@ -252,24 +252,6 @@ export function sendSelectBattleCmdResponse(value: number) {
socketMiddleWare({ cmd: socketCmd.SEND, payload }); socketMiddleWare({ cmd: socketCmd.SEND, payload });
} }
export function sendSelectUnselectCardResponse(value: {
cancel_or_finish?: boolean;
selected_ptr?: number;
}) {
const response = new ygopro.YgoCtosMsg({
ctos_response: new ygopro.CtosGameMsgResponse({
select_unselect_card:
new ygopro.CtosGameMsgResponse.SelectUnselectCardResponse({
selected_ptr: value.selected_ptr,
cancel_or_finish: value.cancel_or_finish,
}),
}),
});
const payload = new GameMsgResponse(response).serialize();
socketMiddleWare({ cmd: socketCmd.SEND, payload });
}
export function sendSelectCounterResponse(counts: number[]) { export function sendSelectCounterResponse(counts: number[]) {
const response = new ygopro.YgoCtosMsg({ const response = new ygopro.YgoCtosMsg({
ctos_response: new ygopro.CtosGameMsgResponse({ ctos_response: new ygopro.CtosGameMsgResponse({
......
src/service/duel/selectChain.ts
View file @ 71871e17
import { sendSelectChainResponse, ygopro } from "@/api"; import { sendSelectSingleResponse, ygopro } from "@/api";
import { import {
fetchCheckCardMeta, fetchCheckCardMeta,
fetchSelectHintMeta, fetchSelectHintMeta,
...@@ -49,7 +49,7 @@ export default (selectChain: MsgSelectChain) => { ...@@ -49,7 +49,7 @@ export default (selectChain: MsgSelectChain) => {
switch (handle_flag) { switch (handle_flag) {
case 0: { case 0: {
// 直接回答 // 直接回答
sendSelectChainResponse(-1); sendSelectSingleResponse(-1);
break; break;
} }
...@@ -79,7 +79,7 @@ export default (selectChain: MsgSelectChain) => { ...@@ -79,7 +79,7 @@ export default (selectChain: MsgSelectChain) => {
} }
case 4: { case 4: {
// 有一张强制发动的卡，直接回应 // 有一张强制发动的卡，直接回应
sendSelectChainResponse(chains[0].response); sendSelectSingleResponse(chains[0].response);
break; break;
} }
......
src/ui/Duel/Message/CheckCardModal.tsx
View file @ 71871e17
...@@ -6,8 +6,8 @@ import { useSnapshot } from "valtio"; ...@@ -6,8 +6,8 @@ import { useSnapshot } from "valtio";
import { import {
fetchStrings, fetchStrings,
sendSelectCardResponse, sendSelectMultiResponse,
sendSelectChainResponse, sendSelectSingleResponse,
} from "@/api"; } from "@/api";
import { useConfig } from "@/config"; import { useConfig } from "@/config";
import { matStore, messageStore } from "@/stores"; import { matStore, messageStore } from "@/stores";
...@@ -85,9 +85,9 @@ export const CheckCardModal = () => { ...@@ -85,9 +85,9 @@ export const CheckCardModal = () => {
.map((option) => option.response); .map((option) => option.response);
if (isChain) { if (isChain) {
sendSelectChainResponse(values[0]); sendSelectSingleResponse(values[0]);
} else { } else {
sendSelectCardResponse(values); sendSelectMultiResponse(values);
} }
resetCheckCardModal(); resetCheckCardModal();
}} }}
...@@ -99,7 +99,7 @@ export const CheckCardModal = () => { ...@@ -99,7 +99,7 @@ export const CheckCardModal = () => {
<Button <Button
disabled={!finishable} disabled={!finishable}
onClick={() => { onClick={() => {
sendSelectCardResponse([FINISH_RESPONSE]); sendSelectSingleResponse(FINISH_RESPONSE);
resetCheckCardModal(); resetCheckCardModal();
}} }}
onFocus={() => {}} onFocus={() => {}}
...@@ -111,7 +111,7 @@ export const CheckCardModal = () => { ...@@ -111,7 +111,7 @@ export const CheckCardModal = () => {
<Button <Button
disabled={!cancelable} disabled={!cancelable}
onClick={() => { onClick={() => {
sendSelectChainResponse(CANCEL_RESPONSE); sendSelectSingleResponse(CANCEL_RESPONSE);
resetCheckCardModal(); resetCheckCardModal();
}} }}
onFocus={() => {}} onFocus={() => {}}
......
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