Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build/web-mobile/index.html
#	profiles/v2/packages/builder.json

assets/Bundles/MainGame/png/游戏道具进度条/粉色倒数条.png.meta

+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "0733b4bd-c829-4753-95fd-965ee28d1ef1",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "0733b4bd-c829-4753-95fd-965ee28d1ef1@6c48a",
+      "displayName": "粉色倒数条",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "0733b4bd-c829-4753-95fd-965ee28d1ef1",
+        "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": "0733b4bd-c829-4753-95fd-965ee28d1ef1@f9941",
+      "displayName": "粉色倒数条",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 61,
+        "height": 8,
+        "rawWidth": 61,
+        "rawHeight": 8,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 4,
+        "borderRight": 5,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -30.5,
+            -4,
+            0,
+            30.5,
+            -4,
+            0,
+            -30.5,
+            4,
+            0,
+            30.5,
+            4,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            8,
+            61,
+            8,
+            0,
+            0,
+            61,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -30.5,
+            -4,
+            0
+          ],
+          "maxPos": [
+            30.5,
+            4,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "0733b4bd-c829-4753-95fd-965ee28d1ef1@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "0733b4bd-c829-4753-95fd-965ee28d1ef1@6c48a"
+  }
+}

assets/Bundles/MainGame/png/游戏道具进度条/粉色倒数条背景.png.meta

+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "c07ec203-9026-4802-bc31-02f6c34d87d2",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "c07ec203-9026-4802-bc31-02f6c34d87d2@6c48a",
+      "displayName": "粉色倒数条背景",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "c07ec203-9026-4802-bc31-02f6c34d87d2",
+        "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": "c07ec203-9026-4802-bc31-02f6c34d87d2@f9941",
+      "displayName": "粉色倒数条背景",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 202,
+        "height": 20,
+        "rawWidth": 202,
+        "rawHeight": 20,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -101,
+            -10,
+            0,
+            101,
+            -10,
+            0,
+            -101,
+            10,
+            0,
+            101,
+            10,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            20,
+            202,
+            20,
+            0,
+            0,
+            202,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -101,
+            -10,
+            0
+          ],
+          "maxPos": [
+            101,
+            10,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c07ec203-9026-4802-bc31-02f6c34d87d2@6c48a",
+        "atlasUuid": ""
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "c07ec203-9026-4802-bc31-02f6c34d87d2@6c48a"
+  }
+}

assets/Scripts/Scenes/MainGame/MainGame.ts

@@ -106,7 +106,7 @@ export class MainGame extends Scene {
     debugLabel: Label = null;
 
     debug() {
-        return;
+        // return;
         const debugNode = new Node("debug");
         debugNode.layer = this.killTxt.node.layer;
         debugNode.addComponent(UITransform);
@@ -236,7 +236,7 @@ export class MainGame extends Scene {
 
         // 初始化玩家
         this.player.init({
-            // initEnergy: 10000
+            initEnergy: 20000,
             tag: this.player.tag,
             nickName: "我",
             skinName: SkinName[gameStore.startInfo.currentDressUp],

assets/Scripts/Scenes/MainGame/Snake.ts

@@ -217,8 +217,6 @@ export class Snake extends Component {
         // 创建身体节点
         this.addEnergy(initEnergy);
 
-        this.fastGrow(lastLen - this.length);
-
         this.isLife = true;
         this.ready = true;
     }
@@ -377,7 +375,7 @@ export class Snake extends Component {
      */
     private grow() {
 
-        if (this.length > 500) {
+        if (this.length > 1500) {
             return;
         }
 

build/web-mobile/index.html

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

profiles/v2/packages/builder.json

@@ -34,8 +34,8 @@
       }
     ],
     "useSplashScreen": false,
-    "debug": true,
-    "sourceMaps": "inline"
+    "debug": false,
+    "sourceMaps": false
   },
   "BuildTaskManager": {
     "taskMap": {
@@ -45,17 +45,17 @@
         "progress": 1,
         "state": "success",
         "stage": "build",
-        "message": "2024-12-17 18:31:10 build success in 1 min 46 s!",
-        "detailMessage": "%c兑吧发布插件 >> 版本号:1734431366897\rcolor: green\r",
+        "message": "2024-12-17 18:29:38 build success in 41 s!",
+        "detailMessage": "%c兑吧发布插件 >> 版本号:1734431337462\rcolor: green\r",
         "options": {
           "name": "cocos-template-3d",
           "server": "",
           "platform": "web-mobile",
           "buildPath": "project://build",
-          "debug": true,
+          "debug": false,
           "md5Cache": false,
           "skipCompressTexture": false,
-          "sourceMaps": "inline",
+          "sourceMaps": false,
           "overwriteProjectSettings": {
             "includeModules": {
               "gfx-webgl2": "inherit-project-setting",
@@ -109,7 +109,7 @@
           "__version__": "1.3.8",
           "logDest": "project://temp/builder/log/web-mobile2024-11-6 15-39.log"
         },
-        "time": "2024-12-17 18:29:23",
+        "time": "2024-12-17 18:28:56",
         "dirty": false
       }
     }

profiles/v2/packages/duiba-publish.json

@@ -11,7 +11,7 @@
         "accessKeySecret": "6sk3EDd1BYrXlAUoh8maMuN7hOMkh1",
         "__version__": "1.0.0",
         "useZip": true,
-        "useJsEncryption": true
+        "useJsEncryption": false
       }
     },
     "taskOptionsMap": {
@@ -24,7 +24,7 @@
         "accessKeySecret": "6sk3EDd1BYrXlAUoh8maMuN7hOMkh1",
         "__version__": "1.0.0",
         "useZip": true,
-        "useJsEncryption": true
+        "useJsEncryption": false
       },
       "1730878748609}": {
         "uploadDir": "db_games/ccc_game/template3d",

profiles/v2/packages/web-mobile.json

@@ -32,8 +32,8 @@
         }
       ],
       "useSplashScreen": false,
-      "debug": true,
-      "sourceMaps": "inline"
+      "debug": false,
+      "sourceMaps": false
     },
     "taskOptionsMap": {
       "1730878748609": {