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
916a072b
Commit
916a072b
authored
Sep 27, 2023
by
Chunchi Che
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/something' into 'main'
修复灵摆卡组在额外卡组发动效果会卡死的问题 See merge request
!323
parents
72f777c1
27883b45
Pipeline
#23603
passed with stages
in 14 minutes and 43 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
13 deletions
+8
-13
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/newPhase.ts
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/newPhase.ts
+0
-9
src/stores/placeStore.ts
src/stores/placeStore.ts
+5
-1
src/ui/BuildDeck/Filter.tsx
src/ui/BuildDeck/Filter.tsx
+3
-3
No files found.
src/api/ocgcore/ocgAdapter/stoc/stocGameMsg/newPhase.ts
View file @
916a072b
...
...
@@ -19,7 +19,6 @@ export default (data: Uint8Array) => {
switch
(
phase
)
{
case
0x01
:
{
phaseType
=
ygopro
.
StocGameMessage
.
MsgNewPhase
.
PhaseType
.
DRAW
;
break
;
}
case
0x02
:
{
...
...
@@ -28,42 +27,34 @@ export default (data: Uint8Array) => {
}
case
0x04
:
{
phaseType
=
ygopro
.
StocGameMessage
.
MsgNewPhase
.
PhaseType
.
MAIN1
;
break
;
}
case
0x08
:
{
phaseType
=
ygopro
.
StocGameMessage
.
MsgNewPhase
.
PhaseType
.
BATTLE_START
;
break
;
}
case
0x10
:
{
phaseType
=
ygopro
.
StocGameMessage
.
MsgNewPhase
.
PhaseType
.
BATTLE_STEP
;
break
;
}
case
0x20
:
{
phaseType
=
ygopro
.
StocGameMessage
.
MsgNewPhase
.
PhaseType
.
DAMAGE
;
break
;
}
case
0x40
:
{
phaseType
=
ygopro
.
StocGameMessage
.
MsgNewPhase
.
PhaseType
.
DAMAGE_GAL
;
break
;
}
case
0x80
:
{
phaseType
=
ygopro
.
StocGameMessage
.
MsgNewPhase
.
PhaseType
.
BATTLE
;
break
;
}
case
0x100
:
{
phaseType
=
ygopro
.
StocGameMessage
.
MsgNewPhase
.
PhaseType
.
MAIN2
;
break
;
}
case
0x200
:
{
phaseType
=
ygopro
.
StocGameMessage
.
MsgNewPhase
.
PhaseType
.
END
;
break
;
}
default
:
{
...
...
src/stores/placeStore.ts
View file @
916a072b
...
...
@@ -15,7 +15,7 @@ export type PlaceInteractivity =
}
>
|
undefined
;
const
{
MZONE
,
SZONE
,
HAND
,
GRAVE
,
REMOVED
}
=
ygopro
.
CardZone
;
const
{
MZONE
,
SZONE
,
HAND
,
GRAVE
,
REMOVED
,
EXTRA
}
=
ygopro
.
CardZone
;
export
interface
BlockState
{
interactivity
?:
PlaceInteractivity
;
// 互动性
...
...
@@ -51,6 +51,10 @@ const initialState = {
me
:
genPLaces
(
100
),
op
:
genPLaces
(
100
),
},
[
EXTRA
]:
{
me
:
genPLaces
(
100
),
op
:
genPLaces
(
100
),
},
};
class
PlaceStore
implements
NeosStore
{
...
...
src/ui/BuildDeck/Filter.tsx
View file @
916a072b
...
...
@@ -23,9 +23,9 @@ const levels = Array.from({ length: 12 }, (_, index) => ({
label
:
(
index
+
1
).
toString
(),
}));
const
lscales
=
Array
.
from
({
length
:
1
2
},
(
_
,
index
)
=>
({
value
:
index
+
1
,
label
:
(
index
+
1
)
.
toString
(),
const
lscales
=
Array
.
from
({
length
:
1
4
},
(
_
,
index
)
=>
({
value
:
index
,
label
:
index
.
toString
(),
}));
export
const
Filter
:
React
.
FC
<
{
...
...
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