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

src/components/settlechance/settlechance.jsx

@@ -11,18 +11,21 @@ import { SvgaPlayer } from "@grace/svgaplayer";
 
 import lightSvga from "../../assets/svga/6输出弹窗.svga";
 import Capsulepage from "../../pages/CapsulePage/CapsulePage";
+import HomePage from "../../pages/HomePage/HomePage";
 @observer
 class Settlechance extends React.Component {
   constructor(props) {
     super(props);
   }
-  
+
   handleClose = _asyncThrottle(() => {
     ModalCtrl.closeModal()
+    PageCtrl.changePage(HomePage)
   })
 
   handleKnow = _asyncThrottle(() => {
     ModalCtrl.closeModal()
+    PageCtrl.changePage(HomePage)
   })
 
   handleDraw = _asyncThrottle(() => {
@@ -47,7 +50,7 @@ class Settlechance extends React.Component {
         <span className="bg"></span>
         <Button className="draw md19" onClick={this.handleDraw} />
         <Button className="know md17" onClick={this.handleKnow} />
-        <img className="icon" 
+        <img className="icon"
           src = {img}
           alt = {title}
         />

src/components/settlenochance/settlenochance.jsx

@@ -11,6 +11,7 @@ import { SvgaPlayer } from "@grace/svgaplayer";
 
 import lightSvga from "../../assets/svga/6输出弹窗.svga";
 import { LOG_KEY, MatterShareOpt, MatterViewDuration, MatterViewOpt, pageView, sensorLog } from "../../utils/sensors.js";
+import HomePage from "@/pages/HomePage/HomePage";
 
 @observer
 class Settlenochance extends React.Component {
@@ -46,10 +47,12 @@ class Settlenochance extends React.Component {
   }
 
   handleClose = _asyncThrottle(() => {
+    PageCtrl.changePage(HomePage)
     ModalCtrl.closeModal()
   })
 
   handleKnow = _asyncThrottle(() => {
+    PageCtrl.changePage(HomePage)
     ModalCtrl.closeModal()
   })
   render() {
@@ -65,7 +68,7 @@ class Settlenochance extends React.Component {
         <SvgaPlayer className="light" src={lightSvga} />
         <span className="bg"></span>
         <Button className="know md17" onClick={this.handleKnow} />
-        <img className="icon" 
+        <img className="icon"
           src = {img}
           alt = {title}
         />

src/pages/GamePage/GamePage.tsx

@@ -127,7 +127,7 @@ class GamePage extends React.Component<any, any> {
     const { levelIndex, levelIdxArr, cd } = gameStore.gameInfo;
 
     const titleSrc = new URL(
-      `../../assets/GamePage/title/title${(levelIndex + 1) || 1}.png?x-oss-process=image/format,webp`,
+      `../../assets/GamePage/title/title${Math.min(levelIndex + 1, levelIdxArr.length) || 1}.png?x-oss-process=image/format,webp`,
       import.meta.url
     ).href;
 

src/store/gameStore.ts

@@ -76,9 +76,9 @@ class GameStore {
     }
 
     if (data.drawChance) {
-      ModalCtrl.showModal(Settlechance, { score, ...data });
+      ModalCtrl.showModal(Settlechance, { data });
     }else {
-      ModalCtrl.showModal(Settlenochance, { score, ...data });
+      ModalCtrl.showModal(Settlenochance, { data });
     }
 
     return success;