Commit 76de28e9 authored by Chunchi Che's avatar Chunchi Che

Merge branch 'optimize/ui/interaction' into 'main'

remove placeInteractivities from CardType

See merge request !367
parents ece428fa 218c4c7b
Pipeline #26985 passed with stages
in 11 minutes and 49 seconds
...@@ -14,11 +14,6 @@ export interface CardType { ...@@ -14,11 +14,6 @@ export interface CardType {
meta: CardMeta; // 卡片元数据 meta: CardMeta; // 卡片元数据
location: ygopro.CardLocation; location: ygopro.CardLocation;
idleInteractivities: Interactivity<number>[]; // IDLE状态下的互动信息 idleInteractivities: Interactivity<number>[]; // IDLE状态下的互动信息
placeInteractivity?: Interactivity<{
controller: number;
zone: ygopro.CardZone;
sequence: number;
}>; // 选择位置状态下的互动信息
counters: { [type: number]: number }; // 指示器 counters: { [type: number]: number }; // 指示器
isToken: boolean; // 是否是token isToken: boolean; // 是否是token
selected: boolean; // 当前卡是否被选择成为效果的对象 selected: boolean; // 当前卡是否被选择成为效果的对象
......
...@@ -96,6 +96,7 @@ export const SelectCardsModal: React.FC<SelectCardsModalProps> = ({ ...@@ -96,6 +96,7 @@ export const SelectCardsModal: React.FC<SelectCardsModalProps> = ({
setSelectedZone(zoneOptions[0]?.value); setSelectedZone(zoneOptions[0]?.value);
}, [selectables]); }, [selectables]);
// 文案
const [submitText, finishText, cancelText] = [1211, 1296, 1295].map((n) => const [submitText, finishText, cancelText] = [1211, 1296, 1295].map((n) =>
fetchStrings(Region.System, n), fetchStrings(Region.System, n),
); );
......
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