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
bc8d435b
Commit
bc8d435b
authored
Jul 30, 2023
by
timel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 暂时微调样式
parent
874b53b5
Pipeline
#22854
failed with stages
in 11 minutes and 29 seconds
Changes
7
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
36 additions
and
58 deletions
+36
-58
src/ui/Duel/PlayMat/Card/index.tsx
src/ui/Duel/PlayMat/Card/index.tsx
+10
-7
src/ui/Duel/utils/interactTypeToString.ts
src/ui/Duel/utils/interactTypeToString.ts
+8
-16
src/ui/Home/index.module.scss
src/ui/Home/index.module.scss
+12
-21
src/ui/Home/index.tsx
src/ui/Home/index.tsx
+0
-7
src/ui/Layout/index.tsx
src/ui/Layout/index.tsx
+1
-1
src/ui/SSO/index.module.scss
src/ui/SSO/index.module.scss
+3
-1
src/ui/SSO/index.tsx
src/ui/SSO/index.tsx
+2
-5
No files found.
src/ui/Duel/PlayMat/Card/index.tsx
View file @
bc8d435b
...
...
@@ -225,9 +225,9 @@ export const Card: React.FC<{ idx: number }> = React.memo(({ idx }) => {
);
},
};
const
items
=
[...
nonEffectItem
];
hasEffect
&&
items
.
push
(
effectItem
);
setDropdownMenu
({
items
});
setDropdownMenu
({
items
:
[...
nonEffectItem
,
...(
hasEffect
?
[
effectItem
]
:
[])],
});
}
;
const onClick = () =
>
{
...
...
@@ -358,10 +358,13 @@ const handleEffectActivation = (
//
<
<<
下拉菜单
<<<
const
call
=
<
Options
,
>
(task: Task) =
>
(uuid: string, options?: Options extends
{}
? Options : never) =
>
eventbus.call(task, uuid, options);
type
CallReturn
<
Options
>
= Options extends
{}
? (uuid: string, options?: Options) =
>
Promise
<
void
>
: (uuid: string) =
>
Promise
<
void
>
;
const call =
<
Options
,
>
(task: Task): CallReturn
<
Options
>
=
>
((uuid: string, options?: Options) =
>
eventbus.call(task, uuid, options)) as any;
export const callCardMove = call
<
MoveOptions
>
(Task.Move);
export const callCardFocus = call(Task.Focus);
...
...
src/ui/Duel/utils/interactTypeToString.ts
View file @
bc8d435b
...
...
@@ -2,29 +2,21 @@ import { InteractType } from "@/stores";
export
function
interactTypeToString
(
t
:
InteractType
):
string
{
switch
(
t
)
{
case
InteractType
.
SUMMON
:
{
case
InteractType
.
SUMMON
:
return
"
普通召唤
"
;
}
case
InteractType
.
SP_SUMMON
:
{
case
InteractType
.
SP_SUMMON
:
return
"
特殊召唤
"
;
}
case
InteractType
.
POS_CHANGE
:
{
case
InteractType
.
POS_CHANGE
:
return
"
改变表示形式
"
;
}
case
InteractType
.
MSET
:
{
case
InteractType
.
MSET
:
return
"
前场放置
"
;
}
case
InteractType
.
SSET
:
{
case
InteractType
.
SSET
:
return
"
后场放置
"
;
}
case
InteractType
.
ACTIVATE
:
{
case
InteractType
.
ACTIVATE
:
return
"
发动效果
"
;
}
case
InteractType
.
ATTACK
:
{
case
InteractType
.
ATTACK
:
return
"
攻击
"
;
}
default
:
{
default
:
return
"
未知选项
"
;
}
}
}
src/ui/Home/index.module.scss
View file @
bc8d435b
.account-header
{
position
:
relative
;
z-index
:
200
;
top
:
0
;
left
:
0
;
background
:
#28272d
99
;
border-bottom
:
1px
solid
rgba
(
150
,
150
,
150
,
.2
);
border-bottom
:
1px
solid
rgba
(
150
,
150
,
150
,
0
.2
);
width
:
100%
;
height
:
40px
;
height
:
0
;
.header-user
{
position
:
absolute
;
...
...
@@ -16,7 +13,7 @@
align-items
:
center
;
img
{
margin
:
0
.5rem
;
margin
:
0
0
.5rem
;
}
.header-user-btn
{
...
...
@@ -24,23 +21,16 @@
}
.sep
{
margin
:
0
.8rem
;
margin
:
0
0
.8rem
;
}
}
}
.account-header
>
div
:first-child
{
display
:
inline-block
;
position
:
absolute
;
left
:
2%
;
top
:
0
;
}
.container
{
position
:
relative
;
display
:
flex
;
width
:
100%
;
height
:
95vh
;
height
:
calc
(
100vh
-
48px
)
;
align-items
:
center
;
.bg
{
...
...
@@ -48,7 +38,7 @@
height
:
100%
;
background
:
url(/neos-assets/home-background.png)
;
background-size
:
cover
;
opacity
:
.2
;
opacity
:
0
.2
;
}
.box
{
...
...
@@ -61,9 +51,9 @@
top
:
50%
;
transform
:
translate
(
-50%
,
-50%
);
background
:
#333b51
;
opacity
:
.8
;
opacity
:
0
.8
;
border-radius
:
1
.2em
;
box-shadow
:
0
2px
10px
-5px
rgba
(
9
,
2
,
4
,
.
8
);
box-shadow
:
0
2px
10px
-5px
rgba
(
9
,
2
,
4
,
0
.8
);
align-items
:
center
;
p
{
...
...
@@ -74,10 +64,11 @@
font-size
:
1
.2em
;
width
:
350px
;
height
:
45px
;
margin
:
.5em
;
margin
:
0
.5em
;
background-color
:
#2c2c2c
;
border-width
:
.3em
;
border-width
:
0
.3em
;
border-image
:
url(/neos-assets/border.webp)
10
;
color
:
white
;
}
button
:hover
{
...
...
src/ui/Home/index.tsx
View file @
bc8d435b
...
...
@@ -54,13 +54,6 @@ const Home: React.FC = () => {
return
(
<>
<
div
className=
{
styles
[
"
account-header
"
]
}
>
<
div
>
<
img
src=
{
`${NeosConfig.assetsPath}/neos-logo.svg`
}
alt=
"NEOS"
height=
{
80
}
/>
</
div
>
<
div
className=
{
styles
[
"
header-user
"
]
}
>
<
img
src=
{
...
...
src/ui/Layout/index.tsx
View file @
bc8d435b
...
...
@@ -19,7 +19,7 @@ export const NeosLayout = () => {
<
NavLink
to=
"/match"
>
匹配
</
NavLink
>
<
NavLink
to=
"/build"
>
组卡
</
NavLink
>
<
span
style=
{
{
flexGrow
:
1
}
}
/>
<
NavLink
to=
"/home"
>
我的
</
NavLink
>
<
NavLink
to=
"/home"
>
个人中心
</
NavLink
>
</
nav
>
<
Outlet
/>
</>
...
...
src/ui/SSO/index.module.scss
View file @
bc8d435b
.hint
{
font-size
:
20px
;
font-family
:
"Gill Sans"
,
sans-serif
;
text-shadow
:
#FC0
1px
0
10px
;
color
:
white
;
text-align
:
center
;
margin-top
:
100px
;
}
src/ui/SSO/index.tsx
View file @
bc8d435b
...
...
@@ -20,7 +20,6 @@ const SSO: React.FC = () => {
useEffect
(()
=>
{
if
(
!
sso
)
{
const
ssoUrl
=
getSSOUrl
(
location
.
href
);
window
.
location
.
href
=
ssoUrl
;
}
...
...
@@ -32,10 +31,8 @@ const SSO: React.FC = () => {
},
[]);
return
(
<
div
>
<
p
className=
{
styles
.
hint
}
>
{
logined
?
"
登录成功,正在跳转。。
"
:
"
登录萌卡账号中。。。
"
}
</
p
>
<
div
className=
{
styles
.
hint
}
>
{
logined
?
"
登录成功,正在跳转......
"
:
"
登录萌卡账号中......
"
}
</
div
>
);
};
...
...
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