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
a7c47579
Commit
a7c47579
authored
Jun 19, 2023
by
timel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: chaining(focus) animation
parent
b021dc99
Pipeline
#22302
failed with stages
in 1 minute and 34 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
100 additions
and
64 deletions
+100
-64
src/ui/Duel/Message/NewSelectActionModal/index.tsx
src/ui/Duel/Message/NewSelectActionModal/index.tsx
+5
-1
src/ui/Duel/PlayMat/Card/index.scss
src/ui/Duel/PlayMat/Card/index.scss
+26
-0
src/ui/Duel/PlayMat/Card/index.tsx
src/ui/Duel/PlayMat/Card/index.tsx
+54
-46
src/ui/Duel/PlayMat/Card/springs/focus.ts
src/ui/Duel/PlayMat/Card/springs/focus.ts
+6
-15
src/ui/Duel/PlayMat/Card/springs/types.ts
src/ui/Duel/PlayMat/Card/springs/types.ts
+9
-2
No files found.
src/ui/Duel/Message/NewSelectActionModal/index.tsx
View file @
a7c47579
...
...
@@ -102,6 +102,10 @@ export const NewSelectActionsModal: FC = () => {
const
[
selectedZone
,
setSelectedZone
]
=
useState
(
zoneOptions
[
0
]?.
value
);
useEffect
(()
=>
{
setSelectedZone
(
zoneOptions
[
0
]?.
value
);
},
[
selectables
]);
const
onSubmit
=
()
=>
{
const
values
=
mustSelects
.
concat
(
response
)
...
...
@@ -184,7 +188,7 @@ export const NewSelectActionsModal: FC = () => {
<
CheckCard
cover=
{
<
YgoCard
code=
{
card
.
meta
.
id
}
/>
}
style=
{
{
width
:
8
0
,
width
:
10
0
,
aspectRatio
:
5.9
/
8.6
,
marginInlineEnd
:
0
,
marginBlockEnd
:
0
,
...
...
src/ui/Duel/PlayMat/Card/index.scss
View file @
a7c47579
...
...
@@ -26,6 +26,9 @@ section#mat {
z-index
:
1
;
transform
:
translateZ
(
0
.5px
);
}
&
.focus
.card-cover
{
animation
:
focus
0
.6s
ease-in-out
;
}
.card-back
{
z-index
:
0
;
transform
:
translateZ
(
0px
);
...
...
@@ -40,9 +43,32 @@ section#mat {
// background-color: #0000005e;
// filter: blur(2px);
}
.card-focus
{
position
:
absolute
;
width
:
calc
(
100%
*
var
(
--
focus-scale
));
height
:
calc
(
100%
*
var
(
--
focus-scale
));
left
:
calc
((
var
(
--
focus-scale
)
-
1
)
*
-50%
);
top
:
calc
((
var
(
--
focus-scale
)
-
1
)
*
-50%
);
outline
:
3px
solid
#ddd
;
filter
:
blur
(
calc
(
2px
*
1
.3
*
var
(
--
focus-scale
)));
display
:
var
(
--
focus-display
);
opacity
:
var
(
--
focus-opacity
);
}
}
}
.highlight
{
box-shadow
:
0
0
10px
2px
#5db7ff
;
}
@keyframes
focus
{
0
%
{
filter
:
brightness
(
1
)
contrast
(
1
);
}
50
%
{
filter
:
brightness
(
1
.5
)
contrast
(
1
.1
);
}
100
%
{
filter
:
brightness
(
1
)
contrast
(
1
);
}
}
src/ui/Duel/PlayMat/Card/index.tsx
View file @
a7c47579
...
...
@@ -19,6 +19,7 @@ import {
moveToHand
,
moveToOutside
,
}
from
"
./springs
"
;
import
type
{
SpringApiProps
}
from
"
./springs/types
"
;
import
{
YgoCard
}
from
"
@/ui/Shared
"
;
...
...
@@ -31,16 +32,22 @@ export const Card: FC<{ idx: number }> = React.memo(({ idx }) => {
const
state
=
cardStore
.
inner
[
idx
];
const
snap
=
useSnapshot
(
state
);
const
[
styles
,
api
]
=
useSpring
(()
=>
({
x
:
0
,
y
:
0
,
z
:
0
,
rx
:
0
,
ry
:
0
,
rz
:
0
,
zIndex
:
0
,
height
:
0
,
}));
const
[
styles
,
api
]
=
useSpring
(
()
=>
({
x
:
0
,
y
:
0
,
z
:
0
,
rx
:
0
,
ry
:
0
,
rz
:
0
,
zIndex
:
0
,
height
:
0
,
focusScale
:
1
,
focusDisplay
:
"
none
"
,
focusOpacity
:
1
,
}
satisfies
SpringApiProps
)
);
const
move
=
async
(
zone
:
ygopro
.
CardZone
)
=>
{
switch
(
zone
)
{
...
...
@@ -72,6 +79,7 @@ export const Card: FC<{ idx: number }> = React.memo(({ idx }) => {
},
[]);
const
[
highlight
,
setHighlight
]
=
useState
(
false
);
const
[
classFocus
,
setClassFocus
]
=
useState
(
false
);
// const [shadowOpacity, setShadowOpacity] = useState(0); // TODO: 透明度
// >>> 动画 >>>
...
...
@@ -83,32 +91,39 @@ export const Card: FC<{ idx: number }> = React.memo(({ idx }) => {
animationQueue
=
animationQueue
.
then
(
p
).
then
(
rs
);
});
eventbus
.
register
(
Task
.
Move
,
async
(
uuid
:
string
)
=>
{
if
(
uuid
===
state
.
uuid
)
{
await
addToAnimation
(()
=>
move
(
state
.
location
.
zone
));
}
});
useEffect
(()
=>
{
eventbus
.
register
(
Task
.
Move
,
async
(
uuid
:
string
)
=>
{
if
(
uuid
===
state
.
uuid
)
{
await
addToAnimation
(()
=>
move
(
state
.
location
.
zone
));
}
});
eventbus
.
register
(
Task
.
Focus
,
async
(
uuid
:
string
)
=>
{
if
(
uuid
===
state
.
uuid
)
{
await
addToAnimation
(()
=>
focus
({
card
:
state
,
api
}));
}
});
eventbus
.
register
(
Task
.
Attack
,
async
(
uuid
:
string
,
directAttack
:
boolean
,
target
?:
ygopro
.
CardLocation
)
=>
{
eventbus
.
register
(
Task
.
Focus
,
async
(
uuid
:
string
)
=>
{
if
(
uuid
===
state
.
uuid
)
{
await
addToAnimation
(()
=>
attack
({
card
:
state
,
api
,
target
,
directAttack
})
);
await
addToAnimation
(
async
()
=>
{
setClassFocus
(
true
);
setTimeout
(()
=>
setClassFocus
(
false
),
1000
);
await
focus
({
card
:
state
,
api
});
});
}
}
);
});
eventbus
.
register
(
Task
.
Attack
,
async
(
uuid
:
string
,
directAttack
:
boolean
,
target
?:
ygopro
.
CardLocation
)
=>
{
if
(
uuid
===
state
.
uuid
)
{
await
addToAnimation
(()
=>
attack
({
card
:
state
,
api
,
target
,
directAttack
})
);
}
}
);
},
[]);
// <<< 动画 <<<
const
idleInteractivities
=
snap
.
idleInteractivities
;
...
...
@@ -130,6 +145,9 @@ export const Card: FC<{ idx: number }> = React.memo(({ idx }) => {
"
--ry
"
:
styles
.
ry
,
height
:
styles
.
height
,
zIndex
:
styles
.
zIndex
,
"
--focus-scale
"
:
styles
.
focusScale
,
"
--focus-display
"
:
styles
.
focusDisplay
,
"
--focus-opacity
"
:
styles
.
focusOpacity
,
}
as
any
as
CSSProperties
}
onClick=
{
()
=>
{
...
...
@@ -140,10 +158,11 @@ export const Card: FC<{ idx: number }> = React.memo(({ idx }) => {
}
}
}
>
<
div
className=
"card-focus"
/>
<
div
className=
"card-shadow"
/>
<
div
className=
"card-img-wrap"
>
<
div
className=
{
classnames
(
"
card-img-wrap
"
,
{
focus
:
classFocus
})
}
>
<
YgoCard
className=
"card-cover"
className=
{
classnames
(
"
card-cover
"
)
}
code=
{
snap
.
code
===
0
?
snap
.
meta
.
id
:
snap
.
code
}
/>
<
YgoCard
className=
"card-back"
isBack
/>
...
...
@@ -152,17 +171,6 @@ export const Card: FC<{ idx: number }> = React.memo(({ idx }) => {
);
});
function
getCardImgUrl
(
code
:
number
,
back
=
false
)
{
const
ASSETS_BASE
=
import
.
meta
.
env
.
BASE_URL
==
"
/
"
?
NeosConfig
.
assetsPath
:
import
.
meta
.
env
.
BASE_URL
+
NeosConfig
.
assetsPath
;
if
(
code
===
0
||
back
)
{
return
ASSETS_BASE
+
"
/card_back.jpg
"
;
}
return
NeosConfig
.
cardImgUrl
+
"
/
"
+
code
+
"
.jpg
"
;
}
const
onCardClick
=
(
card
:
CardType
)
=>
{
// 中央弹窗展示选中卡牌信息
messageStore
.
cardModal
.
meta
=
{
...
...
src/ui/Duel/PlayMat/Card/springs/focus.ts
View file @
a7c47579
...
...
@@ -9,19 +9,10 @@ import { asyncStart } from "./utils";
/** 发动效果的动画 */
export
const
focus
=
async
(
props
:
{
card
:
CardType
;
api
:
SpringApi
})
=>
{
const
{
card
,
api
}
=
props
;
const
current
=
api
.
current
[
0
].
get
();
if
(
card
.
location
.
zone
==
ygopro
.
CardZone
.
HAND
||
card
.
location
.
zone
==
ygopro
.
CardZone
.
DECK
)
{
await
asyncStart
(
api
)({
y
:
current
.
y
+
(
matStore
.
isMe
(
card
.
location
.
controller
)
?
-
1
:
1
)
*
200
,
// TODO: 放到config之中
ry
:
0
,
rz
:
0
,
});
await
asyncStart
(
api
)({
y
:
current
.
y
,
ry
:
current
.
ry
,
rz
:
current
.
rz
});
}
else
{
await
asyncStart
(
api
)({
z
:
200
,
config
:
config
.
gentle
});
await
asyncStart
(
api
)({
z
:
current
.
z
,
config
:
config
.
default
});
}
await
asyncStart
(
api
)({
focusScale
:
1.5
,
focusDisplay
:
"
block
"
,
focusOpacity
:
0
,
});
api
.
set
({
focusScale
:
1
,
focusOpacity
:
1
,
focusDisplay
:
"
none
"
});
};
src/ui/Duel/PlayMat/Card/springs/types.ts
View file @
a7c47579
import
{
type
SpringRef
}
from
"
@react-spring/web
"
;
export
type
SpringApi
=
SpringRef
<
{
export
type
SpringApi
Props
=
{
x
:
number
;
y
:
number
;
z
:
number
;
...
...
@@ -9,4 +9,11 @@ export type SpringApi = SpringRef<{
rz
:
number
;
zIndex
:
number
;
height
:
number
;
}
>
;
// >>> focus
focusScale
:
number
;
focusDisplay
:
string
;
focusOpacity
:
number
;
// <<< focus
};
export
type
SpringApi
=
SpringRef
<
SpringApiProps
>
;
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