1

assets/resources/game/prefab/uiPanel/ADClearSickPanel.prefab

@@ -1017,9 +1017,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 253,
-      "g": 255,
-      "b": 229,
+      "r": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
@@ -1081,11 +1081,13 @@
     "_fontSize": 36,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 0,
     "_N$verticalAlign": 0,
@@ -1104,9 +1106,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 182,
-      "g": 100,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
     "_width": 3,

assets/resources/game/prefab/uiPanel/ADUnlockPanel.prefab

@@ -1017,9 +1017,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 253,
-      "g": 255,
-      "b": 229,
+      "r": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
@@ -1081,8 +1081,10 @@
     "_fontSize": 36,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 1,
@@ -1104,9 +1106,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 182,
-      "g": 100,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
     "_width": 3,

assets/resources/game/prefab/uiPanel/HarvestPanel.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 73
       },
       {
-        "__id__": 67
+        "__id__": 75
       },
       {
-        "__id__": 68
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 77
     },
     "_opacity": 255,
     "_color": {
@@ -98,7 +98,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 64
+      "__id__": 72
     },
     "_opacity": 255,
     "_color": {
@@ -165,11 +165,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 71
     },
     "_opacity": 255,
     "_color": {
@@ -437,7 +437,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 61
+      "__id__": 69
     },
     "_opacity": 255,
     "_color": {
@@ -1059,17 +1059,17 @@
         "__id__": 27
       },
       {
-        "__id__": 42
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -1130,17 +1130,17 @@
         "__id__": 28
       },
       {
-        "__id__": 36
+        "__id__": 40
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1199,19 +1199,22 @@
     "_children": [
       {
         "__id__": 29
+      },
+      {
+        "__id__": 32
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 36
       },
       {
-        "__id__": 33
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -1268,7 +1271,7 @@
       "__id__": 28
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 30
@@ -1368,6 +1371,137 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 28
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 33
+      },
+      {
+        "__id__": 34
+      }
+    ],
+    "_prefab": {
+      "__id__": 35
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 251,
+      "b": 237,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 118,
+      "height": 56.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        3,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 32
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "普通领取",
+    "_N$string": "普通领取",
+    "_fontSize": 28,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 32
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 87,
+      "g": 144,
+      "b": 23,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "a5F7Bw0nZBwJ5YZNDyuukR",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -1413,7 +1547,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 34
+        "__id__": 38
       }
     ],
     "_N$interactable": true,
@@ -1503,11 +1637,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 42
     },
     "_opacity": 255,
     "_color": {
@@ -1561,7 +1695,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 40
     },
     "_enabled": true,
     "_materials": [
@@ -1613,7 +1747,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 40
+        "__id__": 44
       }
     ],
     "_N$interactable": true,
@@ -1701,23 +1835,23 @@
     },
     "_children": [
       {
-        "__id__": 43
+        "__id__": 47
       },
       {
-        "__id__": 52
+        "__id__": 60
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 63
       },
       {
-        "__id__": 57
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 66
     },
     "_opacity": 255,
     "_color": {
@@ -1771,24 +1905,27 @@
     "_name": "noraml_btn",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 42
+      "__id__": 46
     },
     "_children": [
       {
-        "__id__": 44
+        "__id__": 48
       },
       {
-        "__id__": 47
+        "__id__": 51
+      },
+      {
+        "__id__": 55
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -1842,17 +1979,17 @@
     "_name": "hav_btn_byte_0",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 43
+      "__id__": 47
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1906,7 +2043,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1946,20 +2083,151 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 47
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 52
+      },
+      {
+        "__id__": 53
+      }
+    ],
+    "_prefab": {
+      "__id__": 54
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 251,
+      "b": 237,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 118,
+      "height": 56.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 51
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "超级加倍",
+    "_N$string": "超级加倍",
+    "_fontSize": 28,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 51
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 178,
+      "g": 77,
+      "b": 18,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "8bZxjA9hZAQ45xUijpWtQx",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "video_icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 43
+      "__id__": 47
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 57
     },
     "_opacity": 255,
     "_color": {
@@ -2013,7 +2281,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 55
     },
     "_enabled": true,
     "_materials": [
@@ -2056,7 +2324,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 47
     },
     "_enabled": true,
     "_materials": [
@@ -2099,17 +2367,17 @@
     "_name": "hav_btn_byte_2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 42
+      "__id__": 46
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -2163,7 +2431,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 60
     },
     "_enabled": true,
     "_materials": [
@@ -2206,7 +2474,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 46
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2215,7 +2483,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 56
+        "__id__": 64
       }
     ],
     "_N$interactable": true,
@@ -2288,7 +2556,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 46
     },
     "_enabled": true,
     "_defaultClip": {
@@ -2442,7 +2710,7 @@
     "bClickClose": true,
     "onComplete": [
       {
-        "__id__": 66
+        "__id__": 74
       }
     ],
     "_id": ""

assets/resources/module/speedUpUI/productReward.prefab

@@ -2885,8 +2885,12 @@
     "sp_taskProgress": {
       "__id__": 54
     },
-    "node_complete": null,
-    "node_Uncomplete": null,
+    "node_complete": {
+      "__id__": 61
+    },
+    "node_Uncomplete": {
+      "__id__": 44
+    },
     "_id": ""
   },
   {

assets/resources/module/speedUpUI/productReward2.prefab

@@ -917,7 +917,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 126,
+      "width": 118,
       "height": 56.4
     },
     "_anchorPoint": {
@@ -971,7 +971,7 @@
     "_dstBlendFactor": 771,
     "_string": "领取红包",
     "_N$string": "领取红包",
-    "_fontSize": 30,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {
@@ -1353,7 +1353,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 126,
+      "width": 118,
       "height": 56.4
     },
     "_anchorPoint": {
@@ -1407,7 +1407,7 @@
     "_dstBlendFactor": 771,
     "_string": "退出游戏",
     "_N$string": "退出游戏",
-    "_fontSize": 30,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {

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

@@ -4,4 +4,6 @@ import { Data } from "../../../mk/data/Data";
 export class LineUpUIData extends Data {
 
     public personCount = 0;
+    public cashId = 0;
+    public refresh = false;
 }

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

@@ -49,6 +49,8 @@
             if(response.data.count > 0)
             {
                 gData.lineUpUIData.personCount = response.data.count;
+                gData.lineUpUIData.cashId = id;
+                gData.lineUpUIData.refresh = true;
                 mk.ui.openPanel("module/newNotice/lineUpUI");
             }
             return;

assets/script/game/module/newNotice/LineUpUI.ts

@@ -9,13 +9,32 @@ export default class LineUpUI extends cc.Component {
 
 
     start(){
+        gData.lineUpUIData.refresh = false;
         this.lbl_tip.string = `提现排队中，你前面还有${gData.lineUpUIData.personCount}人`;
     }
 
+    update(dt)
+    {
+        if(gData.lineUpUIData.refresh)
+        {
+            gData.lineUpUIData.refresh = false;
+            this.lbl_tip.string = `提现排队中，你前面还有${gData.lineUpUIData.personCount}人`;
+        }
+    }
+
     private clickVideoBtn()
     {
         mk.audio.playEffect("button");
-        mk.tip.pop('插队成功');
+
+        // 看广告
+        mk.ad.watchAd((success: boolean) => {
+            mk.console.log("watchAD:" + success);
+            if (success) {
+                mk.tip.pop('插队成功');
+                gData.walletCashOutData.HttpCashOut2(gData.lineUpUIData.cashId);
+            }
+        });
+        
 
     }
     private clickCloseBtn(){

assets/script/game/module/speedUpUI/ProductReward.ts

@@ -38,7 +38,7 @@ export default class ProductReward extends cc.Component {
                 this.node_Uncomplete.active = false;
                 this.node_complete.active = true;
             }
-            this.lbl_progress.string = (com / count).toString();
+            this.lbl_progress.string = `${com}/${count}`;
             this.sp_taskProgress.fillRange = com / count;
         }
     }

build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

build/jsb-link/assets/resources/import/15/15f959e3-976b-41f3-b0bb-f4d45a52a58f.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/66/66861599-21bd-40ca-aa38-9379445f5f5b.json

@@ -0,0 +1 @@
+[1,["15+Vnjl2tB87C79NRaUqWP"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hbBg","rect":[0,0,101,86],"offset":[0,0],"originalSize":[101,86],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/69/696eb068-a451-4795-838b-909e805f8956.json

@@ -0,0 +1 @@
+[1,["c1dUMMFJREFa9eSd+CPTGd"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hb","rect":[0,0,64,71],"offset":[0,0],"originalSize":[64,71],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/6b/6b16bf98-3349-42bd-9631-d63e9225c348.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.TTFFont",["_name","_native"],1]],[[0,0,1,3]],[[0,"Adorable","Adorable.ttf"],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/c1/c175430c-1494-4415-af5e-49df823d319d.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -2490,12 +2490,16 @@ this.adMap.set(i.turntable, gData.turnable);
 this.adMap.set(i.sign, gData.sign);
 this.adMap.set(i.bigCash, gData.blessingBag);
 this.adMap.set(i.cashOutAddCash, gData.walletCashOutData);
+this.adMap.set(i.harvest, gData.harvestData);
+this.adMap.set(i.farmMap, gData.farmMapData);
 };
 t.prototype.checkAdMax = function() {
 this.watchNumToday++;
 var t = parseInt(gData.gameData.configs.ServerConfig.VideoTimesMax);
+mk.console.logSingle("checkAdMax  watchNumToday ", this.watchNumToday);
+mk.console.logSingle("checkAdMax  max ", t);
 if (this.watchNumToday > t) {
-mk.tip.pop("今日看广告获得奖励的次数已用完", 1);
+mk.tip.pop("今日看广告获得奖励的次数已用完");
 mk.ui.closeAllUI();
 return !0;
 }
@@ -2621,8 +2625,11 @@ this.ABCInsertAdArr = gData.gameData.configs.ServerConfig.ABInsertAd.split(",");
 this.FullCsahAdArr = gData.gameData.configs.ServerConfig.FullCsahAd.split(",");
 };
 t.prototype.setEcpmLevel = function() {
-this.ecpmLevel = 1;
-this.AutoRedMoneyMap.set(1, 20);
+for (var t = gData.gameData.configs.ForceAd, e = t.length, o = -1, n = 0; n < e; n++) if (gData.gameData.adShowConfig.average_ecpm <= parseInt(t[n].ecpmMax)) {
+-1 == o && (o = parseInt(t[n].value));
+this.AutoRedMoneyMap.set(parseInt(t[n].value), parseInt(t[n].AutoRedMoney));
+}
+this.ecpmLevel = o;
 };
 t.prototype.checkShowFullInter = function(t, e) {
 void 0 === e && (e = null);
@@ -2701,7 +2708,11 @@ mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 }
 };
 t.prototype.getPerByEcpm = function() {
-return .26;
+for (var t = gData.gameData.configs.ForceAd, e = t.length, o = 0, n = 0; n < e; n++) if (gData.gameData.adShowConfig.average_ecpm <= parseInt(t[n].ecpmMax)) {
+o = parseFloat(t[n].percent);
+break;
+}
+return o;
 };
 return t;
 }();
@@ -2713,7 +2724,6 @@ t[t.settlement = 3] = "settlement";
 t[t.turntable = 4] = "turntable";
 t[t.sign = 5] = "sign";
 t[t.bigCash = 6] = "bigCash";
-t[t.cashOutNoviceWelfare = 7] = "cashOutNoviceWelfare";
 t[t.cashOutAddCash = 8] = "cashOutAddCash";
 t[t.harvest = 9] = "harvest";
 t[t.farmMap = 10] = "farmMap";
@@ -6753,7 +6763,6 @@ t++;
 return [ 3, 1 ];
 
 case 5:
-gData.gameData.setProductMapFromJson();
 return [ 2 ];
 }
 });
@@ -8823,6 +8832,7 @@ this.countDown.node.active = !0;
 this.process.node.active = !0;
 this.countDown.setState(1);
 this.process.setData(this.data);
+this.plantID = this.data.productID;
 return [ 4, mk.loader.load("game/prefab/ProductShow1", cc.Prefab) ];
 
 case 6:
@@ -11501,7 +11511,8 @@ this.init_makeInfo = !1;
 this.isProducting = !1;
 this.init_task = !1;
 this.init_expLevel = !1;
-this.init_redBagTask = !0;
+this.init_redBagTask = !1;
+this.init_productTask = !1;
 this._farmMapRewardData = [];
 this._farmData = [];
 this._farmDataMap = new Map();
@@ -11566,6 +11577,7 @@ return [ 2 ];
 t.prototype.initConfigs = function(t) {
 this.configs = t;
 this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
+this.setProductMapFromJson();
 };
 t.prototype.initPlayerProp = function(t) {
 this.gameData = new d();
@@ -11880,7 +11892,7 @@ this.setProp(i.farmData, this._farmData);
 } else for (n = 0; n < t; n++) this._farmDataMap.set(this._farmData[n].id, this._farmData[n]);
 };
 t.prototype.setProductMapFromJson = function() {
-for (var t = gData.configData.configMap.get("product"), e = t.length, o = null, n = "", a = [], i = 0; i < e; i++) {
+for (var t = this.configs.Product, e = t.length, o = null, n = "", a = [], i = 0; i < e; i++) {
 o = t[i];
 this._productMap.set(o.picture, o);
 if (n != o.tab) {
@@ -12843,14 +12855,9 @@ scale: 1
 }).start();
 if (gData.gameData.gameData.userFarmTaskInfo) {
 var t = gData.gameData.gameData.userFarmTaskInfo.completeCount, e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
-if (gData.gameData.init_redBagTask) {
-this.lbl_task.string = "<b><color=#8D4D32>点击领取任务!</c></b>";
-this.node_hand.active = !0;
-} else {
 this.lbl_task.string = "<b><color=#8D4D32>进行" + e + "次生产</c><color=#7EB80E>(" + t + "/" + e + ")</color></b>";
 this.node_hand.active = t >= e;
 }
-}
 gData.gameData.init_task = !1;
 };
 e.prototype.initFarmExpUI = function() {
@@ -14685,6 +14692,7 @@ this.config = gData.gameData.getProductMap(this.plantID);
 mk.ui.openPanel("game/prefab/uiPanel/HarvestPanel");
 };
 e.prototype.setAdData = function(e) {
+mk.console.logSingle("HarvestData  addata ", this.adData);
 t.prototype.setAdData.call(this, e);
 this.init_reward = !0;
 };
@@ -14840,18 +14848,30 @@ return null !== t && t.apply(this, arguments) || this;
 }
 e.prototype.clickNormalBtn = function() {
 return r(this, void 0, void 0, function() {
-var t;
-return c(this, function() {
+var t, e, o;
+return c(this, function(n) {
+switch (n.label) {
+case 0:
 mk.ui.closePanel("HarvestPanel");
 gData.adData.checkShowFullInter(1, l.InterFullAdType.interstitial2_init_2);
-t = [ {
+t = {
+id: gData.harvestData.config.id
+};
+return [ 4, mk.http.sendData("redMoney/addRedMoneyByFarm", t) ];
+
+case 1:
+if ((e = n.sent()) && 0 != e.errcode) return [ 2 ];
+if (e.data.redMoneyAddition <= 0) console.log("返回奖励为0"); else {
+o = [ {
 rewardType: 1,
-rewardNum: 20
+rewardNum: e.data.redMoneyAddition
 } ];
-gData.reward.data = t;
+gData.reward.data = o;
 gData.reward.callback = gData.harvestData.call;
 mk.ui.openPanel("module/reward/reward");
+}
 return [ 2 ];
+}
 });
 });
 };
@@ -16101,7 +16121,7 @@ e.lbl_tip = null;
 return e;
 }
 e.prototype.start = function() {
-this.lbl_tip.string = gData.lineUpUIData.personCount.toString();
+this.lbl_tip.string = "提现排队中，你前面还有" + gData.lineUpUIData.personCount + "人";
 };
 e.prototype.clickVideoBtn = function() {
 mk.audio.playEffect("button");
@@ -16877,6 +16897,7 @@ this.setProgress(0);
 e.prototype.start = function() {
 if (1 != mk.storage.getStorage("alifengkong")) {
 mk.aliRiskManager.init();
+mk.loader.preload("game/coregame/coregame", cc.Prefab);
 this.init();
 }
 };
@@ -17055,7 +17076,6 @@ return [ 4, gData.configData.loadConfig() ];
 
 case 1:
 t.sent();
-mk.loader.preload("game/coregame/coregame", cc.Prefab);
 gData.adData.init();
 mk.console.log("[FC] gData.appData.appId", gData.appData.appId);
 gData.loginData.login();
@@ -19068,6 +19088,8 @@ mk.tip.pop("复制成功");
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 mk.audio.setResumeMusic();
+gData.gameData.init_redBagTask = !0;
+gData.gameData.init_productTask = !0;
 };
 e.prototype.onDestroy = function() {};
 i([ l({
@@ -19130,7 +19152,10 @@ console.log("newNotices=>" + gData.receiptNotice.receip_rmb);
 this.lbl_reward_value.string = (gData.receiptNotice.receip_rmb / 100).toFixed(2);
 this.lbl_time.string = mk.time.getNowDayStringExtend();
 };
-e.prototype.clickCloseBtn = function() {};
+e.prototype.clickCloseBtn = function() {
+mk.audio.playEffect("closeButton");
+gData.gameData.init_redBagTask = !0;
+};
 i([ s({
 displayName: "提现金额",
 type: cc.Label
@@ -20707,7 +20732,7 @@ return [ 4, mk.loader.load(o + t.picture, cc.SpriteFrame) ];
 
 case 2:
 a.spriteFrame = c.sent();
-this.awardLabel.string = t.MenuredBagCoin;
+this.awardLabel.string = t.menuRedBagCoin.toString();
 this.timeLabel.string = t.time;
 i = !1;
 r = 0;
@@ -20729,7 +20754,7 @@ return [ 2 ];
 });
 };
 e.prototype.clickMake = function() {
-if (gData.gameData.leftTimes <= 0) mk.ui.openPanel("module/speedUpUI/productReward"); else if (this.data.tab == l.ProductType.nzw) {
+if (gData.gameData.leftTimes <= 0) mk.ui.openPanel("module/speedUpUI/productReward"); else if (gData.gameData.isProducting) mk.tip.pop("点击太快了"); else if (this.data.tab == l.ProductType.nzw) {
 gData.farmSystem.plant(this.data.picture);
 gData.gameData.nextMake = null;
 gData.farmSystem.selectNextFarm(!1);
@@ -21293,6 +21318,11 @@ a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.lbl_times = null;
+e.lbl_taskTimes = null;
+e.lbl_progress = null;
+e.sp_taskProgress = null;
+e.node_complete = null;
+e.node_Uncomplete = null;
 return e;
 }
 e.prototype.onEnable = function() {
@@ -21300,6 +21330,38 @@ this.scheduleOnce(function() {
 mk.guide.open(4);
 }, .5);
 this.lbl_times.string = "生产次数x" + gData.gameData.configs.ServerConfig.ProductionAd;
+gData.gameData.init_productTask = !1;
+if (gData.gameData.gameData.userFarmTaskInfo) {
+var t = gData.gameData.gameData.userFarmTaskInfo.completeCount, e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+if (e > t) {
+this.lbl_taskTimes.string = (e - t).toString();
+this.node_Uncomplete.active = !0;
+this.node_complete.active = !1;
+} else {
+this.node_Uncomplete.active = !1;
+this.node_complete.active = !0;
+}
+this.lbl_progress.string = (t / e).toString();
+this.sp_taskProgress.fillRange = t / e;
+}
+};
+e.prototype.update = function() {
+if (gData.gameData.init_productTask) {
+if (gData.gameData.gameData.userFarmTaskInfo) {
+var t = gData.gameData.gameData.userFarmTaskInfo.completeCount, e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+if (e > t) {
+this.lbl_taskTimes.string = (e - t).toString();
+this.node_Uncomplete.active = !0;
+this.node_complete.active = !1;
+} else {
+this.node_Uncomplete.active = !1;
+this.node_complete.active = !0;
+}
+this.lbl_progress.string = (t / e).toString();
+this.sp_taskProgress.fillRange = t / e;
+}
+gData.gameData.init_productTask = !1;
+}
 };
 e.prototype.clickVideoBtn = function() {
 var t = this;
@@ -21330,6 +21392,26 @@ i([ l({
 type: cc.Label,
 displayName: "文本"
 }) ], e.prototype, "lbl_times", void 0);
+i([ l({
+type: cc.Label,
+displayName: "任务次数"
+}) ], e.prototype, "lbl_taskTimes", void 0);
+i([ l({
+type: cc.Label,
+displayName: "进度文本"
+}) ], e.prototype, "lbl_progress", void 0);
+i([ l({
+type: cc.Sprite,
+displayName: "进度条"
+}) ], e.prototype, "sp_taskProgress", void 0);
+i([ l({
+type: cc.Node,
+displayName: "完成节点"
+}) ], e.prototype, "node_complete", void 0);
+i([ l({
+type: cc.Node,
+displayName: "未完成节点"
+}) ], e.prototype, "node_Uncomplete", void 0);
 return i([ s ], e);
 }(cc.Component);
 o.default = p;
@@ -22743,7 +22825,7 @@ e.lbl_Ani = null;
 e.lbl_taskNum = null;
 e.lbl_taskDes = null;
 e.node_videoIcon = null;
-e.isShowNewTask = !0;
+e.isShowNewTask = !1;
 e.num = 0;
 e.delayTime = 0;
 e.times = 0;
@@ -22754,8 +22836,8 @@ return e;
 e.prototype.start = function() {
 mk.console.logSingle("redBagTask=>", gData.gameData.gameData.userFarmTaskInfo);
 if (gData.gameData.gameData.userFarmTaskInfo) {
+gData.gameData.init_redBagTask = !1;
 this.maxNum = gData.gameData.gameData.userFarmTaskInfo.taskCount;
-this.isShowNewTask = gData.gameData.init_redBagTask;
 if (this.isShowNewTask) this.showNewTaskUI(); else {
 this.initTaskProgressUI();
 this.showChangePart();
@@ -22768,9 +22850,7 @@ this.node_value.active = !1;
 this.node_task.active = !1;
 this.openBtn_ani.node.active = !1;
 this.lbl_Ani.node.active = !0;
-gData.gameData.init_redBagTask = !1;
 gData.gameData.init_task = !0;
-gData.gameData.setProp(p.GameProp.redBagTaskRefresh, gData.gameData.init_redBagTask);
 };
 e.prototype.onEnable = function() {
 mk.ad.showBanner(p.BannerAdType.banner_click_2);
@@ -22831,6 +22911,11 @@ e.showChangePart();
 }
 }
 }
+if (gData.gameData.init_redBagTask) {
+gData.gameData.init_redBagTask = !1;
+this.showNewTaskUI();
+this.isShowNewTask = !0;
+}
 };
 e.prototype.initTaskProgressUI = function() {
 var t = this;
@@ -22897,13 +22982,11 @@ e = o.sent();
 mk.console.logSingle("redBagTask=>", e);
 if (0 != e.errcode) return [ 2, null ];
 gData.gameData.gameData.userFarmTaskInfo = e.data.userFarmTaskInfo;
-gData.gameData.init_redBagTask = !0;
+gData.gameData.init_task = !0;
 this.maxNum = gData.gameData.gameData.userFarmTaskInfo.taskCount;
 this.num = 0;
 this.delayTime = 0;
 this.times = 0;
-this.showNewTaskUI();
-this.isShowNewTask = !0;
 gData.receiptNotice.receip_rmb = e.data.cashMoney;
 mk.ui.openPanel("module/newNotice/newNotice");
 mk.data.sendDataEvent(p.DataEventId.Sundry, "任务红包提现成功");
@@ -29290,7 +29373,7 @@ mk.console.logSingle("wallet2=>", o);
 if (0 != o.errcode) {
 if (o.data.count > 0) {
 gData.lineUpUIData.personCount = o.data.count;
-mk.ui.openPanel("module/newNotice/LineUpUI");
+mk.ui.openPanel("module/newNotice/lineUpUI");
 }
 return [ 2 ];
 }

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631252624818,
-    "genTime": 1631252624818,
+    "buildTime": 1631260160810,
+    "genTime": 1631260160810,
     "genVersion": null
 }