Merge branch 'master' of http://gitlab2.dui88.com/sparkprojects/rb_strongestbrain_250520

src/pages/GamePage/Game.ts

@@ -32,13 +32,10 @@ export class Game extends Base {
     const qsBg = this.addChild(new Sprite(Assets.get("问题.png")));
     qsBg.position.set(49, 316);
 
-    this.level = this.addChild(new Level21());
-
-    gameStore.start();
-
+    // this.level = this.addChild(new Level21());
     globalEvent.on(GameEvent.NextLevel, this.nextLevel, this);
 
-    // this.nextLevel();
+    this.nextLevel();
 
   }
 

src/pages/GamePage/GamePage.tsx

@@ -114,17 +114,17 @@ class GamePage extends React.Component<any, any> {
     const {} = store.indexData;
     const { levelIndex, levelIdxArr } = gameStore.gameInfo;
 
-    const titleIdx = levelIdxArr[levelIndex] + 1;
+    const titleSrc = new URL(
+      `../../assets/GamePage/title/title${(levelIndex + 1) || 1}.png?x-oss-process=image/format,webp`,
+      import.meta.url
+    ).href;
 
     return <div className={styles.root} ref={(el) => this.gameDiv = el}>
 
       <canvas className={styles.gameCanvas} ref={(el) => this.gameCanvas = el}/>
 
       <div className={styles.cd}>180s</div>
-      <img
-        src={new URL(`../../assets/GamePage/title/title${levelIndex+1}.png?x-oss-process=image/format,webp`, import.meta.url).href}
-        className={styles.title}
-      />
+      <img src={titleSrc} className={styles.title}/>
       <Button className={styles.tipBtn} onClick={this.clickTip}/>
       <Button className={styles.backBtn} onClick={this.clickBack}/>
     </div>;

src/pages/HomePage/HomePage.tsx

@@ -16,6 +16,8 @@ import MyPrize from '../MyPrize/MyPrize.js';
 import shareStore from '@/store/share.js';
 import { LOG_KEY, MatterShareOpt, MatterViewDuration, MatterViewOpt, pageView, sensorLog } from "@/utils/sensors.js";
 import { CHANNEL_PARAMS, extranceName } from '@/utils/constants.js';
+import gameStore from "@/store/gameStore.ts";
+import GamePage from "@/pages/GamePage/GamePage.tsx";
 
 @observer
 class Homepage extends React.Component {
@@ -49,7 +51,7 @@ class Homepage extends React.Component {
           page_name: "活动首页",
           button_name: "我的排名按钮",
         });
-        PageCtrl.changePage(RankPage); 
+        PageCtrl.changePage(RankPage);
         break;
 
       // 1 抽奖
@@ -78,7 +80,12 @@ class Homepage extends React.Component {
           page_name: "活动首页",
           button_name: "开始答题按钮",
         });
-        
+
+        const suc = await gameStore.start();
+        if (suc) {
+          PageCtrl.changePage(GamePage);
+        }
+
         break;
 
       // 4 我的奖品
@@ -207,4 +214,4 @@ class Homepage extends React.Component {
     );
   }
 }
-export default Homepage;
+export default Homepage;
\ No newline at end of file