Merge remote-tracking branch 'origin/master'

# Conflicts:
#	profiles/v2/packages/builder.json

assets/Bundles/BlessingBagPage/BlessingBagPage.scene

@@ -193,7 +193,7 @@
     "_priority": 1073741824,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 850.9565217391305,
+    "_orthoHeight": 726.1043723554302,
     "_near": 1,
     "_far": 2000,
     "_color": {
@@ -7233,7 +7233,7 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7@f9941",
+      "__uuid__": "3b9d059e-f51b-4857-a379-b4d2f2614914@f9941",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,

assets/Bundles/BlessingBagPage/png/change-sliver.png.meta

-{
-  "ver": "1.0.27",
-  "importer": "image",
-  "imported": true,
-  "uuid": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7",
-  "files": [
-    ".json",
-    ".png"
-  ],
-  "subMetas": {
-    "6c48a": {
-      "importer": "texture",
-      "uuid": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7@6c48a",
-      "displayName": "change-sliver",
-      "id": "6c48a",
-      "name": "texture",
-      "userData": {
-        "wrapModeS": "clamp-to-edge",
-        "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7",
-        "isUuid": true,
-        "visible": false,
-        "minfilter": "linear",
-        "magfilter": "linear",
-        "mipfilter": "none",
-        "anisotropy": 0
-      },
-      "ver": "1.0.22",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f9941": {
-      "importer": "sprite-frame",
-      "uuid": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7@f9941",
-      "displayName": "change-sliver",
-      "id": "f9941",
-      "name": "spriteFrame",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0.5,
-        "offsetY": 1,
-        "trimX": 32,
-        "trimY": 32,
-        "width": 137,
-        "height": 134,
-        "rawWidth": 200,
-        "rawHeight": 200,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [
-            -68.5,
-            -67,
-            0,
-            68.5,
-            -67,
-            0,
-            -68.5,
-            67,
-            0,
-            68.5,
-            67,
-            0
-          ],
-          "indexes": [
-            0,
-            1,
-            2,
-            2,
-            1,
-            3
-          ],
-          "uv": [
-            32,
-            168,
-            169,
-            168,
-            32,
-            34,
-            169,
-            34
-          ],
-          "nuv": [
-            0.16,
-            0.17,
-            0.845,
-            0.17,
-            0.16,
-            0.84,
-            0.845,
-            0.84
-          ],
-          "minPos": [
-            -68.5,
-            -67,
-            0
-          ],
-          "maxPos": [
-            68.5,
-            67,
-            0
-          ]
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7@6c48a",
-        "atlasUuid": ""
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    }
-  },
-  "userData": {
-    "type": "sprite-frame",
-    "hasAlpha": true,
-    "fixAlphaTransparencyArtifacts": false,
-    "redirect": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7@6c48a"
-  }
-}

assets/Bundles/ExchangeSuccess/ExchangeSuccess.prefab

@@ -238,7 +238,7 @@
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,

assets/Bundles/RankPosterPanel/png/GamePosterPanel.pac

-{
-    "__type__": "cc.SpriteAtlas"
-}

assets/Bundles/RankPosterPanel/png/GamePosterPanel.pac.meta

-{"ver":"1.0.8","importer":"auto-atlas","imported":true,"uuid":"e6d45b5c-bdb1-460b-af35-d4e04c4c8b13","files":[".json"],"subMetas":{},"userData":{"maxWidth":2048,"maxHeight":2048,"padding":2,"allowRotation":true,"forceSquared":false,"powerOfTwo":false,"algorithm":"MaxRects","format":"png","quality":80,"contourBleed":true,"paddingBleed":true,"filterUnused":false,"removeTextureInBundle":true,"removeImageInBundle":true,"removeSpriteAtlasInBundle":true,"compressSettings":{},"textureSetting":{"wrapModeS":"repeat","wrapModeT":"repeat","minfilter":"linear","magfilter":"linear","mipfilter":"none","anisotropy":0}}}

assets/Module/UIFast.ts

@@ -33,8 +33,8 @@ export function hideToast() {
     UIMgr.ins.hideToast();
 }
 
-export function showShareGuide() {
-    UIMgr.ins.showShareGuide();
+export function showShareGuide(guideTxt = "") {
+    UIMgr.ins.showShareGuide(guideTxt);
 }
 
 export function hideShareGuide() {

assets/Module/UIMgr.ts

@@ -76,9 +76,9 @@ export class UIMgr {
         this.toastBg = this.toast.getChildByName("bg");
         this.toastLabel = this.toastBg.getChildByName("label");
 
-        this.showGuide = this.uiCanvas.getChildByName("ShareGuide");
+        this.shareGuide = this.uiCanvas.getChildByName("ShareGuide");
         this.hideShareGuide();
-        this.showGuide.on(Button.EventType.CLICK, this.hideShareGuide, this);
+        this.shareGuide.on(Button.EventType.CLICK, this.hideShareGuide, this);
 
         this.waiting.active = false;
         this.toast.active = false;
@@ -86,14 +86,16 @@ export class UIMgr {
 
     /********* Share Guide *********/
 
-    showGuide: Node = null;
+    shareGuide: Node = null;
 
-    showShareGuide() {
-        this.showGuide.active = true;
+    showShareGuide(guideTxt = "") {
+        this.shareGuide.active = true;
+        this.shareGuide.getChildByName("label")
+            .getComponent(Label).string = guideTxt;
     }
 
     hideShareGuide() {
-        this.showGuide.active = false;
+        this.shareGuide.active = false;
     }
 
     /********* Share Guide *********/

assets/Scripts/Panels/GameRevivePanel.ts

@@ -6,6 +6,7 @@ import gameStore from "../store/gameStore";
 import { MainGame } from "../Scenes/MainGame/MainGame";
 import { hideShareGuide, showShareGuide, showToast } from "../../Module/UIFast";
 import { unwatchPageVisibility, watchPageVisibility } from "../Utils/pageVisibilityNotify";
+import { UIMgr } from "../../Module/UIMgr";
 
 const { ccclass, property } = _decorator;
 
@@ -35,19 +36,19 @@ export default class GameRevivePanel extends Panel {
         this.shareRevive.on(Button.EventType.CLICK, this.clickShare, this);
         this.overBtn.on(Button.EventType.CLICK, this.clickOver, this);
 
-        watchPageVisibility(this.onPageVisibility);
+        // watchPageVisibility(this.onPageVisibility);
     }
 
     onDestroy() {
-        unwatchPageVisibility(this.onPageVisibility);
+        // unwatchPageVisibility(this.onPageVisibility);
     }
 
-    onPageVisibility = (visible) => {
-        if (visible && this.isClickShare && !this.isReview) {
-            hideShareGuide();
-            this.review(3);
-        }
-    };
+    // onPageVisibility = (visible) => {
+    //     if (visible && this.isClickShare && !this.isReview) {
+    //         hideShareGuide();
+    //         this.review(3);
+    //     }
+    // };
 
     async start() {
         const {
@@ -133,7 +134,13 @@ export default class GameRevivePanel extends Panel {
         this.clickFlag = true;
         this.isClickShare = true;
         this.cd.stop();
-        showShareGuide();
+        showShareGuide("分享好友后，点击屏幕即可复活");
+        const clickGuide = () => {
+            UIMgr.ins.shareGuide.off(Button.EventType.CLICK, clickGuide, this);
+            hideShareGuide();
+            this.review(3);
+        };
+        UIMgr.ins.shareGuide.once(Button.EventType.CLICK, clickGuide, this);
 
     }
 

assets/Scripts/store/store.ts

@@ -146,7 +146,7 @@ class Store {
 
 
     async getTaskInfo() {
-        return await sendWebNetWithToken(WebNetName.taskList, {
+        return await sendWebNet(WebNetName.taskList, {
             taskToken: getUrlParams("taskToken") || "123456",
         });
     }

assets/Start/Start.ts

@@ -20,6 +20,7 @@ import store from "../Scripts/store/store";
 import { getPreLoadList, preload } from "../Scripts/Utils/LoaderTools";
 import { AudioMgr } from "../core_tgx/base/AudioMgr";
 import shareStore from "../Scripts/store/shareStore";
+import GetPrize from "../Scripts/Panels/GetPrize";
 
 const { ccclass, property } = _decorator;
 
@@ -92,6 +93,18 @@ export class Start extends Component{
                 path: "HomeScene",
                 type: "bundle",
             },
+            {
+                path: "SnakeSkin",
+                type: "bundle",
+            },
+            {
+                path: "SignPanel",
+                type: "bundle",
+            },
+            {
+                path: "GetPrize",
+                type: "bundle",
+            },
             {
                 path: "MainGame",
                 type: "bundle"

build/web-mobile/index.html

@@ -98,14 +98,14 @@
 
     </style>
 
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/assets/plugin/zepto.min.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/assets/plugin/declare-process.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/assets/plugin/jszip.min.v3.10.1.js"></script>
-    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/assets/plugin/rem.min.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/zepto.min.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/declare-process.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/jszip.min.v3.10.1.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/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/1733985135346/style.css" />-->
-<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/custom.css" />-->
+<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/style.css" />-->
+<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/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/1733985135346/src/polyfills.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/polyfills.bundle.js" charset="utf-8"></script>
 
 <!-- SystemJS support. -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/system.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/system.bundle.js" charset="utf-8"></script>
 
 <!-- Import map -->
-<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
+<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/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/1733985135346/cocos-js/cc.js"}}
+    {"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/cocos-js/cc.js"}}
 </script>
 
 
 <script>
-    System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/index.js').catch(function (err) {
+    System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/index.js').catch(function (err) {
         console.error(err);
     })
 </script>

profiles/v2/packages/builder.json

@@ -45,8 +45,8 @@
         "progress": 1,
         "state": "success",
         "stage": "build",
-        "message": "2024-12-12 12:38:18 build success in 1 min 23 s!",
-        "detailMessage": "%c兑吧发布插件 >> 版本号:1733978214944\rcolor: green\r",
+        "message": "2024-12-12 15:25:18 build success in 54 s!",
+        "detailMessage": "Asset DB is resume!\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 12:36:54",
+        "time": "2024-12-12 15:24:24",
         "dirty": false
       }
     }