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
love_飞影
Neos
Commits
9115bf9e
Commit
9115bf9e
authored
Apr 02, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
68184e77
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
18 deletions
+22
-18
src/reducers/duel/modal/checkCardModalSlice.ts
src/reducers/duel/modal/checkCardModalSlice.ts
+17
-17
src/ui/Duel/checkCardModal.tsx
src/ui/Duel/checkCardModal.tsx
+5
-1
No files found.
src/reducers/duel/modal/checkCardModalSlice.ts
View file @
9115bf9e
...
@@ -95,9 +95,8 @@ export const checkCardModalCase = (
...
@@ -95,9 +95,8 @@ export const checkCardModalCase = (
const
newID
=
const
newID
=
code
!=
0
?
code
:
findCardByLocation
(
state
,
location
)?.
occupant
?.
id
||
0
;
code
!=
0
?
code
:
findCardByLocation
(
state
,
location
)?.
occupant
?.
id
||
0
;
if
(
newID
)
{
const
newOption
=
{
const
newOption
=
{
meta
:
{
id
:
code
,
data
:
{},
text
:
{}
},
meta
:
{
id
:
newID
,
data
:
{},
text
:
{}
},
location
:
location
.
toObject
(),
location
:
location
.
toObject
(),
effectDescCode
,
effectDescCode
,
response
,
response
,
...
@@ -113,7 +112,6 @@ export const checkCardModalCase = (
...
@@ -113,7 +112,6 @@ export const checkCardModalCase = (
tagName
:
combinedTagName
,
tagName
:
combinedTagName
,
options
:
[
newOption
],
options
:
[
newOption
],
});
});
}
});
});
builder
.
addCase
(
fetchCheckCardMeta
.
fulfilled
,
(
state
,
action
)
=>
{
builder
.
addCase
(
fetchCheckCardMeta
.
fulfilled
,
(
state
,
action
)
=>
{
const
tagName
=
action
.
payload
.
tagName
;
const
tagName
=
action
.
payload
.
tagName
;
...
@@ -131,7 +129,9 @@ export const checkCardModalCase = (
...
@@ -131,7 +129,9 @@ export const checkCardModalCase = (
option
.
meta
.
id
==
old
.
meta
.
id
&&
option
.
meta
.
id
==
old
.
meta
.
id
&&
cmpCardLocation
(
option
.
location
,
old
.
location
)
cmpCardLocation
(
option
.
location
,
old
.
location
)
)
{
)
{
const
cardID
=
old
.
meta
.
id
;
old
.
meta
=
option
.
meta
;
old
.
meta
=
option
.
meta
;
old
.
meta
.
id
=
cardID
;
const
effectDescCode
=
old
.
effectDescCode
;
const
effectDescCode
=
old
.
effectDescCode
;
const
effectDesc
=
effectDescCode
const
effectDesc
=
effectDescCode
...
...
src/ui/Duel/checkCardModal.tsx
View file @
9115bf9e
...
@@ -117,7 +117,11 @@ const CheckCardModal = () => {
...
@@ -117,7 +117,11 @@ const CheckCardModal = () => {
cover=
{
cover=
{
<
img
<
img
alt=
{
option
.
meta
.
id
.
toString
()
}
alt=
{
option
.
meta
.
id
.
toString
()
}
src=
{
`${NeosConfig.cardImgUrl}/${option.meta.id}.jpg`
}
src=
{
option
.
meta
.
id
?
`${NeosConfig.cardImgUrl}/${option.meta.id}.jpg`
:
`${NeosConfig.assetsPath}/card_back.jpg`
}
style=
{
{
width
:
100
}
}
style=
{
{
width
:
100
}
}
/>
/>
}
}
...
...
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