@taole/newgiftbar 0.1.7 → 0.1.9

package/npm/newgiftbar.es.js

@@ -674,7 +674,8 @@ function createModal(_Class, props = {}, target = document.body) {
         wrap.parentNode.removeChild(wrap);
       }
     }
-    if (err) {
+    const isDomEvent = typeof Event !== "undefined" && err instanceof Event;
+    if (err && !isDomEvent) {
       defer.reject(err);
     } else {
       defer.resolve(result);
@@ -1755,7 +1756,7 @@ function create_each_block$a(key_1, ctx) {
     }
   };
 }
-function create_if_block_1$p(ctx) {
+function create_if_block_1$o(ctx) {
   let a;
   let t0;
   let t1_value = (
@@ -1766,7 +1767,7 @@ function create_if_block_1$p(ctx) {
   let a_href_value;
   let if_block = (
     /*tip*/
-    ctx[2].img && create_if_block_2$k(ctx)
+    ctx[2].img && create_if_block_2$j(ctx)
   );
   return {
     c() {
@@ -1793,7 +1794,7 @@ function create_if_block_1$p(ctx) {
         if (if_block) {
           if_block.p(ctx2, dirty);
         } else {
-          if_block = create_if_block_2$k(ctx2);
+          if_block = create_if_block_2$j(ctx2);
           if_block.c();
           if_block.m(a, t0);
         }
@@ -1818,7 +1819,7 @@ function create_if_block_1$p(ctx) {
     }
   };
 }
-function create_if_block_2$k(ctx) {
+function create_if_block_2$j(ctx) {
   let img;
   let img_src_value;
   return {
@@ -1902,7 +1903,7 @@ function create_fragment$r(ctx) {
     ctx[2] && /*tip*/
     ctx[2].text && /*tip*/
     ctx[2].link && /*tip*/
-    ctx[2].kind !== "hidden" && create_if_block_1$p(ctx)
+    ctx[2].kind !== "hidden" && create_if_block_1$o(ctx)
   );
   let if_block1 = (
     /*showNobility*/
@@ -1957,7 +1958,7 @@ function create_fragment$r(ctx) {
         if (if_block0) {
           if_block0.p(ctx2, dirty);
         } else {
-          if_block0 = create_if_block_1$p(ctx2);
+          if_block0 = create_if_block_1$o(ctx2);
           if_block0.c();
           if_block0.m(div1, t1);
         }
@@ -2325,7 +2326,7 @@ function create_if_block_3$e(ctx) {
     }
   };
 }
-function create_if_block_2$j(ctx) {
+function create_if_block_2$i(ctx) {
   let div;
   let mounted;
   let dispose;
@@ -2405,7 +2406,7 @@ function create_each_block$9(key_1, ctx) {
     /*giftItem*/
     ctx[10].unitText2 && create_if_block_3$e(ctx)
   );
-  let if_block3 = show_if && create_if_block_2$j(ctx);
+  let if_block3 = show_if && create_if_block_2$i(ctx);
   function click_handler_12() {
     return (
       /*click_handler_1*/
@@ -2554,7 +2555,7 @@ function create_each_block$9(key_1, ctx) {
         if (if_block3) {
           if_block3.p(ctx, dirty);
         } else {
-          if_block3 = create_if_block_2$j(ctx);
+          if_block3 = create_if_block_2$i(ctx);
           if_block3.c();
           if_block3.m(div2, null);
         }
@@ -2599,7 +2600,7 @@ function create_if_block$p(ctx) {
     if (
       /*emptyImg*/
       ctx2[2]
-    ) return create_if_block_1$o;
+    ) return create_if_block_1$n;
     return create_else_block$e;
   }
   let current_block_type = select_block_type(ctx);
@@ -2652,7 +2653,7 @@ function create_else_block$e(ctx) {
     }
   };
 }
-function create_if_block_1$o(ctx) {
+function create_if_block_1$n(ctx) {
   let img;
   let img_src_value;
   return {
@@ -2821,7 +2822,7 @@ class GiftGrid extends SvelteComponent {
     });
   }
 }
-function create_if_block_1$n(ctx) {
+function create_if_block_1$m(ctx) {
   let p;
   let t0;
   let span;
@@ -2908,7 +2909,7 @@ function create_fragment$p(ctx) {
   let t3;
   let if_block0 = (
     /*showCrystal*/
-    ctx[1] && create_if_block_1$n(ctx)
+    ctx[1] && create_if_block_1$m(ctx)
   );
   let if_block1 = (
     /*showCoin*/
@@ -2958,7 +2959,7 @@ function create_fragment$p(ctx) {
         if (if_block0) {
           if_block0.p(ctx2, dirty);
         } else {
-          if_block0 = create_if_block_1$n(ctx2);
+          if_block0 = create_if_block_1$m(ctx2);
           if_block0.c();
           if_block0.m(div0, null);
         }
@@ -3609,7 +3610,7 @@ function create_each_block$8(ctx) {
     }
   };
 }
-function create_if_block_2$i(ctx) {
+function create_if_block_2$h(ctx) {
   let div;
   let t_value = (
     /*ui*/
@@ -3650,7 +3651,7 @@ function create_if_block_2$i(ctx) {
     }
   };
 }
-function create_if_block_1$m(ctx) {
+function create_if_block_1$l(ctx) {
   let div;
   let mounted;
   let dispose;
@@ -3768,11 +3769,11 @@ function create_fragment$o(ctx) {
   let if_block2 = current_block_type && current_block_type(ctx);
   let if_block3 = (
     /*buttons*/
-    ctx[11].send && create_if_block_2$i(ctx)
+    ctx[11].send && create_if_block_2$h(ctx)
   );
   let if_block4 = (
     /*buttons*/
-    ctx[11].open && create_if_block_1$m(ctx)
+    ctx[11].open && create_if_block_1$l(ctx)
   );
   let if_block5 = (
     /*buttons*/
@@ -3927,7 +3928,7 @@ function create_fragment$o(ctx) {
         if (if_block3) {
           if_block3.p(ctx2, dirty);
         } else {
-          if_block3 = create_if_block_2$i(ctx2);
+          if_block3 = create_if_block_2$h(ctx2);
           if_block3.c();
           if_block3.m(div1, t6);
         }
@@ -3942,7 +3943,7 @@ function create_fragment$o(ctx) {
         if (if_block4) {
           if_block4.p(ctx2, dirty);
         } else {
-          if_block4 = create_if_block_1$m(ctx2);
+          if_block4 = create_if_block_1$l(ctx2);
           if_block4.c();
           if_block4.m(div1, t7);
         }
@@ -4292,7 +4293,7 @@ function create_if_block_3$c(ctx) {
     }
   };
 }
-function create_if_block_2$h(ctx) {
+function create_if_block_2$g(ctx) {
   let html_tag;
   let raw_value = (
     /*view*/
@@ -4334,7 +4335,7 @@ function create_if_block$m(ctx) {
   let if_block_anchor;
   let if_block = (
     /*roseUrl*/
-    ctx[0] && create_if_block_1$l(ctx)
+    ctx[0] && create_if_block_1$k(ctx)
   );
   return {
     c() {
@@ -4364,7 +4365,7 @@ function create_if_block$m(ctx) {
         if (if_block) {
           if_block.p(ctx2, dirty);
         } else {
-          if_block = create_if_block_1$l(ctx2);
+          if_block = create_if_block_1$k(ctx2);
           if_block.c();
           if_block.m(if_block_anchor.parentNode, if_block_anchor);
         }
@@ -4438,7 +4439,7 @@ function create_if_block_4$7(ctx) {
     }
   };
 }
-function create_if_block_1$l(ctx) {
+function create_if_block_1$k(ctx) {
   let img;
   let img_src_value;
   return {
@@ -4477,7 +4478,7 @@ function create_fragment$n(ctx) {
       /*view*/
       ctx2[1] && /*view*/
       ctx2[1].mode === "leading"
-    ) return create_if_block_2$h;
+    ) return create_if_block_2$g;
     if (
       /*view*/
       ctx2[1] && /*view*/
@@ -5117,7 +5118,7 @@ function create_if_block$l(ctx) {
     }
   };
 }
-function create_if_block_2$g(ctx) {
+function create_if_block_2$f(ctx) {
   let div;
   return {
     c() {
@@ -5135,7 +5136,7 @@ function create_if_block_2$g(ctx) {
     }
   };
 }
-function create_if_block_1$k(ctx) {
+function create_if_block_1$j(ctx) {
   let div;
   return {
     c() {
@@ -5174,11 +5175,11 @@ function create_each_block$7(ctx) {
     if (
       /*item*/
       ctx2[16].typeid == 1
-    ) return create_if_block_1$k;
+    ) return create_if_block_1$j;
     if (
       /*item*/
       ctx2[16].typeid == 2
-    ) return create_if_block_2$g;
+    ) return create_if_block_2$f;
   }
   let current_block_type = select_block_type_1(ctx);
   let if_block = current_block_type && current_block_type(ctx);
@@ -5543,7 +5544,7 @@ async function showPardonCard({ gift, tabId }) {
     opening = false;
   }
 }
-function create_if_block_1$j(ctx) {
+function create_if_block_1$i(ctx) {
   let div;
   let t;
   return {
@@ -5659,7 +5660,7 @@ function create_fragment$k(ctx) {
   let dispose;
   let if_block0 = (
     /*title*/
-    ctx[0] && create_if_block_1$j(ctx)
+    ctx[0] && create_if_block_1$i(ctx)
   );
   let if_block1 = (
     /*checkboxText*/
@@ -5745,7 +5746,7 @@ function create_fragment$k(ctx) {
         if (if_block0) {
           if_block0.p(ctx2, dirty);
         } else {
-          if_block0 = create_if_block_1$j(ctx2);
+          if_block0 = create_if_block_1$i(ctx2);
           if_block0.c();
           if_block0.m(div2, t0);
         }
@@ -6422,7 +6423,7 @@ function stripCidAddScene(query) {
 function findDataByType(type, initImgData = []) {
   return (initImgData || []).find((item) => item.type === type);
 }
-function create_if_block_1$i(ctx) {
+function create_if_block_1$h(ctx) {
   let div;
   return {
     c() {
@@ -6521,7 +6522,7 @@ function create_fragment$j(ctx) {
   let div2_class_value;
   let if_block0 = (
     /*costly*/
-    ctx[2] && create_if_block_1$i()
+    ctx[2] && create_if_block_1$h()
   );
   let if_block1 = (
     /*isBigger*/
@@ -6590,7 +6591,7 @@ function create_fragment$j(ctx) {
       ) {
         if (if_block0) ;
         else {
-          if_block0 = create_if_block_1$i();
+          if_block0 = create_if_block_1$h();
           if_block0.c();
           if_block0.m(div1, t0);
         }
@@ -6781,7 +6782,7 @@ function create_else_block_2$1(ctx) {
     }
   };
 }
-function create_if_block_2$f(ctx) {
+function create_if_block_2$e(ctx) {
   let img;
   let img_src_value;
   return {
@@ -7110,7 +7111,7 @@ function create_else_block_1$3(ctx) {
     }
   };
 }
-function create_if_block_1$h(ctx) {
+function create_if_block_1$g(ctx) {
   let div4;
   let div3;
   let div0;
@@ -7398,7 +7399,7 @@ function create_fragment$i(ctx) {
     if (
       /*radioIsSelected*/
       ctx2[9]
-    ) return create_if_block_2$f;
+    ) return create_if_block_2$e;
     return create_else_block_2$1;
   }
   let current_block_type = select_block_type(ctx);
@@ -7418,7 +7419,7 @@ function create_fragment$i(ctx) {
     if (
       /*radioIsSelected*/
       ctx2[9]
-    ) return create_if_block_1$h;
+    ) return create_if_block_1$g;
     return create_else_block_1$3;
   }
   let current_block_type_1 = select_block_type_1(ctx);
@@ -8751,7 +8752,7 @@ function create_else_block_1$2(ctx) {
     }
   };
 }
-function create_if_block_2$e(ctx) {
+function create_if_block_2$d(ctx) {
   let div4;
   let div3;
   let div0;
@@ -8956,7 +8957,7 @@ function create_else_block$b(ctx) {
     }
   };
 }
-function create_if_block_1$g(ctx) {
+function create_if_block_1$f(ctx) {
   let img;
   let img_src_value;
   return {
@@ -9128,7 +9129,7 @@ function create_fragment$g(ctx) {
     if (
       /*radioIsSelected*/
       ctx2[5]
-    ) return create_if_block_2$e;
+    ) return create_if_block_2$d;
     return create_else_block_1$2;
   }
   let current_block_type_1 = select_block_type_1(ctx);
@@ -9137,7 +9138,7 @@ function create_fragment$g(ctx) {
     if (
       /*isIgnore*/
       ctx2[1]
-    ) return create_if_block_1$g;
+    ) return create_if_block_1$f;
     return create_else_block$b;
   }
   let current_block_type_2 = select_block_type_2(ctx);
@@ -9842,7 +9843,7 @@ class OpenBox extends SvelteComponent {
     );
   }
 }
-function create_if_block_1$f(ctx) {
+function create_if_block_1$e(ctx) {
   let history;
   let updating_onClose;
   let current;
@@ -10090,7 +10091,7 @@ function create_fragment$f(ctx) {
   });
   let if_block0 = (
     /*isShowHistory*/
-    ctx[9] && create_if_block_1$f(ctx)
+    ctx[9] && create_if_block_1$e(ctx)
   );
   let if_block1 = (
     /*isShowResult*/
@@ -10264,7 +10265,7 @@ function create_fragment$f(ctx) {
             transition_in(if_block0, 1);
           }
         } else {
-          if_block0 = create_if_block_1$f(ctx2);
+          if_block0 = create_if_block_1$e(ctx2);
           if_block0.c();
           transition_in(if_block0, 1);
           if_block0.m(div5, t5);
@@ -10620,13 +10621,13 @@ function create_if_block_4$5(ctx) {
     }
   };
 }
-function create_if_block_1$e(ctx) {
+function create_if_block_1$d(ctx) {
   let if_block_anchor;
   function select_block_type(ctx2, dirty) {
     if (
       /*open_val*/
       ctx2[8]
-    ) return create_if_block_2$d;
+    ) return create_if_block_2$c;
     return create_else_block$a;
   }
   let current_block_type = select_block_type(ctx);
@@ -10712,7 +10713,7 @@ function create_else_block$a(ctx) {
     }
   };
 }
-function create_if_block_2$d(ctx) {
+function create_if_block_2$c(ctx) {
   let div;
   return {
     c() {
@@ -10782,7 +10783,7 @@ function create_fragment$e(ctx) {
   let if_block1 = show_if && create_if_block_3$9(ctx);
   let if_block2 = (
     /*isBigger*/
-    ctx[4] && create_if_block_1$e(ctx)
+    ctx[4] && create_if_block_1$d(ctx)
   );
   let if_block3 = (
     /*hit*/
@@ -10896,7 +10897,7 @@ function create_fragment$e(ctx) {
         if (if_block2) {
           if_block2.p(ctx2, dirty);
         } else {
-          if_block2 = create_if_block_1$e(ctx2);
+          if_block2 = create_if_block_1$d(ctx2);
           if_block2.c();
           if_block2.m(div1, t6);
         }
@@ -11063,6 +11064,10 @@ function create_if_block_7(ctx) {
   let img_src_value;
   let t0;
   let span;
+  let t1_value = (Number(
+    /*hitTimes*/
+    ctx[8]
+  ) || 0) + "";
   let t1;
   let t2;
   return {
@@ -11071,10 +11076,7 @@ function create_if_block_7(ctx) {
       img = element("img");
       t0 = space();
       span = element("span");
-      t1 = text(
-        /*hitTimes*/
-        ctx[8]
-      );
+      t1 = text(t1_value);
       t2 = text("次");
       attr(img, "class", "imgIcon svelte-1ajc4sn");
       if (!src_url_equal(img.src, img_src_value = "https://dynamics-share.tuwan.com/activity/0e24da0fd01719a934630a6652fa4b9d.png?x-oss-process=image/format,webp/ignore-error,1")) attr(img, "src", img_src_value);
@@ -11092,11 +11094,10 @@ function create_if_block_7(ctx) {
     },
     p(ctx2, dirty) {
       if (dirty[0] & /*hitTimes*/
-      256) set_data(
-        t1,
+      256 && t1_value !== (t1_value = (Number(
         /*hitTimes*/
         ctx2[8]
-      );
+      ) || 0) + "")) set_data(t1, t1_value);
     },
     d(detaching) {
       if (detaching) {
@@ -11378,11 +11379,11 @@ function create_if_block$d(ctx) {
   let dispose;
   let if_block0 = (
     /*showCrit*/
-    ctx[13] && create_if_block_2$c()
+    ctx[13] && create_if_block_2$b()
   );
   let if_block1 = (
     /*goldRemark*/
-    ctx[14] && create_if_block_1$d(ctx)
+    ctx[14] && create_if_block_1$c(ctx)
   );
   return {
     c() {
@@ -11478,7 +11479,7 @@ function create_if_block$d(ctx) {
         if (if_block0) {
           if_block0.p(ctx2, dirty);
         } else {
-          if_block0 = create_if_block_2$c();
+          if_block0 = create_if_block_2$b();
           if_block0.c();
           if_block0.m(div1, null);
         }
@@ -11493,7 +11494,7 @@ function create_if_block$d(ctx) {
         if (if_block1) {
           if_block1.p(ctx2, dirty);
         } else {
-          if_block1 = create_if_block_1$d(ctx2);
+          if_block1 = create_if_block_1$c(ctx2);
           if_block1.c();
           if_block1.m(div4, t6);
         }
@@ -11816,7 +11817,7 @@ function create_if_block_3$8(ctx) {
     }
   };
 }
-function create_if_block_2$c(ctx) {
+function create_if_block_2$b(ctx) {
   let img;
   let img_src_value;
   return {
@@ -11837,7 +11838,7 @@ function create_if_block_2$c(ctx) {
     }
   };
 }
-function create_if_block_1$d(ctx) {
+function create_if_block_1$c(ctx) {
   let div;
   let span;
   let t;
@@ -11892,10 +11893,13 @@ function create_fragment$d(ctx) {
   let t5;
   let t6;
   let t7;
-  let show_if = Number(
-    /*hitTimes*/
-    ctx[8]
-  ) > 0;
+  let show_if = (
+    /*mode*/
+    ctx[2] == RESULT_VIEW_TYPE$1.GOLD_TYPE || Number(
+      /*hitTimes*/
+      ctx[8]
+    ) > 0
+  );
   let t8;
   let div5;
   let div4;
@@ -12051,8 +12055,9 @@ function create_fragment$d(ctx) {
         if_block0.d(1);
         if_block0 = null;
       }
-      if (dirty[0] & /*hitTimes*/
-      256) show_if = Number(
+      if (dirty[0] & /*mode, hitTimes*/
+      260) show_if = /*mode*/
+      ctx2[2] == RESULT_VIEW_TYPE$1.GOLD_TYPE || Number(
         /*hitTimes*/
         ctx2[8]
       ) > 0;
@@ -12639,7 +12644,7 @@ function create_else_block$8(ctx) {
     }
   };
 }
-function create_if_block_1$c(ctx) {
+function create_if_block_1$b(ctx) {
   let div4;
   let div3;
   let div1;
@@ -12653,7 +12658,7 @@ function create_if_block_1$c(ctx) {
   let if_block = (
     /*times*/
     ctx[8] && /*unit_price*/
-    ctx[7] && create_if_block_2$b(ctx)
+    ctx[7] && create_if_block_2$a(ctx)
   );
   return {
     c() {
@@ -12734,7 +12739,7 @@ function create_if_block_1$c(ctx) {
         if (if_block) {
           if_block.p(ctx2, dirty);
         } else {
-          if_block = create_if_block_2$b(ctx2);
+          if_block = create_if_block_2$a(ctx2);
           if_block.c();
           if_block.m(div0, null);
         }
@@ -12774,7 +12779,7 @@ function create_if_block_3$7(ctx) {
     }
   };
 }
-function create_if_block_2$b(ctx) {
+function create_if_block_2$a(ctx) {
   let span;
   let t0_value = (
     /*times*/
@@ -12903,7 +12908,7 @@ function create_fragment$c(ctx) {
     if (
       /*radioIsSelected*/
       ctx2[9]
-    ) return create_if_block_1$c;
+    ) return create_if_block_1$b;
     return create_else_block$8;
   }
   let current_block_type = select_block_type(ctx);
@@ -13436,7 +13441,7 @@ function get_each_context_1$1(ctx, list, i) {
   child_ctx[13] = list[i];
   return child_ctx;
 }
-function create_if_block_1$b(ctx) {
+function create_if_block_1$a(ctx) {
   let div;
   let each_value_1 = ensure_array_like(
     /*expires*/
@@ -13670,7 +13675,7 @@ function create_fragment$b(ctx) {
   let dispose;
   let if_block0 = (
     /*expires*/
-    ctx[2].length && create_if_block_1$b(ctx)
+    ctx[2].length && create_if_block_1$a(ctx)
   );
   let if_block1 = (
     /*list*/
@@ -13752,7 +13757,7 @@ function create_fragment$b(ctx) {
         if (if_block0) {
           if_block0.p(ctx2, dirty);
         } else {
-          if_block0 = create_if_block_1$b(ctx2);
+          if_block0 = create_if_block_1$a(ctx2);
           if_block0.c();
           if_block0.m(div2, t1);
         }
@@ -14049,7 +14054,7 @@ function create_else_block$7(ctx) {
     }
   };
 }
-function create_if_block_1$a(ctx) {
+function create_if_block_1$9(ctx) {
   let div4;
   let div3;
   let div1;
@@ -14063,7 +14068,7 @@ function create_if_block_1$a(ctx) {
   let if_block = (
     /*times*/
     ctx[4] && /*resData*/
-    ctx[0] && create_if_block_2$a(ctx)
+    ctx[0] && create_if_block_2$9(ctx)
   );
   return {
     c() {
@@ -14145,7 +14150,7 @@ function create_if_block_1$a(ctx) {
         if (if_block) {
           if_block.p(ctx2, dirty);
         } else {
-          if_block = create_if_block_2$a(ctx2);
+          if_block = create_if_block_2$9(ctx2);
           if_block.c();
           if_block.m(div0, null);
         }
@@ -14164,7 +14169,7 @@ function create_if_block_1$a(ctx) {
     }
   };
 }
-function create_if_block_2$a(ctx) {
+function create_if_block_2$9(ctx) {
   let span;
   let t0_value = (
     /*times*/
@@ -14311,7 +14316,7 @@ function create_fragment$a(ctx) {
     if (
       /*radioIsSelected*/
       ctx2[6]
-    ) return create_if_block_1$a;
+    ) return create_if_block_1$9;
     return create_else_block$7;
   }
   let current_block_type = select_block_type(ctx);
@@ -14822,87 +14827,6 @@ class Magic extends SvelteComponent {
     });
   }
 }
-function create_if_block_2$9(ctx) {
-  let div;
-  let img;
-  let img_src_value;
-  let t0;
-  let span;
-  let t1_value = (
-    /*resData*/
-    ctx[0].hit_times + ""
-  );
-  let t1;
-  let t2;
-  return {
-    c() {
-      div = element("div");
-      img = element("img");
-      t0 = space();
-      span = element("span");
-      t1 = text(t1_value);
-      t2 = text("次");
-      attr(img, "class", "imgIcon");
-      if (!src_url_equal(img.src, img_src_value = "https://dynamics-share.tuwan.com/activity/0e24da0fd01719a934630a6652fa4b9d.png?x-oss-process=image/format,webp/ignore-error,1")) attr(img, "src", img_src_value);
-      attr(img, "alt", "");
-      attr(span, "class", "wordCtn");
-      attr(div, "class", "subCtn");
-    },
-    m(target, anchor) {
-      insert(target, div, anchor);
-      append(div, img);
-      append(div, t0);
-      append(div, span);
-      append(span, t1);
-      append(span, t2);
-    },
-    p(ctx2, dirty) {
-      if (dirty & /*resData*/
-      1 && t1_value !== (t1_value = /*resData*/
-      ctx2[0].hit_times + "")) set_data(t1, t1_value);
-    },
-    d(detaching) {
-      if (detaching) {
-        detach(div);
-      }
-    }
-  };
-}
-function create_if_block_1$9(ctx) {
-  let div1;
-  let div0;
-  let div0_style_value;
-  return {
-    c() {
-      var _a, _b;
-      div1 = element("div");
-      div0 = element("div");
-      attr(div0, "class", "showBar");
-      attr(div0, "style", div0_style_value = `width: ${/*resData*/
-      (((_a = ctx[0]) == null ? void 0 : _a.gold_process) || 0) / /*resData*/
-      ((_b = ctx[0]) == null ? void 0 : _b.gold_total) * 100}%`);
-      attr(div1, "class", "progressCtn");
-    },
-    m(target, anchor) {
-      insert(target, div1, anchor);
-      append(div1, div0);
-    },
-    p(ctx2, dirty) {
-      var _a, _b;
-      if (dirty & /*resData*/
-      1 && div0_style_value !== (div0_style_value = `width: ${/*resData*/
-      (((_a = ctx2[0]) == null ? void 0 : _a.gold_process) || 0) / /*resData*/
-      ((_b = ctx2[0]) == null ? void 0 : _b.gold_total) * 100}%`)) {
-        attr(div0, "style", div0_style_value);
-      }
-    },
-    d(detaching) {
-      if (detaching) {
-        detach(div1);
-      }
-    }
-  };
-}
 function create_if_block$9(ctx) {
   let div1;
   let div0;
@@ -14939,12 +14863,12 @@ function create_if_block$9(ctx) {
   };
 }
 function create_fragment$9(ctx) {
-  var _a, _b;
-  let div15;
+  var _a;
+  let div18;
   let img0;
   let img0_src_value;
   let t0;
-  let div3;
+  let div4;
   let div0;
   let img1;
   let img1_src_value;
@@ -14988,44 +14912,49 @@ function create_fragment$9(ctx) {
   let t8;
   let t9;
   let t10;
-  let show_if_1 = Number(
+  let div3;
+  let img4;
+  let img4_src_value;
+  let t11;
+  let span3;
+  let t12_value = (Number(
     /*resData*/
     (_a = ctx[0]) == null ? void 0 : _a.hit_times
-  ) > 0;
-  let t11;
-  let div4;
+  ) || 0) + "";
   let t12;
-  let div5;
   let t13;
-  let div9;
+  let t14;
+  let div5;
+  let t15;
+  let div6;
   let t16;
-  let div14;
-  let show_if = Number(
-    /*resData*/
-    (_b = ctx[0]) == null ? void 0 : _b.gold_process
-  ) > 0;
-  let t17;
   let div10;
-  let t18;
-  let div13;
-  let div11;
-  let t22;
+  let t19;
+  let div17;
   let div12;
-  let t23;
+  let div11;
+  let div11_style_value;
+  let t20;
+  let div13;
+  let t21;
+  let div16;
+  let div14;
+  let t25;
+  let div15;
+  let t26;
   let mounted;
   let dispose;
-  let if_block0 = show_if_1 && create_if_block_2$9(ctx);
-  let if_block1 = show_if && create_if_block_1$9(ctx);
-  let if_block2 = (
+  let if_block = (
     /*expiresText*/
     ctx[3] && create_if_block$9(ctx)
   );
   return {
     c() {
-      div15 = element("div");
+      var _a2, _b;
+      div18 = element("div");
       img0 = element("img");
       t0 = space();
-      div3 = element("div");
+      div4 = element("div");
       div0 = element("div");
       img1 = element("img");
       t1 = space();
@@ -15045,28 +14974,34 @@ function create_fragment$9(ctx) {
       t8 = text(t8_value);
       t9 = text("个");
       t10 = space();
-      if (if_block0) if_block0.c();
+      div3 = element("div");
+      img4 = element("img");
       t11 = space();
-      div4 = element("div");
-      t12 = space();
+      span3 = element("span");
+      t12 = text(t12_value);
+      t13 = text("次");
+      t14 = space();
       div5 = element("div");
-      t13 = space();
-      div9 = element("div");
-      div9.innerHTML = `<div class="fireCtn"></div> <div class="mainImgCtn mainImgCtnGold"></div> <div class="mainSvgaCtn"></div>`;
+      t15 = space();
+      div6 = element("div");
       t16 = space();
-      div14 = element("div");
-      if (if_block1) if_block1.c();
-      t17 = space();
       div10 = element("div");
-      t18 = space();
-      div13 = element("div");
+      div10.innerHTML = `<div class="fireCtn"></div> <div class="mainImgCtn mainImgCtnGold"></div> <div class="mainSvgaCtn"></div>`;
+      t19 = space();
+      div17 = element("div");
+      div12 = element("div");
       div11 = element("div");
-      div11.innerHTML = `<span class="innerCtn"><img class="icon" src="https://asset.tuwan.com/goldMagic/magicIcon.png"/> <span class="numCtn">680</span></span>
+      t20 = space();
+      div13 = element("div");
+      t21 = space();
+      div16 = element("div");
+      div14 = element("div");
+      div14.innerHTML = `<span class="innerCtn"><img class="icon" src="https://asset.tuwan.com/goldMagic/magicIcon.png"/> <span class="numCtn">680</span></span>
                 开启魔法`;
-      t22 = space();
-      div12 = element("div");
-      t23 = space();
-      if (if_block2) if_block2.c();
+      t25 = space();
+      div15 = element("div");
+      t26 = space();
+      if (if_block) if_block.c();
       attr(img0, "class", "openGiftTitle");
       if (!src_url_equal(img0.src, img0_src_value = "https://asset.tuwan.com/goldMagic/goldTitle.png")) attr(img0, "src", img0_src_value);
       attr(img1, "class", "imgIcon");
@@ -15081,75 +15016,91 @@ function create_fragment$9(ctx) {
       if (!src_url_equal(img3.src, img3_src_value = "https://asset.tuwan.com/goldMagic/goldBook.png")) attr(img3, "src", img3_src_value);
       attr(span2, "class", "wordCtn");
       attr(div2, "class", "subCtn");
-      attr(div3, "class", "leftTopCtn");
-      attr(div4, "class", "fireSvgaCtn");
-      attr(div5, "class", "result_vap_anim");
-      attr(div9, "class", "mainShowerCtn");
-      attr(div10, "class", "topTipsCtn");
-      attr(div11, "class", "normalBtn");
-      attr(div11, "id", "goldNormalBtn");
-      attr(div12, "class", "firedButton");
-      attr(div12, "id", "goldFiredBtn");
-      attr(div13, "class", "buttonCtn");
-      attr(div14, "class", "openGiftFooter");
-      attr(div15, "class", "GoldCtn");
+      attr(img4, "class", "imgIcon");
+      if (!src_url_equal(img4.src, img4_src_value = "https://dynamics-share.tuwan.com/activity/0e24da0fd01719a934630a6652fa4b9d.png?x-oss-process=image/format,webp/ignore-error,1")) attr(img4, "src", img4_src_value);
+      attr(img4, "alt", "");
+      attr(span3, "class", "wordCtn");
+      attr(div3, "class", "subCtn");
+      attr(div4, "class", "leftTopCtn");
+      attr(div5, "class", "fireSvgaCtn");
+      attr(div6, "class", "result_vap_anim");
+      attr(div10, "class", "mainShowerCtn");
+      attr(div11, "class", "showBar");
+      attr(div11, "style", div11_style_value = `width: ${/*resData*/
+      (((_a2 = ctx[0]) == null ? void 0 : _a2.gold_process) || 0) / /*resData*/
+      (((_b = ctx[0]) == null ? void 0 : _b.gold_total) || 1) * 100}%`);
+      attr(div12, "class", "progressCtn");
+      attr(div13, "class", "topTipsCtn");
+      attr(div14, "class", "normalBtn");
+      attr(div14, "id", "goldNormalBtn");
+      attr(div15, "class", "firedButton");
+      attr(div15, "id", "goldFiredBtn");
+      attr(div16, "class", "buttonCtn");
+      attr(div17, "class", "openGiftFooter");
+      attr(div18, "class", "GoldCtn");
     },
     m(target, anchor) {
-      insert(target, div15, anchor);
-      append(div15, img0);
-      append(div15, t0);
-      append(div15, div3);
-      append(div3, div0);
+      insert(target, div18, anchor);
+      append(div18, img0);
+      append(div18, t0);
+      append(div18, div4);
+      append(div4, div0);
       append(div0, img1);
       append(div0, t1);
       append(div0, span0);
       append(span0, t2);
-      append(div3, t3);
-      append(div3, div1);
+      append(div4, t3);
+      append(div4, div1);
       append(div1, img2);
       append(div1, t4);
       append(div1, span1);
       append(span1, t5);
-      append(div3, t6);
-      append(div3, div2);
+      append(div4, t6);
+      append(div4, div2);
       append(div2, img3);
       append(div2, t7);
       append(div2, span2);
       append(span2, t8);
       append(span2, t9);
-      append(div3, t10);
-      if (if_block0) if_block0.m(div3, null);
-      append(div15, t11);
-      append(div15, div4);
-      append(div15, t12);
-      append(div15, div5);
-      ctx[8](div5);
-      append(div15, t13);
-      append(div15, div9);
-      append(div15, t16);
-      append(div15, div14);
-      if (if_block1) if_block1.m(div14, null);
-      append(div14, t17);
-      append(div14, div10);
-      div10.innerHTML = /*tipsStr*/
+      append(div4, t10);
+      append(div4, div3);
+      append(div3, img4);
+      append(div3, t11);
+      append(div3, span3);
+      append(span3, t12);
+      append(span3, t13);
+      append(div18, t14);
+      append(div18, div5);
+      append(div18, t15);
+      append(div18, div6);
+      ctx[8](div6);
+      append(div18, t16);
+      append(div18, div10);
+      append(div18, t19);
+      append(div18, div17);
+      append(div17, div12);
+      append(div12, div11);
+      append(div17, t20);
+      append(div17, div13);
+      div13.innerHTML = /*tipsStr*/
       ctx[2];
-      append(div14, t18);
-      append(div14, div13);
-      append(div13, div11);
-      append(div13, t22);
-      append(div13, div12);
-      append(div14, t23);
-      if (if_block2) if_block2.m(div14, null);
+      append(div17, t21);
+      append(div17, div16);
+      append(div16, div14);
+      append(div16, t25);
+      append(div16, div15);
+      append(div17, t26);
+      if (if_block) if_block.m(div17, null);
       if (!mounted) {
         dispose = [
           listen(
-            div11,
+            div14,
             "click",
             /*handleOpenGift*/
             ctx[4]
           ),
           listen(
-            div12,
+            div15,
             "click",
             /*handleOpenGift*/
             ctx[4]
@@ -15159,7 +15110,7 @@ function create_fragment$9(ctx) {
       }
     },
     p(ctx2, [dirty]) {
-      var _a2, _b2;
+      var _a2, _b, _c;
       if (dirty & /*resData*/
       1 && t2_value !== (t2_value = /*resData*/
       (ctx2[0] ? (
@@ -15179,68 +15130,43 @@ function create_fragment$9(ctx) {
         ctx2[0].glod_num
       ) : "") + "")) set_data(t8, t8_value);
       if (dirty & /*resData*/
-      1) show_if_1 = Number(
+      1 && t12_value !== (t12_value = (Number(
         /*resData*/
         (_a2 = ctx2[0]) == null ? void 0 : _a2.hit_times
-      ) > 0;
-      if (show_if_1) {
-        if (if_block0) {
-          if_block0.p(ctx2, dirty);
-        } else {
-          if_block0 = create_if_block_2$9(ctx2);
-          if_block0.c();
-          if_block0.m(div3, null);
-        }
-      } else if (if_block0) {
-        if_block0.d(1);
-        if_block0 = null;
-      }
+      ) || 0) + "")) set_data(t12, t12_value);
       if (dirty & /*resData*/
-      1) show_if = Number(
-        /*resData*/
-        (_b2 = ctx2[0]) == null ? void 0 : _b2.gold_process
-      ) > 0;
-      if (show_if) {
-        if (if_block1) {
-          if_block1.p(ctx2, dirty);
-        } else {
-          if_block1 = create_if_block_1$9(ctx2);
-          if_block1.c();
-          if_block1.m(div14, t17);
-        }
-      } else if (if_block1) {
-        if_block1.d(1);
-        if_block1 = null;
+      1 && div11_style_value !== (div11_style_value = `width: ${/*resData*/
+      (((_b = ctx2[0]) == null ? void 0 : _b.gold_process) || 0) / /*resData*/
+      (((_c = ctx2[0]) == null ? void 0 : _c.gold_total) || 1) * 100}%`)) {
+        attr(div11, "style", div11_style_value);
       }
       if (dirty & /*tipsStr*/
-      4) div10.innerHTML = /*tipsStr*/
+      4) div13.innerHTML = /*tipsStr*/
       ctx2[2];
       if (
         /*expiresText*/
         ctx2[3]
       ) {
-        if (if_block2) {
-          if_block2.p(ctx2, dirty);
+        if (if_block) {
+          if_block.p(ctx2, dirty);
         } else {
-          if_block2 = create_if_block$9(ctx2);
-          if_block2.c();
-          if_block2.m(div14, null);
+          if_block = create_if_block$9(ctx2);
+          if_block.c();
+          if_block.m(div17, null);
         }
-      } else if (if_block2) {
-        if_block2.d(1);
-        if_block2 = null;
+      } else if (if_block) {
+        if_block.d(1);
+        if_block = null;
       }
     },
     i: noop,
     o: noop,
     d(detaching) {
       if (detaching) {
-        detach(div15);
+        detach(div18);
       }
-      if (if_block0) if_block0.d();
       ctx[8](null);
-      if (if_block1) if_block1.d();
-      if (if_block2) if_block2.d();
+      if (if_block) if_block.d();
       mounted = false;
       run_all(dispose);
     }
@@ -15363,7 +15289,7 @@ function instance$9($$self, $$props, $$invalidate) {
     handleGetGiftInfo();
     SvgaPlayer.getInstance().playEver(".mainImgCtnGold", gold_pending_svga, "pendingSvga");
   });
-  function div5_binding($$value) {
+  function div6_binding($$value) {
     binding_callbacks[$$value ? "unshift" : "push"](() => {
       animEl = $$value;
       $$invalidate(1, animEl);
@@ -15405,7 +15331,7 @@ function instance$9($$self, $$props, $$invalidate) {
     handleSetResult,
     flag,
     handleGetGiftInfo,
-    div5_binding
+    div6_binding
   ];
 }
 class Gold extends SvelteComponent {
@@ -16465,12 +16391,10 @@ function create_if_block$7(ctx) {
       current = true;
       if (!mounted) {
         dispose = [
-          listen(div0, "click", stop_propagation(function() {
-            if (is_function(
-              /*closeModal*/
-              ctx[1]
-            )) ctx[1].apply(this, arguments);
-          })),
+          listen(div0, "click", stop_propagation(
+            /*click_handler_2*/
+            ctx[21]
+          )),
           listen(
             div1,
             "click",
@@ -16495,13 +16419,12 @@ function create_if_block$7(ctx) {
         mounted = true;
       }
     },
-    p(new_ctx, dirty) {
-      ctx = new_ctx;
+    p(ctx2, dirty) {
       let previous_block_index = current_block_type_index;
-      current_block_type_index = select_block_type(ctx);
+      current_block_type_index = select_block_type(ctx2);
       if (current_block_type_index === previous_block_index) {
         if (~current_block_type_index) {
-          if_blocks[current_block_type_index].p(ctx, dirty);
+          if_blocks[current_block_type_index].p(ctx2, dirty);
         }
       } else {
         if (if_block0) {
@@ -16514,10 +16437,10 @@ function create_if_block$7(ctx) {
         if (~current_block_type_index) {
           if_block0 = if_blocks[current_block_type_index];
           if (!if_block0) {
-            if_block0 = if_blocks[current_block_type_index] = if_block_creators[current_block_type_index](ctx);
+            if_block0 = if_blocks[current_block_type_index] = if_block_creators[current_block_type_index](ctx2);
             if_block0.c();
           } else {
-            if_block0.p(ctx, dirty);
+            if_block0.p(ctx2, dirty);
           }
           transition_in(if_block0, 1);
           if_block0.m(div4, t3);
@@ -16527,16 +16450,16 @@ function create_if_block$7(ctx) {
       }
       if (
         /*isShowResult*/
-        ctx[12]
+        ctx2[12]
       ) {
         if (if_block1) {
-          if_block1.p(ctx, dirty);
+          if_block1.p(ctx2, dirty);
           if (dirty & /*isShowResult*/
           4096) {
             transition_in(if_block1, 1);
           }
         } else {
-          if_block1 = create_if_block_2$7(ctx);
+          if_block1 = create_if_block_2$7(ctx2);
           if_block1.c();
           transition_in(if_block1, 1);
           if_block1.m(div4, t4);
@@ -16550,16 +16473,16 @@ function create_if_block$7(ctx) {
       }
       if (
         /*isShowHistory*/
-        ctx[10]
+        ctx2[10]
       ) {
         if (if_block2) {
-          if_block2.p(ctx, dirty);
+          if_block2.p(ctx2, dirty);
           if (dirty & /*isShowHistory*/
           1024) {
             transition_in(if_block2, 1);
           }
         } else {
-          if_block2 = create_if_block_1$7(ctx);
+          if_block2 = create_if_block_1$7(ctx2);
           if_block2.c();
           transition_in(if_block2, 1);
           if_block2.m(div4, null);
@@ -16574,9 +16497,9 @@ function create_if_block$7(ctx) {
       if (!current || dirty & /*currentType*/
       1 && div4_class_value !== (div4_class_value = null_to_empty(
         /*currentType*/
-        ctx[0] == "1" ? "goldMagicCtn magic" : (
+        ctx2[0] == "1" ? "goldMagicCtn magic" : (
           /*currentType*/
-          ctx[0] == "2" ? "goldMagicCtn gold" : "goldMagicCtn magic"
+          ctx2[0] == "2" ? "goldMagicCtn gold" : "goldMagicCtn magic"
         )
       ) + " svelte-1h7epg8")) {
         attr(div4, "class", div4_class_value);
@@ -16689,7 +16612,7 @@ function create_if_block_5$2(ctx) {
     )
   };
   gold = new Gold({ props: gold_props });
-  ctx[21](gold);
+  ctx[22](gold);
   return {
     c() {
       create_component(gold.$$.fragment);
@@ -16718,7 +16641,7 @@ function create_if_block_5$2(ctx) {
       current = false;
     },
     d(detaching) {
-      ctx[21](null);
+      ctx[22](null);
       destroy_component(gold, detaching);
     }
   };
@@ -16855,7 +16778,7 @@ function create_else_block$5(ctx) {
   let updating_onClose;
   let current;
   function result_1_onClose_binding(value) {
-    ctx[23](value);
+    ctx[24](value);
   }
   let result_1_props = {
     num: (
@@ -16938,7 +16861,7 @@ function create_if_block_3$4(ctx) {
   let updating_onClose;
   let current;
   function newyearresult_onClose_binding(value) {
-    ctx[22](value);
+    ctx[23](value);
   }
   let newyearresult_props = {
     num: (
@@ -17015,7 +16938,7 @@ function create_if_block_1$7(ctx) {
   let updating_onClose;
   let current;
   function history_onClose_binding(value) {
-    ctx[24](value);
+    ctx[25](value);
   }
   let history_props = {
     mode: (
@@ -17190,6 +17113,7 @@ function instance$7($$self, $$props, $$invalidate) {
   function click_handler_12(event) {
     bubble.call(this, $$self, event);
   }
+  const click_handler_2 = () => closeModal();
   function gold_binding($$value) {
     binding_callbacks[$$value ? "unshift" : "push"](() => {
       goldChild = $$value;
@@ -17235,6 +17159,7 @@ function instance$7($$self, $$props, $$invalidate) {
     explain_url,
     click_handler,
     click_handler_12,
+    click_handler_2,
     gold_binding,
     newyearresult_onClose_binding,
     result_1_onClose_binding,
@@ -21284,7 +21209,7 @@ function create_else_block(ctx) {
     )
   };
   love = new Love({ props: love_props });
-  ctx[21](love);
+  ctx[22](love);
   return {
     c() {
       create_component(love.$$.fragment);
@@ -21313,7 +21238,7 @@ function create_else_block(ctx) {
       current = false;
     },
     d(detaching) {
-      ctx[21](null);
+      ctx[22](null);
       destroy_component(love, detaching);
     }
   };
@@ -21387,7 +21312,7 @@ function create_if_block_1$1(ctx) {
   let updating_onClose;
   let current;
   function result_1_onClose_binding(value) {
-    ctx[22](value);
+    ctx[23](value);
   }
   let result_1_props = {
     num: (
@@ -21484,7 +21409,7 @@ function create_if_block$1(ctx) {
   let updating_onClose;
   let current;
   function history_onClose_binding(value) {
-    ctx[23](value);
+    ctx[24](value);
   }
   let history_props = {
     mode: (
@@ -21624,12 +21549,10 @@ function create_fragment$1(ctx) {
       current = true;
       if (!mounted) {
         dispose = [
-          listen(div0, "click", stop_propagation(function() {
-            if (is_function(
-              /*closeModal*/
-              ctx[1]
-            )) ctx[1].apply(this, arguments);
-          })),
+          listen(div0, "click", stop_propagation(
+            /*click_handler_2*/
+            ctx[21]
+          )),
           listen(
             div1,
             "click",
@@ -21654,12 +21577,11 @@ function create_fragment$1(ctx) {
         mounted = true;
       }
     },
-    p(new_ctx, [dirty]) {
-      ctx = new_ctx;
+    p(ctx2, [dirty]) {
       let previous_block_index = current_block_type_index;
-      current_block_type_index = select_block_type(ctx);
+      current_block_type_index = select_block_type(ctx2);
       if (current_block_type_index === previous_block_index) {
-        if_blocks[current_block_type_index].p(ctx, dirty);
+        if_blocks[current_block_type_index].p(ctx2, dirty);
       } else {
         group_outros();
         transition_out(if_blocks[previous_block_index], 1, 1, () => {
@@ -21668,26 +21590,26 @@ function create_fragment$1(ctx) {
         check_outros();
         if_block0 = if_blocks[current_block_type_index];
         if (!if_block0) {
-          if_block0 = if_blocks[current_block_type_index] = if_block_creators[current_block_type_index](ctx);
+          if_block0 = if_blocks[current_block_type_index] = if_block_creators[current_block_type_index](ctx2);
           if_block0.c();
         } else {
-          if_block0.p(ctx, dirty);
+          if_block0.p(ctx2, dirty);
         }
         transition_in(if_block0, 1);
         if_block0.m(div4, t3);
       }
       if (
         /*isShowResult*/
-        ctx[11]
+        ctx2[11]
       ) {
         if (if_block1) {
-          if_block1.p(ctx, dirty);
+          if_block1.p(ctx2, dirty);
           if (dirty & /*isShowResult*/
           2048) {
             transition_in(if_block1, 1);
           }
         } else {
-          if_block1 = create_if_block_1$1(ctx);
+          if_block1 = create_if_block_1$1(ctx2);
           if_block1.c();
           transition_in(if_block1, 1);
           if_block1.m(div4, t4);
@@ -21701,16 +21623,16 @@ function create_fragment$1(ctx) {
       }
       if (
         /*isShowHistory*/
-        ctx[9]
+        ctx2[9]
       ) {
         if (if_block2) {
-          if_block2.p(ctx, dirty);
+          if_block2.p(ctx2, dirty);
           if (dirty & /*isShowHistory*/
           512) {
             transition_in(if_block2, 1);
           }
         } else {
-          if_block2 = create_if_block$1(ctx);
+          if_block2 = create_if_block$1(ctx2);
           if_block2.c();
           transition_in(if_block2, 1);
           if_block2.m(div4, null);
@@ -21725,7 +21647,7 @@ function create_fragment$1(ctx) {
       if (!current || dirty & /*currentType*/
       1 && div4_class_value !== (div4_class_value = null_to_empty(
         /*currentType*/
-        ctx[0] == "1" ? "goldMagicCtn2 magic" : "goldMagicCtn2 gold"
+        ctx2[0] == "1" ? "goldMagicCtn2 magic" : "goldMagicCtn2 gold"
       ) + " svelte-5p8e4p")) {
         attr(div4, "class", div4_class_value);
       }
@@ -21811,6 +21733,7 @@ function instance$1($$self, $$props, $$invalidate) {
   function click_handler_12(event) {
     bubble.call(this, $$self, event);
   }
+  const click_handler_2 = () => closeModal();
   function love_binding($$value) {
     binding_callbacks[$$value ? "unshift" : "push"](() => {
       goldChild = $$value;
@@ -21851,6 +21774,7 @@ function instance$1($$self, $$props, $$invalidate) {
     handelChangeUnitPrice,
     click_handler,
     click_handler_12,
+    click_handler_2,
     love_binding,
     result_1_onClose_binding,
     history_onClose_binding