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
c60f9a6f
Commit
c60f9a6f
authored
Apr 05, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
a6668f06
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
12 deletions
+18
-12
neos.config.json
neos.config.json
+2
-1
neos.config.prod.json
neos.config.prod.json
+2
-1
src/ui/Duel/checkCardModalV2.tsx
src/ui/Duel/checkCardModalV2.tsx
+9
-7
src/ui/Duel/hintNotification.tsx
src/ui/Duel/hintNotification.tsx
+5
-3
No files found.
neos.config.json
View file @
c60f9a6f
...
...
@@ -68,7 +68,8 @@
"opAvatarColor"
:
"#e10e68"
},
"hint"
:{
"waitingDuration"
:
1.5
"waitingDuration"
:
1.5
,
"maxCount"
:
3
}
},
"unimplementedWhiteList"
:[
...
...
neos.config.prod.json
View file @
c60f9a6f
...
...
@@ -68,7 +68,8 @@
"opAvatarColor"
:
"#e10e68"
},
"hint"
:{
"waitingDuration"
:
1.5
"waitingDuration"
:
1.5
,
"maxCount"
:
3
}
},
"unimplementedWhiteList"
:[
...
...
src/ui/Duel/checkCardModalV2.tsx
View file @
c60f9a6f
...
...
@@ -35,16 +35,12 @@ const CheckCardModalV2 = () => {
const
responseable
=
useAppSelector
(
selectCheckCardModalV2ResponseAble
);
const
selectHint
=
useAppSelector
(
selectMeHint
)?.
esSelectHint
||
"
请选择卡片
"
;
const
onFinish
=
()
=>
{
const
onFinish
OrCancel
=
()
=>
{
sendSelectUnselectCardResponse
({
cancel_or_finish
:
true
});
dispatch
(
setCheckCardModalV2IsOpen
(
false
));
dispatch
(
resetCheckCardModalV2
());
dispatch
(
setCheckCardModalV2ResponseAble
(
false
));
};
const
onCancel
=
()
=>
{
sendSelectUnselectCardResponse
({
cancel_or_finish
:
true
});
dispatch
(
setCheckCardModalV2ResponseAble
(
false
));
};
return
(
<
DragModal
...
...
@@ -53,10 +49,16 @@ const CheckCardModalV2 = () => {
closable=
{
false
}
footer=
{
<>
<
Button
disabled=
{
!
finishable
||
!
responseable
}
onClick=
{
onFinish
}
>
<
Button
disabled=
{
!
finishable
||
!
responseable
}
onClick=
{
onFinishOrCancel
}
>
finish
</
Button
>
<
Button
disabled=
{
!
cancelable
||
!
responseable
}
onClick=
{
onCancel
}
>
<
Button
disabled=
{
!
cancelable
||
!
responseable
}
onClick=
{
onFinishOrCancel
}
>
cancel
</
Button
>
</>
...
...
src/ui/Duel/hintNotification.tsx
View file @
c60f9a6f
...
...
@@ -17,7 +17,9 @@ const HintNotification = () => {
const
result
=
useAppSelector
(
selectDuelResult
);
const
navigate
=
useNavigate
();
const
[
api
,
contextHolder
]
=
notification
.
useNotification
();
const
[
api
,
contextHolder
]
=
notification
.
useNotification
({
maxCount
:
NeosConfig
.
ui
.
hint
.
maxCount
,
});
useEffect
(()
=>
{
if
(
meHint
&&
meHint
.
msg
)
{
api
.
info
({
...
...
@@ -25,7 +27,7 @@ const HintNotification = () => {
placement
:
"
bottom
"
,
});
}
},
[
meHint
]);
},
[
meHint
?.
msg
]);
useEffect
(()
=>
{
if
(
opHint
&&
opHint
.
msg
)
{
...
...
@@ -34,7 +36,7 @@ const HintNotification = () => {
placement
:
"
top
"
,
});
}
},
[
opHint
]);
},
[
opHint
?.
msg
]);
useEffect
(()
=>
{
if
(
currentPhase
)
{
...
...
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