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
bc6b3a06
Commit
bc6b3a06
authored
Jan 19, 2023
by
chechunchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
dcd5406e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
6 deletions
+38
-6
src/reducers/duel/mod.ts
src/reducers/duel/mod.ts
+4
-0
src/reducers/duel/modal/checkCardModalV2Slice.ts
src/reducers/duel/modal/checkCardModalV2Slice.ts
+11
-0
src/reducers/duel/modal/mod.ts
src/reducers/duel/modal/mod.ts
+1
-0
src/service/duel/selectUnselectCard.ts
src/service/duel/selectUnselectCard.ts
+3
-0
src/ui/Duel/checkCardModalV2.tsx
src/ui/Duel/checkCardModalV2.tsx
+19
-6
No files found.
src/reducers/duel/mod.ts
View file @
bc6b3a06
...
...
@@ -51,6 +51,7 @@ import {
setCheckCardModalV2MinMaxImpl
,
setCheckCardModalV2FinishAbleImpl
,
resetCheckCardModalV2Impl
,
setCheckCardModalV2ResponseAbleImpl
,
}
from
"
./modal/mod
"
;
import
{
MonsterState
,
...
...
@@ -148,6 +149,7 @@ const initialState: DuelState = {
isOpen
:
false
,
cancelAble
:
false
,
finishAble
:
false
,
responseable
:
false
,
selectableOptions
:
[],
selectedOptions
:
[],
},
...
...
@@ -236,6 +238,7 @@ const duelSlice = createSlice({
setCheckCardModalV2CancelAble
:
setCheckCardModalV2CancelAbleImpl
,
setCheckCardModalV2IsOpen
:
setCheckCardModalV2IsOpenImpl
,
resetCheckCardModalV2
:
resetCheckCardModalV2Impl
,
setCheckCardModalV2ResponseAble
:
setCheckCardModalV2ResponseAbleImpl
,
},
extraReducers
(
builder
)
{
handsCase
(
builder
);
...
...
@@ -309,6 +312,7 @@ export const {
setCheckCardModalV2CancelAble
,
setCheckCardModalV2FinishAble
,
resetCheckCardModalV2
,
setCheckCardModalV2ResponseAble
,
}
=
duelSlice
.
actions
;
export
const
selectDuelHsStart
=
(
state
:
RootState
)
=>
{
return
state
.
duel
.
meInitInfo
!=
null
;
...
...
src/reducers/duel/modal/checkCardModalV2Slice.ts
View file @
bc6b3a06
...
...
@@ -41,6 +41,14 @@ export const setCheckCardModalV2FinishAbleImpl: DuelReducer<boolean> = (
state
.
modalState
.
checkCardModalV2
.
finishAble
=
action
.
payload
;
};
// 更新是否可以回应
export
const
setCheckCardModalV2ResponseAbleImpl
:
DuelReducer
<
boolean
>
=
(
state
,
action
)
=>
{
state
.
modalState
.
checkCardModalV2
.
responseable
=
action
.
payload
;
};
// 增加卡牌选项
export
const
fetchCheckCardMetasV2
=
createAsyncThunk
(
"
duel/fetchCheckCardMetaV2
"
,
...
...
@@ -100,6 +108,7 @@ export const resetCheckCardModalV2Impl: CaseReducer<DuelState> = (state) => {
modalState
.
isOpen
=
false
;
modalState
.
finishAble
=
false
;
modalState
.
cancelAble
=
false
;
modalState
.
responseable
=
false
;
modalState
.
selectableOptions
=
[];
modalState
.
selectedOptions
=
[];
};
...
...
@@ -116,6 +125,8 @@ export const selectCheckCardModalV2CancelAble = (state: RootState) =>
state
.
duel
.
modalState
.
checkCardModalV2
.
cancelAble
;
export
const
selectCheckCardModalV2FinishAble
=
(
state
:
RootState
)
=>
state
.
duel
.
modalState
.
checkCardModalV2
.
finishAble
;
export
const
selectCheckCardModalV2ResponseAble
=
(
state
:
RootState
)
=>
state
.
duel
.
modalState
.
checkCardModalV2
.
responseable
;
export
const
selectCheckCardModalV2SelectAbleOptions
=
(
state
:
RootState
)
=>
state
.
duel
.
modalState
.
checkCardModalV2
.
selectableOptions
;
export
const
selectCheckCardModalV2SelectedOptions
=
(
state
:
RootState
)
=>
...
...
src/reducers/duel/modal/mod.ts
View file @
bc6b3a06
...
...
@@ -59,6 +59,7 @@ export interface ModalState {
finishAble
:
boolean
;
selectMin
?:
number
;
selectMax
?:
number
;
responseable
:
boolean
;
selectableOptions
:
{
code
:
number
;
name
?:
string
;
...
...
src/service/duel/selectUnselectCard.ts
View file @
bc6b3a06
...
...
@@ -4,6 +4,7 @@ import {
setCheckCardModalV2FinishAble
,
setCheckCardModalV2IsOpen
,
setCheckCardModalV2MinMax
,
setCheckCardModalV2ResponseAble
,
}
from
"
../../reducers/duel/mod
"
;
import
{
fetchCheckCardMetasV2
}
from
"
../../reducers/duel/modal/checkCardModalV2Slice
"
;
import
{
AppDispatch
}
from
"
../../store
"
;
...
...
@@ -45,4 +46,6 @@ export default (
}),
})
);
dispatch
(
setCheckCardModalV2ResponseAble
(
true
));
};
src/ui/Duel/checkCardModalV2.tsx
View file @
bc6b3a06
...
...
@@ -8,6 +8,7 @@ import {
selectCheckCardModalV2FinishAble
,
selectCheckCardModalV2IsOpen
,
selectCheckCardModalV2MinMax
,
selectCheckCardModalV2ResponseAble
,
selectCheckCardModalV2SelectAbleOptions
,
selectCheckCardModalV2SelectedOptions
,
}
from
"
../../reducers/duel/modal/checkCardModalV2Slice
"
;
...
...
@@ -15,6 +16,7 @@ import { sendSelectUnselectCardResponse } from "../../api/ocgcore/ocgHelper";
import
{
resetCheckCardModalV2
,
setCheckCardModalV2IsOpen
,
setCheckCardModalV2ResponseAble
,
}
from
"
../../reducers/duel/mod
"
;
const
CheckCardModalV2
=
()
=>
{
...
...
@@ -27,16 +29,24 @@ const CheckCardModalV2 = () => {
selectCheckCardModalV2SelectAbleOptions
);
const
selectedOptions
=
useAppSelector
(
selectCheckCardModalV2SelectedOptions
);
const
responseable
=
useAppSelector
(
selectCheckCardModalV2ResponseAble
);
const
onFinish
=
()
=>
{
sendSelectUnselectCardResponse
({
cancel_or_finish
:
true
});
dispatch
(
setCheckCardModalV2IsOpen
(
false
));
dispatch
(
resetCheckCardModalV2
());
if
(
responseable
)
{
sendSelectUnselectCardResponse
({
cancel_or_finish
:
true
});
dispatch
(
setCheckCardModalV2IsOpen
(
false
));
dispatch
(
resetCheckCardModalV2
());
dispatch
(
setCheckCardModalV2ResponseAble
(
false
));
}
};
const
onCancel
=
()
=>
{
sendSelectUnselectCardResponse
({
cancel_or_finish
:
true
});
if
(
responseable
)
{
sendSelectUnselectCardResponse
({
cancel_or_finish
:
true
});
dispatch
(
setCheckCardModalV2ResponseAble
(
false
));
}
};
return
(
<
Modal
title=
{
`请选择未选择的卡片,最少${min}张,最多${max}张`
}
...
...
@@ -58,8 +68,11 @@ const CheckCardModalV2 = () => {
bordered
size=
"small"
onChange=
{
(
value
)
=>
{
// @ts-ignore
sendSelectUnselectCardResponse
({
selected_ptr
:
value
});
if
(
responseable
)
{
// @ts-ignore
sendSelectUnselectCardResponse
({
selected_ptr
:
value
});
dispatch
(
setCheckCardModalV2ResponseAble
(
false
));
}
}
}
>
{
selectableOptions
.
map
((
option
,
idx
)
=>
{
...
...
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