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
f5d5a2cb
Commit
f5d5a2cb
authored
Sep 04, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/feedback' into 'main'
修复玩家反馈的一些BUG See merge request
!294
parents
a14c1573
f1d8b11a
Pipeline
#23348
passed with stages
in 10 minutes and 49 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
+22
-2
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectPlace.ts
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectPlace.ts
+11
-0
src/ui/Duel/Message/CardListModal.tsx
src/ui/Duel/Message/CardListModal.tsx
+1
-1
src/ui/Duel/PlayMat/Bg/index.tsx
src/ui/Duel/PlayMat/Bg/index.tsx
+10
-1
No files found.
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/selectPlace.ts
View file @
f5d5a2cb
...
...
@@ -69,6 +69,17 @@ export default (data: Uint8Array) => {
}
}
if
((
field
&
0x2000
)
!==
0
)
{
// 场地魔法区
msg
.
places
.
push
(
new
MsgSelectPlace
.
SelectAblePlace
({
controller
,
zone
:
ygopro
.
CardZone
.
SZONE
,
sequence
:
5
,
}),
);
}
if
((
field
&
0xc000
)
!==
0
)
{
// 灵摆区?
const
zone
=
ygopro
.
CardZone
.
SZONE
;
...
...
src/ui/Duel/Message/CardListModal.tsx
View file @
f5d5a2cb
...
...
@@ -71,7 +71,7 @@ export const displayCardListModal = ({
controller
,
}:
Partial
<
Omit
<
typeof
defaultStore
,
"
isOpen
"
>>
)
=>
{
store
.
isOpen
=
true
;
isZone
&&
(
store
.
isZone
=
isZone
)
;
store
.
isZone
=
isZone
??
false
;
monster
&&
(
store
.
monster
=
monster
);
zone
&&
(
store
.
zone
=
zone
);
controller
!==
undefined
&&
(
store
.
controller
=
controller
);
...
...
src/ui/Duel/PlayMat/Bg/index.tsx
View file @
f5d5a2cb
...
...
@@ -87,11 +87,20 @@ const BgOtherBlocks: React.FC<{ op?: boolean }> = ({ op }) => {
const
glowingExtra
=
judgeGlowing
(
ygopro
.
CardZone
.
EXTRA
);
const
glowingGraveyard
=
judgeGlowing
(
ygopro
.
CardZone
.
GRAVE
);
const
glowingBanish
=
judgeGlowing
(
ygopro
.
CardZone
.
REMOVED
);
const
snap
=
useSnapshot
(
placeStore
.
inner
);
const
field
=
op
?
snap
[
ygopro
.
CardZone
.
SZONE
].
op
[
5
]
:
snap
[
ygopro
.
CardZone
.
SZONE
].
me
[
5
];
return
(
<
div
className=
{
classnames
(
styles
[
"
other-blocks
"
],
{
[
styles
.
op
]:
op
})
}
>
<
BgBlock
className=
{
styles
.
banish
}
glowing=
{
!
op
&&
glowingBanish
}
/>
<
BgBlock
className=
{
styles
.
graveyard
}
glowing=
{
!
op
&&
glowingGraveyard
}
/>
<
BgBlock
className=
{
styles
.
field
}
/>
<
BgBlock
className=
{
styles
.
field
}
onClick=
{
()
=>
onBlockClick
(
field
.
interactivity
)
}
disabled=
{
field
.
disabled
}
highlight=
{
!!
field
.
interactivity
}
/>
<
BgBlock
className=
{
styles
.
deck
}
/>
<
BgBlock
className=
{
classnames
(
styles
.
deck
,
styles
[
"
extra-deck
"
])
}
...
...
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