福利相关

assets/resources/module/blessingBag/blessingBag.prefab

@@ -1227,7 +1227,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "a28EGmqkNLhaACIsqY1Dqv",
+    "fileId": "adlLQDTPFGHoj8xNWk+8kP",
     "sync": false
   },
   {
@@ -1357,7 +1357,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "a6jVO8ApVDraZIMUdbmEv9",
+    "fileId": "ee++2hBlRJsLrYnxFFtBl4",
     "sync": false
   },
   {
@@ -1487,7 +1487,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "b8DiLjwRxNboMRbF//9URv",
+    "fileId": "223T6vRERDZqT18r3yOnSm",
     "sync": false
   },
   {
@@ -1562,7 +1562,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        271.47,
+        294.47,
         0,
         0,
         0,
@@ -6458,7 +6458,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 650,
-      "height": 700
+      "height": 730
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6470,7 +6470,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        560.48,
+        586.48,
         0,
         0,
         0,
@@ -6518,7 +6518,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 650,
-      "height": 700
+      "height": 730
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6629,6 +6629,8 @@
     "node_xiabiao": {
       "__id__": 190
     },
+    "isShowByLimitLength": true,
+    "limitLength": 5,
     "direction": 1,
     "isHideAllChild": true,
     "_id": ""
@@ -8196,7 +8198,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -518.6,
+        -546.6,
         0,
         0,
         0,
@@ -8331,7 +8333,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 186,
+      "width": 246,
       "height": 100
     },
     "_anchorPoint": {
@@ -8343,7 +8345,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        -28.98,
         7,
         0,
         0,
@@ -8407,13 +8409,13 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -64.5,
+        -94.5,
         0,
         0,
         0,
         0,
-        -0.06104853953485687,
-        0.9981347984218669,
+        0.057712133315534125,
+        0.9983332658326928,
         1,
         1,
         1
@@ -8423,7 +8425,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": -7
+      "z": 6.617000000000001
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -8505,7 +8507,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 124,
+      "width": 184,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -8557,8 +8559,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "观看广告",
-    "_N$string": "观看广告",
+    "_string": "增加提现进度",
+    "_N$string": "增加提现进度",
     "_fontSize": 30,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -8611,10 +8613,10 @@
     "node": {
       "__id__": 237
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 186,
+      "width": 246,
       "height": 100
     },
     "_resize": 1,
@@ -9044,7 +9046,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "31p4gFgFlFtr/ErXza3pAA",
+    "fileId": "23kjRegPhHcIGnLRbEiCV8",
     "sync": false
   },
   {
@@ -9153,7 +9155,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "a7Hw3V0mRGfLgDT5Ujkfwn",
+    "fileId": "a7c3iHu8dCBr6bzLnCCjbZ",
     "sync": false
   },
   {
@@ -9266,7 +9268,7 @@
     "node": {
       "__id__": 235
     },
-    "_enabled": true,
+    "_enabled": false,
     "alignMode": 1,
     "_target": {
       "__id__": 1

assets/script/game/component/TableView.ts

@@ -30,6 +30,12 @@ export default class TableView extends cc.Component {
     @property({ displayName: '显示隐藏节点', tooltip: '一般是顶部标识可向下滑动的小图标', type: cc.Node })
     private node_xiabiao: cc.Node = null;
 
+    @property({displayName: '上面的节点是否根据指定数据的长度来控制显示，优先级最高'})
+    private isShowByLimitLength: boolean = false;
+    @property({displayName: '长度值', visible(){return this.isShowByLimitLength}})
+    private limitLength: number = 0;
+
+
     @property({ displayName: '滚动方向', tooltip: '', type: cc.Enum(Direction) })
     private direction = Direction.vertical;
 
@@ -71,6 +77,9 @@ export default class TableView extends cc.Component {
             this.scrollView.vertical = false;
             this.scrollView.horizontal = true;
         }
+
+        if(this.node_xiabiao)
+            this.node_xiabiao.active = false;
         // 测试
         // let itemData = [];
         // for (let i = 0; i < 20; i++) {
@@ -173,6 +182,15 @@ export default class TableView extends cc.Component {
         if (!this.node_xiabiao)
             return;
 
+        if(this.isShowByLimitLength)
+        {
+            if(this.itemData.length <= this.limitLength)
+            {
+                return;
+            }
+        }   
+
+
         if (this.content.height > this.layerHeight) {
             if (this.scrollView.getScrollOffset().y >= this.scrollView.getMaxScrollOffset().y) {
                 if (this.node_xiabiao.active == true)

assets/script/game/data/module/BlessingBagData.ts

@@ -102,6 +102,7 @@ export class BlessingBagData extends Data {
         let data = { Id: this.taskRbId };
         let response = await mk.http.sendData('welFare/welFareCash', data);
 
+        mk.console.logSingle("'welFare/welFareCash", response.data);
         if (response.errcode != 0) {
             return null;
         }

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -223,7 +223,7 @@ export default class BlessingBag extends cc.Component {
                         //gData.adData.watchVideo(AdFun.bigCash)
                     }
                 });
-            } else {
+            } else {             
                 mk.tip.pop('今日观看次数已用完');
             }
         }

assets/script/game/module/setting/Setting.ts

@@ -39,7 +39,7 @@ export default class Setting extends cc.Component {
     }
 
     start() {
-        mk.ad.showNative(4);     
+        //mk.ad.showNative(4);     
     }
 
     private async initData() {