Merge branch 'master' of gitlab2.dui88.com:sparkprojects/rb-studychina-20250617

# Conflicts: # src/pages/HomePage/HomePage.tsx

Merge branch 'master' of gitlab2.dui88.com:sparkprojects/rb-studychina-20250617
# Conflicts: # src/pages/HomePage/HomePage.tsx
6758c42a · jtwu · e32c880f · d4bcfd26 · 6758c42a · 6758c42a
Commit 6758c42a authored Jun 21, 2025 by jtwu
178 changed files
--- a/dist/index.html
+++ b/dist/index.html
@@ -84,19 +84,20 @@
      // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
    }
  </script>
-  <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1750401779598/assets/index-BuTGA3Z8.js"></script>
+  <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1750410846558/assets/index-CxFoMwqj.js"></script>
-  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750401779598/assets/vendor-CGo6ru4B.js">
+  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750410846558/assets/vendor-CZIrWzrO.js">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750401779598/assets/vendor-NZxPxbcK.css">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750410846558/assets/vendor-NZxPxbcK.css">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750401779598/assets/index-EmYQxIx8.css">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750410846558/assets/index-PJofHX-T.css">
  <script type="module">import.meta.url;import("_").catch(()=>1);(async function*(){})().next();if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
  <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
 <body>
  <div id="root"></div>
+  <!-- <script src="https://yun.duiba.com.cn/db_games/RB_yanxue/250620/js/output.js"></script> -->
  <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1750401779598/assets/polyfills-legacy-arANKBzQ.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1750410846558/assets/polyfills-legacy-C2MhNPfJ.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1750401779598/assets/index-legacy-DXm7xBD3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1750410846558/assets/index-legacy-WcIs3430.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 </html>
\ No newline at end of file
--- a/mock/draw.ts
+++ b/mock/draw.ts
@@ -9,7 +9,7 @@ export default [
        "code": "123",
        "data": {
          "leftDrawTimes": 6, // 抽奖次数
-          "optionList": [
+          "optionInfoList": [
            {
              "name": `奖品1`,
              "icon": `//yun.duiba.com.cn/polaris/jinmoqiang.9e5bbc004f69ab6a3f34d93daeda028616a9f00d.png`,

--- a/mock/main.ts
+++ b/mock/main.ts
@@ -9,7 +9,7 @@ export default [
        "message": "message",
        "data": {
          "actStartTimestamp": Date.now()-42625488.007563084,
-          "leftGameTimes": 0,
+          "leftGameTimes": 10,
          "rewardDailyFreeGameTimes": 666,
          "uid": "00000000000",
          "currentTimestamp": Date.now(),
@@ -22,7 +22,7 @@ export default [
          "isAgent": true,
          "boundYkCode": "eiusmod in dolor",
          "agreePrivacyFlag": true,
-          "newGuideFlag": 0, // 从0开始
+          "newGuideFlag": 1, // 从0开始
        }
      }
    },

--- a/src/assets/Game/common/error.png
+++ b/src/assets/Game/common/error.png
--- a/src/assets/Game/common/right.png
+++ b/src/assets/Game/common/right.png
--- a/src/assets/Game/level1/A.png
+++ b/src/assets/Game/level1/A.png
--- a/src/assets/Game/level1/B.png
+++ b/src/assets/Game/level1/B.png
--- a/src/assets/Game/level1/C.png
+++ b/src/assets/Game/level1/C.png
--- a/src/assets/Game/level1/D.png
+++ b/src/assets/Game/level1/D.png
--- a/src/assets/Game/level1/error.png
+++ b/src/assets/Game/level1/error.png
--- a/src/assets/Game/level1/qs.png
+++ b/src/assets/Game/level1/qs.png
--- a/src/assets/Game/level1/right.png
+++ b/src/assets/Game/level1/right.png
--- a/src/assets/Game/level10/A.png
+++ b/src/assets/Game/level10/A.png
--- a/src/assets/Game/level10/B.png
+++ b/src/assets/Game/level10/B.png
--- a/src/assets/Game/level10/C.png
+++ b/src/assets/Game/level10/C.png
--- a/src/assets/Game/level10/D.png
+++ b/src/assets/Game/level10/D.png
--- a/src/assets/Game/level10/qs.png
+++ b/src/assets/Game/level10/qs.png
--- a/src/assets/Game/level11/qs.png
+++ b/src/assets/Game/level11/qs.png
--- a/src/assets/Game/level11/冰箱.png
+++ b/src/assets/Game/level11/冰箱.png
--- a/src/assets/Game/level11/长颈鹿.png
+++ b/src/assets/Game/level11/长颈鹿.png
--- a/src/assets/Game/level12/qs.png
+++ b/src/assets/Game/level12/qs.png
--- a/src/assets/Game/level12/头.png
+++ b/src/assets/Game/level12/头.png
--- a/src/assets/Game/level12/尾.png
+++ b/src/assets/Game/level12/尾.png
--- a/src/assets/Game/level13/A.png
+++ b/src/assets/Game/level13/A.png
--- a/src/assets/Game/level13/B.png
+++ b/src/assets/Game/level13/B.png
--- a/src/assets/Game/level13/C.png
+++ b/src/assets/Game/level13/C.png
--- a/src/assets/Game/level13/D.png
+++ b/src/assets/Game/level13/D.png
--- a/src/assets/Game/level13/qs.png
+++ b/src/assets/Game/level13/qs.png
--- a/src/assets/Game/level14/A.png
+++ b/src/assets/Game/level14/A.png
--- a/src/assets/Game/level14/B.png
+++ b/src/assets/Game/level14/B.png
--- a/src/assets/Game/level14/img.png
+++ b/src/assets/Game/level14/img.png
--- a/src/assets/Game/level14/qs.png
+++ b/src/assets/Game/level14/qs.png
--- a/src/assets/Game/level14/right.png
+++ b/src/assets/Game/level14/right.png
--- a/src/assets/Game/level15/A.png
+++ b/src/assets/Game/level15/A.png
--- a/src/assets/Game/level15/B.png
+++ b/src/assets/Game/level15/B.png
--- a/src/assets/Game/level15/C.png
+++ b/src/assets/Game/level15/C.png
--- a/src/assets/Game/level15/D.png
+++ b/src/assets/Game/level15/D.png
--- a/src/assets/Game/level15/img.png
+++ b/src/assets/Game/level15/img.png
--- a/src/assets/Game/level15/mi.png
+++ b/src/assets/Game/level15/mi.png
--- a/src/assets/Game/level15/mi2.png
+++ b/src/assets/Game/level15/mi2.png
--- a/src/assets/Game/level15/qs.png
+++ b/src/assets/Game/level15/qs.png
--- a/src/assets/Game/level15/right.png
+++ b/src/assets/Game/level15/right.png
--- a/src/assets/Game/level16/A.png
+++ b/src/assets/Game/level16/A.png
--- a/src/assets/Game/level16/B.png
+++ b/src/assets/Game/level16/B.png
--- a/src/assets/Game/level16/qs.png
+++ b/src/assets/Game/level16/qs.png
--- a/src/assets/Game/level16/right.png
+++ b/src/assets/Game/level16/right.png
--- a/src/assets/Game/level17/circle0.png
+++ b/src/assets/Game/level17/circle0.png
--- a/src/assets/Game/level17/circle1.png
+++ b/src/assets/Game/level17/circle1.png
--- a/src/assets/Game/level17/circle2.png
+++ b/src/assets/Game/level17/circle2.png
--- a/src/assets/Game/level17/circle3.png
+++ b/src/assets/Game/level17/circle3.png
--- a/src/assets/Game/level17/circle4.png
+++ b/src/assets/Game/level17/circle4.png
--- a/src/assets/Game/level17/circle5.png
+++ b/src/assets/Game/level17/circle5.png
--- a/src/assets/Game/level17/circle6.png
+++ b/src/assets/Game/level17/circle6.png
--- a/src/assets/Game/level17/circle7.png
+++ b/src/assets/Game/level17/circle7.png
--- a/src/assets/Game/level17/circle8.png
+++ b/src/assets/Game/level17/circle8.png
--- a/src/assets/Game/level17/circle9.png
+++ b/src/assets/Game/level17/circle9.png
--- a/src/assets/Game/level17/img.png
+++ b/src/assets/Game/level17/img.png
--- a/src/assets/Game/level17/qs.png
+++ b/src/assets/Game/level17/qs.png
--- a/src/assets/Game/level18/cloud1.png
+++ b/src/assets/Game/level18/cloud1.png
--- a/src/assets/Game/level18/cloud2.png
+++ b/src/assets/Game/level18/cloud2.png
--- a/src/assets/Game/level18/ice.png
+++ b/src/assets/Game/level18/ice.png
--- a/src/assets/Game/level18/ice2.png
+++ b/src/assets/Game/level18/ice2.png
--- a/src/assets/Game/level18/qs.png
+++ b/src/assets/Game/level18/qs.png
--- a/src/assets/Game/level18/sun.png
+++ b/src/assets/Game/level18/sun.png
--- a/src/assets/Game/level19/img.png
+++ b/src/assets/Game/level19/img.png
--- a/src/assets/Game/level19/qs.png
+++ b/src/assets/Game/level19/qs.png
--- a/src/assets/Game/level19/女.png
+++ b/src/assets/Game/level19/女.png
--- a/src/assets/Game/level19/男.png
+++ b/src/assets/Game/level19/男.png
--- a/src/assets/Game/level19/船.png
+++ b/src/assets/Game/level19/船.png
--- a/src/assets/Game/level2/A.png
+++ b/src/assets/Game/level2/A.png
--- a/src/assets/Game/level2/B.png
+++ b/src/assets/Game/level2/B.png
--- a/src/assets/Game/level2/C.png
+++ b/src/assets/Game/level2/C.png
--- a/src/assets/Game/level2/D.png
+++ b/src/assets/Game/level2/D.png
--- a/src/assets/Game/level2/error.png
+++ b/src/assets/Game/level2/error.png
--- a/src/assets/Game/level2/qs.png
+++ b/src/assets/Game/level2/qs.png
--- a/src/assets/Game/level2/right.png
+++ b/src/assets/Game/level2/right.png
--- a/src/assets/Game/level2/题图.png
+++ b/src/assets/Game/level2/题图.png
--- a/src/assets/Game/level20/A.png
+++ b/src/assets/Game/level20/A.png
--- a/src/assets/Game/level20/B.png
+++ b/src/assets/Game/level20/B.png
--- a/src/assets/Game/level20/C.png
+++ b/src/assets/Game/level20/C.png
--- a/src/assets/Game/level20/box.png
+++ b/src/assets/Game/level20/box.png
--- a/src/assets/Game/level20/qs.png
+++ b/src/assets/Game/level20/qs.png
--- a/src/assets/Game/level20/top.png
+++ b/src/assets/Game/level20/top.png
--- a/src/assets/Game/level21/A.png
+++ b/src/assets/Game/level21/A.png
--- a/src/assets/Game/level21/qs.png
+++ b/src/assets/Game/level21/qs.png
--- a/src/assets/Game/level21/right.png
+++ b/src/assets/Game/level21/right.png
--- a/src/assets/Game/level22/qs.png
+++ b/src/assets/Game/level22/qs.png
--- a/src/assets/Game/level22/头.png
+++ b/src/assets/Game/level22/头.png
--- a/src/assets/Game/level22/底.png
+++ b/src/assets/Game/level22/底.png
--- a/src/assets/Game/level22/衣服.png
+++ b/src/assets/Game/level22/衣服.png
--- a/src/assets/Game/level22/裤子.png
+++ b/src/assets/Game/level22/裤子.png
--- a/src/assets/Game/level23/A.png
+++ b/src/assets/Game/level23/A.png
--- a/src/assets/Game/level23/B.png
+++ b/src/assets/Game/level23/B.png
--- a/src/assets/Game/level23/C.png
+++ b/src/assets/Game/level23/C.png
--- a/src/assets/Game/level23/error.png
+++ b/src/assets/Game/level23/error.png
--- a/src/assets/Game/level23/qs.png
+++ b/src/assets/Game/level23/qs.png
--- a/src/assets/Game/level23/right.png
+++ b/src/assets/Game/level23/right.png
--- a/src/assets/Game/level24/qs.png
+++ b/src/assets/Game/level24/qs.png
--- a/src/assets/Game/level24/球.png
+++ b/src/assets/Game/level24/球.png
--- a/src/assets/Game/level25/hide.png
+++ b/src/assets/Game/level25/hide.png
--- a/src/assets/Game/level25/img.png
+++ b/src/assets/Game/level25/img.png
--- a/src/assets/Game/level25/mad.png
+++ b/src/assets/Game/level25/mad.png
--- a/src/assets/Game/level25/open.png
+++ b/src/assets/Game/level25/open.png
--- a/src/assets/Game/level25/qs.png
+++ b/src/assets/Game/level25/qs.png
--- a/src/assets/Game/level25/redFace.png
+++ b/src/assets/Game/level25/redFace.png
--- a/src/assets/Game/level25/right.png
+++ b/src/assets/Game/level25/right.png
--- a/src/assets/Game/level25/sleep.png
+++ b/src/assets/Game/level25/sleep.png
--- a/src/assets/Game/level25/wake.png
+++ b/src/assets/Game/level25/wake.png
--- a/src/assets/Game/level3/A.png
+++ b/src/assets/Game/level3/A.png
--- a/src/assets/Game/level3/B.png
+++ b/src/assets/Game/level3/B.png
--- a/src/assets/Game/level3/C.png
+++ b/src/assets/Game/level3/C.png
--- a/src/assets/Game/level3/D.png
+++ b/src/assets/Game/level3/D.png
--- a/src/assets/Game/level3/error.png
+++ b/src/assets/Game/level3/error.png
--- a/src/assets/Game/level3/qs.png
+++ b/src/assets/Game/level3/qs.png
--- a/src/assets/Game/level3/right.png
+++ b/src/assets/Game/level3/right.png
--- a/src/assets/Game/level4/A.png
+++ b/src/assets/Game/level4/A.png
--- a/src/assets/Game/level4/B.png
+++ b/src/assets/Game/level4/B.png
--- a/src/assets/Game/level4/C.png
+++ b/src/assets/Game/level4/C.png
--- a/src/assets/Game/level4/D.png
+++ b/src/assets/Game/level4/D.png
--- a/src/assets/Game/level4/error.png
+++ b/src/assets/Game/level4/error.png
--- a/src/assets/Game/level4/qs.png
+++ b/src/assets/Game/level4/qs.png
--- a/src/assets/Game/level4/right.png
+++ b/src/assets/Game/level4/right.png
--- a/src/assets/Game/level5/A.png
+++ b/src/assets/Game/level5/A.png
--- a/src/assets/Game/level5/B.png
+++ b/src/assets/Game/level5/B.png
--- a/src/assets/Game/level5/C.png
+++ b/src/assets/Game/level5/C.png
--- a/src/assets/Game/level5/D.png
+++ b/src/assets/Game/level5/D.png
--- a/src/assets/Game/level5/qs.png
+++ b/src/assets/Game/level5/qs.png
--- a/src/assets/Game/level5/right.png
+++ b/src/assets/Game/level5/right.png
--- a/src/assets/Game/level6/A.png
+++ b/src/assets/Game/level6/A.png
--- a/src/assets/Game/level6/B.png
+++ b/src/assets/Game/level6/B.png
--- a/src/assets/Game/level6/C.png
+++ b/src/assets/Game/level6/C.png
--- a/src/assets/Game/level6/qs.png
+++ b/src/assets/Game/level6/qs.png
--- a/src/assets/Game/level6/right.png
+++ b/src/assets/Game/level6/right.png
--- a/src/assets/Game/level6/叉子.png
+++ b/src/assets/Game/level6/叉子.png
--- a/src/assets/Game/level7/mask.png
+++ b/src/assets/Game/level7/mask.png
--- a/src/assets/Game/level7/pig.png
+++ b/src/assets/Game/level7/pig.png
--- a/src/assets/Game/level7/qs.png
+++ b/src/assets/Game/level7/qs.png
--- a/src/assets/Game/level7/金币.png
+++ b/src/assets/Game/level7/金币.png
--- a/src/assets/Game/level8/A.png
+++ b/src/assets/Game/level8/A.png
--- a/src/assets/Game/level8/B.png
+++ b/src/assets/Game/level8/B.png
--- a/src/assets/Game/level8/C.png
+++ b/src/assets/Game/level8/C.png
--- a/src/assets/Game/level8/D.png
+++ b/src/assets/Game/level8/D.png
--- a/src/assets/Game/level8/error.png
+++ b/src/assets/Game/level8/error.png
--- a/src/assets/Game/level8/qs.png
+++ b/src/assets/Game/level8/qs.png
--- a/src/assets/Game/level9/duck.png
+++ b/src/assets/Game/level9/duck.png
--- a/src/assets/Game/level9/img.png
+++ b/src/assets/Game/level9/img.png
--- a/src/assets/Game/level9/qs.png
+++ b/src/assets/Game/level9/qs.png
--- a/src/assets/Game/问题.png
+++ b/src/assets/Game/问题.png
--- a/src/assets/GamePage/bg.jpg
+++ b/src/assets/GamePage/bg.jpg
--- a/src/assets/GamePage/title/title1.png
+++ b/src/assets/GamePage/title/title1.png
--- a/src/assets/GamePage/title/title10.png
+++ b/src/assets/GamePage/title/title10.png
--- a/src/assets/GamePage/title/title11.png
+++ b/src/assets/GamePage/title/title11.png
--- a/src/assets/GamePage/title/title12.png
+++ b/src/assets/GamePage/title/title12.png
--- a/src/assets/GamePage/title/title13.png
+++ b/src/assets/GamePage/title/title13.png
--- a/src/assets/GamePage/title/title14.png
+++ b/src/assets/GamePage/title/title14.png
--- a/src/assets/GamePage/title/title15.png
+++ b/src/assets/GamePage/title/title15.png
--- a/src/assets/GamePage/title/title16.png
+++ b/src/assets/GamePage/title/title16.png
--- a/src/assets/GamePage/title/title17.png
+++ b/src/assets/GamePage/title/title17.png
--- a/src/assets/GamePage/title/title18.png
+++ b/src/assets/GamePage/title/title18.png
--- a/src/assets/GamePage/title/title19.png
+++ b/src/assets/GamePage/title/title19.png
--- a/src/assets/GamePage/title/title2.png
+++ b/src/assets/GamePage/title/title2.png
--- a/src/assets/GamePage/title/title20.png
+++ b/src/assets/GamePage/title/title20.png
--- a/src/assets/GamePage/title/title21.png
+++ b/src/assets/GamePage/title/title21.png
--- a/src/assets/GamePage/title/title22.png
+++ b/src/assets/GamePage/title/title22.png
--- a/src/assets/GamePage/title/title23.png
+++ b/src/assets/GamePage/title/title23.png
--- a/src/assets/GamePage/title/title24.png
+++ b/src/assets/GamePage/title/title24.png
--- a/src/assets/GamePage/title/title25.png
+++ b/src/assets/GamePage/title/title25.png
--- a/src/assets/GamePage/title/title3.png
+++ b/src/assets/GamePage/title/title3.png
--- a/src/assets/GamePage/title/title4.png
+++ b/src/assets/GamePage/title/title4.png
--- a/src/assets/GamePage/title/title5.png
+++ b/src/assets/GamePage/title/title5.png
--- a/src/assets/GamePage/title/title6.png
+++ b/src/assets/GamePage/title/title6.png
--- a/src/assets/GamePage/title/title7.png
+++ b/src/assets/GamePage/title/title7.png
--- a/src/assets/GamePage/title/title8.png
+++ b/src/assets/GamePage/title/title8.png
--- a/src/assets/GamePage/title/title9.png
+++ b/src/assets/GamePage/title/title9.png
--- a/src/pages/GamePage/GamePage.module.less
+++ b/src/pages/GamePage/GamePage.module.less
--- a/src/pages/GamePage/GamePage.tsx
+++ b/src/pages/GamePage/GamePage.tsx
--- a/src/pages/HomePage/HomePage.tsx
+++ b/src/pages/HomePage/HomePage.tsx
--- a/src/store/store.ts
+++ b/src/store/store.ts