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
d7bd1852
Commit
d7bd1852
authored
Jun 11, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/win' into 'main'
Fix/win See merge request
!221
parents
40f0cdde
7bf462f2
Pipeline
#22193
passed with stages
in 12 minutes and 8 seconds
Changes
10
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
15003 additions
and
18600 deletions
+15003
-18600
neos-protobuf
neos-protobuf
+1
-1
neos.config.json
neos.config.json
+0
-2
neos.config.prod.json
neos.config.prod.json
+0
-2
src/api/ocgcore/idl/ocgcore.ts
src/api/ocgcore/idl/ocgcore.ts
+14985
-18562
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/win.ts
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/win.ts
+4
-11
src/service/duel/win.ts
src/service/duel/win.ts
+6
-10
src/stores/matStore/store.ts
src/stores/matStore/store.ts
+0
-1
src/stores/matStore/types.ts
src/stores/matStore/types.ts
+4
-1
src/ui/Duel/Message/CheckCounterModal.tsx
src/ui/Duel/Message/CheckCounterModal.tsx
+1
-1
src/ui/Duel/Message/HintNotification.tsx
src/ui/Duel/Message/HintNotification.tsx
+2
-9
No files found.
neos-protobuf
@
b38ac93e
Subproject commit
44727f7136ec5708c86d6ed09d5bec8b48f13efc
Subproject commit
b38ac93eef4ec235d1be4cfb689754a0e360e2ab
neos.config.json
View file @
d7bd1852
...
...
@@ -23,8 +23,6 @@
1
,
6
,
7
,
30
,
31
,
32
,
34
,
54
,
...
...
neos.config.prod.json
View file @
d7bd1852
...
...
@@ -23,8 +23,6 @@
1
,
6
,
7
,
30
,
31
,
32
,
34
,
54
,
...
...
src/api/ocgcore/idl/ocgcore.ts
View file @
d7bd1852
This diff is collapsed.
Click to expand it.
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/win.ts
View file @
d7bd1852
...
...
@@ -12,18 +12,11 @@ import MsgWin = ygopro.StocGameMessage.MsgWin;
export
default
(
data
:
Uint8Array
)
=>
{
const
reader
=
new
BufferReader
(
data
);
const
player
=
reader
.
readUint8
();
const
winType
=
reader
.
readUint8
();
const
type_
=
player
==
0
||
winType
==
4
?
MsgWin
.
ActionType
.
Win
:
player
==
1
?
MsgWin
.
ActionType
.
Defeated
:
MsgWin
.
ActionType
.
UNKNOWN
;
const
win_player
=
reader
.
readUint8
();
const
reason
=
reader
.
readUint8
();
return
new
MsgWin
({
player
,
type_
,
win_
player
,
reason
,
});
};
src/service/duel/win.ts
View file @
d7bd1852
import
{
ygopro
}
from
"
@/api
"
;
import
{
fetchStrings
,
ygopro
}
from
"
@/api
"
;
import
{
matStore
}
from
"
@/stores
"
;
import
MsgWin
=
ygopro
.
StocGameMessage
.
MsgWin
;
export
default
(
win
:
MsgWin
)
=>
{
const
player
=
win
.
player
;
if
(
matStore
.
isMe
(
player
))
{
matStore
.
result
=
win
.
type_
;
}
else
{
matStore
.
result
=
win
.
type_
==
MsgWin
.
ActionType
.
Win
?
MsgWin
.
ActionType
.
Defeated
:
MsgWin
.
ActionType
.
Win
;
}
const
{
win_player
,
reason
}
=
win
;
matStore
.
result
=
{
isWin
:
matStore
.
isMe
(
win_player
),
reason
:
fetchStrings
(
"
!victory
"
,
`0x
${
reason
.
toString
(
16
)}
`
),
};
};
src/stores/matStore/store.ts
View file @
d7bd1852
...
...
@@ -80,7 +80,6 @@ export const matStore: MatState = proxy<MatState>({
enableM2
:
false
,
// 允许进入M2阶段
enableEp
:
false
,
// 允许回合结束
},
result
:
ygopro
.
StocGameMessage
.
MsgWin
.
ActionType
.
UNKNOWN
,
waiting
:
false
,
unimplemented
:
0
,
// methods
...
...
src/stores/matStore/types.ts
View file @
d7bd1852
...
...
@@ -28,7 +28,10 @@ export interface MatState {
phase
:
PhaseState
;
result
:
ygopro
.
StocGameMessage
.
MsgWin
.
ActionType
;
result
?:
{
isWin
:
boolean
;
reason
:
string
;
};
waiting
:
boolean
;
...
...
src/ui/Duel/Message/CheckCounterModal.tsx
View file @
d7bd1852
...
...
@@ -20,7 +20,7 @@ export const CheckCounterModal = () => {
const
counterName
=
fetchStrings
(
"
!counter
"
,
`0x
${
snapCheckCounterModal
.
counterType
!
}
`
);
);
// FIXME: 这里转十六进制的逻辑有问题
const
[
selected
,
setSelected
]
=
useState
(
new
Array
(
options
.
length
));
const
sum
=
selected
.
reduce
((
sum
,
current
)
=>
sum
+
current
,
0
);
...
...
src/ui/Duel/Message/HintNotification.tsx
View file @
d7bd1852
...
...
@@ -2,7 +2,7 @@ import { notification } from "antd";
import
React
,
{
useEffect
}
from
"
react
"
;
import
{
useSnapshot
}
from
"
valtio
"
;
import
{
fetchStrings
,
ygopro
}
from
"
@/api
"
;
import
{
fetchStrings
}
from
"
@/api
"
;
import
{
Phase2StringCodeMap
}
from
"
@/common
"
;
import
{
useConfig
}
from
"
@/config
"
;
import
{
matStore
}
from
"
@/stores
"
;
...
...
@@ -13,8 +13,6 @@ const style = {
backgroundColor
:
"
#303030
"
,
};
const
MsgWin
=
ygopro
.
StocGameMessage
.
MsgWin
;
const
NeosConfig
=
useConfig
();
export
const
HintNotification
=
()
=>
{
const
snap
=
useSnapshot
(
matStore
);
...
...
@@ -67,12 +65,7 @@ export const HintNotification = () => {
useEffect
(()
=>
{
if
(
result
)
{
const
message
=
result
==
MsgWin
.
ActionType
.
Win
?
"
胜利
"
:
MsgWin
.
ActionType
.
Defeated
?
"
失败
"
:
"
未知结果
"
;
const
message
=
result
.
isWin
?
"
Win
"
:
"
Defeated
"
+
"
"
+
result
.
reason
;
api
.
open
({
message
,
placement
:
"
bottom
"
,
...
...
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