Commit d6372030 authored by Chunchi Che's avatar Chunchi Che

Merge branch 'fix/ts-check' into 'main'

Fix Typescript CI

See merge request !344
parents c65739fa 803df485
import { easings } from "@react-spring/web";
import { ygopro } from "@/api";
import { isMe } from "@/stores";
import { matConfig } from "@/ui/Shared";
......
......@@ -22,10 +22,10 @@ export const moveToOutside: MoveFunc = async (props) => {
const { zone, controller, position, sequence } = card.location;
let x =
BLOCK_WIDTH * 2.5 +
COL_GAP * 2 +
BLOCK_OUTSIDE_OFFSET_X +
CARD_HEIGHT_O * CARD_RATIO * 0.5,
BLOCK_WIDTH * 2.5 +
COL_GAP * 2 +
BLOCK_OUTSIDE_OFFSET_X +
CARD_HEIGHT_O * CARD_RATIO * 0.5,
y = ROW_GAP + BLOCK_HEIGHT_M + (BLOCK_HEIGHT_M - CARD_HEIGHT_O) / 2;
if (zone === REMOVED) y -= ROW_GAP + CARD_HEIGHT_O;
if (!isMe(controller)) {
......@@ -35,7 +35,7 @@ export const moveToOutside: MoveFunc = async (props) => {
api.set({
z: 0,
subZ: 100,
})
});
await asyncStart(api)({
x,
y,
......
......@@ -22,11 +22,11 @@ export interface SpringApiProps {
subZ: number; // 0 -> 100,这是为了让卡片移动过程中,稍微上浮一些,避免一些奇怪的遮挡问题
config?: Partial<{
mass: number,
tension: number,
friction: number,
clamp: boolean
}>
mass: number;
tension: number;
friction: number;
clamp: boolean;
}>;
}
export type SpringApi = SpringRef<SpringApiProps>;
......@@ -44,7 +44,7 @@ export type MoveFunc = OptionsToFunc<MoveOptions>;
export type AttackOptions =
| {
directAttack: true;
}
directAttack: true;
}
| { directAttack: false; target: ygopro.CardLocation };
export type AttackFunc = OptionsToFunc<AttackOptions>;
import classNames from "classnames";
import { CSSProperties, useMemo, useEffect, useState } from "react";
import { CSSProperties, useEffect, useState } from "react";
import { useConfig } from "@/config";
import { isSuperReleaseCard } from "@/superPreRelease";
......
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