Skip to content

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

Merge branch 'feat/service/select_chain' into 'main' 

Feat/service/select chain

See merge request !62
parents 3eec2126 94b2b445
Hide whitespace changes
Inline Side-by-side
Showing with 546 additions and 5 deletions
neos-protobuf @ e34d37c5
Subproject commit 07651117cd5f99d81740c2419383a88904ba6557
Subproject commit e34d37c57a4bbbefcd18c790856f19bf947955e7
src/api/ocgcore/idl/ocgcore.ts
View file @ f38abf22
/**
* Generated by the protoc-gen-ts. DO NOT EDIT!
* compiler version: 3.21.5
* compiler version: 3.19.4
* source: idl/ocgcore.proto
* git: https://github.com/thesayyn/protoc-gen-ts */
import * as pb_1 from "google-protobuf";
......@@ -4300,7 +4300,7 @@ export namespace ygopro {
}
}
export class StocGameMessage extends pb_1.Message {
#one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7, 8, 9]];
#one_of_decls: number[][] = [[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]];
constructor(
data?:
| any[]
......@@ -4315,6 +4315,7 @@ export namespace ygopro {
select_place?: never;
move?: never;
select_card?: never;
select_chain?: never;
}
| {
start?: never;
......@@ -4326,6 +4327,7 @@ export namespace ygopro {
select_place?: never;
move?: never;
select_card?: never;
select_chain?: never;
}
| {
start?: never;
......@@ -4337,6 +4339,7 @@ export namespace ygopro {
select_place?: never;
move?: never;
select_card?: never;
select_chain?: never;
}
| {
start?: never;
......@@ -4348,6 +4351,7 @@ export namespace ygopro {
select_place?: never;
move?: never;
select_card?: never;
select_chain?: never;
}
| {
start?: never;
......@@ -4359,6 +4363,7 @@ export namespace ygopro {
select_place?: never;
move?: never;
select_card?: never;
select_chain?: never;
}
| {
start?: never;
......@@ -4370,6 +4375,7 @@ export namespace ygopro {
select_place?: never;
move?: never;
select_card?: never;
select_chain?: never;
}
| {
start?: never;
......@@ -4381,6 +4387,7 @@ export namespace ygopro {
select_place?: StocGameMessage.MsgSelectPlace;
move?: never;
select_card?: never;
select_chain?: never;
}
| {
start?: never;
......@@ -4392,6 +4399,7 @@ export namespace ygopro {
select_place?: never;
move?: StocGameMessage.MsgMove;
select_card?: never;
select_chain?: never;
}
| {
start?: never;
......@@ -4403,6 +4411,19 @@ export namespace ygopro {
select_place?: never;
move?: never;
select_card?: StocGameMessage.MsgSelectCard;
select_chain?: 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?: StocGameMessage.MsgSelectChain;
}
))
) {
......@@ -4443,6 +4464,9 @@ export namespace ygopro {
if ("select_card" in data && data.select_card != undefined) {
this.select_card = data.select_card;
}
if ("select_chain" in data && data.select_chain != undefined) {
this.select_chain = data.select_chain;
}
}
}
get start() {
......@@ -4562,6 +4586,19 @@ export namespace ygopro {
get has_select_card() {
return pb_1.Message.getField(this, 9) != null;
}
get select_chain() {
return pb_1.Message.getWrapperField(
this,
StocGameMessage.MsgSelectChain,
10
) as StocGameMessage.MsgSelectChain;
}
set select_chain(value: StocGameMessage.MsgSelectChain) {
pb_1.Message.setOneofWrapperField(this, 10, this.#one_of_decls[0], value);
}
get has_select_chain() {
return pb_1.Message.getField(this, 10) != null;
}
get gameMsg() {
const cases: {
[index: number]:
......@@ -4574,7 +4611,8 @@ export namespace ygopro {
| "select_idle_cmd"
| "select_place"
| "move"
| "select_card";
| "select_card"
| "select_chain";
} = {
0: "none",
1: "start",
......@@ -4586,9 +4624,10 @@ export namespace ygopro {
7: "select_place",
8: "move",
9: "select_card",
10: "select_chain",
};
return cases[
pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7, 8, 9])
pb_1.Message.computeOneofCase(this, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
];
}
static fromObject(data: {
......@@ -4611,6 +4650,9 @@ export namespace ygopro {
select_card?: ReturnType<
typeof StocGameMessage.MsgSelectCard.prototype.toObject
>;
select_chain?: ReturnType<
typeof StocGameMessage.MsgSelectChain.prototype.toObject
>;
}): StocGameMessage {
const message = new StocGameMessage({});
if (data.start != null) {
......@@ -4648,6 +4690,11 @@ export namespace ygopro {
data.select_card
);
}
if (data.select_chain != null) {
message.select_chain = StocGameMessage.MsgSelectChain.fromObject(
data.select_chain
);
}
return message;
}
toObject() {
......@@ -4671,6 +4718,9 @@ export namespace ygopro {
select_card?: ReturnType<
typeof StocGameMessage.MsgSelectCard.prototype.toObject
>;
select_chain?: ReturnType<
typeof StocGameMessage.MsgSelectChain.prototype.toObject
>;
} = {};
if (this.start != null) {
data.start = this.start.toObject();
......@@ -4699,6 +4749,9 @@ export namespace ygopro {
if (this.select_card != null) {
data.select_card = this.select_card.toObject();
}
if (this.select_chain != null) {
data.select_chain = this.select_chain.toObject();
}
return data;
}
serialize(): Uint8Array;
......@@ -4733,6 +4786,10 @@ export namespace ygopro {
writer.writeMessage(9, this.select_card, () =>
this.select_card.serialize(writer)
);
if (this.has_select_chain)
writer.writeMessage(10, this.select_chain, () =>
this.select_chain.serialize(writer)
);
if (!w) return writer.getResultBuffer();
}
static deserialize(bytes: Uint8Array | pb_1.BinaryReader): StocGameMessage {
......@@ -4809,6 +4866,14 @@ export namespace ygopro {
StocGameMessage.MsgSelectCard.deserialize(reader))
);
break;
case 10:
reader.readMessage(
message.select_chain,
() =>
(message.select_chain =
StocGameMessage.MsgSelectChain.deserialize(reader))
);
break;
default:
reader.skipField();
}
......@@ -6777,5 +6842,409 @@ export namespace ygopro {
}
}
}
export class MsgSelectChain extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(
data?:
| any[]
| {
player?: number;
special_count?: number;
forced?: boolean;
hint0?: number;
hint1?: number;
chains?: StocGameMessage.MsgSelectChain.Chain[];
}
) {
super();
pb_1.Message.initialize(
this,
Array.isArray(data) ? data : [],
0,
-1,
[6],
this.#one_of_decls
);
if (!Array.isArray(data) && typeof data == "object") {
if ("player" in data && data.player != undefined) {
this.player = data.player;
}
if ("special_count" in data && data.special_count != undefined) {
this.special_count = data.special_count;
}
if ("forced" in data && data.forced != undefined) {
this.forced = data.forced;
}
if ("hint0" in data && data.hint0 != undefined) {
this.hint0 = data.hint0;
}
if ("hint1" in data && data.hint1 != undefined) {
this.hint1 = data.hint1;
}
if ("chains" in data && data.chains != undefined) {
this.chains = data.chains;
}
}
}
get player() {
return pb_1.Message.getFieldWithDefault(this, 1, 0) as number;
}
set player(value: number) {
pb_1.Message.setField(this, 1, value);
}
get special_count() {
return pb_1.Message.getFieldWithDefault(this, 2, 0) as number;
}
set special_count(value: number) {
pb_1.Message.setField(this, 2, value);
}
get forced() {
return pb_1.Message.getFieldWithDefault(this, 3, false) as boolean;
}
set forced(value: boolean) {
pb_1.Message.setField(this, 3, value);
}
get hint0() {
return pb_1.Message.getFieldWithDefault(this, 4, 0) as number;
}
set hint0(value: number) {
pb_1.Message.setField(this, 4, value);
}
get hint1() {
return pb_1.Message.getFieldWithDefault(this, 5, 0) as number;
}
set hint1(value: number) {
pb_1.Message.setField(this, 5, value);
}
get chains() {
return pb_1.Message.getRepeatedWrapperField(
this,
StocGameMessage.MsgSelectChain.Chain,
6
) as StocGameMessage.MsgSelectChain.Chain[];
}
set chains(value: StocGameMessage.MsgSelectChain.Chain[]) {
pb_1.Message.setRepeatedWrapperField(this, 6, value);
}
static fromObject(data: {
player?: number;
special_count?: number;
forced?: boolean;
hint0?: number;
hint1?: number;
chains?: ReturnType<
typeof StocGameMessage.MsgSelectChain.Chain.prototype.toObject
>[];
}): MsgSelectChain {
const message = new MsgSelectChain({});
if (data.player != null) {
message.player = data.player;
}
if (data.special_count != null) {
message.special_count = data.special_count;
}
if (data.forced != null) {
message.forced = data.forced;
}
if (data.hint0 != null) {
message.hint0 = data.hint0;
}
if (data.hint1 != null) {
message.hint1 = data.hint1;
}
if (data.chains != null) {
message.chains = data.chains.map((item) =>
StocGameMessage.MsgSelectChain.Chain.fromObject(item)
);
}
return message;
}
toObject() {
const data: {
player?: number;
special_count?: number;
forced?: boolean;
hint0?: number;
hint1?: number;
chains?: ReturnType<
typeof StocGameMessage.MsgSelectChain.Chain.prototype.toObject
>[];
} = {};
if (this.player != null) {
data.player = this.player;
}
if (this.special_count != null) {
data.special_count = this.special_count;
}
if (this.forced != null) {
data.forced = this.forced;
}
if (this.hint0 != null) {
data.hint0 = this.hint0;
}
if (this.hint1 != null) {
data.hint1 = this.hint1;
}
if (this.chains != null) {
data.chains = this.chains.map(
(item: StocGameMessage.MsgSelectChain.Chain) => 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.player != 0) writer.writeInt32(1, this.player);
if (this.special_count != 0) writer.writeInt32(2, this.special_count);
if (this.forced != false) writer.writeBool(3, this.forced);
if (this.hint0 != 0) writer.writeInt32(4, this.hint0);
if (this.hint1 != 0) writer.writeInt32(5, this.hint1);
if (this.chains.length)
writer.writeRepeatedMessage(
6,
this.chains,
(item: StocGameMessage.MsgSelectChain.Chain) =>
item.serialize(writer)
);
if (!w) return writer.getResultBuffer();
}
static deserialize(
bytes: Uint8Array | pb_1.BinaryReader
): MsgSelectChain {
const reader =
bytes instanceof pb_1.BinaryReader
? bytes
: new pb_1.BinaryReader(bytes),
message = new MsgSelectChain();
while (reader.nextField()) {
if (reader.isEndGroup()) break;
switch (reader.getFieldNumber()) {
case 1:
message.player = reader.readInt32();
break;
case 2:
message.special_count = reader.readInt32();
break;
case 3:
message.forced = reader.readBool();
break;
case 4:
message.hint0 = reader.readInt32();
break;
case 5:
message.hint1 = reader.readInt32();
break;
case 6:
reader.readMessage(message.chains, () =>
pb_1.Message.addToRepeatedWrapperField(
message,
6,
StocGameMessage.MsgSelectChain.Chain.deserialize(reader),
StocGameMessage.MsgSelectChain.Chain
)
);
break;
default:
reader.skipField();
}
}
return message;
}
serializeBinary(): Uint8Array {
return this.serialize();
}
static deserializeBinary(bytes: Uint8Array): MsgSelectChain {
return MsgSelectChain.deserialize(bytes);
}
}
export namespace MsgSelectChain {
export class Chain extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(
data?:
| any[]
| {
flag?: number;
code?: number;
location?: CardLocation;
effect_description?: number;
response?: 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 ("flag" in data && data.flag != undefined) {
this.flag = data.flag;
}
if ("code" in data && data.code != undefined) {
this.code = data.code;
}
if ("location" in data && data.location != undefined) {
this.location = data.location;
}
if (
"effect_description" in data &&
data.effect_description != undefined
) {
this.effect_description = data.effect_description;
}
if ("response" in data && data.response != undefined) {
this.response = data.response;
}
}
}
get flag() {
return pb_1.Message.getFieldWithDefault(this, 1, 0) as number;
}
set flag(value: number) {
pb_1.Message.setField(this, 1, value);
}
get code() {
return pb_1.Message.getFieldWithDefault(this, 2, 0) as number;
}
set code(value: number) {
pb_1.Message.setField(this, 2, value);
}
get location() {
return pb_1.Message.getWrapperField(
this,
CardLocation,
3
) as CardLocation;
}
set location(value: CardLocation) {
pb_1.Message.setWrapperField(this, 3, value);
}
get has_location() {
return pb_1.Message.getField(this, 3) != null;
}
get effect_description() {
return pb_1.Message.getFieldWithDefault(this, 4, 0) as number;
}
set effect_description(value: number) {
pb_1.Message.setField(this, 4, value);
}
get response() {
return pb_1.Message.getFieldWithDefault(this, 5, 0) as number;
}
set response(value: number) {
pb_1.Message.setField(this, 5, value);
}
static fromObject(data: {
flag?: number;
code?: number;
location?: ReturnType<typeof CardLocation.prototype.toObject>;
effect_description?: number;
response?: number;
}): Chain {
const message = new Chain({});
if (data.flag != null) {
message.flag = data.flag;
}
if (data.code != null) {
message.code = data.code;
}
if (data.location != null) {
message.location = CardLocation.fromObject(data.location);
}
if (data.effect_description != null) {
message.effect_description = data.effect_description;
}
if (data.response != null) {
message.response = data.response;
}
return message;
}
toObject() {
const data: {
flag?: number;
code?: number;
location?: ReturnType<typeof CardLocation.prototype.toObject>;
effect_description?: number;
response?: number;
} = {};
if (this.flag != null) {
data.flag = this.flag;
}
if (this.code != null) {
data.code = this.code;
}
if (this.location != null) {
data.location = this.location.toObject();
}
if (this.effect_description != null) {
data.effect_description = this.effect_description;
}
if (this.response != null) {
data.response = this.response;
}
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.flag != 0) writer.writeInt32(1, this.flag);
if (this.code != 0) writer.writeInt32(2, this.code);
if (this.has_location)
writer.writeMessage(3, this.location, () =>
this.location.serialize(writer)
);
if (this.effect_description != 0)
writer.writeInt32(4, this.effect_description);
if (this.response != 0) writer.writeInt32(5, this.response);
if (!w) return writer.getResultBuffer();
}
static deserialize(bytes: Uint8Array | pb_1.BinaryReader): Chain {
const reader =
bytes instanceof pb_1.BinaryReader
? bytes
: new pb_1.BinaryReader(bytes),
message = new Chain();
while (reader.nextField()) {
if (reader.isEndGroup()) break;
switch (reader.getFieldNumber()) {
case 1:
message.flag = reader.readInt32();
break;
case 2:
message.code = reader.readInt32();
break;
case 3:
reader.readMessage(
message.location,
() => (message.location = CardLocation.deserialize(reader))
);
break;
case 4:
message.effect_description = reader.readInt32();
break;
case 5:
message.response = reader.readInt32();
break;
default:
reader.skipField();
}
}
return message;
}
serializeBinary(): Uint8Array {
return this.serialize();
}
static deserializeBinary(bytes: Uint8Array): Chain {
return Chain.deserialize(bytes);
}
}
}
}
}
src/api/ocgcore/ocgAdapter/protoDecl.ts
View file @ f38abf22
......@@ -35,3 +35,4 @@ export const MSG_SELECT_IDLE_CMD = 11;
export const MSG_SELECT_PLACE = 18;
export const MSG_MOVE = 50;
export const MSG_SELECT_CARD = 15;
export const MSG_SELECT_CHAIN = 16;
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
View file @ f38abf22
......@@ -15,6 +15,7 @@ import MsgSelectIdleCmdAdapter from "./selectIdleCmd";
import MsgSelectPlaceAdapter from "./selectPlace";
import MsgMoveAdapter from "./move";
import MsgSelectCardAdapter from "./selectCard";
import MsgSelectChainAdapter from "./selectChain";
/*
* STOC GameMsg
......@@ -85,6 +86,11 @@ export default class GameMsgAdapter implements StocAdapter {
break;
}
case GAME_MSG.MSG_SELECT_CHAIN: {
gameMsg.select_chain = MsgSelectChainAdapter(gameData);
break;
}
default: {
console.log("Unhandled GameMessage function=", func);
......
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectChain.ts 0 → 100644
View file @ f38abf22
import { ygopro } from "../../../idl/ocgcore";
import { BufferReader } from "../../bufferIO";
import MsgSelectChain = ygopro.StocGameMessage.MsgSelectChain;
/*
* Msg Select Chain
*
* @param - see: https://code.mycard.moe/mycard/neos-protobuf/-/blob/main/idl/ocgcore.neos-protobuf
* @usage - 玩家选择连锁
*
* */
export default (data: Uint8Array) => {
const reader = new BufferReader(data, true);
const player = reader.readUint8();
const count = reader.readUint8();
const spCount = reader.readUint8();
const forced = reader.readUint8() != 0;
const hint0 = reader.readUint32();
const hint1 = reader.readUint32();
const msg = new MsgSelectChain({
player,
special_count: spCount,
forced,
hint0,
hint1,
chains: [],
});
for (let i = 0; i < count; i++) {
const flag = reader.readUint8();
const code = reader.readUint32();
const location = reader.readCardLocation();
const effect_desc = reader.readUint32();
msg.chains.push(
new MsgSelectChain.Chain({
flag,
code,
location,
effect_description: effect_desc,
response: i,
})
);
}
return msg;
};
src/service/duel/gameMsg.ts
View file @ f38abf22
......@@ -9,6 +9,7 @@ import onMsgSelectIdleCmd from "./selectIdleCmd";
import onMsgSelectPlace from "./selectPlace";
import onMsgMove from "./move";
import onMsgSelectCard from "./selectCard";
import onMsgSelectChain from "./selectChain";
export default function handleGameMsg(pb: ygopro.YgoStocMsg) {
const dispatch = store.dispatch;
......@@ -78,6 +79,13 @@ export default function handleGameMsg(pb: ygopro.YgoStocMsg) {
break;
}
case "select_chain": {
const selectChain = msg.select_chain;
onMsgSelectChain(selectChain, dispatch);
break;
}
default: {
break;
}
......
src/service/duel/selectChain.ts 0 → 100644
View file @ f38abf22
import { ygopro } from "../../api/ocgcore/idl/ocgcore";
import { AppDispatch } from "../../store";
import MsgSelectChain = ygopro.StocGameMessage.MsgSelectChain;
export default (selectChain: MsgSelectChain, dispatch: AppDispatch) => {
console.log(selectChain);
};
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