Merge branch 'fix/select_option' into 'main'

fix selectOption service

See merge request !300

src/api/strings.ts

@@ -29,13 +29,13 @@ export function fetchStrings(region: Region, id: string | number): string {
   return localStorage.getItem(`${region}_${id}`) || "";
 }
 
-export async function getStrings(description: number): Promise<string> {
+export function getStrings(description: number): string {
   if (description < DESCRIPTION_LIMIT) {
     return fetchStrings(Region.System, description);
   } else {
     const code = description >> 4;
     const index = description & 0xf;
 
-    return getCardStr(fetchCard(code), index) || "";
+    return getCardStr(fetchCard(code), index) ?? "[?]";
   }
 }

src/service/duel/hint.ts

@@ -18,7 +18,7 @@ export default async (hint: MsgHint) => {
       break;
     }
     case MsgHint.HintType.HINT_SELECTMSG: {
-      await fetchSelectHintMeta({
+      fetchSelectHintMeta({
         selectHintData: hint.hint_data,
         esHint: "",
       });

src/service/duel/selectChain.ts

@@ -67,7 +67,7 @@ export default async (selectChain: MsgSelectChain) => {
     case 2: // 处理多张
     case 3: {
       // 处理强制发动的卡
-      await fetchSelectHintMeta({
+      fetchSelectHintMeta({
         selectHintData: 203,
       });
       const { selecteds, mustSelects, selectables } = await fetchCheckCardMeta(

src/service/duel/selectOption.ts

-import {
-  fetchCard,
-  fetchStrings,
-  getCardStr,
-  Region,
-  type ygopro,
-} from "@/api";
+import { fetchStrings, getStrings, Region, type ygopro } from "@/api";
 import { displayOptionModal } from "@/ui/Duel/Message";
 
 export default async (selectOption: ygopro.StocGameMessage.MsgSelectOption) => {
   const options = selectOption.options;
   await displayOptionModal(
     fetchStrings(Region.System, 556),
-    await Promise.all(
-      options.map(async ({ code, response }) => {
-        const meta = fetchCard(code >> 4);
-        const info = getCardStr(meta, code & 0xf) ?? "[?]";
-        return { info, response };
-      }),
-    ),
+    options.map(({ code, response }) => ({
+      info: getStrings(code),
+      response,
+    })),
     1,
   );
 };

src/service/duel/selectYesNo.ts

@@ -7,6 +7,6 @@ export default async (selectYesNo: MsgSelectYesNo) => {
   const _player = selectYesNo.player;
   const effect_description = selectYesNo.effect_description;
 
-  const msg = await getStrings(effect_description);
+  const msg = getStrings(effect_description);
   await displayYesNoModal(msg);
 };

src/stores/matStore/methods/fetchHint.ts

@@ -10,7 +10,7 @@ export const fetchCommonHintMeta = (code: number) => {
   matStore.hint.msg = fetchStrings(Region.System, code);
 };
 
-export const fetchSelectHintMeta = async ({
+export const fetchSelectHintMeta = ({
   selectHintData,
   esHint,
 }: {
@@ -26,7 +26,7 @@ export const fetchSelectHintMeta = async ({
       cardMeta.text.name || "[?]",
     );
   } else {
-    selectHintMeta = await getStrings(selectHintData);
+    selectHintMeta = getStrings(selectHintData);
   }
 
   matStore.hint.code = selectHintData;