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
c295640e
Commit
c295640e
authored
Aug 10, 2023
by
timel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: filter and duel
parent
5fd899f7
Pipeline
#23022
failed with stages
in 13 minutes and 57 seconds
Changes
11
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
221 additions
and
25 deletions
+221
-25
src/styles/inject.scss
src/styles/inject.scss
+8
-0
src/ui/BuildDeck/Filter.module.scss
src/ui/BuildDeck/Filter.module.scss
+48
-0
src/ui/BuildDeck/Filter.tsx
src/ui/BuildDeck/Filter.tsx
+109
-0
src/ui/BuildDeck/index.module.scss
src/ui/BuildDeck/index.module.scss
+13
-0
src/ui/BuildDeck/index.tsx
src/ui/BuildDeck/index.tsx
+18
-20
src/ui/Duel/Main.tsx
src/ui/Duel/Main.tsx
+2
-0
src/ui/Duel/PlayMat/Bg/index.module.scss
src/ui/Duel/PlayMat/Bg/index.module.scss
+1
-1
src/ui/Duel/PlayMat/Bg/index.tsx
src/ui/Duel/PlayMat/Bg/index.tsx
+1
-1
src/ui/Duel/PlayMat/Mat/index.module.scss
src/ui/Duel/PlayMat/Mat/index.module.scss
+5
-2
src/ui/Layout/index.tsx
src/ui/Layout/index.tsx
+1
-1
src/ui/theme.ts
src/ui/theme.ts
+15
-0
No files found.
src/styles/inject.scss
View file @
c295640e
...
@@ -22,3 +22,11 @@
...
@@ -22,3 +22,11 @@
height
:
100%
;
height
:
100%
;
flex-direction
:
column
;
flex-direction
:
column
;
}
}
.ant-modal-confirm-content
{
max-width
:
100%
!
important
;
}
.ant-select-dropdown
{
backdrop-filter
:
blur
(
10px
);
}
src/ui/BuildDeck/Filter.module.scss
0 → 100644
View file @
c295640e
.title
{
text-align
:
center
;
font-size
:
16px
;
font-weight
:
bold
;
margin-bottom
:
32px
;
}
.item
{
display
:
flex
;
align-items
:
center
;
.item-name
{
flex
:
1
;
flex-basis
:
80px
;
}
}
.form
{
display
:
flex
;
flex-direction
:
column
;
gap
:
10px
;
}
.btns
{
margin-top
:
30px
;
display
:
flex
;
flex-direction
:
column
;
gap
:
10px
;
align-items
:
center
;
padding-bottom
:
10px
;
&
>
button
{
width
:
220px
;
border-radius
:
3px
;
}
}
.number
{
width
:
100%
;
display
:
flex
;
&
>
*
{
flex
:
1
;
}
.divider
{
flex
:
0
;
flex-basis
:
32px
;
text-align
:
center
;
line-height
:
30px
;
}
}
src/ui/BuildDeck/Filter.tsx
0 → 100644
View file @
c295640e
import
{
Button
,
Checkbox
,
Form
,
Input
,
Select
,
type
SelectProps
,
InputNumber
,
}
from
"
antd
"
;
import
styles
from
"
./Filter.module.scss
"
;
const
options
:
SelectProps
[
"
options
"
]
=
[];
for
(
let
i
=
10
;
i
<
36
;
i
++
)
{
options
.
push
({
label
:
i
.
toString
(
36
)
+
i
,
value
:
i
.
toString
(
36
)
+
i
,
});
}
export
const
Filter
:
React
.
FC
=
()
=>
{
return
(
<>
<
div
className=
{
styles
.
title
}
>
卡片筛选
</
div
>
<
div
className=
{
styles
.
form
}
>
<
div
className=
{
styles
.
item
}
>
<
div
className=
{
styles
[
"
item-name
"
]
}
>
卡种
</
div
>
<
Select
mode=
"multiple"
allowClear
style=
{
{
width
:
"
100%
"
}
}
placeholder=
"Please select"
options=
{
options
}
/>
</
div
>
<
div
className=
{
styles
.
item
}
>
<
div
className=
{
styles
[
"
item-name
"
]
}
>
属性
</
div
>
<
Select
mode=
"multiple"
allowClear
style=
{
{
width
:
"
100%
"
}
}
placeholder=
"Please select"
options=
{
options
}
/>
</
div
>
<
div
className=
{
styles
.
item
}
>
<
div
className=
{
styles
[
"
item-name
"
]
}
>
星级
</
div
>
<
Select
mode=
"multiple"
allowClear
style=
{
{
width
:
"
100%
"
}
}
placeholder=
"Please select"
options=
{
options
}
/>
</
div
>
<
div
className=
{
styles
.
item
}
>
<
div
className=
{
styles
[
"
item-name
"
]
}
>
种族
</
div
>
<
Select
mode=
"multiple"
allowClear
style=
{
{
width
:
"
100%
"
}
}
placeholder=
"Please select"
options=
{
options
}
/>
</
div
>
<
div
className=
{
styles
.
item
}
>
<
div
className=
{
styles
[
"
item-name
"
]
}
>
类型
</
div
>
<
Select
mode=
"multiple"
allowClear
style=
{
{
width
:
"
100%
"
}
}
placeholder=
"Please select"
options=
{
options
}
/>
</
div
>
<
div
className=
{
styles
.
item
}
>
<
div
className=
{
styles
[
"
item-name
"
]
}
>
其他
</
div
>
<
Select
mode=
"multiple"
allowClear
style=
{
{
width
:
"
100%
"
}
}
placeholder=
"Please select"
options=
{
options
}
/>
</
div
>
<
div
className=
{
styles
.
item
}
>
<
div
className=
{
styles
[
"
item-name
"
]
}
>
攻击力
</
div
>
<
div
className=
{
styles
.
number
}
>
<
InputNumber
min=
{
1
}
max=
{
10
}
defaultValue=
{
3
}
/>
<
span
className=
{
styles
.
divider
}
>
~
</
span
>
<
InputNumber
min=
{
1
}
max=
{
10
}
defaultValue=
{
3
}
/>
</
div
>
</
div
>
<
div
className=
{
styles
.
item
}
>
<
div
className=
{
styles
[
"
item-name
"
]
}
>
防御力
</
div
>
<
div
className=
{
styles
.
number
}
>
<
InputNumber
min=
{
1
}
max=
{
10
}
defaultValue=
{
3
}
/>
<
span
className=
{
styles
.
divider
}
>
~
</
span
>
<
InputNumber
min=
{
1
}
max=
{
10
}
defaultValue=
{
3
}
/>
</
div
>
</
div
>
</
div
>
<
div
className=
{
styles
.
btns
}
>
<
Button
type=
"primary"
>
确定
</
Button
>
<
Button
type=
"text"
>
取消
</
Button
>
</
div
>
</>
);
};
src/ui/BuildDeck/index.module.scss
View file @
c295640e
...
@@ -59,6 +59,7 @@
...
@@ -59,6 +59,7 @@
.main
,
.main
,
.extra
,
.extra
,
.side
{
.side
{
position
:
relative
;
border-bottom
:
1px
solid
rgba
(
255
,
255
,
255
,
0
.1
);
border-bottom
:
1px
solid
rgba
(
255
,
255
,
255
,
0
.1
);
padding
:
0
.75rem
;
padding
:
0
.75rem
;
}
}
...
@@ -140,3 +141,15 @@
...
@@ -140,3 +141,15 @@
justify-content
:
center
;
justify-content
:
center
;
align-items
:
center
;
align-items
:
center
;
}
}
.editing-zone-name
{
position
:
absolute
;
right
:
0
;
bottom
:
0
;
background-color
:
#212332
;
color
:
hsla
(
0
,
0%
,
100%
,
0
.3
);
font-size
:
12px
;
padding
:
2px
6px
;
font-family
:
var
(
--
theme-font
);
user-select
:
none
;
}
src/ui/BuildDeck/index.tsx
View file @
c295640e
...
@@ -37,6 +37,7 @@ import {
...
@@ -37,6 +37,7 @@ import {
import
{
CardDetail
}
from
"
./CardDetail
"
;
import
{
CardDetail
}
from
"
./CardDetail
"
;
import
{
DeckSelect
}
from
"
./DeckSelect
"
;
import
{
DeckSelect
}
from
"
./DeckSelect
"
;
import
{
Filter
}
from
"
./Filter
"
;
import
styles
from
"
./index.module.scss
"
;
import
styles
from
"
./index.module.scss
"
;
import
{
import
{
canAdd
,
canAdd
,
...
@@ -210,8 +211,19 @@ const Search: React.FC = () => {
...
@@ -210,8 +211,19 @@ const Search: React.FC = () => {
);
// 衍生物不显示
);
// 衍生物不显示
setSearchResult
(
result
);
setSearchResult
(
result
);
};
};
const
[
_
,
dropRef
]
=
useDrop
({
accept
:
[
"
Card
"
],
// 指明该区域允许接收的拖放物。可以是单个,也可以是数组
// 里面的值就是useDrag所定义的type
// 当拖拽物在这个拖放区域放下时触发,这个item就是拖拽物的item(拖拽物携带的数据)
drop
:
({
value
,
source
}:
{
value
:
CardMeta
;
source
:
Type
|
"
search
"
})
=>
{
if
(
source
!==
"
search
"
)
{
editDeckStore
.
remove
(
source
,
value
);
}
},
});
return
(
return
(
<
div
className=
{
styles
.
container
}
>
<
div
className=
{
styles
.
container
}
ref=
{
dropRef
}
>
<
div
className=
{
styles
.
title
}
>
<
div
className=
{
styles
.
title
}
>
<
Input
<
Input
placeholder=
"搜索卡片"
placeholder=
"搜索卡片"
...
@@ -234,11 +246,12 @@ const Search: React.FC = () => {
...
@@ -234,11 +246,12 @@ const Search: React.FC = () => {
type=
"text"
type=
"text"
icon=
{
<
FilterOutlined
/>
}
icon=
{
<
FilterOutlined
/>
}
onClick=
{
()
=>
{
onClick=
{
()
=>
{
modal
.
confirm
({
modal
.
info
({
width
:
500
,
centered
:
true
,
centered
:
true
,
title
:
null
,
title
:
null
,
icon
:
null
,
icon
:
null
,
content
:
"
TODO
"
,
content
:
<
Filter
/>
,
footer
:
null
,
footer
:
null
,
});
});
}
}
}
}
...
@@ -308,6 +321,7 @@ const DeckZone: React.FC<{
...
@@ -308,6 +321,7 @@ const DeckZone: React.FC<{
onRightClick=
{
()
=>
editDeckStore
.
remove
(
type
,
item
)
}
onRightClick=
{
()
=>
editDeckStore
.
remove
(
type
,
item
)
}
/>
/>
))
}
))
}
<
div
className=
{
styles
[
"
editing-zone-name
"
]
}
>
{
type
.
toUpperCase
()
}
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
);
);
...
@@ -317,24 +331,8 @@ const DeckZone: React.FC<{
...
@@ -317,24 +331,8 @@ const DeckZone: React.FC<{
const
SearchResults
:
React
.
FC
<
{
const
SearchResults
:
React
.
FC
<
{
results
:
CardMeta
[];
results
:
CardMeta
[];
}
>
=
memo
(({
results
})
=>
{
}
>
=
memo
(({
results
})
=>
{
const
[
_
,
dropRef
]
=
useDrop
({
accept
:
[
"
Card
"
],
// 指明该区域允许接收的拖放物。可以是单个,也可以是数组
// 里面的值就是useDrag所定义的type
// 当拖拽物在这个拖放区域放下时触发,这个item就是拖拽物的item(拖拽物携带的数据)
drop
:
({
value
,
source
,
}:
{
value
:
CardMeta
;
source
:
"
main
"
|
"
extra
"
|
"
side
"
|
"
search
"
;
})
=>
{
if
(
source
!==
"
search
"
)
{
editDeckStore
.
remove
(
source
,
value
);
}
},
});
return
(
return
(
<
div
className=
{
styles
[
"
search-cards
"
]
}
ref=
{
dropRef
}
>
<
div
className=
{
styles
[
"
search-cards
"
]
}
>
{
results
.
map
((
item
)
=>
(
{
results
.
map
((
item
)
=>
(
<
Card
value=
{
item
}
key=
{
v4uuid
()
}
source=
"search"
/>
<
Card
value=
{
item
}
key=
{
v4uuid
()
}
source=
"search"
/>
))
}
))
}
...
...
src/ui/Duel/Main.tsx
View file @
c295640e
...
@@ -16,10 +16,12 @@ import {
...
@@ -16,10 +16,12 @@ import {
YesNoModal
,
YesNoModal
,
}
from
"
./Message
"
;
}
from
"
./Message
"
;
import
{
LifeBar
,
Mat
,
Menu
}
from
"
./PlayMat
"
;
import
{
LifeBar
,
Mat
,
Menu
}
from
"
./PlayMat
"
;
import
{
Background
}
from
"
@/ui/Shared
"
;
export
const
Component
:
React
.
FC
=
()
=>
{
export
const
Component
:
React
.
FC
=
()
=>
{
return
(
return
(
<>
<>
<
Background
/>
<
SelectActionsModal
/>
<
SelectActionsModal
/>
<
Alert
/>
<
Alert
/>
<
Menu
/>
<
Menu
/>
...
...
src/ui/Duel/PlayMat/Bg/index.module.scss
View file @
c295640e
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
.block
{
.block
{
height
:
var
(
--
block-height-m
);
height
:
var
(
--
block-height-m
);
width
:
var
(
--
block-width
);
width
:
var
(
--
block-width
);
background
:
radial-gradient
(
#ffffff
00
,
#151212
)
;
background
:
#ffffff
1c
;
position
:
relative
;
position
:
relative
;
&
.extra
{
&
.extra
{
margin-inline
:
calc
(
var
(
--
block-width
)
/
2
+
var
(
--
col-gap
)
/
2
);
margin-inline
:
calc
(
var
(
--
block-width
)
/
2
+
var
(
--
col-gap
)
/
2
);
...
...
src/ui/Duel/PlayMat/Bg/index.tsx
View file @
c295640e
...
@@ -32,7 +32,7 @@ const BgBlock: React.FC<
...
@@ -32,7 +32,7 @@ const BgBlock: React.FC<
[
styles
.
glowing
]:
glowing
,
[
styles
.
glowing
]:
glowing
,
})
}
})
}
>
>
{
<
DecoTriangles
/>
}
{
/* {<DecoTriangles />} */
}
{
<
DisabledCross
disabled=
{
disabled
}
/>
}
{
<
DisabledCross
disabled=
{
disabled
}
/>
}
</
div
>
</
div
>
);
);
...
...
src/ui/Duel/PlayMat/Mat/index.module.scss
View file @
c295640e
...
@@ -5,8 +5,11 @@ body {
...
@@ -5,8 +5,11 @@ body {
}
}
section
.mat
{
section
.mat
{
position
:
relative
;
position
:
absolute
;
width
:
"100%"
;
width
:
100%
;
left
:
0
;
top
:
0
;
height
:
100%
;
.camera
{
.camera
{
height
:
100%
;
height
:
100%
;
display
:
flex
;
display
:
flex
;
...
...
src/ui/Layout/index.tsx
View file @
c295640e
...
@@ -56,7 +56,7 @@ export const Component = () => {
...
@@ -56,7 +56,7 @@ export const Component = () => {
const
logined
=
Boolean
(
useSnapshot
(
accountStore
).
user
);
const
logined
=
Boolean
(
useSnapshot
(
accountStore
).
user
);
const
{
pathname
}
=
useLocation
();
const
{
pathname
}
=
useLocation
();
const
pathnamesHideHeader
=
[
"
/waitroom
"
];
const
pathnamesHideHeader
=
[
"
/waitroom
"
,
"
/duel
"
];
return
(
return
(
<>
<>
{
!
pathnamesHideHeader
.
includes
(
pathname
)
&&
(
{
!
pathnamesHideHeader
.
includes
(
pathname
)
&&
(
...
...
src/ui/theme.ts
View file @
c295640e
...
@@ -10,6 +10,21 @@ export const theme: ThemeConfig = {
...
@@ -10,6 +10,21 @@ export const theme: ThemeConfig = {
},
},
Modal
:
{
Modal
:
{
colorBgElevated
:
"
#1f242c
"
,
colorBgElevated
:
"
#1f242c
"
,
paddingMD
:
24
,
paddingContentHorizontalLG
:
48
,
},
Select
:
{
colorBgElevated
:
"
hsla(0, 0%, 20%, 0.3)
"
,
controlItemBgActive
:
"
#79797955
"
,
colorBorder
:
"
transparent
"
,
colorBgContainer
:
"
hsla(0, 0%, 100%, 0.05)
"
,
colorPrimaryHover
:
"
#3400d1
"
,
lineWidth
:
0
,
},
InputNumber
:
{
colorBorder
:
"
transparent
"
,
lineWidth
:
0
,
colorBgContainer
:
"
hsla(0, 0%, 100%, 0.05)
"
,
},
},
},
},
};
};
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