Merge remote-tracking branch 'origin/master'

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

assets/Bundles/BlessingBagPage/BlessingBagPage.scene

@@ -7100,8 +7100,8 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -135.978515625,
-      "y": -242.479,
+      "x": -135.97900000000004,
+      "y": -194.8,
       "z": 0
     },
     "_lrot": {
@@ -7221,12 +7221,12 @@
     },
     "_enabled": true,
     "__prefab": null,
-    "_alignFlags": 8,
+    "_alignFlags": 12,
     "_target": null,
-    "_left": 620,
+    "_left": 619.999515625,
     "_right": 0,
     "_top": 0,
-    "_bottom": 0,
+    "_bottom": 135,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,

build/web-mobile/index.html

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

profiles/v2/packages/builder.json

@@ -34,8 +34,8 @@
       }
     ],
     "useSplashScreen": false,
-    "debug": false,
-    "sourceMaps": false
+    "debug": true,
+    "sourceMaps": "inline"
   },
   "BuildTaskManager": {
     "taskMap": {
@@ -45,17 +45,17 @@
         "progress": 1,
         "state": "success",
         "stage": "build",
-        "message": "2024-12-17 18:21:29 build success in 13 min 29 s!",
-        "detailMessage": "refresh db internal success\r",
+        "message": "2024-12-17 18:24:19 build success in 1 min 15 s!",
+        "detailMessage": "%c兑吧发布插件 >> 版本号:1734430983835\rcolor: green\r",
         "options": {
           "name": "cocos-template-3d",
           "server": "",
           "platform": "web-mobile",
           "buildPath": "project://build",
-          "debug": false,
+          "debug": true,
           "md5Cache": false,
           "skipCompressTexture": false,
-          "sourceMaps": false,
+          "sourceMaps": "inline",
           "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:07:59",
+        "time": "2024-12-17 18:23:03",
         "dirty": false
       }
     }

profiles/v2/packages/duiba-publish.json

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

profiles/v2/packages/web-mobile.json

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