Merge remote-tracking branch 'origin/master'

# Conflicts:
#	assets/Bundles/MainGame/MainGame.scene

assets/Scripts/Scenes/MainGame/Components/Target.ts

@@ -30,6 +30,10 @@ export class Target extends Component {
 
     @property([Node]) bannerArr: Node[] = [];
 
+    @property(Node) top: Node = null;
+
+    @property(Node) topCard: Node = null;
+
     constructor() {
         super();
         Target._ins = this;
@@ -92,10 +96,12 @@ export class Target extends Component {
     }
 
     async showTarget3() {
+        this.showTopCard()
         await this.showBanner(this.bannerArr[2]);
     }
 
     async showTarget2() {
+        this.showTop()
         const { time, length } = Global.stageConfig[1];
 
         this.goalTxt.string = `${time}秒长度达到${length}`;
@@ -106,6 +112,7 @@ export class Target extends Component {
     }
 
     async showTarget1() {
+        this.showTop()
         const { time } = Global.stageConfig[0];
         this.goalTxt.string = `存活${time}秒`;
         this.bannerArr[0].getChildByName("txt")
@@ -114,6 +121,15 @@ export class Target extends Component {
         await this.showBanner(this.bannerArr[0]);
     }
 
+    showTopCard() {
+        this.topCard.active = true;
+        this.top.active = false;
+    }
+
+    showTop() {
+        this.top.active = true;
+        this.topCard.active = false
+    }
 
     private _cd = 0;
 
@@ -137,7 +153,7 @@ export class Target extends Component {
 
     cdTween: Tween<Target> = null;
 
-    startCd(cd: number, onComplete = () => {}) {
+    startCd(cd: number, onComplete = () => { }) {
         this.graphics.node.active = true;
         this.cd = this.totalCd = cd;
         this.cdTween = tween(this as Target)

assets/Scripts/Scenes/MainGame/MainGame.ts

@@ -212,8 +212,6 @@ export class MainGame extends Scene {
     async initStage() {
         let { currentStage } = gameStore.startInfo;
 
-        currentStage = 3
-        
         // 初始化玩家
         this.player.init({
             // initEnergy: 10000

build/web-mobile/index.html

@@ -98,14 +98,14 @@
 
     </style>
 
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/zepto.min.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/declare-process.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/jszip.min.v3.10.1.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/assets/plugin/rem.min.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/zepto.min.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/declare-process.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/jszip.min.v3.10.1.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/assets/plugin/rem.min.js"></script>
     <script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
-<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/style.css" />-->
-<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/custom.css" />-->
+<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/style.css" />-->
+<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/custom.css" />-->
 
 <!--    <script src="//yun-duiba-credits-test.duibatest.com.cn/TNGD_GAMES/libs/eruda.min.js"></script>-->
 <!--    <script>eruda.init()</script>-->
@@ -118,20 +118,20 @@
 </div>
 
 <!-- Polyfills bundle. -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/polyfills.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/polyfills.bundle.js" charset="utf-8"></script>
 
 <!-- SystemJS support. -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/system.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/system.bundle.js" charset="utf-8"></script>
 
 <!-- Import map -->
-<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
+<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
 <script type="systemjs-importmap" charset="utf-8">
-    {"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/cocos-js/cc.js"}}
+    {"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/cocos-js/cc.js"}}
 </script>
 
 
 <script>
-    System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733970917185/index.js').catch(function (err) {
+    System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733971997849/index.js').catch(function (err) {
         console.error(err);
     })
 </script>

preview-template/mock/game/startGame.do.json

@@ -2,5 +2,5 @@
     "success": true,
     "code": "",
     "message": "",
-    "data": "Dn22D8mkVmDOfP4ajNWcqtUT2BWK7hLAEHSofRAnITI23/h6M5dk9MJ+cY56DvHjlsXFGC8q3BgSsz56SCAcO6LiZx8tbmrjStn4UcGZq6/W+ZIm0IEma+v0iYkjGBT6bqBnMhA+9JKPvWXKnFJiNR2b8kEDC1Mjt2MH2penAaujIPcM6SAvaaZuTB04+JtkJ98NCKq1ib5v/FUMmokJ2ofNdGPeuPZSIUN8ahCVVm0LEiJd9siI+wzg1thOd0KJQZW9YxHsu0HWY/jI/1JmUbQLqULqipVEC3e9okEe0ha7326T45Erlu0hVtbzzK6VvSIqosm8iwVaiI8PKZkxRtGZRbU7NRiG9E1bE3qr7BBcbrwC4DzLpeRVxZM3SeycegMncfxDX59mZqGYE6274++7czNkS2xHJBg5dTQFdHYFMGDAZM1l4853kvIKUkUexSfaG7mWLEYynXdF/jfosCEDLUNCBBzjHRPWEvLBL7PDUDi1vMW1y3TeOKUpkxYWGmZYkMROFK3+4vJOA7LnNM9Z4l51nolXIqTL3L9SbcttLGZMjBs1Dehz1AAJDLOXZG2Lj0q8njFRKxrG/2dNarOwKEIUt9cjXYvmZ+WkHMnqgv8RnSWnwOGkOAIlEGm2N/9heEukf+6pNxZAUkh+UQ=="
+    "data": "Dn22D8mkVmDOfP4ajNWcqtUT2BWK7hLAEHSofRAnITI23/h6M5dk9MJ+cY56DvHjlsXFGC8q3BgSsz56SCAcO6LiZx8tbmrjStn4UcGZq6/W+ZIm0IEma+v0iYkjGBT6bqBnMhA+9JKPvWXKnFJiNR2b8kEDC1Mjt2MH2penAaujIPcM6SAvaaZuTB04+Jtk5VSYZXauvq4KmXW3GGRumeiiyEIA+ZXAopsUzjcknsRY6nZmKVj0NjiFtVGF84qiZnISqNrmwNrdHOQONlI0TLVPx0Bzlpich1zyMUMMkZ/7cV2CeMi6Sm84oR/risQdMtm7d9EPsIDnoL6i0TO+JLCfvbc2r4yxr3qVSjSnK8A2DqxrtTBtXV8BLNwPLVjtZLVP0MnLPT6PXS5TNsD/jRswCJPga523j5LQgkXjJLlRl83WRQ8/SrcECSAoTF0gHG0+rm8WuFVrvQadxzK8kWZertwqJhAKkAlaj5rOJIgfS7rfoxrqPFSG7JvnMFNyCJ5Z8e4SSC6R/G8pBB1js45fXO6HvLg1QrYCZp+yxNAhcvDgXSPMIHVQns9RFNrw5cC0a4gSW8qIqzNbbl12pfq/OYvV0TjVFIZuGGYAlDrmSifBtQbh3yuT4pd6NH/inb/RXr6U3M6zCet4l0foaQ=="
 }
\ No newline at end of file

profiles/v2/packages/builder.json

@@ -45,8 +45,8 @@
         "progress": 1,
         "state": "success",
         "stage": "build",
-        "message": "2024-12-12 10:36:13 build success in 56 s!",
-        "detailMessage": "%c兑吧发布插件 >> 版本号:1733970917185\rcolor: green\r",
+        "message": "2024-12-12 10:54:03 build success in 45 s!",
+        "detailMessage": "%c兑吧发布插件 >> 版本号:1733971997849\rcolor: green\r",
         "options": {
           "name": "cocos-template-3d",
           "server": "",
@@ -109,7 +109,7 @@
           "__version__": "1.3.8",
           "logDest": "project://temp/builder/log/web-mobile2024-11-6 15-39.log"
         },
-        "time": "2024-12-12 10:35:16",
+        "time": "2024-12-12 10:53:17",
         "dirty": false
       }
     }