Merge remote-tracking branch 'origin/master'

assets/Bundles/HomeScene/HomeScene.scene

@@ -478,7 +478,7 @@
       "y": -180,
       "z": -12.000012657215834
     },
-    "_id": "fcTGbkhuBJ8otO0aCNBok/"
+    "_id": "b6XPisGFdJdbikRH3iuuVS"
   },
   {
     "__type__": "cc.UITransform",
@@ -500,7 +500,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "e6IgK+VxJDCZZnVK804ZLE"
+    "_id": "afk/IFv1hAp7FCMUYSxfEI"
   },
   {
     "__type__": "cc.Sprite",
@@ -536,7 +536,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "5744ml6FlHlKuxH2oaj3PI"
+    "_id": "2b9ejPUEhBybSJyf0cGL0L"
   },
   {
     "__type__": "cc.Node",
@@ -584,7 +584,7 @@
       "y": -180,
       "z": -11.00000220913452
     },
-    "_id": "b3CTVlpVVA+qeYxrajLprV"
+    "_id": "1523MOdtJPmpLKfK0Krkjc"
   },
   {
     "__type__": "cc.UITransform",
@@ -606,7 +606,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "44F9ILuKNFOrfVmOu4rlGi"
+    "_id": "60u6/iiyFBm7LuoMjQnnK0"
   },
   {
     "__type__": "cc.Sprite",
@@ -642,7 +642,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "1ckVTrlddIDaBmug16N8nL"
+    "_id": "6dTaLEXSZMWa1giTfJGQ3o"
   },
   {
     "__type__": "cc.Node",
@@ -690,7 +690,7 @@
       "y": -180,
       "z": -64.00000614258742
     },
-    "_id": "f8I+GfeUxOcJTyV/uRsdwc"
+    "_id": "67p9QVXGVMb7VGuhrmbZx+"
   },
   {
     "__type__": "cc.UITransform",
@@ -712,7 +712,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "53QYPAABJDVYPldZwin8T+"
+    "_id": "5akRu4b+FKA5sSLaifF/Gz"
   },
   {
     "__type__": "cc.Sprite",
@@ -748,7 +748,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "a9d7dBvTVNKoTSze5+ypYi"
+    "_id": "71yk95gqdFopG8GgAdxqe/"
   },
   {
     "__type__": "cc.Node",
@@ -796,7 +796,7 @@
       "y": 180,
       "z": 25.99999385741257
     },
-    "_id": "7eKLDpx5VACYF3WP9ZBVc7"
+    "_id": "85zVq++CJCe7WKtDHBXKNH"
   },
   {
     "__type__": "cc.UITransform",
@@ -818,7 +818,7 @@
       "x": 0,
       "y": 1
     },
-    "_id": "802EnTjjpKY4Unrxm26/RC"
+    "_id": "99YzeYKSxPRI1dvm929kjx"
   },
   {
     "__type__": "cc.Sprite",
@@ -854,7 +854,7 @@
     "_isTrimmedMode": true,
     "_useGrayscale": false,
     "_atlas": null,
-    "_id": "1cZ+DrKW9PX7ndouP9Q4C0"
+    "_id": "88RgM4C1lF0p+z+N70fGTl"
   },
   {
     "__type__": "cc.UITransform",

assets/Scripts/Panels/MyBagPanel.ts

@@ -56,7 +56,7 @@ export class MyBagPanel extends Panel {
   toolDate: any[] = [];
 
   onLoad() {
-    this.tab = TAB.TOOL;
+    this.tab = TAB.PRIZE;
 
     this.closeBtn.on(Button.EventType.CLICK, this.clickClose, this);
     this.prize_btn.on(Button.EventType.CLICK, this.clickSheng, this);
@@ -133,6 +133,9 @@ export class MyBagPanel extends Panel {
     for (let item of data) {
 
       const { extra: { name, icon, type }, id, prizeId, gmtCreate } = item;
+      if (excludeSp && type === 1) {
+        continue;
+      }
 
       records.push({
         id,
@@ -168,11 +171,13 @@ export class MyBagPanel extends Panel {
     const goCheck = cell.getChildByName("goCheck")
     const goBuy = cell.getChildByName("goBuy")
     const goDress = cell.getChildByName("goDress")
+    const Derssed = cell.getChildByName("Derssed")
 
 
-    goCheck.on(Button.EventType.CLICK, () => this.clickToCheck(url, id))
-    goBuy.on(Button.EventType.CLICK, () => this.clickToBuy())
-    goDress.on(Button.EventType.CLICK, () => this.clickToDress(spId))
+    goCheck.on(Button.EventType.CLICK, () => this.clickToCheck(url, id)) // 奖品-去查看
+    goBuy.on(Button.EventType.CLICK, () => this.clickToBuy()) // 道具-去购买
+    goDress.on(Button.EventType.CLICK, () => this.clickToDress()) // 道具-去装扮
+    Derssed.on(Button.EventType.CLICK, () => this.clickToDefaultDress()) // 道具-换回默认装扮
 
 
     goCheck.active = isPrize;
@@ -184,7 +189,6 @@ export class MyBagPanel extends Panel {
     cell.getChildByName("img").getComponent(Sprite).spriteFrame = icon || spImg;
   }
 
-
   clickToCheck = (url, id) => {
     this.hidePanel()
     if (url) {
@@ -199,13 +203,21 @@ export class MyBagPanel extends Panel {
     await changeScene(PropPage)
   })
 
-  clickToDress = async (spId) => {
-    const { success, data } = await sendWebNetWithToken(WebNetName.doDress, { spId });
+  // clickToDress = async (spId) => {
+  clickToDress = _asyncThrottle(async () => {
+    const { success, data } = await sendWebNetWithToken(WebNetName.doDress, { spId: "sp_skin_snake_year" });
     if (!success) return;
 
     console.log("换上了新皮肤");
     this.hidePanel()
-  }
+  })
 
+  clickToDefaultDress = _asyncThrottle(async () => {
+    const { success, data } = await sendWebNetWithToken(WebNetName.doDress, { spId: "sp_decoration_default" });
+    if (!success) return;
+
+    console.log("换回了原皮肤");
+    this.hidePanel()
+  })
 }
 

assets/Scripts/Scenes/PointDetailScene.ts

@@ -33,7 +33,7 @@ export class PointDetailScene extends Scene {
     this.List.onCellDisplay = this.onListCellDisplay;
 
     const shengLayout = new YXFlowLayout();
-    shengLayout.itemSize = new Size(800, 50);
+    shengLayout.itemSize = new Size(1133, 50);
     this.List.layout = shengLayout;
     this.List.reloadData();
 

build/web-mobile/index.html

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

preview-template/mock/home/index.do.json

 {
-  "code": "est irure aute",
+  "code": null,
   "data": {
-    "actStartTime": 1733032500000,
-    "signPopFlag": false,
-    "creditsNum": 999999,
-    "actEndTime": 1734242100000,
-    "currentTime": 1733896500000,
-    "avatar": "",
-    "nickname": "贪吃的小铭铭1",
-    "rankInfos": [
-      {
-        "avatar": "",
-        "index": 1,
-        "nickname": "微信用户"
-      },
-      {
-        "avatar": "https://public-images-trantor-noprod.oss-cn-hangzhou.aliyuncs.com/trantor/attachments/%E9%BB%98%E8%AE%A4%E5%A4%B4%E5%83%8F.png",
-        "index": 1,
-        "nickname": "微信用户"
-      }
-    ],
-    "rankPopList": [
-      {
-        "rankType": "1",
-        "openDate": "do dolor irure adipisicing",
-        "index": 51975861.85452643,
-        "prizeName": "elit Ut cillum irure",
-        "count": -69110138.47883804,
-        "prizeImage": "https://yun.duiba.com.cn/spark/assets/f77861647e7b55e9c95e9c49d891a21526157a76.jpg",
-        "prizeId": "minim aute fugiat aliqua eiusmod"
-      },
-      {
-        "rankType": "2",
-        "openDate": "aliqua veniam sit",
-        "index": -90451212.72170383,
-        "prizeName": "deserunt ullamco",
-        "count": 32524730.09524168,
-        "prizeImage": "//yun.dui88.com/images/201907/tua0um9jjp.jpgd",
-        "prizeId": "quis et dolore"
-      },
-      {
-        "rankType": "1",
-        "openDate": "mollit voluptate nisi",
-        "index": -5272952.166486308,
-        "prizeName": "jhdfbwfhuwiebfwejlfhwbenfewbwhe",
-        "count": -87639967.64217277,
-        "prizeImage": "https://yun.duiba.com.cn/spark/assets/f77861647e7b55e9c95e9c49d891a21526157a76.jpg",
-        "prizeId": "sunt"
-      },
-      {
-        "rankType": "2",
-        "openDate": "adipisicing do",
-        "index": -30792310.48187779,
-        "prizeName": "nulla esse Duis sunt",
-        "count": 90098550.33463329,
-        "prizeImage": "//yun.duiba.com.cn/polaris/1.380dff33883285a6186d0a408d6c0c7400734a4b.png",
-        "prizeId": "ullamco nulla aliquip"
-      }
-    ],
-    "rankPopList": [],
-    "continueSignDays": 4,
-    "newGetSpName":"denjekewnj we",
-    "newGetSpImage": "//yun.duiba.com.cn/polaris/img.546cbcd3811aa2265e50d495c078108a217450b7.png",
-    "newGetSpId": "sp_skin_snake_year11",
-    "bagPopVO": {
-      "bagNum": 3,
-      "bagImg": "aute laboris et",
-      "bagName": "银福袋"
-    },
-    "bagPopVO": null,
-    "benefitDesc":"权益文案"
+      "actEndTime": 1735638689560,
+      "actStartTime": 1733565086149,
+      "avatar": null,
+      "bagPopVO": null,
+      "benefitDesc": "规则权益文案",
+      "continueSignDays": 1,
+      "creditsNum": 1011347,
+      "currentTime": 1733984931891,
+      "firstEntryFlag": false,
+      "luckBenefitDesc": "权益福袋权益",
+      "newGetSpId": null,
+      "newGetSpImage": null,
+      "newGetSpName": null,
+      "nickname": null,
+      "rankInfos": [
+          {
+              "avatar": null,
+              "index": 1,
+              "nickname": null
+          },
+          {
+              "avatar": null,
+              "index": 2,
+              "nickname": null
+          },
+          {
+              "avatar": null,
+              "index": 3,
+              "nickname": null
+          }
+      ],
+      "rankPopList": [],
+      "signPopFlag": false
   },
-  "message": "incididunt ullamco qui voluptate dolor",
-  "success": true
+  "message": null,
+  "success": true,
+  "timeStamp": 1733984932128
 }
\ 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 14:28:41 build success in 41 s!",
-        "detailMessage": "%c兑吧发布插件 >> 版本号:1733984880454\rcolor: green\r",
+        "message": "2024-12-12 14:33:29 build success in 1 min 14 s!",
+        "detailMessage": "%c兑吧发布插件 >> 版本号:1733985135346\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 14:28:00",
+        "time": "2024-12-12 14:32:15",
         "dirty": false
       }
     }