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

mock/capsule.ts

@@ -55,7 +55,7 @@ export default [
         "message": "信息xxx",
         "success": true,
         "data": {
-          "boolPrize": true, // true-中奖，取prizeInfo信息，false-未中奖，取productInfo
+          "boolPrize": false, // true-中奖，取prizeInfo信息，false-未中奖，取productInfo
           "productInfos": [
             {
               "productImg": "//yun.duiba.com.cn/spark/assets/f77861647e7b55e9c95e9c49d891a21526157a76.jpg",

src/components/NoPrizeCard/NoPrizeCard.jsx

@@ -32,10 +32,10 @@ class NoPrizeCard extends React.Component {
   /** card1文本选择 */
   opt1 = () => {
     const list = [
-      "src/assets/NoPrizeCard/text1.png",
-      "src/assets/NoPrizeCard/text2.png",
-      "src/assets/NoPrizeCard/text3.png",
-      "src/assets/NoPrizeCard/text4.png",
+      "/src/assets//NoPrizeCard/text1.png",
+      "/src/assets/NoPrizeCard/text2.png",
+      "/src/assets/NoPrizeCard/text3.png",
+      "/src/assets/NoPrizeCard/text4.png",
     ];
     const address = list[randomNum(0, 4)];
     return address;
@@ -67,8 +67,8 @@ class NoPrizeCard extends React.Component {
 
   render() {
     const { card } = this.state;
-    const { productInfos } = this.props || {};
-    console.log(productInfos);
+    const { productInfo } = this.props || {};
+    console.log(productInfo);
     return (
       <div className="NoPrizeCard modal_center">
         {card === true ? (
@@ -85,7 +85,7 @@ class NoPrizeCard extends React.Component {
               className="prodSwiper"
               indicatorProps={{ style: { display: "none" } }}
             >
-              {productInfos?.map((item, index) => {
+              {productInfo?.map((item, index) => {
                 return (
                   <SwiperSlide className="prodItem" key={index}>
                     <img

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/CapsulePage/CapsulePage.jsx

@@ -101,7 +101,7 @@ class Capsulepage extends React.Component {
       const {
         boolPrize = false,
         prizeInfo = {},
-        productInfos = [],
+        productInfo = [],
       } = data || {};
 
       // const index = prizeVOs?.findIndex(
@@ -115,7 +115,7 @@ class Capsulepage extends React.Component {
       }, 1600);
       setTimeout(() => {
         this.setState({ btnDynamic: false });
-        this.stopOkHandle(boolPrize, prizeInfo, productInfos);
+        this.stopOkHandle(boolPrize, prizeInfo, productInfo);
       }, 2000);
       // this.turntableRef.braking(index);
     } else {
@@ -125,13 +125,13 @@ class Capsulepage extends React.Component {
   });
 
   // 抽奖停止处理
-  stopOkHandle = (boolPrize, prizeInfo, productInfos) => {
+  stopOkHandle = (boolPrize, prizeInfo, productInfo) => {
     this.btnStarting = false;
     setTimeout(() => {
       this.setState({ btnOutput: false });
     }, 1600);
 
-    // 此时判断是否中奖 true-中奖，取prizeInfo信息，false-为中奖，取productInfos
+    // 此时判断是否中奖 true-中奖，取prizeInfo信息，false-为中奖，取productInfo
     if (boolPrize) {
       // 中奖
       setTimeout(() => {
@@ -140,7 +140,7 @@ class Capsulepage extends React.Component {
     } else {
       // 没中奖
       setTimeout(() => {
-        ModalCtrl.showModal(NoPrizeCard, { productInfos });
+        ModalCtrl.showModal(NoPrizeCard, { productInfo });
       }, 1600);
     }
 

src/pages/GamePage/Game.ts

@@ -48,10 +48,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(this.setPauseCd));
+    // this.level = this.addChild(new Level21(this.setPauseCd));
     globalEvent.on(GameEvent.NextLevel, this.nextLevel, this);
 
-    // this.nextLevel();
+    this.nextLevel();
     this.startCd();
   }
 
@@ -85,6 +85,7 @@ export class Game extends Base {
     if (levelIndex > 0) {
       if (levelIndex >= LevelArr.length) {
         clearInterval(this.intervalId);
+        gameStore.middleSubmit(levelIndex);
         gameStore.submit(LevelArr.length);
         return;
       } else {

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/pages/GamePage/Level/LevelConfig.ts

@@ -14,6 +14,7 @@ import { Level13 } from "@/pages/GamePage/Level/Level13.ts";
 import { Level14 } from "@/pages/GamePage/Level/Level14.ts";
 import { Level15 } from "@/pages/GamePage/Level/Level15.ts";
 import { Level16 } from "@/pages/GamePage/Level/Level16.ts";
+import { Level17 } from "@/pages/GamePage/Level/Level17.ts";
 import { Level18 } from "@/pages/GamePage/Level/Level18.ts";
 import { Level19 } from "@/pages/GamePage/Level/Level19.ts";
 import { Level20 } from "@/pages/GamePage/Level/Level20.ts";
@@ -41,7 +42,7 @@ export const LevelArr = [
   { cls: Level14, tip: `将香蕉移动到牛奶中<br/>变成香蕉牛奶` },
   { cls: Level15, tip: `猫吃老鼠` },
   { cls: Level16, tip: `移动笼子罩住小鸭子` },
-  { cls: Level14, tip: `别忘了，人是高等动物哦` }, // 17
+  { cls: Level17, tip: `别忘了，人是高等动物哦` },
   { cls: Level18, tip: `移开乌云露出太阳<br/>让冰块融化` },
   { cls: Level19, tip: `将冰箱放大至能够装下长颈鹿` },
   { cls: Level20, tip: `别忘了把题目也装进箱子里` },
@@ -49,5 +50,5 @@ export const LevelArr = [
   { cls: Level22, tip: `移开圣诞老人的衣服看看` },
   { cls: Level23, tip: `一样重` },
   { cls: Level24, tip: `将雪球合在一起滚成大雪球` },
-  { cls: Level25, tip: `按住小猪鼻子，把它憋醒` }, // 25
+  { cls: Level25, tip: `按住小猪鼻子，把它憋醒` },
 ];

src/store/gameStore.ts

@@ -69,16 +69,16 @@ class GameStore {
     console.log(d);
     const param = AESEncrypt(JSON.stringify(d), "7A2F4B8D1E6C3905", "cDOiBC1n2QrkAY2P");
 
-    const { success, data } = await API.middleSubmit({ param });
+    const { success, data } = await API.submit({ param });
     if (!success) {
       PageCtrl.changePage(HomePage);
       return success;
     }
 
     if (data.drawChance) {
-      ModalCtrl.showModal(Settlechance, { score, ...data });
+      ModalCtrl.showModal(Settlechance, { data });
     }else {
-      ModalCtrl.showModal(Settlenochance, { score, ...data });
+      ModalCtrl.showModal(Settlenochance, { data });
     }
 
     return success;