Merge branch 'fix/feedback' into 'main'

修复一些玩家反馈的Bug 02

See merge request mycard/Neos!295

src/common.ts

@@ -27,7 +27,7 @@ const TYPE_TOON = 0x400000; //
 const TYPE_XYZ = 0x800000; //
 const TYPE_PENDULUM = 0x1000000; //
 const TYPE_SPSUMMON = 0x2000000; //
-const TYPE_LINK = 0x4000000; //
+export const TYPE_LINK = 0x4000000; //
 
 /*
  * 在做卡牌信息展示的时候，发现`CardMeta`里面的数据和`strings.conf`配置文件

src/service/duel/selectEffectYn.ts

@@ -31,7 +31,10 @@ export default async (selectEffectYn: MsgSelectEffectYn) => {
 
   // TODO: 国际化文案
 
-  const desc = fetchStrings(Region.System, effect_description);
+  const desc = fetchStrings(
+    Region.System,
+    effect_description === 0 ? 200 : effect_description,
+  );
   const meta = fetchCard(code);
   await displayYesNoModal(textGenerator(desc, meta, location));
 };

src/ui/BuildDeck/CardDetail.tsx

@@ -101,7 +101,7 @@ export const CardDetail: React.FC<{
       }
     }
     return result;
-  }, [code]);
+  }, [card]);
 
   return (
     <div className={classNames(styles.detail, { [styles.open]: open })}>

src/ui/Duel/Message/CardModal/index.tsx

@@ -10,6 +10,7 @@ import {
   Attribute2StringCodeMap,
   extraCardTypes,
   Race2StringCodeMap,
+  TYPE_LINK,
   Type2StringCodeMap,
 } from "../../../../common";
 import { Desc } from "./Desc";
@@ -43,7 +44,7 @@ export const CardModal = () => {
   const { isOpen, meta, counters: _counters } = snap;
 
   const name = meta?.text.name;
-  const types = meta?.data.type;
+  const types = extraCardTypes(meta?.data.type ?? 0);
   const race = meta?.data.race;
   const attribute = meta?.data.attribute;
   const desc = meta?.text.desc;
@@ -75,12 +76,11 @@ export const CardModal = () => {
             style={{ borderRadius: 4 }}
           />
           <Space direction="vertical" className={styles.info}>
-            <AtkLine atk={atk} def={def} />
-            <AttLine
-              types={extraCardTypes(types || 0)}
-              race={race}
-              attribute={attribute}
+            <AtkLine
+              atk={atk}
+              def={types.includes(TYPE_LINK) ? undefined : def}
             />
+            <AttLine types={types} race={race} attribute={attribute} />
             {/* TODO: 只有怪兽卡需要展示攻击防御 */}
             {/* TODO: 展示星级/LINK数 */}
             {/* <CounterLine counters={counters} /> */}