Commit 916a072b authored by Chunchi Che's avatar Chunchi Che

Merge branch 'fix/something' into 'main'

修复灵摆卡组在额外卡组发动效果会卡死的问题

See merge request !323
parents 72f777c1 27883b45
...@@ -19,7 +19,6 @@ export default (data: Uint8Array) => { ...@@ -19,7 +19,6 @@ export default (data: Uint8Array) => {
switch (phase) { switch (phase) {
case 0x01: { case 0x01: {
phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.DRAW; phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.DRAW;
break; break;
} }
case 0x02: { case 0x02: {
...@@ -28,42 +27,34 @@ export default (data: Uint8Array) => { ...@@ -28,42 +27,34 @@ export default (data: Uint8Array) => {
} }
case 0x04: { case 0x04: {
phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.MAIN1; phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.MAIN1;
break; break;
} }
case 0x08: { case 0x08: {
phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.BATTLE_START; phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.BATTLE_START;
break; break;
} }
case 0x10: { case 0x10: {
phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.BATTLE_STEP; phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.BATTLE_STEP;
break; break;
} }
case 0x20: { case 0x20: {
phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.DAMAGE; phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.DAMAGE;
break; break;
} }
case 0x40: { case 0x40: {
phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.DAMAGE_GAL; phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.DAMAGE_GAL;
break; break;
} }
case 0x80: { case 0x80: {
phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.BATTLE; phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.BATTLE;
break; break;
} }
case 0x100: { case 0x100: {
phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.MAIN2; phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.MAIN2;
break; break;
} }
case 0x200: { case 0x200: {
phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.END; phaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType.END;
break; break;
} }
default: { default: {
......
...@@ -15,7 +15,7 @@ export type PlaceInteractivity = ...@@ -15,7 +15,7 @@ export type PlaceInteractivity =
}> }>
| undefined; | undefined;
const { MZONE, SZONE, HAND, GRAVE, REMOVED } = ygopro.CardZone; const { MZONE, SZONE, HAND, GRAVE, REMOVED, EXTRA } = ygopro.CardZone;
export interface BlockState { export interface BlockState {
interactivity?: PlaceInteractivity; // 互动性 interactivity?: PlaceInteractivity; // 互动性
...@@ -51,6 +51,10 @@ const initialState = { ...@@ -51,6 +51,10 @@ const initialState = {
me: genPLaces(100), me: genPLaces(100),
op: genPLaces(100), op: genPLaces(100),
}, },
[EXTRA]: {
me: genPLaces(100),
op: genPLaces(100),
},
}; };
class PlaceStore implements NeosStore { class PlaceStore implements NeosStore {
......
...@@ -23,9 +23,9 @@ const levels = Array.from({ length: 12 }, (_, index) => ({ ...@@ -23,9 +23,9 @@ const levels = Array.from({ length: 12 }, (_, index) => ({
label: (index + 1).toString(), label: (index + 1).toString(),
})); }));
const lscales = Array.from({ length: 12 }, (_, index) => ({ const lscales = Array.from({ length: 14 }, (_, index) => ({
value: index + 1, value: index,
label: (index + 1).toString(), label: index.toString(),
})); }));
export const Filter: React.FC<{ export const Filter: React.FC<{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment