Merge remote-tracking branch 'origin/master'

assets/Bundles/PropPop/PropPop.prefab

@@ -434,8 +434,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 2.5470000000000255,
-      "y": 0.47900000000004184,
+      "x": 15.000999999999976,
+      "y": 0.478999999999985,
       "z": 0
     },
     "_lrot": {
@@ -475,7 +475,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 35.59375,
+      "width": 17.796875,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -511,7 +511,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "25",
+    "_string": "0",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 32,
@@ -1221,6 +1221,8 @@
       "__id__": 0
     },
     "fileId": "aflVw5/2dP+rzU7TMNhCDd",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {

assets/Scripts/Panels/ExchangeSuccess.ts

@@ -30,6 +30,9 @@ export default class ExchangeSuccess extends Panel {
         this.prizeName.string = item.optionName;
 
         this.prize.spriteFrame = item.optionImg;
+
+        await sendWebNetWithToken(WebNetName.propExchange)
+
     }
 
     clickLook() {
@@ -40,7 +43,7 @@ export default class ExchangeSuccess extends Panel {
     clickClose = async () => {
         this.hidePanel()
 
-        await sendWebNetWithToken(WebNetName.propExchange)
+
     }
 
 }

assets/Scripts/Panels/GetPrize.ts

@@ -26,6 +26,9 @@ export default class GetPrize extends Panel {
 
     @property(Node) content: Node = null;
 
+    @property(Node) svga: Node = null;
+    @property(Node) bg: Node = null;
+
     onLoad() {
         this.happy.on(Button.EventType.CLICK, this.clickHappy, this);
         this.share.on(Button.EventType.CLICK, this.clickShare, this);
@@ -34,8 +37,8 @@ export default class GetPrize extends Panel {
     async start() {
 
         const {data = this.data} = this.data
-        console.log(data,112233)
-        console.log(data.prizeName,22222)
+        console.log(data, 112233)
+        console.log(data.prizeName, 22222)
 
         data.map((item, index) => {
             const prize = instantiate(this.prizePrefab)
@@ -49,12 +52,25 @@ export default class GetPrize extends Panel {
             const numBg = prize.getChildByName("numBg")
             const num = numBg.getChildByName("num")
             num.getComponent(Label).string = `X${item.sendCount}`
-        })
 
+            this.bg.active = false;
+            this.svga.active = true
 
+            setTimeout(()=>{
+                this.bg.active = true
+                this.svga.active = false
+            },1000)
 
+        })
     }
 
+
+  change(){
+      this.bg.active = true
+      this.svga.active = false
+  }
+
+
     clickShare() {
         showPanel(SharePop, {
             prizeName: this.data[0].prizeName,

assets/Scripts/Scenes/BlessingBagPage.ts

@@ -194,6 +194,10 @@ export class BlessingBagPage extends Scene {
 
             if (item.code == "task_invite"){
                 Label_task_name.getComponent(Label).string = item.title
+
+                const activeBtn = EarnList.getChildByName("active_btn")
+                const activeLabel = activeBtn.getChildByName("ActiveLabel")
+                activeLabel.getComponent(Label).string = "去邀请"
             }else{
                 Label_task_name.getComponent(Label).string = `${item.title}(${item.completedSize}/${item.intervalLimitSize})`
             }

build/web-mobile/index.html

@@ -98,14 +98,14 @@
 
     </style>
 
-    <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="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/assets/plugin/zepto.min.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/assets/plugin/declare-process.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/assets/plugin/jszip.min.v3.10.1.js"></script>
+    <script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/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/1733988264453/style.css" />-->
-<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/custom.css" />-->
+<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/style.css" />-->
+<!--    <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/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/1733988264453/src/polyfills.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/polyfills.bundle.js" charset="utf-8"></script>
 
 <!-- SystemJS support. -->
-<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/system.bundle.js" charset="utf-8"></script>
+<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/src/system.bundle.js" charset="utf-8"></script>
 
 <!-- Import map -->
-<!--<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 src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/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/1733988264453/cocos-js/cc.js"}}
+    {"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/cocos-js/cc.js"}}
 </script>
 
 
 <script>
-    System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/index.js').catch(function (err) {
+    System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733992156174/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 15:25:18 build success in 54 s!",
-        "detailMessage": "Asset DB is resume!\r",
+        "message": "2024-12-12 16:30:31 build success in 1 min 14 s!",
+        "detailMessage": "%c兑吧发布插件 >> 版本号:1733992156174\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 15:24:24",
+        "time": "2024-12-12 16:29:16",
         "dirty": false
       }
     }