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
c5d4e353
Commit
c5d4e353
authored
Dec 01, 2022
by
Chunchi Che
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add MsgNewTurn
parent
f334f373
Pipeline
#18296
passed with stages
in 2 minutes and 15 seconds
Changes
7
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
176 additions
and
4 deletions
+176
-4
neos-protobuf
neos-protobuf
+1
-1
src/api/ocgcore/idl/ocgcore.ts
src/api/ocgcore/idl/ocgcore.ts
+129
-3
src/api/ocgcore/ocgAdapter/protoDecl.ts
src/api/ocgcore/ocgAdapter/protoDecl.ts
+1
-0
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
+6
-0
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/newTurn.ts
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/newTurn.ts
+22
-0
src/service/duel/gameMsg.ts
src/service/duel/gameMsg.ts
+8
-0
src/service/duel/newTurn.ts
src/service/duel/newTurn.ts
+9
-0
No files found.
neos-protobuf
@
f4278cdb
Subproject commit
cdceb9956b250e56cc59c18936872cdda3f3fb2c
Subproject commit
f4278cdb78436dd2fd2a521f825c7498eef7b65d
src/api/ocgcore/idl/ocgcore.ts
View file @
c5d4e353
...
...
@@ -3100,7 +3100,7 @@ export namespace ygopro {
}
}
export
class
StocGameMessage
extends
pb_1
.
Message
{
#
one_of_decls
:
number
[][]
=
[[
1
,
2
]];
#
one_of_decls
:
number
[][]
=
[[
1
,
2
,
3
]];
constructor
(
data
?:
|
any
[]
...
...
@@ -3108,10 +3108,17 @@ export namespace ygopro {
|
{
start
?:
StocGameMessage
.
MsgStart
;
draw
?:
never
;
new_turn
?:
never
;
}
|
{
start
?:
never
;
draw
?:
StocGameMessage
.
MsgDraw
;
new_turn
?:
never
;
}
|
{
start
?:
never
;
draw
?:
never
;
new_turn
?:
StocGameMessage
.
MsgNewTurn
;
}
))
)
{
...
...
@@ -3131,6 +3138,9 @@ export namespace ygopro {
if
(
"
draw
"
in
data
&&
data
.
draw
!=
undefined
)
{
this
.
draw
=
data
.
draw
;
}
if
(
"
new_turn
"
in
data
&&
data
.
new_turn
!=
undefined
)
{
this
.
new_turn
=
data
.
new_turn
;
}
}
}
get
start
()
{
...
...
@@ -3159,19 +3169,36 @@ export namespace ygopro {
get
has_draw
()
{
return
pb_1
.
Message
.
getField
(
this
,
2
)
!=
null
;
}
get
new_turn
()
{
return
pb_1
.
Message
.
getWrapperField
(
this
,
StocGameMessage
.
MsgNewTurn
,
3
)
as
StocGameMessage
.
MsgNewTurn
;
}
set
new_turn
(
value
:
StocGameMessage
.
MsgNewTurn
)
{
pb_1
.
Message
.
setOneofWrapperField
(
this
,
3
,
this
.
#
one_of_decls
[
0
],
value
);
}
get
has_new_turn
()
{
return
pb_1
.
Message
.
getField
(
this
,
3
)
!=
null
;
}
get
gameMsg
()
{
const
cases
:
{
[
index
:
number
]:
"
none
"
|
"
start
"
|
"
draw
"
;
[
index
:
number
]:
"
none
"
|
"
start
"
|
"
draw
"
|
"
new_turn
"
;
}
=
{
0
:
"
none
"
,
1
:
"
start
"
,
2
:
"
draw
"
,
3
:
"
new_turn
"
,
};
return
cases
[
pb_1
.
Message
.
computeOneofCase
(
this
,
[
1
,
2
])];
return
cases
[
pb_1
.
Message
.
computeOneofCase
(
this
,
[
1
,
2
,
3
])];
}
static
fromObject
(
data
:
{
start
?:
ReturnType
<
typeof
StocGameMessage
.
MsgStart
.
prototype
.
toObject
>
;
draw
?:
ReturnType
<
typeof
StocGameMessage
.
MsgDraw
.
prototype
.
toObject
>
;
new_turn
?:
ReturnType
<
typeof
StocGameMessage
.
MsgNewTurn
.
prototype
.
toObject
>
;
}):
StocGameMessage
{
const
message
=
new
StocGameMessage
({});
if
(
data
.
start
!=
null
)
{
...
...
@@ -3180,12 +3207,18 @@ export namespace ygopro {
if
(
data
.
draw
!=
null
)
{
message
.
draw
=
StocGameMessage
.
MsgDraw
.
fromObject
(
data
.
draw
);
}
if
(
data
.
new_turn
!=
null
)
{
message
.
new_turn
=
StocGameMessage
.
MsgNewTurn
.
fromObject
(
data
.
new_turn
);
}
return
message
;
}
toObject
()
{
const
data
:
{
start
?:
ReturnType
<
typeof
StocGameMessage
.
MsgStart
.
prototype
.
toObject
>
;
draw
?:
ReturnType
<
typeof
StocGameMessage
.
MsgDraw
.
prototype
.
toObject
>
;
new_turn
?:
ReturnType
<
typeof
StocGameMessage
.
MsgNewTurn
.
prototype
.
toObject
>
;
}
=
{};
if
(
this
.
start
!=
null
)
{
data
.
start
=
this
.
start
.
toObject
();
...
...
@@ -3193,6 +3226,9 @@ export namespace ygopro {
if
(
this
.
draw
!=
null
)
{
data
.
draw
=
this
.
draw
.
toObject
();
}
if
(
this
.
new_turn
!=
null
)
{
data
.
new_turn
=
this
.
new_turn
.
toObject
();
}
return
data
;
}
serialize
():
Uint8Array
;
...
...
@@ -3203,6 +3239,10 @@ export namespace ygopro {
writer
.
writeMessage
(
1
,
this
.
start
,
()
=>
this
.
start
.
serialize
(
writer
));
if
(
this
.
has_draw
)
writer
.
writeMessage
(
2
,
this
.
draw
,
()
=>
this
.
draw
.
serialize
(
writer
));
if
(
this
.
has_new_turn
)
writer
.
writeMessage
(
3
,
this
.
new_turn
,
()
=>
this
.
new_turn
.
serialize
(
writer
)
);
if
(
!
w
)
return
writer
.
getResultBuffer
();
}
static
deserialize
(
bytes
:
Uint8Array
|
pb_1
.
BinaryReader
):
StocGameMessage
{
...
...
@@ -3227,6 +3267,14 @@ export namespace ygopro {
()
=>
(
message
.
draw
=
StocGameMessage
.
MsgDraw
.
deserialize
(
reader
))
);
break
;
case
3
:
reader
.
readMessage
(
message
.
new_turn
,
()
=>
(
message
.
new_turn
=
StocGameMessage
.
MsgNewTurn
.
deserialize
(
reader
))
);
break
;
default
:
reader
.
skipField
();
}
...
...
@@ -3590,5 +3638,83 @@ export namespace ygopro {
return
MsgDraw
.
deserialize
(
bytes
);
}
}
export
class
MsgNewTurn
extends
pb_1
.
Message
{
#
one_of_decls
:
number
[][]
=
[];
constructor
(
data
?:
|
any
[]
|
{
player
?:
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
;
}
}
}
get
player
()
{
return
pb_1
.
Message
.
getFieldWithDefault
(
this
,
1
,
0
)
as
number
;
}
set
player
(
value
:
number
)
{
pb_1
.
Message
.
setField
(
this
,
1
,
value
);
}
static
fromObject
(
data
:
{
player
?:
number
}):
MsgNewTurn
{
const
message
=
new
MsgNewTurn
({});
if
(
data
.
player
!=
null
)
{
message
.
player
=
data
.
player
;
}
return
message
;
}
toObject
()
{
const
data
:
{
player
?:
number
;
}
=
{};
if
(
this
.
player
!=
null
)
{
data
.
player
=
this
.
player
;
}
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
(
!
w
)
return
writer
.
getResultBuffer
();
}
static
deserialize
(
bytes
:
Uint8Array
|
pb_1
.
BinaryReader
):
MsgNewTurn
{
const
reader
=
bytes
instanceof
pb_1
.
BinaryReader
?
bytes
:
new
pb_1
.
BinaryReader
(
bytes
),
message
=
new
MsgNewTurn
();
while
(
reader
.
nextField
())
{
if
(
reader
.
isEndGroup
())
break
;
switch
(
reader
.
getFieldNumber
())
{
case
1
:
message
.
player
=
reader
.
readInt32
();
break
;
default
:
reader
.
skipField
();
}
}
return
message
;
}
serializeBinary
():
Uint8Array
{
return
this
.
serialize
();
}
static
deserializeBinary
(
bytes
:
Uint8Array
):
MsgNewTurn
{
return
MsgNewTurn
.
deserialize
(
bytes
);
}
}
}
}
src/api/ocgcore/ocgAdapter/protoDecl.ts
View file @
c5d4e353
...
...
@@ -25,3 +25,4 @@ export const STOC_GAME_MSG = 1;
export
const
MSG_START
=
4
;
export
const
MSG_DRAW
=
90
;
export
const
MSG_NEW_TURN
=
40
;
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/mod.ts
View file @
c5d4e353
...
...
@@ -8,6 +8,7 @@ import { YgoProPacket, StocAdapter } from "../../packet";
import
*
as
GAME_MSG
from
"
../../protoDecl
"
;
import
MsgStartAdapter
from
"
./start
"
;
import
MsgDrawAdapter
from
"
./draw
"
;
import
MsgNewTurnAdapter
from
"
./newTurn
"
;
/*
* STOC GameMsg
...
...
@@ -43,6 +44,11 @@ export default class GameMsgAdapter implements StocAdapter {
break
;
}
case
GAME_MSG
.
MSG_NEW_TURN
:
{
gameMsg
.
new_turn
=
MsgNewTurnAdapter
(
gameData
);
break
;
}
default
:
{
console
.
log
(
"
Unhandled GameMessage function=
"
,
func
);
...
...
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/newTurn.ts
0 → 100644
View file @
c5d4e353
import
{
ygopro
}
from
"
../../../idl/ocgcore
"
;
import
{
BufferReader
}
from
"
../../bufferIO
"
;
const
LITTLE_ENDIAN
=
true
;
/*
* MSG New Turn
*
* @param player: char - 下一个操作的玩家编号
*
* @usage - 服务端告诉前端下一个操作的玩家
* */
export
default
(
data
:
Uint8Array
)
=>
{
const
reader
=
new
BufferReader
(
data
,
LITTLE_ENDIAN
);
const
player
=
reader
.
readUint8
();
return
new
ygopro
.
StocGameMessage
.
MsgNewTurn
({
player
,
});
};
src/service/duel/gameMsg.ts
View file @
c5d4e353
...
...
@@ -2,6 +2,7 @@ import { ygopro } from "../../api/ocgcore/idl/ocgcore";
import
{
store
}
from
"
../../store
"
;
import
onMsgStart
from
"
./start
"
;
import
onMsgDraw
from
"
./draw
"
;
import
onMsgNewTurn
from
"
./newTurn
"
;
export
default
function
handleGameMsg
(
pb
:
ygopro
.
YgoStocMsg
)
{
const
dispatch
=
store
.
dispatch
;
...
...
@@ -22,6 +23,13 @@ export default function handleGameMsg(pb: ygopro.YgoStocMsg) {
break
;
}
case
"
new_turn
"
:
{
const
newTurn
=
msg
.
new_turn
;
onMsgNewTurn
(
newTurn
,
dispatch
);
break
;
}
default
:
{
console
.
log
(
"
Unhandled GameMsg=
"
+
msg
.
gameMsg
);
...
...
src/service/duel/newTurn.ts
0 → 100644
View file @
c5d4e353
import
{
ygopro
}
from
"
../../api/ocgcore/idl/ocgcore
"
;
import
{
AppDispatch
}
from
"
../../store
"
;
export
default
(
newTurn
:
ygopro
.
StocGameMessage
.
MsgNewTurn
,
dispatch
:
AppDispatch
)
=>
{
// TODO
};
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