Skip to content

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

Merge branch 'feat/field_disabled' into 'main' 

Feat/field disabled

See merge request !232
parents feb483cc a0764834
Hide whitespace changes
Inline Side-by-side
Showing with 527 additions and 31 deletions
neos-protobuf @ 984aa1c4
Subproject commit 2caaa3aa310f699ebf5b52a08413d0a555ac4065
Subproject commit 984aa1c40cee961f2a0f4540eaae7bc9d8d907a2
neos.config.json
View file @ b23c5ab2
......@@ -2,7 +2,7 @@
"version":4960,
"servers":[
{
"ip":"koishi-r.momobako.com",
"ip":"koishi.momobako.com",
"port":"7211"
}
],
......
src/api/ocgcore/idl/ocgcore.ts
View file @ b23c5ab2
......@@ -4511,7 +4511,7 @@ export namespace ygopro {
}
}
export class StocGameMessage extends pb_1.Message {
#one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48]];
#one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49]];
constructor(data?: any[] | ({} & (({
start?: StocGameMessage.MsgStart;
draw?: never;
......@@ -4561,6 +4561,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: StocGameMessage.MsgDraw;
......@@ -4610,6 +4611,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -4659,6 +4661,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -4708,6 +4711,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -4757,6 +4761,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -4806,6 +4811,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -4855,6 +4861,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -4904,6 +4911,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -4953,6 +4961,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5002,6 +5011,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5051,6 +5061,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5100,6 +5111,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5149,6 +5161,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5198,6 +5211,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5247,6 +5261,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5296,6 +5311,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5345,6 +5361,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5394,6 +5411,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5443,6 +5461,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5492,6 +5511,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5541,6 +5561,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5590,6 +5611,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5639,6 +5661,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5688,6 +5711,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5737,6 +5761,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5786,6 +5811,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5835,6 +5861,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5884,6 +5911,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5933,6 +5961,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -5982,6 +6011,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6031,6 +6061,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6080,6 +6111,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6129,6 +6161,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6178,6 +6211,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6227,6 +6261,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6276,6 +6311,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6325,6 +6361,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6374,6 +6411,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6423,6 +6461,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6472,6 +6511,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6521,6 +6561,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6570,6 +6611,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6619,6 +6661,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6668,6 +6711,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6717,6 +6761,7 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6766,6 +6811,7 @@ export namespace ygopro {
become_target?: StocGameMessage.MsgBecomeTarget;
toss?: never;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6815,6 +6861,7 @@ export namespace ygopro {
become_target?: never;
toss?: StocGameMessage.MsgToss;
shuffle_set_card?: never;
field_disabled?: never;
} | {
start?: never;
draw?: never;
......@@ -6864,6 +6911,57 @@ export namespace ygopro {
become_target?: never;
toss?: never;
shuffle_set_card?: StocGameMessage.MsgShuffleSetCard;
field_disabled?: never;
} | {
start?: never;
draw?: never;
new_turn?: never;
new_phase?: never;
hint?: never;
select_idle_cmd?: never;
select_place?: never;
move?: never;
select_card?: never;
select_chain?: never;
select_effect_yn?: never;
select_position?: never;
select_option?: never;
shuffle_hand?: never;
select_battle_cmd?: never;
pos_change?: never;
select_unselect_card?: never;
select_yes_no?: never;
update_hp?: never;
win?: never;
wait?: never;
unimplemented?: never;
update_data?: never;
reload_field?: never;
select_sum?: never;
select_tribute?: never;
update_counter?: never;
select_counter?: never;
sort_card?: never;
set?: never;
swap?: never;
summoning?: never;
summoned?: never;
flip_summoning?: never;
flip_summoned?: never;
sp_summoning?: never;
sp_summoned?: never;
chaining?: never;
attack?: never;
attack_disable?: never;
chain_solved?: never;
chain_end?: never;
announce?: never;
lp_update?: never;
confirm_cards?: never;
become_target?: never;
toss?: never;
shuffle_set_card?: never;
field_disabled?: StocGameMessage.MsgFieldDisabled;
})))) {
super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
......@@ -7012,6 +7110,9 @@ export namespace ygopro {
if ("shuffle_set_card" in data && data.shuffle_set_card != undefined) {
this.shuffle_set_card = data.shuffle_set_card;
}
if ("field_disabled" in data && data.field_disabled != undefined) {
this.field_disabled = data.field_disabled;
}
}
}
get start() {
......@@ -7446,9 +7547,18 @@ export namespace ygopro {
get has_shuffle_set_card() {
return pb_1.Message.getField(this, 48) != null;
}
get field_disabled() {
return pb_1.Message.getWrapperField(this, StocGameMessage.MsgFieldDisabled, 49) as StocGameMessage.MsgFieldDisabled;
}
set field_disabled(value: StocGameMessage.MsgFieldDisabled) {
pb_1.Message.setOneofWrapperField(this, 49, this.#one_of_decls[0], value);
}
get has_field_disabled() {
return pb_1.Message.getField(this, 49) != null;
}
get gameMsg() {
const cases: {
[index: number]: "none" | "start" | "draw" | "new_turn" | "new_phase" | "hint" | "select_idle_cmd" | "select_place" | "move" | "select_card" | "select_chain" | "select_effect_yn" | "select_position" | "select_option" | "shuffle_hand" | "select_battle_cmd" | "pos_change" | "select_unselect_card" | "select_yes_no" | "update_hp" | "win" | "wait" | "unimplemented" | "update_data" | "reload_field" | "select_sum" | "select_tribute" | "update_counter" | "select_counter" | "sort_card" | "set" | "swap" | "summoning" | "summoned" | "flip_summoning" | "flip_summoned" | "sp_summoning" | "sp_summoned" | "chaining" | "attack" | "attack_disable" | "chain_solved" | "chain_end" | "announce" | "lp_update" | "confirm_cards" | "become_target" | "toss" | "shuffle_set_card";
[index: number]: "none" | "start" | "draw" | "new_turn" | "new_phase" | "hint" | "select_idle_cmd" | "select_place" | "move" | "select_card" | "select_chain" | "select_effect_yn" | "select_position" | "select_option" | "shuffle_hand" | "select_battle_cmd" | "pos_change" | "select_unselect_card" | "select_yes_no" | "update_hp" | "win" | "wait" | "unimplemented" | "update_data" | "reload_field" | "select_sum" | "select_tribute" | "update_counter" | "select_counter" | "sort_card" | "set" | "swap" | "summoning" | "summoned" | "flip_summoning" | "flip_summoned" | "sp_summoning" | "sp_summoned" | "chaining" | "attack" | "attack_disable" | "chain_solved" | "chain_end" | "announce" | "lp_update" | "confirm_cards" | "become_target" | "toss" | "shuffle_set_card" | "field_disabled";
} = {
0: "none",
1: "start",
......@@ -7498,9 +7608,10 @@ export namespace ygopro {
45: "confirm_cards",
46: "become_target",
47: "toss",
48: "shuffle_set_card"
48: "shuffle_set_card",
49: "field_disabled"
};
return cases[pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48])];
return cases[pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49])];
}
static fromObject(data: {
start?: ReturnType<typeof StocGameMessage.MsgStart.prototype.toObject>;
......@@ -7551,6 +7662,7 @@ export namespace ygopro {
become_target?: ReturnType<typeof StocGameMessage.MsgBecomeTarget.prototype.toObject>;
toss?: ReturnType<typeof StocGameMessage.MsgToss.prototype.toObject>;
shuffle_set_card?: ReturnType<typeof StocGameMessage.MsgShuffleSetCard.prototype.toObject>;
field_disabled?: ReturnType<typeof StocGameMessage.MsgFieldDisabled.prototype.toObject>;
}): StocGameMessage {
const message = new StocGameMessage({});
if (data.start != null) {
......@@ -7697,6 +7809,9 @@ export namespace ygopro {
if (data.shuffle_set_card != null) {
message.shuffle_set_card = StocGameMessage.MsgShuffleSetCard.fromObject(data.shuffle_set_card);
}
if (data.field_disabled != null) {
message.field_disabled = StocGameMessage.MsgFieldDisabled.fromObject(data.field_disabled);
}
return message;
}
toObject() {
......@@ -7749,6 +7864,7 @@ export namespace ygopro {
become_target?: ReturnType<typeof StocGameMessage.MsgBecomeTarget.prototype.toObject>;
toss?: ReturnType<typeof StocGameMessage.MsgToss.prototype.toObject>;
shuffle_set_card?: ReturnType<typeof StocGameMessage.MsgShuffleSetCard.prototype.toObject>;
field_disabled?: ReturnType<typeof StocGameMessage.MsgFieldDisabled.prototype.toObject>;
} = {};
if (this.start != null) {
data.start = this.start.toObject();
......@@ -7894,6 +8010,9 @@ export namespace ygopro {
if (this.shuffle_set_card != null) {
data.shuffle_set_card = this.shuffle_set_card.toObject();
}
if (this.field_disabled != null) {
data.field_disabled = this.field_disabled.toObject();
}
return data;
}
serialize(): Uint8Array;
......@@ -7996,6 +8115,8 @@ export namespace ygopro {
writer.writeMessage(47, this.toss, () => this.toss.serialize(writer));
if (this.has_shuffle_set_card)
writer.writeMessage(48, this.shuffle_set_card, () => this.shuffle_set_card.serialize(writer));
if (this.has_field_disabled)
writer.writeMessage(49, this.field_disabled, () => this.field_disabled.serialize(writer));
if (!w)
return writer.getResultBuffer();
}
......@@ -8149,6 +8270,9 @@ export namespace ygopro {
case 48:
reader.readMessage(message.shuffle_set_card, () => message.shuffle_set_card = StocGameMessage.MsgShuffleSetCard.deserialize(reader));
break;
case 49:
reader.readMessage(message.field_disabled, () => message.field_disabled = StocGameMessage.MsgFieldDisabled.deserialize(reader));
break;
default: reader.skipField();
}
}
......@@ -15515,6 +15639,211 @@ export namespace ygopro {
DICE = 2
}
}
export class MsgFieldDisabled extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
actions?: StocGameMessage.MsgFieldDisabled.Action[];
}) {
super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("actions" in data && data.actions != undefined) {
this.actions = data.actions;
}
}
}
get actions() {
return pb_1.Message.getRepeatedWrapperField(this, StocGameMessage.MsgFieldDisabled.Action, 1) as StocGameMessage.MsgFieldDisabled.Action[];
}
set actions(value: StocGameMessage.MsgFieldDisabled.Action[]) {
pb_1.Message.setRepeatedWrapperField(this, 1, value);
}
static fromObject(data: {
actions?: ReturnType<typeof StocGameMessage.MsgFieldDisabled.Action.prototype.toObject>[];
}): MsgFieldDisabled {
const message = new MsgFieldDisabled({});
if (data.actions != null) {
message.actions = data.actions.map(item => StocGameMessage.MsgFieldDisabled.Action.fromObject(item));
}
return message;
}
toObject() {
const data: {
actions?: ReturnType<typeof StocGameMessage.MsgFieldDisabled.Action.prototype.toObject>[];
} = {};
if (this.actions != null) {
data.actions = this.actions.map((item: StocGameMessage.MsgFieldDisabled.Action) => item.toObject());
}
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.actions.length)
writer.writeRepeatedMessage(1, this.actions, (item: StocGameMessage.MsgFieldDisabled.Action) => item.serialize(writer));
if (!w)
return writer.getResultBuffer();
}
static deserialize(bytes: Uint8Array | pb_1.BinaryReader): MsgFieldDisabled {
const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new MsgFieldDisabled();
while (reader.nextField()) {
if (reader.isEndGroup())
break;
switch (reader.getFieldNumber()) {
case 1:
reader.readMessage(message.actions, () => pb_1.Message.addToRepeatedWrapperField(message, 1, StocGameMessage.MsgFieldDisabled.Action.deserialize(reader), StocGameMessage.MsgFieldDisabled.Action));
break;
default: reader.skipField();
}
}
return message;
}
serializeBinary(): Uint8Array {
return this.serialize();
}
static deserializeBinary(bytes: Uint8Array): MsgFieldDisabled {
return MsgFieldDisabled.deserialize(bytes);
}
}
export namespace MsgFieldDisabled {
export class Action extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
controller?: number;
zone?: CardZone;
sequence?: number;
disabled?: boolean;
}) {
super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
if (!Array.isArray(data) && typeof data == "object") {
if ("controller" in data && data.controller != undefined) {
this.controller = data.controller;
}
if ("zone" in data && data.zone != undefined) {
this.zone = data.zone;
}
if ("sequence" in data && data.sequence != undefined) {
this.sequence = data.sequence;
}
if ("disabled" in data && data.disabled != undefined) {
this.disabled = data.disabled;
}
}
}
get controller() {
return pb_1.Message.getFieldWithDefault(this, 1, 0) as number;
}
set controller(value: number) {
pb_1.Message.setField(this, 1, value);
}
get zone() {
return pb_1.Message.getFieldWithDefault(this, 2, CardZone.DECK) as CardZone;
}
set zone(value: CardZone) {
pb_1.Message.setField(this, 2, value);
}
get sequence() {
return pb_1.Message.getFieldWithDefault(this, 3, 0) as number;
}
set sequence(value: number) {
pb_1.Message.setField(this, 3, value);
}
get disabled() {
return pb_1.Message.getFieldWithDefault(this, 4, false) as boolean;
}
set disabled(value: boolean) {
pb_1.Message.setField(this, 4, value);
}
static fromObject(data: {
controller?: number;
zone?: CardZone;
sequence?: number;
disabled?: boolean;
}): Action {
const message = new Action({});
if (data.controller != null) {
message.controller = data.controller;
}
if (data.zone != null) {
message.zone = data.zone;
}
if (data.sequence != null) {
message.sequence = data.sequence;
}
if (data.disabled != null) {
message.disabled = data.disabled;
}
return message;
}
toObject() {
const data: {
controller?: number;
zone?: CardZone;
sequence?: number;
disabled?: boolean;
} = {};
if (this.controller != null) {
data.controller = this.controller;
}
if (this.zone != null) {
data.zone = this.zone;
}
if (this.sequence != null) {
data.sequence = this.sequence;
}
if (this.disabled != null) {
data.disabled = this.disabled;
}
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.controller != 0)
writer.writeInt32(1, this.controller);
if (this.zone != CardZone.DECK)
writer.writeEnum(2, this.zone);
if (this.sequence != 0)
writer.writeInt32(3, this.sequence);
if (this.disabled != false)
writer.writeBool(4, this.disabled);
if (!w)
return writer.getResultBuffer();
}
static deserialize(bytes: Uint8Array | pb_1.BinaryReader): Action {
const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new Action();
while (reader.nextField()) {
if (reader.isEndGroup())
break;
switch (reader.getFieldNumber()) {
case 1:
message.controller = reader.readInt32();
break;
case 2:
message.zone = reader.readEnum();
break;
case 3:
message.sequence = reader.readInt32();
break;
case 4:
message.disabled = reader.readBool();
break;
default: reader.skipField();
}
}
return message;
}
serializeBinary(): Uint8Array {
return this.serialize();
}
static deserializeBinary(bytes: Uint8Array): Action {
return Action.deserialize(bytes);
}
}
}
export class MsgReloadField extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(data?: any[] | {
......
src/api/ocgcore/ocgAdapter/protoDecl.ts
View file @ b23c5ab2
......@@ -65,3 +65,4 @@ export const MSG_ANNOUNCE_NUMBER = 143;
export const MSG_TOSS_COIN = 130;
export const MSG_TOSS_DICE = 131;
export const MSG_SHUFFLE_SET_CARD = 36;
export const MSG_FIELD_DISABLED = 56;
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/fieldDisabled.ts 0 → 100644
View file @ b23c5ab2
import { ygopro } from "@/api/ocgcore/idl/ocgcore";
import { BufferReader } from "../../../../../../rust-src/pkg/rust_src";
import MsgFieldDisabled = ygopro.StocGameMessage.MsgFieldDisabled;
import CardZone = ygopro.CardZone;
/*
* Msg Field Disabled
* @param - TODO
*
* @usage - 区域禁用
* */
export default (data: Uint8Array) => {
const reader = new BufferReader(data);
const flag = reader.readInt32();
const actions = [];
let filter = 0x1;
for (let i = 0; i < 5; i++, filter <<= 1) {
const disabled = (flag & filter) > 0;
actions.push(
new MsgFieldDisabled.Action({
controller: 0,
zone: CardZone.MZONE,
sequence: i,
disabled,
})
);
}
filter = 0x100;
for (let i = 0; i < 8; i++, filter <<= 1) {
const disabled = (flag & filter) > 0;
actions.push(
new MsgFieldDisabled.Action({
controller: 0,
zone: CardZone.SZONE,
sequence: i,
disabled,
})
);
}
filter = 0x10000;
for (let i = 0; i < 5; i++, filter <<= 1) {
const disabled = (flag & filter) > 0;
actions.push(
new MsgFieldDisabled.Action({
controller: 1,
zone: CardZone.MZONE,
sequence: i,
disabled,
})
);
}
filter = 0x1000000;
for (let i = 0; i < 8; i++, filter <<= 1) {
const disabled = (flag & filter) > 0;
actions.push(
new MsgFieldDisabled.Action({
controller: 1,
zone: CardZone.SZONE,
sequence: i,
disabled,
})
);
}
return new MsgFieldDisabled({
actions,
});
};
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
View file @ b23c5ab2
......@@ -14,6 +14,7 @@ import MsgAnnounceRace from "./announceRace";
import MsgAttack from "./attack";
import MsgDamage from "./damage";
import MsgDrawAdapter from "./draw";
import MsgFieldDisabledAdapter from "./fieldDisabled";
import MsgHintAdapter from "./hint";
import MsgNewPhaseAdapter from "./newPhase";
import MsgNewTurnAdapter from "./newTurn";
......@@ -244,6 +245,11 @@ export default class GameMsgAdapter implements StocAdapter {
break;
}
case GAME_MSG.MSG_FIELD_DISABLED: {
gameMsg.field_disabled = MsgFieldDisabledAdapter(gameData);
break;
}
default: {
gameMsg.unimplemented = new ygopro.StocGameMessage.MsgUnimplemented({
command: func,
......
src/service/duel/fieldDisabled.ts 0 → 100644
View file @ b23c5ab2
import { ygopro } from "@/api";
import { placeStore } from "@/stores";
import MsgFieldDisabled = ygopro.StocGameMessage.MsgFieldDisabled;
export default (fieldDisabled: MsgFieldDisabled) => {
for (const action of fieldDisabled.actions) {
switch (action.zone) {
case ygopro.CardZone.MZONE:
case ygopro.CardZone.SZONE:
placeStore.set(action.zone, action.controller, action.sequence, {
interactivity: undefined,
disabled: action.disabled,
});
break;
default:
console.warn("<FieldDisabled>zone is not MZONE nor SZONE!");
}
}
};
src/service/duel/gameMsg.ts
View file @ b23c5ab2
......@@ -11,6 +11,7 @@ import onMsgChaining from "./chaining";
import onMsgChainSolved from "./chainSolved";
import onConfirmCards from "./confirmCards";
import onMsgDraw from "./draw";
import onMsgFieldDisabled from "./fieldDisabled";
import onMsgFilpSummoned from "./flipSummoned";
import onMsgFlipSummoning from "./flipSummoning";
import onMsgHint from "./hint";
......@@ -315,6 +316,11 @@ async function _handleGameMsg(pb: ygopro.YgoStocMsg) {
break;
}
case "field_disabled": {
onMsgFieldDisabled(msg.field_disabled);
break;
}
case "unimplemented": {
onUnimplemented(msg.unimplemented);
......
src/service/duel/selectPlace.ts
View file @ b23c5ab2
......@@ -14,12 +14,15 @@ export default (selectPlace: MsgSelectPlace) => {
case ygopro.CardZone.MZONE:
case ygopro.CardZone.SZONE:
placeStore.set(place.zone, place.controller, place.sequence, {
interactType: InteractType.PLACE_SELECTABLE,
response: {
controller: place.controller,
zone: place.zone,
sequence: place.sequence,
interactivity: {
interactType: InteractType.PLACE_SELECTABLE,
response: {
controller: place.controller,
zone: place.zone,
sequence: place.sequence,
},
},
disabled: false,
});
break;
}
......
src/stores/placeStore.ts
View file @ b23c5ab2
......@@ -15,31 +15,60 @@ export type PlaceInteractivity =
const { MZONE, SZONE } = ygopro.CardZone;
export interface BlockState {
interactivity?: PlaceInteractivity; // 互动性
disabled: boolean; // 是否被禁用
}
export const placeStore = proxy({
inner: {
[MZONE]: {
me: Array.from({ length: 7 }).map(() => undefined as PlaceInteractivity),
op: Array.from({ length: 7 }).map(() => undefined as PlaceInteractivity),
me: Array.from({ length: 7 }).map(
() =>
({
interactivity: undefined,
disabled: false,
} as BlockState)
),
op: Array.from({ length: 7 }).map(
() =>
({
interactivity: undefined,
disabled: false,
} as BlockState)
),
},
[SZONE]: {
me: Array.from({ length: 6 }).map(() => undefined as PlaceInteractivity),
op: Array.from({ length: 6 }).map(() => undefined as PlaceInteractivity),
me: Array.from({ length: 6 }).map(
() =>
({
interactivity: undefined,
disabled: false,
} as BlockState)
),
op: Array.from({ length: 6 }).map(
() =>
({
interactivity: undefined,
disabled: false,
} as BlockState)
),
},
},
set(
zone: ygopro.CardZone.MZONE | ygopro.CardZone.SZONE,
controller: number,
sequence: number,
placeInteractivity: PlaceInteractivity
state: BlockState
) {
placeStore.inner[zone][matStore.isMe(controller) ? "me" : "op"][sequence] =
placeInteractivity;
state;
},
clearAll() {
clearAllInteractivity() {
(["me", "op"] as const).forEach((who) => {
([MZONE, SZONE] as const).forEach((where) => {
placeStore.inner[where][who] = placeStore.inner[where][who].map(
() => undefined
placeStore.inner[where][who].forEach(
(block) => (block.interactivity = undefined)
);
});
});
......
src/ui/Duel/PlayMat/Bg/index.tsx
View file @ b23c5ab2
import "./index.scss";
import classnames from "classnames";
import { type FC } from "react";
import { type CSSProperties, type FC } from "react";
import { type INTERNAL_Snapshot as Snapshot, useSnapshot } from "valtio";
import { sendSelectPlaceResponse, ygopro } from "@/api";
import { cardStore, type PlaceInteractivity, placeStore } from "@/stores";
import {
BlockState,
cardStore,
type PlaceInteractivity,
placeStore,
} from "@/stores";
// Block被禁用的样式
const BgDisabledStyle = {
background: `linear-gradient(
to top right,
rgba(0, 0, 0, 0) 0%,
rgba(0, 0, 0, 0) calc(50% - 1.5px),
red 50%,
rgba(0, 0, 0, 0) calc(50% + 1.5px),
rgba(0, 0, 0, 0) 100%
), linear-gradient(
to bottom right,
rgba(0, 0, 0, 0) 0%,
rgba(0, 0, 0, 0) calc(50% - 1.5px),
red 50%,
rgba(0, 0, 0, 0) calc(50% + 1.5px),
rgba(0, 0, 0, 0) 100%
)`,
};
const BgExtraRow: FC<{
meSnap: Snapshot<PlaceInteractivity[]>;
opSnap: Snapshot<PlaceInteractivity[]>;
meSnap: Snapshot<BlockState[]>;
opSnap: Snapshot<BlockState[]>;
}> = ({ meSnap, opSnap }) => {
return (
<div className={classnames("bg-row")}>
......@@ -17,11 +41,16 @@ const BgExtraRow: FC<{
<div
key={i}
className={classnames("block", "extra", {
highlight: !!meSnap[i] || !!opSnap[i],
highlight: !!meSnap[i].interactivity || !!opSnap[i].interactivity,
})}
style={
meSnap[i].disabled || opSnap[i].disabled
? (BgDisabledStyle as CSSProperties)
: {}
}
onClick={() => {
onBlockClick(meSnap[i]);
onBlockClick(opSnap[i]);
onBlockClick(meSnap[i].interactivity);
onBlockClick(opSnap[i].interactivity);
}}
></div>
))}
......@@ -32,7 +61,7 @@ const BgExtraRow: FC<{
const BgRow: FC<{
isSzone?: boolean;
opponent?: boolean;
snap: Snapshot<PlaceInteractivity[]>;
snap: Snapshot<BlockState[]>;
}> = ({ isSzone = false, opponent = false, snap }) => (
<div className={classnames("bg-row", { opponent })}>
{Array.from({ length: 5 }).map((_, i) => (
......@@ -40,9 +69,10 @@ const BgRow: FC<{
key={i}
className={classnames("block", {
szone: isSzone,
highlight: !!snap[i],
highlight: !!snap[i].interactivity,
})}
onClick={() => onBlockClick(snap[i])}
style={snap[i].disabled ? (BgDisabledStyle as CSSProperties) : {}}
onClick={() => onBlockClick(snap[i].interactivity)}
></div>
))}
</div>
......@@ -68,6 +98,6 @@ const onBlockClick = (placeInteractivity: PlaceInteractivity) => {
if (placeInteractivity) {
sendSelectPlaceResponse(placeInteractivity.response);
cardStore.inner.forEach((card) => (card.idleInteractivities = []));
placeStore.clearAll();
placeStore.clearAllInteractivity();
}
};
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