Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
N
Neos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
BBeretta
Neos
Commits
49c2ebe6
Commit
49c2ebe6
authored
Jan 23, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feat/select_yesno' into 'main'
Feat/select yesno See merge request
!93
parents
3404295a
3ba11a80
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
218 additions
and
5 deletions
+218
-5
neos-protobuf
neos-protobuf
+1
-1
src/api/ocgcore/idl/ocgcore.ts
src/api/ocgcore/idl/ocgcore.ts
+193
-4
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/penetrate.json
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/penetrate.json
+7
-0
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/penetrate.ts
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/penetrate.ts
+1
-0
src/service/duel/gameMsg.ts
src/service/duel/gameMsg.ts
+6
-0
src/service/duel/selectYesNo.ts
src/service/duel/selectYesNo.ts
+10
-0
No files found.
neos-protobuf
@
fc8be2c4
Subproject commit
c3da8f45d34fcb6fa6d393f9fa02c2cd5e36e6cc
Subproject commit
fc8be2c49a17c13ad25040e99293fc29d8b9f4e1
src/api/ocgcore/idl/ocgcore.ts
View file @
49c2ebe6
/**
/**
* Generated by the protoc-gen-ts. DO NOT EDIT!
* Generated by the protoc-gen-ts. DO NOT EDIT!
* compiler version: 3.
19.4
* compiler version: 3.
21.5
* source: idl/ocgcore.proto
* source: idl/ocgcore.proto
* git: https://github.com/thesayyn/protoc-gen-ts */
* git: https://github.com/thesayyn/protoc-gen-ts */
import * as pb_1 from "google-protobuf";
import * as pb_1 from "google-protobuf";
...
@@ -5196,7 +5196,7 @@ export namespace ygopro {
...
@@ -5196,7 +5196,7 @@ export namespace ygopro {
}
}
export class StocGameMessage extends pb_1.Message {
export class StocGameMessage extends pb_1.Message {
#one_of_decls: number[][] = [
#one_of_decls: number[][] = [
[
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
,
11
,
12
,
13
,
14
,
15
,
16
,
17
],
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
, 18
],
];
];
constructor(
constructor(
data?:
data?:
...
@@ -5220,6 +5220,7 @@ export namespace ygopro {
...
@@ -5220,6 +5220,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5239,6 +5240,7 @@ export namespace ygopro {
...
@@ -5239,6 +5240,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5258,6 +5260,7 @@ export namespace ygopro {
...
@@ -5258,6 +5260,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5277,6 +5280,7 @@ export namespace ygopro {
...
@@ -5277,6 +5280,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5296,6 +5300,7 @@ export namespace ygopro {
...
@@ -5296,6 +5300,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5315,6 +5320,7 @@ export namespace ygopro {
...
@@ -5315,6 +5320,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5334,6 +5340,7 @@ export namespace ygopro {
...
@@ -5334,6 +5340,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5353,6 +5360,7 @@ export namespace ygopro {
...
@@ -5353,6 +5360,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5372,6 +5380,7 @@ export namespace ygopro {
...
@@ -5372,6 +5380,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5391,6 +5400,7 @@ export namespace ygopro {
...
@@ -5391,6 +5400,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5410,6 +5420,7 @@ export namespace ygopro {
...
@@ -5410,6 +5420,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5429,6 +5440,7 @@ export namespace ygopro {
...
@@ -5429,6 +5440,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5448,6 +5460,7 @@ export namespace ygopro {
...
@@ -5448,6 +5460,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5467,6 +5480,7 @@ export namespace ygopro {
...
@@ -5467,6 +5480,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5486,6 +5500,7 @@ export namespace ygopro {
...
@@ -5486,6 +5500,7 @@ export namespace ygopro {
select_battle_cmd?: StocGameMessage.MsgSelectBattleCmd;
select_battle_cmd?: StocGameMessage.MsgSelectBattleCmd;
pos_change?: never;
pos_change?: never;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5505,6 +5520,7 @@ export namespace ygopro {
...
@@ -5505,6 +5520,7 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: StocGameMessage.MsgPosChange;
pos_change?: StocGameMessage.MsgPosChange;
select_unselect_card?: never;
select_unselect_card?: never;
select_yes_no?: never;
}
}
| {
| {
start?: never;
start?: never;
...
@@ -5524,6 +5540,27 @@ export namespace ygopro {
...
@@ -5524,6 +5540,27 @@ export namespace ygopro {
select_battle_cmd?: never;
select_battle_cmd?: never;
pos_change?: never;
pos_change?: never;
select_unselect_card?: StocGameMessage.MsgSelectUnselectCard;
select_unselect_card?: StocGameMessage.MsgSelectUnselectCard;
select_yes_no?: 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?: StocGameMessage.MsgSelectYesNo;
}
}
))
))
) {
) {
...
@@ -5594,6 +5631,9 @@ export namespace ygopro {
...
@@ -5594,6 +5631,9 @@ export namespace ygopro {
) {
) {
this.select_unselect_card = data.select_unselect_card;
this.select_unselect_card = data.select_unselect_card;
}
}
if ("select_yes_no" in data && data.select_yes_no != undefined) {
this.select_yes_no = data.select_yes_no;
}
}
}
}
}
get start() {
get start() {
...
@@ -5817,6 +5857,19 @@ export namespace ygopro {
...
@@ -5817,6 +5857,19 @@ export namespace ygopro {
get has_select_unselect_card() {
get has_select_unselect_card() {
return pb_1.Message.getField(this, 17) != null;
return pb_1.Message.getField(this, 17) != null;
}
}
get select_yes_no() {
return pb_1.Message.getWrapperField(
this,
StocGameMessage.MsgSelectYesNo,
18
) as StocGameMessage.MsgSelectYesNo;
}
set select_yes_no(value: StocGameMessage.MsgSelectYesNo) {
pb_1.Message.setOneofWrapperField(this, 18, this.#one_of_decls[0], value);
}
get has_select_yes_no() {
return pb_1.Message.getField(this, 18) != null;
}
get gameMsg() {
get gameMsg() {
const cases: {
const cases: {
[index: number]:
[index: number]:
...
@@ -5837,7 +5890,8 @@ export namespace ygopro {
...
@@ -5837,7 +5890,8 @@ export namespace ygopro {
| "shuffle_hand"
| "shuffle_hand"
| "select_battle_cmd"
| "select_battle_cmd"
| "pos_change"
| "pos_change"
|
"
select_unselect_card
"
;
| "select_unselect_card"
| "select_yes_no";
} = {
} = {
0: "none",
0: "none",
1: "start",
1: "start",
...
@@ -5857,11 +5911,12 @@ export namespace ygopro {
...
@@ -5857,11 +5911,12 @@ export namespace ygopro {
15: "select_battle_cmd",
15: "select_battle_cmd",
16: "pos_change",
16: "pos_change",
17: "select_unselect_card",
17: "select_unselect_card",
18: "select_yes_no",
};
};
return cases[
return cases[
pb_1.Message.computeOneofCase(
pb_1.Message.computeOneofCase(
this,
this,
[
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
,
11
,
12
,
13
,
14
,
15
,
16
,
17
]
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17
, 18
]
)
)
];
];
}
}
...
@@ -5909,6 +5964,9 @@ export namespace ygopro {
...
@@ -5909,6 +5964,9 @@ export namespace ygopro {
select_unselect_card?: ReturnType<
select_unselect_card?: ReturnType<
typeof StocGameMessage.MsgSelectUnselectCard.prototype.toObject
typeof StocGameMessage.MsgSelectUnselectCard.prototype.toObject
>;
>;
select_yes_no?: ReturnType<
typeof StocGameMessage.MsgSelectYesNo.prototype.toObject
>;
}): StocGameMessage {
}): StocGameMessage {
const message = new StocGameMessage({});
const message = new StocGameMessage({});
if (data.start != null) {
if (data.start != null) {
...
@@ -5986,6 +6044,11 @@ export namespace ygopro {
...
@@ -5986,6 +6044,11 @@ export namespace ygopro {
data.select_unselect_card
data.select_unselect_card
);
);
}
}
if (data.select_yes_no != null) {
message.select_yes_no = StocGameMessage.MsgSelectYesNo.fromObject(
data.select_yes_no
);
}
return message;
return message;
}
}
toObject() {
toObject() {
...
@@ -6033,6 +6096,9 @@ export namespace ygopro {
...
@@ -6033,6 +6096,9 @@ export namespace ygopro {
select_unselect_card?: ReturnType<
select_unselect_card?: ReturnType<
typeof StocGameMessage.MsgSelectUnselectCard.prototype.toObject
typeof StocGameMessage.MsgSelectUnselectCard.prototype.toObject
>;
>;
select_yes_no?: ReturnType<
typeof StocGameMessage.MsgSelectYesNo.prototype.toObject
>;
} = {};
} = {};
if (this.start != null) {
if (this.start != null) {
data.start = this.start.toObject();
data.start = this.start.toObject();
...
@@ -6085,6 +6151,9 @@ export namespace ygopro {
...
@@ -6085,6 +6151,9 @@ export namespace ygopro {
if (this.select_unselect_card != null) {
if (this.select_unselect_card != null) {
data.select_unselect_card = this.select_unselect_card.toObject();
data.select_unselect_card = this.select_unselect_card.toObject();
}
}
if (this.select_yes_no != null) {
data.select_yes_no = this.select_yes_no.toObject();
}
return data;
return data;
}
}
serialize(): Uint8Array;
serialize(): Uint8Array;
...
@@ -6151,6 +6220,10 @@ export namespace ygopro {
...
@@ -6151,6 +6220,10 @@ export namespace ygopro {
writer.writeMessage(17, this.select_unselect_card, () =>
writer.writeMessage(17, this.select_unselect_card, () =>
this.select_unselect_card.serialize(writer)
this.select_unselect_card.serialize(writer)
);
);
if (this.has_select_yes_no)
writer.writeMessage(18, this.select_yes_no, () =>
this.select_yes_no.serialize(writer)
);
if (!w) return writer.getResultBuffer();
if (!w) return writer.getResultBuffer();
}
}
static deserialize(bytes: Uint8Array | pb_1.BinaryReader): StocGameMessage {
static deserialize(bytes: Uint8Array | pb_1.BinaryReader): StocGameMessage {
...
@@ -6291,6 +6364,14 @@ export namespace ygopro {
...
@@ -6291,6 +6364,14 @@ export namespace ygopro {
StocGameMessage.MsgSelectUnselectCard.deserialize(reader))
StocGameMessage.MsgSelectUnselectCard.deserialize(reader))
);
);
break;
break;
case 18:
reader.readMessage(
message.select_yes_no,
() =>
(message.select_yes_no =
StocGameMessage.MsgSelectYesNo.deserialize(reader))
);
break;
default:
default:
reader.skipField();
reader.skipField();
}
}
...
@@ -10470,5 +10551,113 @@ export namespace ygopro {
...
@@ -10470,5 +10551,113 @@ export namespace ygopro {
}
}
}
}
}
}
export class MsgSelectYesNo extends pb_1.Message {
#one_of_decls: number[][] = [];
constructor(
data?:
| any[]
| {
player?: number;
effect_description?: 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 ("player" in data && data.player != undefined) {
this.player = data.player;
}
if (
"effect_description" in data &&
data.effect_description != undefined
) {
this.effect_description = data.effect_description;
}
}
}
get player() {
return pb_1.Message.getFieldWithDefault(this, 1, 0) as number;
}
set player(value: number) {
pb_1.Message.setField(this, 1, value);
}
get effect_description() {
return pb_1.Message.getFieldWithDefault(this, 2, 0) as number;
}
set effect_description(value: number) {
pb_1.Message.setField(this, 2, value);
}
static fromObject(data: {
player?: number;
effect_description?: number;
}): MsgSelectYesNo {
const message = new MsgSelectYesNo({});
if (data.player != null) {
message.player = data.player;
}
if (data.effect_description != null) {
message.effect_description = data.effect_description;
}
return message;
}
toObject() {
const data: {
player?: number;
effect_description?: number;
} = {};
if (this.player != null) {
data.player = this.player;
}
if (this.effect_description != null) {
data.effect_description = this.effect_description;
}
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.effect_description != 0)
writer.writeInt32(2, this.effect_description);
if (!w) return writer.getResultBuffer();
}
static deserialize(
bytes: Uint8Array | pb_1.BinaryReader
): MsgSelectYesNo {
const reader =
bytes instanceof pb_1.BinaryReader
? bytes
: new pb_1.BinaryReader(bytes),
message = new MsgSelectYesNo();
while (reader.nextField()) {
if (reader.isEndGroup()) break;
switch (reader.getFieldNumber()) {
case 1:
message.player = reader.readInt32();
break;
case 2:
message.effect_description = reader.readInt32();
break;
default:
reader.skipField();
}
}
return message;
}
serializeBinary(): Uint8Array {
return this.serialize();
}
static deserializeBinary(bytes: Uint8Array): MsgSelectYesNo {
return MsgSelectYesNo.deserialize(bytes);
}
}
}
}
}
}
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/penetrate.json
View file @
49c2ebe6
...
@@ -50,5 +50,12 @@
...
@@ -50,5 +50,12 @@
"fieldType"
:
"CardPosition"
"fieldType"
:
"CardPosition"
}
}
]
]
},
"13"
:
{
"protoType"
:
"select_yes_no"
,
"fields"
:
[
{
"fieldName"
:
"player"
,
"fieldType"
:
"uint8"
},
{
"fieldName"
:
"effect_description"
,
"fieldType"
:
"uint32"
}
]
}
}
}
}
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/penetrate.ts
View file @
49c2ebe6
...
@@ -19,6 +19,7 @@ const MsgConstructorMap: Map<string, Constructor> = new Map([
...
@@ -19,6 +19,7 @@ const MsgConstructorMap: Map<string, Constructor> = new Map([
[
"
move
"
,
ygopro
.
StocGameMessage
.
MsgMove
as
Constructor
],
[
"
move
"
,
ygopro
.
StocGameMessage
.
MsgMove
as
Constructor
],
[
"
shuffle_hand
"
,
ygopro
.
StocGameMessage
.
MsgShuffleHand
],
[
"
shuffle_hand
"
,
ygopro
.
StocGameMessage
.
MsgShuffleHand
],
[
"
pos_change
"
,
ygopro
.
StocGameMessage
.
MsgPosChange
],
[
"
pos_change
"
,
ygopro
.
StocGameMessage
.
MsgPosChange
],
[
"
select_yes_no
"
,
ygopro
.
StocGameMessage
.
MsgSelectYesNo
],
]);
]);
export
interface
penetrateType
{
export
interface
penetrateType
{
...
...
src/service/duel/gameMsg.ts
View file @
49c2ebe6
...
@@ -17,6 +17,7 @@ import onMsgShuffleHand from "./shuffleHand";
...
@@ -17,6 +17,7 @@ import onMsgShuffleHand from "./shuffleHand";
import
onMsgSelectBattleCmd
from
"
./selectBattleCmd
"
;
import
onMsgSelectBattleCmd
from
"
./selectBattleCmd
"
;
import
onMsgPosChange
from
"
./posChange
"
;
import
onMsgPosChange
from
"
./posChange
"
;
import
onMsgSelectUnselectCard
from
"
./selectUnselectCard
"
;
import
onMsgSelectUnselectCard
from
"
./selectUnselectCard
"
;
import
onMsgSelectYesNo
from
"
./selectYesNo
"
;
export
default
function
handleGameMsg
(
pb
:
ygopro
.
YgoStocMsg
)
{
export
default
function
handleGameMsg
(
pb
:
ygopro
.
YgoStocMsg
)
{
const
dispatch
=
store
.
dispatch
;
const
dispatch
=
store
.
dispatch
;
...
@@ -108,6 +109,11 @@ export default function handleGameMsg(pb: ygopro.YgoStocMsg) {
...
@@ -108,6 +109,11 @@ export default function handleGameMsg(pb: ygopro.YgoStocMsg) {
break
;
break
;
}
}
case
"
select_yes_no
"
:
{
onMsgSelectYesNo
(
msg
.
select_yes_no
,
dispatch
);
break
;
}
default
:
{
default
:
{
break
;
break
;
}
}
...
...
src/service/duel/selectYesNo.ts
0 → 100644
View file @
49c2ebe6
import
{
ygopro
}
from
"
../../api/ocgcore/idl/ocgcore
"
;
import
{
AppDispatch
}
from
"
../../store
"
;
import
MsgSelectYesNo
=
ygopro
.
StocGameMessage
.
MsgSelectYesNo
;
export
default
(
selectYesNo
:
MsgSelectYesNo
,
dispatch
:
AppDispatch
)
=>
{
const
player
=
selectYesNo
.
player
;
const
effect_description
=
selectYesNo
.
effect_description
;
console
.
log
(
`effect_description:
${
effect_description
}
`
);
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment