update

src/reducers/duel/hintSlice.ts

@@ -64,7 +64,7 @@ export const fetchEsHintMeta = createAsyncThunk(
     const location = param.location;
 
     if (param.cardID) {
-      const cardMeta = await fetchCard(param.cardID);
+      const cardMeta = await fetchCard(param.cardID, true);
 
       return { originMsg, cardMeta, location };
     } else {

src/service/duel/hint.ts

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

src/service/duel/spSummoned.ts

@@ -6,5 +6,5 @@ export default (
   _: ygopro.StocGameMessage.MsgSpSummoned,
   dispatch: AppDispatch
 ) => {
-  dispatch(fetchEsHintMeta({ originMsg: 1604 }));
+  dispatch(fetchEsHintMeta({ originMsg: 1606 }));
 };

src/ui/Duel/checkCardModal.tsx

@@ -34,8 +34,9 @@ const CheckCardModal = () => {
   const cancelResponse = useAppSelector(selectCheckCardModalCacnelResponse);
   const [response, setResponse] = useState<number[]>([]);
   const defaultValue: number[] = [];
-  const selectHintMsg =
-    useAppSelector(selectHint)?.esSelectHint || "请选择卡片";
+  const hint = useAppSelector(selectHint);
+  const preHintMsg = hint?.esHint || "";
+  const selectHintMsg = hint?.esSelectHint || "请选择卡片";
 
   // TODO: 这里可以考虑更好地封装
   const sendResponseHandler = (
@@ -58,7 +59,7 @@ const CheckCardModal = () => {
 
   return (
     <DragModal
-      title={`${selectHintMsg} ${min}-${max}`}
+      title={`${preHintMsg} ${selectHintMsg} ${min}-${max}`}
       open={isOpen}
       closable={false}
       footer={

src/ui/Duel/checkCardModalV2.tsx

@@ -33,8 +33,9 @@ const CheckCardModalV2 = () => {
   );
   const selectedOptions = useAppSelector(selectCheckCardModalV2SelectedOptions);
   const responseable = useAppSelector(selectCheckCardModalV2ResponseAble);
-  const selectHintMsg =
-    useAppSelector(selectHint)?.esSelectHint || "请选择卡片";
+  const hint = useAppSelector(selectHint);
+  const preHintMsg = hint?.esHint || "";
+  const selectHintMsg = hint?.esSelectHint || "请选择卡片";
 
   const onFinishOrCancel = () => {
     sendSelectUnselectCardResponse({ cancel_or_finish: true });
@@ -45,7 +46,7 @@ const CheckCardModalV2 = () => {
 
   return (
     <DragModal
-      title={`${selectHintMsg} ${min}-${max}`}
+      title={`${preHintMsg} ${selectHintMsg} ${min}-${max}`}
       open={isOpen}
       closable={false}
       footer={

src/ui/Duel/checkCardModalV3.tsx

@@ -33,8 +33,9 @@ const CheckCardModalV3 = () => {
     .concat(selectedOptions)
     .map((option) => option.level2)
     .reduce((sum, current) => sum + current, 0);
-  const selectHintMsg =
-    useAppSelector(selectHint)?.esSelectHint || "请选择卡片";
+  const hint = useAppSelector(selectHint);
+  const preHintMsg = hint?.esHint || "";
+  const selectHintMsg = hint?.esSelectHint || "请选择卡片";
 
   const responseable =
     (overflow
@@ -53,7 +54,7 @@ const CheckCardModalV3 = () => {
 
   return (
     <DragModal
-      title={`${selectHintMsg} ${min}-${max}`}
+      title={`${preHintMsg} ${selectHintMsg} ${min}-${max}`}
       open={isOpen}
       closable={false}
       footer={

src/ui/Duel/yesNoModal.tsx

@@ -9,15 +9,18 @@ import {
 } from "../../reducers/duel/modal/mod";
 import { setYesNoModalIsOpen } from "../../reducers/duel/mod";
 import DragModal from "./dragModal";
+import { selectHint } from "../../reducers/duel/hintSlice";
 
 const YesNoModal = () => {
   const dispatch = store.dispatch;
   const isOpen = useAppSelector(selectYesNoModalIsOpen);
   const msg = useAppSelector(selectYesNOModalMsg);
+  const hint = useAppSelector(selectHint);
+  const preHintMsg = hint?.esHint || "";
 
   return (
     <DragModal
-      title={msg}
+      title={`${preHintMsg} ${msg}`}
       open={isOpen}
       closable={false}
       footer={