Commit f5d5a2cb authored by Chunchi Che's avatar Chunchi Che

Merge branch 'fix/feedback' into 'main'

修复玩家反馈的一些BUG

See merge request !294
parents a14c1573 f1d8b11a
Pipeline #23348 passed with stages
in 10 minutes and 49 seconds
...@@ -69,6 +69,17 @@ export default (data: Uint8Array) => { ...@@ -69,6 +69,17 @@ export default (data: Uint8Array) => {
} }
} }
if ((field & 0x2000) !== 0) {
// 场地魔法区
msg.places.push(
new MsgSelectPlace.SelectAblePlace({
controller,
zone: ygopro.CardZone.SZONE,
sequence: 5,
}),
);
}
if ((field & 0xc000) !== 0) { if ((field & 0xc000) !== 0) {
// 灵摆区? // 灵摆区?
const zone = ygopro.CardZone.SZONE; const zone = ygopro.CardZone.SZONE;
......
...@@ -71,7 +71,7 @@ export const displayCardListModal = ({ ...@@ -71,7 +71,7 @@ export const displayCardListModal = ({
controller, controller,
}: Partial<Omit<typeof defaultStore, "isOpen">>) => { }: Partial<Omit<typeof defaultStore, "isOpen">>) => {
store.isOpen = true; store.isOpen = true;
isZone && (store.isZone = isZone); store.isZone = isZone ?? false;
monster && (store.monster = monster); monster && (store.monster = monster);
zone && (store.zone = zone); zone && (store.zone = zone);
controller !== undefined && (store.controller = controller); controller !== undefined && (store.controller = controller);
......
...@@ -87,11 +87,20 @@ const BgOtherBlocks: React.FC<{ op?: boolean }> = ({ op }) => { ...@@ -87,11 +87,20 @@ const BgOtherBlocks: React.FC<{ op?: boolean }> = ({ op }) => {
const glowingExtra = judgeGlowing(ygopro.CardZone.EXTRA); const glowingExtra = judgeGlowing(ygopro.CardZone.EXTRA);
const glowingGraveyard = judgeGlowing(ygopro.CardZone.GRAVE); const glowingGraveyard = judgeGlowing(ygopro.CardZone.GRAVE);
const glowingBanish = judgeGlowing(ygopro.CardZone.REMOVED); const glowingBanish = judgeGlowing(ygopro.CardZone.REMOVED);
const snap = useSnapshot(placeStore.inner);
const field = op
? snap[ygopro.CardZone.SZONE].op[5]
: snap[ygopro.CardZone.SZONE].me[5];
return ( return (
<div className={classnames(styles["other-blocks"], { [styles.op]: op })}> <div className={classnames(styles["other-blocks"], { [styles.op]: op })}>
<BgBlock className={styles.banish} glowing={!op && glowingBanish} /> <BgBlock className={styles.banish} glowing={!op && glowingBanish} />
<BgBlock className={styles.graveyard} glowing={!op && glowingGraveyard} /> <BgBlock className={styles.graveyard} glowing={!op && glowingGraveyard} />
<BgBlock className={styles.field} /> <BgBlock
className={styles.field}
onClick={() => onBlockClick(field.interactivity)}
disabled={field.disabled}
highlight={!!field.interactivity}
/>
<BgBlock className={styles.deck} /> <BgBlock className={styles.deck} />
<BgBlock <BgBlock
className={classnames(styles.deck, styles["extra-deck"])} className={classnames(styles.deck, styles["extra-deck"])}
......
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