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
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
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
MyCard
Neos
Commits
53ffb94e
Commit
53ffb94e
authored
Jun 17, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feat/toss' into 'main'
Feat/toss See merge request
!225
parents
de05dbe7
277c93c4
Pipeline
#22281
passed with stages
in 16 minutes and 1 second
Changes
9
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
336 additions
and
5 deletions
+336
-5
neos-protobuf
neos-protobuf
+1
-1
src/api/ocgcore/idl/ocgcore.ts
src/api/ocgcore/idl/ocgcore.ts
+244
-4
src/api/ocgcore/ocgAdapter/protoDecl.ts
src/api/ocgcore/ocgAdapter/protoDecl.ts
+2
-0
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
+17
-0
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/toss.ts
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/toss.ts
+26
-0
src/service/duel/gameMsg.ts
src/service/duel/gameMsg.ts
+6
-0
src/service/duel/toss.ts
src/service/duel/toss.ts
+27
-0
src/stores/matStore/types.ts
src/stores/matStore/types.ts
+2
-0
src/ui/Duel/Message/HintNotification.tsx
src/ui/Duel/Message/HintNotification.tsx
+11
-0
No files found.
neos-protobuf
@
b67b483c
Subproject commit
e6e23561a0f8e515a0168d87d72c281b7b9cca17
Subproject commit
b67b483ce9db064611619a2e1a8b8767b100d035
src/api/ocgcore/idl/ocgcore.ts
View file @
53ffb94e
...
...
@@ -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
]];
#
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
]];
constructor
(
data
?:
any
[]
|
({}
&
(({
start
?:
StocGameMessage
.
MsgStart
;
draw
?:
never
;
...
...
@@ -4559,6 +4559,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
StocGameMessage
.
MsgDraw
;
...
...
@@ -4606,6 +4607,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -4653,6 +4655,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -4700,6 +4703,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -4747,6 +4751,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -4794,6 +4799,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -4841,6 +4847,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -4888,6 +4895,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -4935,6 +4943,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -4982,6 +4991,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5029,6 +5039,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5076,6 +5087,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5123,6 +5135,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5170,6 +5183,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5217,6 +5231,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5264,6 +5279,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5311,6 +5327,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5358,6 +5375,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5405,6 +5423,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5452,6 +5471,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5499,6 +5519,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5546,6 +5567,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5593,6 +5615,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5640,6 +5663,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5687,6 +5711,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5734,6 +5759,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5781,6 +5807,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5828,6 +5855,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5875,6 +5903,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5922,6 +5951,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -5969,6 +5999,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6016,6 +6047,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6063,6 +6095,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6110,6 +6143,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6157,6 +6191,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6204,6 +6239,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6251,6 +6287,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6298,6 +6335,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6345,6 +6383,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6392,6 +6431,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6439,6 +6479,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6486,6 +6527,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6533,6 +6575,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6580,6 +6623,7 @@ export namespace ygopro {
lp_update
?:
StocGameMessage
.
MsgLpUpdate
;
confirm_cards
?:
never
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6627,6 +6671,7 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
StocGameMessage
.
MsgConfirmCards
;
become_target
?:
never
;
toss
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
...
...
@@ -6674,6 +6719,55 @@ export namespace ygopro {
lp_update
?:
never
;
confirm_cards
?:
never
;
become_target
?:
StocGameMessage
.
MsgBecomeTarget
;
toss
?:
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
?:
StocGameMessage
.
MsgToss
;
}))))
{
super
();
pb_1
.
Message
.
initialize
(
this
,
Array
.
isArray
(
data
)
?
data
:
[],
0
,
-
1
,
[],
this
.
#
one_of_decls
);
...
...
@@ -6816,6 +6910,9 @@ export namespace ygopro {
if
(
"
become_target
"
in
data
&&
data
.
become_target
!=
undefined
)
{
this
.
become_target
=
data
.
become_target
;
}
if
(
"
toss
"
in
data
&&
data
.
toss
!=
undefined
)
{
this
.
toss
=
data
.
toss
;
}
}
}
get
start
()
{
...
...
@@ -7232,9 +7329,18 @@ export namespace ygopro {
get
has_become_target
()
{
return
pb_1
.
Message
.
getField
(
this
,
46
)
!=
null
;
}
get
toss
()
{
return
pb_1
.
Message
.
getWrapperField
(
this
,
StocGameMessage
.
MsgToss
,
47
)
as
StocGameMessage
.
MsgToss
;
}
set
toss
(
value
:
StocGameMessage
.
MsgToss
)
{
pb_1
.
Message
.
setOneofWrapperField
(
this
,
47
,
this
.
#
one_of_decls
[
0
],
value
);
}
get
has_toss
()
{
return
pb_1
.
Message
.
getField
(
this
,
47
)
!=
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
"
;
[
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
"
;
}
=
{
0
:
"
none
"
,
1
:
"
start
"
,
...
...
@@ -7282,9 +7388,10 @@ export namespace ygopro {
43
:
"
announce
"
,
44
:
"
lp_update
"
,
45
:
"
confirm_cards
"
,
46
:
"
become_target
"
46
:
"
become_target
"
,
47
:
"
toss
"
};
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
])];
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
])];
}
static
fromObject
(
data
:
{
start
?:
ReturnType
<
typeof
StocGameMessage
.
MsgStart
.
prototype
.
toObject
>
;
...
...
@@ -7333,6 +7440,7 @@ export namespace ygopro {
lp_update
?:
ReturnType
<
typeof
StocGameMessage
.
MsgLpUpdate
.
prototype
.
toObject
>
;
confirm_cards
?:
ReturnType
<
typeof
StocGameMessage
.
MsgConfirmCards
.
prototype
.
toObject
>
;
become_target
?:
ReturnType
<
typeof
StocGameMessage
.
MsgBecomeTarget
.
prototype
.
toObject
>
;
toss
?:
ReturnType
<
typeof
StocGameMessage
.
MsgToss
.
prototype
.
toObject
>
;
}):
StocGameMessage
{
const
message
=
new
StocGameMessage
({});
if
(
data
.
start
!=
null
)
{
...
...
@@ -7473,6 +7581,9 @@ export namespace ygopro {
if
(
data
.
become_target
!=
null
)
{
message
.
become_target
=
StocGameMessage
.
MsgBecomeTarget
.
fromObject
(
data
.
become_target
);
}
if
(
data
.
toss
!=
null
)
{
message
.
toss
=
StocGameMessage
.
MsgToss
.
fromObject
(
data
.
toss
);
}
return
message
;
}
toObject
()
{
...
...
@@ -7523,6 +7634,7 @@ export namespace ygopro {
lp_update
?:
ReturnType
<
typeof
StocGameMessage
.
MsgLpUpdate
.
prototype
.
toObject
>
;
confirm_cards
?:
ReturnType
<
typeof
StocGameMessage
.
MsgConfirmCards
.
prototype
.
toObject
>
;
become_target
?:
ReturnType
<
typeof
StocGameMessage
.
MsgBecomeTarget
.
prototype
.
toObject
>
;
toss
?:
ReturnType
<
typeof
StocGameMessage
.
MsgToss
.
prototype
.
toObject
>
;
}
=
{};
if
(
this
.
start
!=
null
)
{
data
.
start
=
this
.
start
.
toObject
();
...
...
@@ -7662,6 +7774,9 @@ export namespace ygopro {
if
(
this
.
become_target
!=
null
)
{
data
.
become_target
=
this
.
become_target
.
toObject
();
}
if
(
this
.
toss
!=
null
)
{
data
.
toss
=
this
.
toss
.
toObject
();
}
return
data
;
}
serialize
():
Uint8Array
;
...
...
@@ -7760,6 +7875,8 @@ export namespace ygopro {
writer
.
writeMessage
(
45
,
this
.
confirm_cards
,
()
=>
this
.
confirm_cards
.
serialize
(
writer
));
if
(
this
.
has_become_target
)
writer
.
writeMessage
(
46
,
this
.
become_target
,
()
=>
this
.
become_target
.
serialize
(
writer
));
if
(
this
.
has_toss
)
writer
.
writeMessage
(
47
,
this
.
toss
,
()
=>
this
.
toss
.
serialize
(
writer
));
if
(
!
w
)
return
writer
.
getResultBuffer
();
}
...
...
@@ -7907,6 +8024,9 @@ export namespace ygopro {
case
46
:
reader
.
readMessage
(
message
.
become_target
,
()
=>
message
.
become_target
=
StocGameMessage
.
MsgBecomeTarget
.
deserialize
(
reader
));
break
;
case
47
:
reader
.
readMessage
(
message
.
toss
,
()
=>
message
.
toss
=
StocGameMessage
.
MsgToss
.
deserialize
(
reader
));
break
;
default
:
reader
.
skipField
();
}
}
...
...
@@ -15040,6 +15160,126 @@ export namespace ygopro {
return
MsgBecomeTarget
.
deserialize
(
bytes
);
}
}
export
class
MsgToss
extends
pb_1
.
Message
{
#
one_of_decls
:
number
[][]
=
[];
constructor
(
data
?:
any
[]
|
{
player
?:
number
;
toss_type
?:
StocGameMessage
.
MsgToss
.
TossType
;
res
?:
number
[];
})
{
super
();
pb_1
.
Message
.
initialize
(
this
,
Array
.
isArray
(
data
)
?
data
:
[],
0
,
-
1
,
[
3
],
this
.
#
one_of_decls
);
if
(
!
Array
.
isArray
(
data
)
&&
typeof
data
==
"
object
"
)
{
if
(
"
player
"
in
data
&&
data
.
player
!=
undefined
)
{
this
.
player
=
data
.
player
;
}
if
(
"
toss_type
"
in
data
&&
data
.
toss_type
!=
undefined
)
{
this
.
toss_type
=
data
.
toss_type
;
}
if
(
"
res
"
in
data
&&
data
.
res
!=
undefined
)
{
this
.
res
=
data
.
res
;
}
}
}
get
player
()
{
return
pb_1
.
Message
.
getFieldWithDefault
(
this
,
1
,
0
)
as
number
;
}
set
player
(
value
:
number
)
{
pb_1
.
Message
.
setField
(
this
,
1
,
value
);
}
get
toss_type
()
{
return
pb_1
.
Message
.
getFieldWithDefault
(
this
,
2
,
StocGameMessage
.
MsgToss
.
TossType
.
UNKNOWN
)
as
StocGameMessage
.
MsgToss
.
TossType
;
}
set
toss_type
(
value
:
StocGameMessage
.
MsgToss
.
TossType
)
{
pb_1
.
Message
.
setField
(
this
,
2
,
value
);
}
get
res
()
{
return
pb_1
.
Message
.
getFieldWithDefault
(
this
,
3
,
[])
as
number
[];
}
set
res
(
value
:
number
[])
{
pb_1
.
Message
.
setField
(
this
,
3
,
value
);
}
static
fromObject
(
data
:
{
player
?:
number
;
toss_type
?:
StocGameMessage
.
MsgToss
.
TossType
;
res
?:
number
[];
}):
MsgToss
{
const
message
=
new
MsgToss
({});
if
(
data
.
player
!=
null
)
{
message
.
player
=
data
.
player
;
}
if
(
data
.
toss_type
!=
null
)
{
message
.
toss_type
=
data
.
toss_type
;
}
if
(
data
.
res
!=
null
)
{
message
.
res
=
data
.
res
;
}
return
message
;
}
toObject
()
{
const
data
:
{
player
?:
number
;
toss_type
?:
StocGameMessage
.
MsgToss
.
TossType
;
res
?:
number
[];
}
=
{};
if
(
this
.
player
!=
null
)
{
data
.
player
=
this
.
player
;
}
if
(
this
.
toss_type
!=
null
)
{
data
.
toss_type
=
this
.
toss_type
;
}
if
(
this
.
res
!=
null
)
{
data
.
res
=
this
.
res
;
}
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
.
toss_type
!=
StocGameMessage
.
MsgToss
.
TossType
.
UNKNOWN
)
writer
.
writeEnum
(
2
,
this
.
toss_type
);
if
(
this
.
res
.
length
)
writer
.
writePackedInt32
(
3
,
this
.
res
);
if
(
!
w
)
return
writer
.
getResultBuffer
();
}
static
deserialize
(
bytes
:
Uint8Array
|
pb_1
.
BinaryReader
):
MsgToss
{
const
reader
=
bytes
instanceof
pb_1
.
BinaryReader
?
bytes
:
new
pb_1
.
BinaryReader
(
bytes
),
message
=
new
MsgToss
();
while
(
reader
.
nextField
())
{
if
(
reader
.
isEndGroup
())
break
;
switch
(
reader
.
getFieldNumber
())
{
case
1
:
message
.
player
=
reader
.
readInt32
();
break
;
case
2
:
message
.
toss_type
=
reader
.
readEnum
();
break
;
case
3
:
message
.
res
=
reader
.
readPackedInt32
();
break
;
default
:
reader
.
skipField
();
}
}
return
message
;
}
serializeBinary
():
Uint8Array
{
return
this
.
serialize
();
}
static
deserializeBinary
(
bytes
:
Uint8Array
):
MsgToss
{
return
MsgToss
.
deserialize
(
bytes
);
}
}
export
namespace
MsgToss
{
export
enum
TossType
{
UNKNOWN
=
0
,
COIN
=
1
,
DICE
=
2
}
}
export
class
MsgReloadField
extends
pb_1
.
Message
{
#
one_of_decls
:
number
[][]
=
[];
constructor
(
data
?:
any
[]
|
{
...
...
src/api/ocgcore/ocgAdapter/protoDecl.ts
View file @
53ffb94e
...
...
@@ -61,3 +61,5 @@ export const MSG_ANNOUNCE_RACE = 140;
export
const
MSG_ANNOUNCE_ATTRIB
=
141
;
export
const
MSG_ANNOUNCE_CARD
=
142
;
export
const
MSG_ANNOUNCE_NUMBER
=
143
;
export
const
MSG_TOSS_COIN
=
130
;
export
const
MSG_TOSS_DICE
=
131
;
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
View file @
53ffb94e
...
...
@@ -35,6 +35,7 @@ import MsgSelectTributeAdapter from "./selectTribute";
import
MsgSelectUnselectCardAdapter
from
"
./selectUnselectCard
"
;
import
MsgSortCard
from
"
./sortCard
"
;
import
MsgStartAdapter
from
"
./start
"
;
import
MsgTossAdapter
from
"
./toss
"
;
import
MsgUpdateDataAdapter
from
"
./updateData
"
;
import
MsgWaitAdapter
from
"
./wait
"
;
import
MsgWin
from
"
./win
"
;
...
...
@@ -220,6 +221,22 @@ export default class GameMsgAdapter implements StocAdapter {
break
;
}
case
GAME_MSG
.
MSG_TOSS_COIN
:
{
gameMsg
.
toss
=
MsgTossAdapter
(
gameData
,
ygopro
.
StocGameMessage
.
MsgToss
.
TossType
.
COIN
);
break
;
}
case
GAME_MSG
.
MSG_TOSS_DICE
:
{
gameMsg
.
toss
=
MsgTossAdapter
(
gameData
,
ygopro
.
StocGameMessage
.
MsgToss
.
TossType
.
DICE
);
break
;
}
default
:
{
gameMsg
.
unimplemented
=
new
ygopro
.
StocGameMessage
.
MsgUnimplemented
({
command
:
func
,
...
...
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/toss.ts
0 → 100644
View file @
53ffb94e
import
{
BufferReader
}
from
"
../../../../../../rust-src/pkg/rust_src
"
;
import
{
ygopro
}
from
"
../../../idl/ocgcore
"
;
import
MsgToss
=
ygopro
.
StocGameMessage
.
MsgToss
;
/*
* Msg Toss
* @param - TODO
*
* @usage 骰子/硬币结果
* */
export
default
(
data
:
Uint8Array
,
toss_type
:
MsgToss
.
TossType
)
=>
{
const
reader
=
new
BufferReader
(
data
);
const
player
=
reader
.
readUint8
();
const
count
=
reader
.
readUint8
();
const
res
=
[];
for
(
let
i
=
0
;
i
<
count
;
i
++
)
{
res
.
push
(
reader
.
readUint8
());
}
return
new
MsgToss
({
player
,
toss_type
,
res
,
});
};
src/service/duel/gameMsg.ts
View file @
53ffb94e
...
...
@@ -42,6 +42,7 @@ import onMsgStart from "./start";
import
onMsgSummoned
from
"
./summoned
"
;
import
onMsgSummoning
from
"
./summoning
"
;
import
onMsgSwap
from
"
./swap
"
;
import
onMsgToss
from
"
./toss
"
;
import
onUnimplemented
from
"
./unimplemented
"
;
import
onMsgUpdateCounter
from
"
./updateCounter
"
;
import
onMsgUpdateData
from
"
./updateData
"
;
...
...
@@ -303,6 +304,11 @@ async function _handleGameMsg(pb: ygopro.YgoStocMsg) {
break
;
}
case
"
toss
"
:
{
onMsgToss
(
msg
.
toss
);
break
;
}
case
"
unimplemented
"
:
{
onUnimplemented
(
msg
.
unimplemented
);
...
...
src/service/duel/toss.ts
0 → 100644
View file @
53ffb94e
import
{
fetchStrings
,
ygopro
}
from
"
@/api
"
;
import
{
sleep
}
from
"
@/infra
"
;
import
{
matStore
}
from
"
@/stores
"
;
import
MsgToss
=
ygopro
.
StocGameMessage
.
MsgToss
;
export
default
async
(
toss
:
MsgToss
)
=>
{
const
player
=
toss
.
player
;
const
tossType
=
toss
.
toss_type
;
const
prefix
=
fetchStrings
(
"
!system
"
,
matStore
.
isMe
(
player
)
?
102
:
103
);
for
(
const
x
of
toss
.
res
)
{
if
(
tossType
==
MsgToss
.
TossType
.
DICE
)
{
matStore
.
tossResult
=
prefix
+
fetchStrings
(
"
!system
"
,
1624
)
+
x
;
}
else
if
(
tossType
==
MsgToss
.
TossType
.
COIN
)
{
matStore
.
tossResult
=
prefix
+
fetchStrings
(
"
!system
"
,
1623
)
+
fetchStrings
(
"
!system
"
,
61
-
x
);
}
else
{
console
.
log
(
`Unknown tossType =
${
tossType
}
`
);
}
// 等待1s,不然多个结果刷新太快了
await
sleep
(
1000
);
}
};
src/stores/matStore/types.ts
View file @
53ffb94e
...
...
@@ -37,6 +37,8 @@ export interface MatState {
unimplemented
:
number
;
// 未处理的`Message`
tossResult
?:
string
;
// 骰子/硬币结果
/** 根据自己的先后手判断是否是自己 */
isMe
:
(
player
:
number
)
=>
boolean
;
}
...
...
src/ui/Duel/Message/HintNotification.tsx
View file @
53ffb94e
...
...
@@ -17,6 +17,7 @@ const NeosConfig = useConfig();
export
const
HintNotification
=
()
=>
{
const
snap
=
useSnapshot
(
matStore
);
const
hintState
=
snap
.
hint
;
const
toss
=
snap
.
tossResult
;
const
currentPhase
=
snap
.
phase
.
currentPhase
;
const
waiting
=
snap
.
waiting
;
...
...
@@ -35,6 +36,16 @@ export const HintNotification = () => {
}
},
[
hintState
.
msg
]);
useEffect
(()
=>
{
if
(
toss
)
{
api
.
open
({
message
:
`
${
toss
}
`
,
placement
:
"
topLeft
"
,
style
:
style
,
});
}
},
[
toss
]);
useEffect
(()
=>
{
if
(
currentPhase
)
{
const
message
=
fetchStrings
(
...
...
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