Bladeren bron

feat: 修改

year 3 weken geleden
bovenliggende
commit
8794052b60
3 gewijzigde bestanden met toevoegingen van 17 en 15 verwijderingen
  1. 8 6
      src/dialog/auto.ts
  2. 8 8
      src/dialog/wheel/index.tsx
  3. 1 1
      src/stores/useWheelStore.ts

+ 8 - 6
src/dialog/auto.ts

@@ -134,12 +134,14 @@ const AutoShowDialog = () => {
                         break;
                     case 3:
                         // 轮盘特殊处理 dialogManage.showDialog('WheelSection')
-                        console.log(wheelState.status);
-                        if (
-                            curData?.action_params?.includes("WheelSection") &&
-                            wheelState.status === 2
-                        ) {
-                            break;
+
+                        if (curData?.action_params?.includes("WheelSection")) {
+                            console.log(wheelState.status);
+                            await wheelState.setWheel();
+                            console.log(wheelState.status);
+                            if (wheelState.status != 1) {
+                                break;
+                            }
                         }
                         if (curData.action_type === 5) {
                             curData?.action_params ? await eval(curData?.action_params || "") : "";

+ 8 - 8
src/dialog/wheel/index.tsx

@@ -23,14 +23,14 @@ const WheelSection = () => {
         dialogManager.registerDialog({
             key: keyName,
             async show() {
-                try {
-                    await getData();
-                    if (status === 2) {
-                        return "close";
-                    }
-                } catch {
-                    return "close";
-                }
+                // try {
+                //     await getData();
+                //     if (status === 3) {
+                //         return "close";
+                //     }
+                // } catch {
+                //     return "close";
+                // }
                 wheelModalRef?.current?.onOpen(data);
             },
         });

+ 1 - 1
src/stores/useWheelStore.ts

@@ -52,7 +52,7 @@ export const useWheelStore = create<State & Action>()((set, get) => {
                 if (data?.activate?.can === 0) {
                     set((state) => ({
                         ...state,
-                        status: 2,
+                        status: 3,
                         currentWheel: source,
                         receiveTarget: {},
                     }));