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
55f024c3
Commit
55f024c3
authored
Jan 17, 2023
by
chechunchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update ui
parent
b8ee8490
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
57 additions
and
19 deletions
+57
-19
src/reducers/duel/phaseSlice.ts
src/reducers/duel/phaseSlice.ts
+2
-0
src/ui/Duel/monsters.tsx
src/ui/Duel/monsters.tsx
+0
-13
src/ui/Duel/phase.tsx
src/ui/Duel/phase.tsx
+55
-6
No files found.
src/reducers/duel/phaseSlice.ts
View file @
55f024c3
...
@@ -55,5 +55,7 @@ export const selectCurrentPhase = (state: RootState) =>
...
@@ -55,5 +55,7 @@ export const selectCurrentPhase = (state: RootState) =>
state
.
duel
.
phase
?.
currentPhase
;
state
.
duel
.
phase
?.
currentPhase
;
export
const
selectEnableBp
=
(
state
:
RootState
)
=>
export
const
selectEnableBp
=
(
state
:
RootState
)
=>
state
.
duel
.
phase
?.
enableBp
||
false
;
state
.
duel
.
phase
?.
enableBp
||
false
;
export
const
selectEnableM2
=
(
state
:
RootState
)
=>
state
.
duel
.
phase
?.
enableBp
||
false
;
export
const
selectEnableEp
=
(
state
:
RootState
)
=>
export
const
selectEnableEp
=
(
state
:
RootState
)
=>
state
.
duel
.
phase
?.
enableEp
||
false
;
state
.
duel
.
phase
?.
enableEp
||
false
;
src/ui/Duel/monsters.tsx
View file @
55f024c3
...
@@ -54,19 +54,6 @@ const Monsters = () => {
...
@@ -54,19 +54,6 @@ const Monsters = () => {
}
}
)
}
)
}
<
ExtraMonsters
/>
<
ExtraMonsters
/>
<
adtFullscreenUi
name=
"ui"
>
<
rectangle
name=
"rect"
height=
"20px"
width=
"60px"
>
<
babylon
-
button
name=
"close-icon"
>
<
textBlock
text=
"bp"
fontFamily=
"FontAwesome"
fontStyle=
"bold"
fontSize=
{
15
}
color=
"white"
/>
</
babylon
-
button
>
</
rectangle
>
</
adtFullscreenUi
>
<
ExtraMonsters
/>
<
ExtraMonsters
/>
</>
</>
);
);
...
...
src/ui/Duel/phase.tsx
View file @
55f024c3
import
React
from
"
react
"
;
import
React
from
"
react
"
;
import
{
store
}
from
"
../../store
"
;
import
{
store
}
from
"
../../store
"
;
import
{
useAppSelector
}
from
"
../../hook
"
;
import
{
useAppSelector
}
from
"
../../hook
"
;
import
{
selectEnableBp
,
selectEnableEp
}
from
"
../../reducers/duel/phaseSlice
"
;
import
{
import
{
sendSelectIdleCmdResponse
}
from
"
../../api/ocgcore/ocgHelper
"
;
selectCurrentPhase
,
selectEnableBp
,
selectEnableEp
,
selectEnableM2
,
}
from
"
../../reducers/duel/phaseSlice
"
;
import
{
sendSelectBattleCmdResponse
,
sendSelectIdleCmdResponse
,
}
from
"
../../api/ocgcore/ocgHelper
"
;
import
{
import
{
clearFieldIdleInteractivities
,
clearFieldIdleInteractivities
,
clearHandsIdleInteractivity
,
clearHandsIdleInteractivity
,
...
@@ -10,6 +18,7 @@ import {
...
@@ -10,6 +18,7 @@ import {
clearMonsterIdleInteractivities
,
clearMonsterIdleInteractivities
,
setEnableBp
,
setEnableBp
,
setEnableEp
,
setEnableEp
,
setEnableM2
,
}
from
"
../../reducers/duel/mod
"
;
}
from
"
../../reducers/duel/mod
"
;
import
{
Button2D
}
from
"
./2d
"
;
import
{
Button2D
}
from
"
./2d
"
;
...
@@ -31,13 +40,45 @@ const Bp = () => {
...
@@ -31,13 +40,45 @@ const Bp = () => {
dispatch
(
setEnableBp
(
false
));
dispatch
(
setEnableBp
(
false
));
};
};
return
<
Button2D
text=
"bp"
left=
{
0
}
enable=
{
enable
}
onClick=
{
onClick
}
/>;
return
<
Button2D
text=
"bp"
left=
{
-
200
}
enable=
{
enable
}
onClick=
{
onClick
}
/>;
};
const
M2
=
()
=>
{
const
dispatch
=
store
.
dispatch
;
const
enable
=
useAppSelector
(
selectEnableM2
);
const
onClick
=
()
=>
{
// 清除一堆东西的互动性
dispatch
(
clearHandsIdleInteractivity
(
0
));
dispatch
(
clearHandsIdleInteractivity
(
1
));
dispatch
(
clearMonsterIdleInteractivities
(
0
));
dispatch
(
clearMonsterIdleInteractivities
(
1
));
dispatch
(
clearMagicIdleInteractivities
(
0
));
dispatch
(
clearMagicIdleInteractivities
(
1
));
dispatch
(
clearFieldIdleInteractivities
(
0
));
dispatch
(
clearFieldIdleInteractivities
(
1
));
sendSelectBattleCmdResponse
(
2
);
dispatch
(
setEnableM2
(
false
));
};
return
<
Button2D
text=
"m2"
left=
{
0
}
enable=
{
enable
}
onClick=
{
onClick
}
/>;
};
};
const
Ep
=
()
=>
{
const
Ep
=
()
=>
{
const
dispatch
=
store
.
dispatch
;
const
dispatch
=
store
.
dispatch
;
const
enable
=
useAppSelector
(
selectEnableEp
);
const
enable
=
useAppSelector
(
selectEnableEp
);
const
onClick
=
()
=>
{
const
currentPhase
=
useAppSelector
(
selectCurrentPhase
);
const
response
=
currentPhase
===
"
BATTLE_START
"
||
currentPhase
===
"
BATTLE_STEP
"
||
currentPhase
===
"
DAMAGE
"
||
currentPhase
===
"
DAMAGE_GAL
"
||
currentPhase
===
"
BATTLE
"
?
3
:
7
;
const
onClick
=
(
response
:
number
)
=>
()
=>
{
// 清除一堆东西的互动性
// 清除一堆东西的互动性
dispatch
(
clearHandsIdleInteractivity
(
0
));
dispatch
(
clearHandsIdleInteractivity
(
0
));
dispatch
(
clearHandsIdleInteractivity
(
1
));
dispatch
(
clearHandsIdleInteractivity
(
1
));
...
@@ -48,16 +89,24 @@ const Ep = () => {
...
@@ -48,16 +89,24 @@ const Ep = () => {
dispatch
(
clearFieldIdleInteractivities
(
0
));
dispatch
(
clearFieldIdleInteractivities
(
0
));
dispatch
(
clearFieldIdleInteractivities
(
1
));
dispatch
(
clearFieldIdleInteractivities
(
1
));
sendSelectIdleCmdResponse
(
7
);
sendSelectIdleCmdResponse
(
response
);
dispatch
(
setEnableEp
(
false
));
dispatch
(
setEnableEp
(
false
));
};
};
return
<
Button2D
text=
"ep"
left=
{
200
}
enable=
{
enable
}
onClick=
{
onClick
}
/>;
return
(
<
Button2D
text=
"ep"
left=
{
200
}
enable=
{
enable
}
onClick=
{
onClick
(
response
)
}
/>
);
};
};
const
Phase
=
()
=>
(
const
Phase
=
()
=>
(
<>
<>
<
Bp
/>
<
Bp
/>
<
M2
/>
<
Ep
/>
<
Ep
/>
</>
</>
);
);
...
...
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