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
f96af3a5
Commit
f96af3a5
authored
Apr 16, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/magic' into 'main'
fix small See merge request
mycard/Neos!171
parents
225fc3f3
514e7caf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
20 deletions
+6
-20
src/reducers/duel/magicSlice.ts
src/reducers/duel/magicSlice.ts
+0
-6
src/reducers/duel/monstersSlice.ts
src/reducers/duel/monstersSlice.ts
+0
-7
src/ui/Duel/Message/CardModal.tsx
src/ui/Duel/Message/CardModal.tsx
+2
-2
src/ui/Duel/Message/Phase.tsx
src/ui/Duel/Message/Phase.tsx
+4
-5
No files found.
src/reducers/duel/magicSlice.ts
View file @
f96af3a5
...
@@ -36,7 +36,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -36,7 +36,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
SZONE
,
location
:
ygopro
.
CardZone
.
SZONE
,
sequence
:
0
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
@@ -45,7 +44,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -45,7 +44,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
SZONE
,
location
:
ygopro
.
CardZone
.
SZONE
,
sequence
:
1
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
@@ -54,7 +52,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -54,7 +52,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
SZONE
,
location
:
ygopro
.
CardZone
.
SZONE
,
sequence
:
2
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
@@ -63,7 +60,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -63,7 +60,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
SZONE
,
location
:
ygopro
.
CardZone
.
SZONE
,
sequence
:
3
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
@@ -72,7 +68,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -72,7 +68,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
SZONE
,
location
:
ygopro
.
CardZone
.
SZONE
,
sequence
:
4
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
@@ -82,7 +77,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -82,7 +77,6 @@ export const initMagicsImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
SZONE
,
location
:
ygopro
.
CardZone
.
SZONE
,
sequence
:
5
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
...
src/reducers/duel/monstersSlice.ts
View file @
f96af3a5
...
@@ -42,7 +42,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -42,7 +42,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
MZONE
,
location
:
ygopro
.
CardZone
.
MZONE
,
sequence
:
0
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
@@ -51,7 +50,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -51,7 +50,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
MZONE
,
location
:
ygopro
.
CardZone
.
MZONE
,
sequence
:
1
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
@@ -60,7 +58,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -60,7 +58,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
MZONE
,
location
:
ygopro
.
CardZone
.
MZONE
,
sequence
:
2
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
@@ -69,7 +66,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -69,7 +66,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
MZONE
,
location
:
ygopro
.
CardZone
.
MZONE
,
sequence
:
3
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
@@ -78,7 +74,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -78,7 +74,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
MZONE
,
location
:
ygopro
.
CardZone
.
MZONE
,
sequence
:
4
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
@@ -87,7 +82,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -87,7 +82,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
MZONE
,
location
:
ygopro
.
CardZone
.
MZONE
,
sequence
:
5
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
@@ -96,7 +90,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
...
@@ -96,7 +90,6 @@ export const initMonstersImpl: CaseReducer<DuelState, PayloadAction<number>> = (
location
:
{
location
:
{
controler
:
player
,
controler
:
player
,
location
:
ygopro
.
CardZone
.
MZONE
,
location
:
ygopro
.
CardZone
.
MZONE
,
sequence
:
6
,
},
},
idleInteractivities
:
[],
idleInteractivities
:
[],
counters
:
{},
counters
:
{},
...
...
src/ui/Duel/Message/CardModal.tsx
View file @
f96af3a5
import
Icon
,
{
StarOutlined
}
from
"
@ant-design/icons
"
;
import
Icon
,
{
StarOutlined
}
from
"
@ant-design/icons
"
;
import
{
Button
,
Card
,
Col
,
Modal
,
Row
}
from
"
antd
"
;
import
{
Button
,
Card
,
Col
,
Modal
,
Row
}
from
"
antd
"
;
import
{
ReactComponent
as
BattleSvg
}
from
"
neos-assets/battle-axe.svg
"
;
import
{
ReactComponent
as
DefenceSvg
}
from
"
neos-assets/checked-shield.svg
"
;
import
React
from
"
react
"
;
import
React
from
"
react
"
;
import
{
sendSelectIdleCmdResponse
}
from
"
@/api/ocgcore/ocgHelper
"
;
import
{
sendSelectIdleCmdResponse
}
from
"
@/api/ocgcore/ocgHelper
"
;
...
@@ -18,8 +20,6 @@ import {
...
@@ -18,8 +20,6 @@ import {
}
from
"
@/reducers/duel/modal/mod
"
;
}
from
"
@/reducers/duel/modal/mod
"
;
import
{
store
}
from
"
@/store
"
;
import
{
store
}
from
"
@/store
"
;
import
{
ReactComponent
as
BattleSvg
}
from
"
neos-assets/battle-axe.svg
"
;
import
{
ReactComponent
as
DefenceSvg
}
from
"
neos-assets/checked-shield.svg
"
;
import
{
import
{
Attribute2StringCodeMap
,
Attribute2StringCodeMap
,
extraCardTypes
,
extraCardTypes
,
...
...
src/ui/Duel/Message/Phase.tsx
View file @
f96af3a5
import
Icon
from
"
@ant-design/icons
"
;
import
Icon
from
"
@ant-design/icons
"
;
import
{
Button
,
Modal
,
Space
}
from
"
antd
"
;
import
{
Button
,
Modal
,
Space
}
from
"
antd
"
;
import
{
ReactComponent
as
BattleSvg
}
from
"
neos-assets/crossed-swords.svg
"
;
import
{
ReactComponent
as
EpSvg
}
from
"
neos-assets/power-button.svg
"
;
import
{
ReactComponent
as
Main2Svg
}
from
"
neos-assets/sword-in-stone.svg
"
;
import
{
ReactComponent
as
SurrenderSvg
}
from
"
neos-assets/truce.svg
"
;
import
React
,
{
useState
}
from
"
react
"
;
import
React
,
{
useState
}
from
"
react
"
;
import
{
import
{
...
@@ -22,11 +26,6 @@ import {
...
@@ -22,11 +26,6 @@ import {
}
from
"
@/reducers/duel/phaseSlice
"
;
}
from
"
@/reducers/duel/phaseSlice
"
;
import
{
store
}
from
"
@/store
"
;
import
{
store
}
from
"
@/store
"
;
import
{
ReactComponent
as
BattleSvg
}
from
"
neos-assets/crossed-swords.svg
"
;
import
{
ReactComponent
as
EpSvg
}
from
"
neos-assets/power-button.svg
"
;
import
{
ReactComponent
as
Main2Svg
}
from
"
neos-assets/sword-in-stone.svg
"
;
import
{
ReactComponent
as
SurrenderSvg
}
from
"
neos-assets/truce.svg
"
;
const
IconSize
=
"
150%
"
;
const
IconSize
=
"
150%
"
;
const
SpaceSize
=
16
;
const
SpaceSize
=
16
;
...
...
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