整合主包的功能

assets/resources/data/guide_data.json

@@ -13,7 +13,8 @@
 		"clickRect": "all",
 		"finger": "",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "10_1",
@@ -29,7 +30,8 @@
 		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
 		"finger": "100:20",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "10_2",
@@ -45,7 +47,8 @@
 		"clickRect": "主界面层/game/node_ui/顶部个人信息/订单",
 		"finger": "",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "10_3",
@@ -61,7 +64,8 @@
 		"clickRect": "主界面层/game/功能按钮/底部按钮/中间按钮",
 		"finger": "100:20",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "11_0",
@@ -77,7 +81,8 @@
 		"clickRect": "all",
 		"finger": "100:-280",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "12_0",
@@ -93,7 +98,8 @@
 		"clickRect": "主界面层/game/node_ui/顶部个人信息/订单",
 		"finger": "",
 		"lagNext": "0",
-		"continue": "false"
+		"continue": "false",
+		"isShowSkip": "true"
 	},
 	{
 		"id": "13_0",
@@ -108,7 +114,25 @@
 		"displayRect": "",
 		"clickRect": "主界面层/game/功能按钮/底部按钮/富翁银行",
 		"finger": "",
-		"lagNext": "",
-		"continue": "false"
+		"lagNext": "0.2",
+		"continue": "false",
+		"isShowSkip": "true"
+	},
+	{
+		"id": "14_0",
+		"trigger": "0",
+		"trNum": "0",
+		"btnEnable": "1",
+		"trForm": "1",
+		"dialogPos": "150:::::",
+		"dialogPos1": "",
+		"dialogAlignment": "0",
+		"dialog": "<color=8A4312>点击<color=ff0000>提现</c>立即<color=ff0000>到账！</c></color>",
+		"displayRect": "",
+		"clickRect": "主界面层/game/node_ui/顶部个人信息/提现按钮",
+		"finger": "100:0",
+		"lagNext": "0.2",
+		"continue": "false",
+		"isShowSkip": "false"
 	}
 ]

assets/resources/game/prefab/flyHb.prefab

@@ -0,0 +1,254 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "flyHb",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 64,
+      "height": 71
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 119.04,
+      "height": 54.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        40.403000000000006,
+        3.58,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        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__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "+2000",
+    "_N$string": "+2000",
+    "_fontSize": 40,
+    "_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__": 2
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 251,
+      "g": 86,
+      "b": 10,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1896f4b5-a351-483a-841e-1b4f52337d72"
+    },
+    "fileId": "b0sGGQHgJKrrK5hTgE+6nG",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "5abbf7c1-a43e-4a8a-9682-202851c05c7e"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1896f4b5-a351-483a-841e-1b4f52337d72"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/game/prefab/flyHb.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "1896f4b5-a351-483a-841e-1b4f52337d72",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/cashOutBill.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "6ca3c672-912b-4ec5-bd92-8ab88aae0283",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/module/cashOutBill/cashOutBill.prefab

@@ -0,0 +1,1896 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "cashOutBill",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 56
+      },
+      {
+        "__id__": 57
+      },
+      {
+        "__id__": 58
+      },
+      {
+        "__id__": 59
+      }
+    ],
+    "_prefab": {
+      "__id__": 60
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        375,
+        667,
+        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.Node",
+    "_name": "动画节点",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 55
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_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.Node",
+    "_name": "背景",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 42
+      },
+      {
+        "__id__": 46
+      },
+      {
+        "__id__": 50
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 53
+      }
+    ],
+    "_prefab": {
+      "__id__": 54
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 588,
+      "height": 890
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.25,
+        1.25,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "标题背景",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 5
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 9
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 212,
+      "height": 110
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        400,
+        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.Node",
+    "_name": "标题",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 4
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 132,
+      "g": 135,
+      "b": 121,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 136,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        13,
+        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__": 5
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "账单提现",
+    "_N$string": "账单提现",
+    "_fontSize": 34,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "70iNBeNXRG/IIuKh/ZxwSv",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 4
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "736f4c4a-46e2-4f12-a2c5-e27cab0e63ff"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "80ZZOvakJA3bbC7IUG0mxu",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "关闭按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 82,
+      "height": 87
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        257.804,
+        409.792,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "af2a7472-1f78-414a-8307-5ac0edead809"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 0,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "a20d9E+N7FBiIV7z1whuT6J",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "fromData": {
+      "__id__": 14
+    },
+    "targetData": [
+      {
+        "__id__": 15
+      }
+    ],
+    "target": {
+      "__id__": 10
+    },
+    "tweenEasing": 21,
+    "repeat": 1,
+    "onOneRepeatComplete": {
+      "__id__": 17
+    },
+    "playOnLoad": true,
+    "actType": 0,
+    "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
+    "_id": ""
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 257.804,
+      "y": 409.792
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": false
+  },
+  {
+    "__type__": "TweenData",
+    "propsData": {
+      "__id__": 16
+    },
+    "duration": 0.3,
+    "delay": 1.2,
+    "isOffset": false,
+    "onComplete": [],
+    "onStart": [],
+    "onUpdate": []
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 257.804,
+      "y": 409.792
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": true
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "70ibAzTktIELac3TjEFs/f",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "操作",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 23
+      },
+      {
+        "__id__": 26
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 30
+      }
+    ],
+    "_prefab": {
+      "__id__": 35
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 430,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        310,
+        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.Node",
+    "_name": "提现金额",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 19
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 21
+      }
+    ],
+    "_prefab": {
+      "__id__": 22
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 179,
+      "g": 46,
+      "b": 46,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 112,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -215,
+        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__": 20
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "提现金额",
+    "_N$string": "提现金额",
+    "_fontSize": 28,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "2bjXAazm9BabxxHih0CYKY",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "状态",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 19
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 24
+      }
+    ],
+    "_prefab": {
+      "__id__": 25
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 179,
+      "g": 46,
+      "b": 46,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 112,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -59,
+        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__": 23
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "提现状态",
+    "_N$string": "提现状态",
+    "_fontSize": 28,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "f8Ecpewr9F64Yb+E+9yJ56",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "操作",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 19
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 27
+      }
+    ],
+    "_prefab": {
+      "__id__": 28
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 179,
+      "g": 46,
+      "b": 46,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 56,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        135,
+        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__": 26
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "操作",
+    "_N$string": "操作",
+    "_fontSize": 28,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "52oe/C/t1CqYk2/kNNDyT3",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 19
+    },
+    "_enabled": false,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 430,
+      "height": 60
+    },
+    "_resize": 0,
+    "_N$layoutType": 1,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 90,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
+  {
+    "__type__": "a20d9E+N7FBiIV7z1whuT6J",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 19
+    },
+    "_enabled": true,
+    "fromData": {
+      "__id__": 31
+    },
+    "targetData": [
+      {
+        "__id__": 32
+      }
+    ],
+    "target": {
+      "__id__": 19
+    },
+    "tweenEasing": 21,
+    "repeat": 1,
+    "onOneRepeatComplete": {
+      "__id__": 34
+    },
+    "playOnLoad": true,
+    "actType": 0,
+    "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
+    "_id": ""
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 500,
+      "y": 310
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": true
+  },
+  {
+    "__type__": "TweenData",
+    "propsData": {
+      "__id__": 33
+    },
+    "duration": 0.2,
+    "delay": 0.2,
+    "isOffset": false,
+    "onComplete": [],
+    "onStart": [],
+    "onUpdate": []
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 310
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": true
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "75jch1+OpCWLQRF9z9hNH/",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "scrollView2",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 37
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 39
+      },
+      {
+        "__id__": 40
+      },
+      {
+        "__id__": 41
+      }
+    ],
+    "_prefab": {
+      "__id__": 45
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 500,
+      "height": 520
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        13.756999999999998,
+        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.Node",
+    "_name": "content",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 36
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 38
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 500,
+      "height": 520
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 1
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        250,
+        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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "8311UF+XhNmbJcQFl+Ywp5",
+    "sync": false
+  },
+  {
+    "__type__": "cc.ScrollView",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "horizontal": false,
+    "vertical": true,
+    "inertia": true,
+    "brake": 0.75,
+    "elastic": true,
+    "bounceDuration": 0.23,
+    "scrollEvents": [],
+    "cancelInnerEvents": false,
+    "_N$content": {
+      "__id__": 37
+    },
+    "content": {
+      "__id__": 37
+    },
+    "_N$horizontalScrollBar": null,
+    "_N$verticalScrollBar": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Mask",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_spriteFrame": null,
+    "_type": 0,
+    "_segments": 64,
+    "_N$alphaThreshold": 0.1,
+    "_N$inverted": false,
+    "_id": ""
+  },
+  {
+    "__type__": "9a31drXM+9NCKYkF9D78zlF",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 36
+    },
+    "_enabled": true,
+    "pre_item": [
+      {
+        "__uuid__": "a2b84337-c644-4c2d-87a7-26968d516e9c"
+      }
+    ],
+    "scr_item": [
+      "CashOutBillItem"
+    ],
+    "itemInterval": 15,
+    "node_xiabiao": {
+      "__id__": 42
+    },
+    "isShowByLimitLength": false,
+    "limitLength": 0,
+    "direction": 1,
+    "isHideAllChild": false,
+    "limitDataLen": -1,
+    "addOffset": 10,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "下标",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 43
+      }
+    ],
+    "_prefab": {
+      "__id__": 44
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 36,
+      "height": 27
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -263.573,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 42
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "6746af4e-9f63-4e2c-9b3f-4d2ec3426db2"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "30+VayMl1Ki6oDNEeAgzBa",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "03hiwLSlpBhblLYa2tKIOt",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "tip",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 47
+      },
+      {
+        "__id__": 48
+      }
+    ],
+    "_prefab": {
+      "__id__": 49
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 196,
+      "g": 26,
+      "b": 26,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 373.35,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -303,
+        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__": 46
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "近3天未登录游戏，提现账单将清空",
+    "_N$string": "近3天未登录游戏，提现账单将清空",
+    "_fontSize": 24,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_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.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 46
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+    },
+    "_clips": [
+      {
+        "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "16fcbcNQFGFoC0X5zZFtZn",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "tip2",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 51
+      }
+    ],
+    "_prefab": {
+      "__id__": 52
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 205,
+      "g": 42,
+      "b": 42,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 330,
+      "height": 50.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__": 50
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "提现后即可查看提现账单",
+    "_N$string": "提现后即可查看提现账单",
+    "_fontSize": 30,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "8fuSjU9PZNtKn/IoZKVMUW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a989151b-72b7-473f-be09-0356d18bb79b"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "cbPYq2BOxHzIHMZGSODb5Y",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "caAdRkqjdInJQOYHKCs2P3",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_id": ""
+  },
+  {
+    "__type__": "58495/rJOBNGoxELFSp8G2a",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 180
+    },
+    "design_block_node": null,
+    "bClickClose": false,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "f8c18NZX9tHxJ9TnMUIG/Rl",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "scroll_view": {
+      "__id__": 39
+    },
+    "node_tip": {
+      "__id__": 50
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "ac053zwqaRD6IJmTlQWmefZ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "effect_par": {
+      "__id__": 2
+    },
+    "open_effect": 1,
+    "isOpenCloseEffect": true,
+    "close_effect": 2,
+    "close_toPoint": "Canvas/主界面层/game/node_ui/顶部个人信息/标题/左侧按钮/提现账单",
+    "close_uibg": true,
+    "isDelayOneFrame": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "68a799c9-8646-4f20-8a3a-ab763cdf31dd"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/module/cashOutBill/cashOutBill.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "68a799c9-8646-4f20-8a3a-ab763cdf31dd",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/cashOutBill/cashOutBillItem.prefab

@@ -0,0 +1,882 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "cashOutBillItem",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 20
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 23
+      }
+    ],
+    "_prefab": {
+      "__id__": 24
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 470,
+      "height": 90
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 1
+    },
+    "_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.Node",
+    "_name": "New Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 18
+      }
+    ],
+    "_prefab": {
+      "__id__": 19
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 460,
+      "height": 80
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -45,
+        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.Node",
+    "_name": "金额",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 118,
+      "g": 79,
+      "b": 79,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 63.37,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -161.315,
+        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__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "10元",
+    "_N$string": "10元",
+    "_fontSize": 30,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a2b84337-c644-4c2d-87a7-26968d516e9c"
+    },
+    "fileId": "c9l49St5hJwYD2SXeBBVQS",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "状态",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 118,
+      "g": 79,
+      "b": 79,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 140.14,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -12.929999999999993,
+        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__": 6
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "已提现0.3元",
+    "_N$string": "已提现0.3元",
+    "_fontSize": 26,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a2b84337-c644-4c2d-87a7-26968d516e9c"
+    },
+    "fileId": "44lfq1qMJBj63onlKfdGOb",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 10
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 123,
+      "height": 45
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        162.77,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 118,
+      "g": 79,
+      "b": 79,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 96,
+      "height": 50.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__": 10
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "次日提现",
+    "_N$string": "次日提现",
+    "_fontSize": 24,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a2b84337-c644-4c2d-87a7-26968d516e9c"
+    },
+    "fileId": "dfAxycKX5PGo2inXzLlEct",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "010c7f93-d02f-4812-a23d-331822ac6426"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 15
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": {
+      "__id__": 9
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "fd084z1d8lEprYToRQgzIiH",
+    "handler": "clickBtn",
+    "customEventData": ""
+  },
+  {
+    "__type__": "f67a9SEPlBL8rHHpVX6g1ZW",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "normal": {
+      "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+    },
+    "gray": {
+      "__uuid__": "3a7bb79f-32fd-422e-ada2-96f518fed422"
+    },
+    "grayState": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a2b84337-c644-4c2d-87a7-26968d516e9c"
+    },
+    "fileId": "18hEowmPREvZoQ9pslmRQx",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": false,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 300,
+      "height": 200
+    },
+    "_resize": 0,
+    "_N$layoutType": 1,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 15,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 120,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a2b84337-c644-4c2d-87a7-26968d516e9c"
+    },
+    "fileId": "feATzs9M5FZrX05ptR/vbs",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Sprite",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 21
+      }
+    ],
+    "_prefab": {
+      "__id__": 22
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 460,
+      "height": 6
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -85,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 20
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "7f7db6cb-423d-448d-8357-d5e130bfca30"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a2b84337-c644-4c2d-87a7-26968d516e9c"
+    },
+    "fileId": "0aUuLBXoBIBItubvPhNrYs",
+    "sync": false
+  },
+  {
+    "__type__": "fd084z1d8lEprYToRQgzIiH",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "lab_value": {
+      "__id__": 4
+    },
+    "lab_status": {
+      "__id__": 7
+    },
+    "lab_operate": {
+      "__id__": 11
+    },
+    "node_setGray": {
+      "__id__": 16
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a2b84337-c644-4c2d-87a7-26968d516e9c"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/module/cashOutBill/cashOutBillItem.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "a2b84337-c644-4c2d-87a7-26968d516e9c",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/cashOutBill/texture.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "7e2a0de7-5251-4634-ae6a-a1735507e7c1",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/module/cashOutBill/texture/line.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "d6a35528-02e2-4642-b64a-e7fa493f32c8",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 696,
+  "height": 19,
+  "platformSettings": {},
+  "subMetas": {
+    "line": {
+      "ver": "1.0.4",
+      "uuid": "7f7db6cb-423d-448d-8357-d5e130bfca30",
+      "rawTextureUuid": "d6a35528-02e2-4642-b64a-e7fa493f32c8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 2,
+      "offsetY": 0,
+      "trimX": 4,
+      "trimY": 0,
+      "width": 692,
+      "height": 19,
+      "rawWidth": 696,
+      "rawHeight": 19,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/guide/guide.prefab

@@ -1612,7 +1612,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "5bOZw0rPtG6JPoObaga/v0",
+    "fileId": "58vP3SFFhIH649g3UOrzxx",
     "sync": false
   },
   {
@@ -1723,7 +1723,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "647dEku+VPH4WdDsmTpwJ6",
+    "fileId": "dfoUfhPpVDjY7SPa32qU0Z",
     "sync": false
   },
   {
@@ -2423,6 +2423,9 @@
     "rich_dialog1": {
       "__id__": 26
     },
+    "node_skip": {
+      "__id__": 52
+    },
     "_id": ""
   },
   {

assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/version.manifest"}
+{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/version.manifest"}

assets/resources/module/newCashUI/walletCashOut.prefab

@@ -1113,7 +1113,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "32UJibkopI07b5y1NInp8Y",
+    "fileId": "89/UQ2IE9J4ZFIzpf4t+YX",
     "sync": false
   },
   {
@@ -1322,7 +1322,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "360GNPET5PJK9fyBHTGH4W",
+    "fileId": "6dpAzjFxBOErFxu+/2fnCr",
     "sync": false
   },
   {
@@ -5437,7 +5437,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -5823,7 +5823,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -5877,7 +5877,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -6084,7 +6084,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -6470,7 +6470,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -6524,7 +6524,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -6731,7 +6731,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -7117,7 +7117,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -7171,7 +7171,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -7495,7 +7495,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -7881,7 +7881,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -7935,7 +7935,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -8142,7 +8142,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -8528,7 +8528,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -8582,7 +8582,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -8789,7 +8789,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -9175,7 +9175,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -9229,7 +9229,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,

assets/resources/module/speedUpUI/productReward.prefab

@@ -1040,6 +1040,9 @@
       },
       {
         "__id__": 31
+      },
+      {
+        "__id__": 34
       }
     ],
     "_active": true,
@@ -1064,7 +1067,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 288.49,
+      "width": 385.28,
       "height": 50
     },
     "_anchorPoint": {
@@ -1076,7 +1079,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -70,
+        2,
         53,
         0,
         0,
@@ -1140,7 +1143,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -79.245,
+        -127.63999999999999,
         0,
         0,
         0,
@@ -1248,7 +1251,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        12.999999999999996,
+        -35.39499999999998,
         -5,
         0,
         0,
@@ -1324,19 +1327,15 @@
     "_parent": {
       "__id__": 24
     },
-    "_children": [
-      {
-        "__id__": 32
-      }
-    ],
+    "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -1348,7 +1347,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 104,
+      "width": 52,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1360,7 +1359,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        92.245,
+        17.85000000000002,
         0,
         0,
         0,
@@ -1386,21 +1385,65 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 31
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "次，",
+    "_N$string": "次，",
+    "_fontSize": 26,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a2f8ad6a-6054-4b3e-8202-7e9e1975fad9"
+    },
+    "fileId": "173fnhaXxM9pe1r/UbhHri",
+    "sync": false
+  },
+  {
     "__type__": "cc.Node",
     "_name": "任务描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 31
+      "__id__": 24
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -1417,14 +1460,14 @@
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
+      "x": 0,
       "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        122.895,
+        48.85000000000002,
         0,
         0,
         0,
@@ -1454,7 +1497,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 34
     },
     "_enabled": true,
     "_materials": [
@@ -1490,51 +1533,7 @@
     "asset": {
       "__uuid__": "a2f8ad6a-6054-4b3e-8202-7e9e1975fad9"
     },
-    "fileId": "f7Jr0yRdNNtb0Jxu6fTL43",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 31
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_string": "次，立即",
-    "_N$string": "次，立即",
-    "_fontSize": 26,
-    "_lineHeight": 40,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_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.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "a2f8ad6a-6054-4b3e-8202-7e9e1975fad9"
-    },
-    "fileId": "173fnhaXxM9pe1r/UbhHri",
+    "fileId": "1aMjOpAjtJdJrNRzkBJyYB",
     "sync": false
   },
   {
@@ -1547,7 +1546,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 288.49,
+      "width": 385.28,
       "height": 50
     },
     "_resize": 1,
@@ -2046,7 +2045,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 260,
+      "width": 234,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -2098,8 +2097,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "订单已完成，领取红包",
-    "_N$string": "订单已完成，领取红包",
+    "_string": "订单完成，点击领奖",
+    "_N$string": "订单完成，点击领奖",
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -4136,6 +4135,9 @@
     "lbl_orderValue": {
       "__id__": 52
     },
+    "lbl_rewardDes": {
+      "__id__": 35
+    },
     "_id": ""
   },
   {

assets/script/before/main/FactoryIcon.ts

@@ -95,8 +95,12 @@ export class FactoryIcon extends cc.Component {
     private clean(): void {
         this.showGroup.removeAllChildren();
     }
-
+    
+    isCanTouch = true;
     public async onTouch() {
+        if(!this.isCanTouch){
+            return;
+        }
         switch (this.data.state) {
             case FactroyState.Lock:
                 let arr = gData.gameData.getProductArrByType(this.tab);
@@ -117,7 +121,11 @@ export class FactoryIcon extends cc.Component {
                 break;
             case FactroyState.Ripe:
                 gData.factorySystem.currSelectFactory = this;
-                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
+                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 2);
+                this.isCanTouch = false;
+                setTimeout(()=>{
+                    this.isCanTouch = true;
+                }, 1000);
                 break;
             case FactroyState.Sick:
                 // mk.tip.pop(`生虫了！`);
@@ -207,7 +215,7 @@ export class FactoryIcon extends cc.Component {
     public canHarvest() {
         this.getComponent(MoveToCenter).move();
         gData.factorySystem.currSelectFactory = this;
-        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
+        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 2);
     }
 
     public canClearSick() {

assets/script/before/main/FarmCountDown.ts

@@ -1,5 +1,5 @@
 import { BitmapFontC } from "../../game/component/BitmapFontC";
-import { ProductType } from "../../game/data/GameData";
+import { GameProp, ProductType } from "../../game/data/GameData";
 import Util from "../util/Util";
 
 const { ccclass, property } = cc._decorator;
@@ -104,7 +104,8 @@ export class FarmCountDown extends cc.Component {
         this.counting = false;
         this.normalGroup.active = false;
         let sick = false;
-        if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= 1 && Math.random() < parseFloat(gData.gameData.configs.ServerConfig.StopProduction)) {
+        let cashTimes = gData.gameData.getProp(GameProp.cashTimes);
+        if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= 1 && cashTimes >= gData.gameData.insectAutoShowLimit && Math.random() < parseFloat(gData.gameData.configs.ServerConfig.StopProduction)) {
             if (this.productConfig.tab == ProductType.nzw) {
                 if (gData.gameData.RawInsectCurArr[0] < parseInt(gData.gameData.RawInsectArr[0])) {
                     sick = true;

assets/script/before/main/FarmIcon.ts

@@ -116,7 +116,11 @@ export class FarmIcon extends cc.Component {
         }
     }
 
+    isCanTouch = true
     public async onTouch() {
+        if (!this.isCanTouch) {
+            return;
+        }
         switch (this.data.state) {
             case FarmState.Lock:
                 mk.tip.pop(`点击拓建即可解锁农田`);
@@ -134,7 +138,11 @@ export class FarmIcon extends cc.Component {
                 break;
             case FarmState.Ripe:
                 gData.farmSystem.currSelectFarm = this;
-                gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true);
+                gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
+                this.isCanTouch = false;
+                setTimeout(() => {
+                    this.isCanTouch = true;
+                }, 1000);
                 break;
             case FarmState.Sick:
                 // mk.tip.pop(`生虫了！`);
@@ -165,6 +173,8 @@ export class FarmIcon extends cc.Component {
         else {
             gData.farmGradeData.addGradeExp(ExpAddType.EAT_others, this.node);
         }
+
+        gData.gameData.popTableScreenADLogic(7);
     }
 
     public async plant(id: number, parentNode = null) {
@@ -197,7 +207,16 @@ export class FarmIcon extends cc.Component {
             return flyRed;
         }
         else {
-            mk.tip.pop('农田已满，无法继续生产');
+            gData.gameData.nextMake = null;
+            gData.gameData.setNextProduct(false);
+            if(gData.gameData.nextType == 0){
+                mk.tip.pop('农田已满，无法继续生产');
+                return false;
+            }else{
+               let flyRed =  await gData.gameData.makeProduct();
+               return flyRed;
+            }
+            //mk.tip.pop('农田已满，无法继续生产');
             return false;
         }
     }
@@ -245,8 +264,15 @@ export class FarmIcon extends cc.Component {
     }
 
     public canHarvest() {
+        if(!this.isCanTouch){
+            return;
+        }
         gData.farmSystem.currSelectFarm = this;
-        gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true);
+        gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
+        this.isCanTouch = false;
+        setTimeout(() => {
+            this.isCanTouch = true;
+        }, 1000);
     }
 
     public canClearSick() {
@@ -258,7 +284,7 @@ export class FarmIcon extends cc.Component {
     public clickGuideBtn() {
         if (mk.guide.isGuiding()) {
             //gData.farmSystem.currSelectFarm = this;
-            gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true, false, true);
+            gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, 0, false, true);
         }
     }
 }

assets/script/before/main/PastureIcon.ts

@@ -146,7 +146,11 @@ export default class PastureIcon extends cc.Component {
         this.showGroup.removeAllChildren();
     }
 
+    isCanTouch = true;
     public async onTouch() {
+        if(!this.isCanTouch){
+            return;
+        }
         switch (this.data.state) {
             case PastureState.Lock:
                 let config = gData.gameData.getProductMap(this.data.productID);
@@ -178,7 +182,11 @@ export default class PastureIcon extends cc.Component {
                 mk.ui.openPanel('module/speedUpUI/speedUp');
                 break;
             case PastureState.Ripe:
-                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
+                gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 1);
+                this.isCanTouch = false;
+                setTimeout(()=>{
+                    this.isCanTouch = true;
+                }, 1000);
                 break;
             case PastureState.Sick:
                 // mk.tip.pop(`生虫了！`);
@@ -303,7 +311,7 @@ export default class PastureIcon extends cc.Component {
 
     public canHarvest() {
         this.getComponent(MoveToCenter).move();
-        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
+        gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 1);
     }
 
     public canClearSick() {

assets/script/before/view/data/HarvestData.ts

@@ -20,17 +20,20 @@ export default class HarvestData extends Data {
     isMatchOrder = false;
     //是否是点击一键生产按钮
     isTouchBtn = false;
-    openPanel(configID, plantID, call, node, isCrops = false, isTouchBtn =false, isTeach = false) {
+    isCrops_ = 0;
+    //isCrops 0 农作物，1动物，2商品
+    openPanel(configID, plantID, call, node, isCrops = 0, isTouchBtn =false, isTeach = false) {
 
         this.configID = configID;
         this.plantID = plantID;
         this.call = call;
         this.node_fly = node;
         this.isTouchBtn = isTouchBtn;
+        this.isCrops_ = isCrops;
         this.config = gData.gameData.getProductMap(this.plantID);
         //this.judgeIsMatchOrder();
 
-        if(!isTeach && !isCrops)
+        if(!isTeach && isCrops != 0)
         {
             let isTeaching = mk.guide.isGuiding();
             let rand = Math.random();
@@ -70,9 +73,16 @@ export default class HarvestData extends Data {
         gData.reward.getReward(world_Pos);
         //mk.ui.openPanel('module/reward/reward');
         gData.harvestData.call = null;
+
+       if(this.isCrops_ == 1){
+            mk.data.sendDataEvent(DataEventId.button_click, "动物超级加倍收获");
+        }else if(this.isCrops_ == 2){
+            mk.data.sendDataEvent(DataEventId.button_click, "商品超级加倍收获");
+        }
     }
 
     async getNormalReward() {
+        await mk.time.WaitForSeconds(0.2);
         let data = { id: this.config.id };
         let response = await mk.http.sendData('redMoney/addRedMoneyByFarm', data);
 
@@ -114,9 +124,20 @@ export default class HarvestData extends Data {
                 gData.reward.data = rewardData;
                 gData.reward.callback = this.call;
     
-    
                 let world_Pos = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
                 gData.reward.getReward(world_Pos);
+
+                let str = "+"+ response.data.redMoneyAddition/100 + "";
+                let pos =  mk.fly.node.convertToNodeSpaceAR(world_Pos);
+                let prefab = await mk.loader.load("game/prefab/flyHb", cc.Prefab);
+                let hand = cc.instantiate(prefab);
+                //hand.opacity = 0;
+                hand.zIndex = 1000;
+                hand.parent = mk.fly.node;
+                hand.setPosition(pos);
+                let lab_value = hand.getComponentInChildren(cc.Label);
+                lab_value.string = str;
+                cc.tween(hand).by(0.8, { y: 100 }).to(0.4, { opacity: 0 }).removeSelf().start();
                 //mk.ui.openPanel('module/reward/reward');
             }
             
@@ -130,6 +151,14 @@ export default class HarvestData extends Data {
                 mk.data.sendDataEvent(DataEventId.htRedBag_scene, "点击可收获");
             }
         }
+
+        if(this.isCrops_ == 0){
+            mk.data.sendDataEvent(DataEventId.button_click, "农作物普通收获");
+        }else if(this.isCrops_ == 1){
+            mk.data.sendDataEvent(DataEventId.button_click, "动物普通收获");
+        }else if(this.isCrops_ == 2){
+            mk.data.sendDataEvent(DataEventId.button_click, "商品普通收获");
+        }
     }
 
     public judgeIsMatchOrder()

assets/script/before/view/ui/ADClearSickPanel.ts

@@ -35,7 +35,7 @@ export default class ADClearSickPanel extends cc.Component {
     }
 
     onEnable() {
-        gData.adData.checkPopInter(InterAdType.interstitial1_click_3);
+        gData.gameData.popTableScreenADLogic(2);
 
         //mk.ad.showBanner(BannerAdType.banner_click_8);
         mk.ad.showNative();

assets/script/before/view/ui/ADUnlockPanel.ts

@@ -14,6 +14,8 @@ export default class ADUnlockPanel extends cc.Component {
                 mk.ui.closePanel(this.node.name);
                 gData.adData.watchVideo(null);
                 gData.adUnlockData.unlockFarm();
+
+                gData.gameData.popTableScreenADLogic(16);
             }
         });
     }

assets/script/before/view/ui/HarvestPanel.ts

@@ -11,7 +11,7 @@ const { ccclass, property } = cc._decorator;
 export default class HarvestPanel extends cc.Component {
     @property({ type: cc.Label }) lbl_des: cc.Label = null;
     @property({ type: cc.RichText }) lbl_max: cc.RichText = null;
-    @property({type: cc.Node}) node_hb: cc.Node = null;
+    @property({ type: cc.Node }) node_hb: cc.Node = null;
 
     start() {
         let data = gData.gameData.configs.CashCfg[0];
@@ -25,7 +25,7 @@ export default class HarvestPanel extends cc.Component {
         // gData.harvestData.config.picture
         //调用收获红包币接口
         mk.audio.playEffect("button");
-        
+
         gData.adData.checkShowFullInter(1, InterFullAdType.interstitial2_init_2);
 
         let data = { id: gData.harvestData.config.id };
@@ -48,6 +48,18 @@ export default class HarvestPanel extends cc.Component {
             let world_Pos = gData.harvestData.node_fly.parent.convertToWorldSpaceAR(gData.harvestData.node_fly.getPosition());
             gData.reward.getReward(world_Pos);
             //mk.ui.openPanel('module/reward/reward');
+
+            let str = "+" + response.data.redMoneyAddition / 100 + "";
+            let pos = mk.fly.node.convertToNodeSpaceAR(world_Pos);
+            let prefab = await mk.loader.load("game/prefab/flyHb", cc.Prefab);
+            let hand = cc.instantiate(prefab);
+            //hand.opacity = 0;
+            hand.zIndex = 1000;
+            hand.parent = mk.fly.node;
+            hand.setPosition(pos);
+            let lab_value = hand.getComponentInChildren(cc.Label);
+            lab_value.string = str;
+            cc.tween(hand).by(0.8, { y: 100 }).to(0.4, { opacity: 0 }).removeSelf().start();
         }
         mk.ui.closePanel('HarvestPanel');
     }
@@ -62,6 +74,8 @@ export default class HarvestPanel extends cc.Component {
             mk.console.log("watchAD:" + success);
             if (success) {
                 await gData.adData.watchVideo(AdFun.harvest);
+
+                gData.gameData.popTableScreenADLogic(17);
             }
         });
     }
@@ -71,7 +85,7 @@ export default class HarvestPanel extends cc.Component {
         mk.ad.showNative();
 
         let pop = gData.adData.checkShowFullInter(4);
-        if(pop){
+        if (pop) {
             gData.moreGame.openType = 0;
             mk.data.sendDataEvent(DataEventId.htRedBag_scene, "点击可收获");
         }

assets/script/before/view/uiItem/PlantItem.ts

@@ -114,7 +114,7 @@ export default class PlantItem extends cc.Component {
         }
 
         if (gData.gameData.isProducting) {
-            mk.tip.pop('点击太快了');
+            //mk.tip.pop('点击太快了');
             return;
         }
         let flyRed;

assets/script/game/data/AdData.ts

@@ -1,6 +1,6 @@
 import Util from "../../before/util/Util";
 import { Data } from "../../mk/data/Data";
-import { GameProp, VideoAdType } from "./GameData";
+import { GameProp, InterAdType, InterFullAdType, VideoAdType } from "./GameData";
 
 /**
  * @description 广告数据
@@ -104,7 +104,7 @@ export class AdData {
         this.precision = data.precision;
         this.ecpm_level = data.ecpm_level;
         this.request_id = '';
-        if(data.ext_info && data.ext_info.request_id){
+        if (data.ext_info && data.ext_info.request_id) {
             this.request_id = data.ext_info.request_id;
         }
     }
@@ -157,11 +157,10 @@ export class AdData {
             curData.setAdData(response.data);
         }
 
-        if(callBack)
-        {
+        if (callBack) {
             callBack(response.data);
         }
-        
+
         //达到任务之后计算视频
         if (gData.safeDepositBoxData.isStartBankTask > 0) {
             gData.safeDepositBoxData.richBankDailyVideoTimes++
@@ -231,7 +230,7 @@ export class AdData {
                 "platformRisk": 1,
                 "request_id": '',
             }
-            if(data.ext_info && data.ext_info.request_id){
+            if (data.ext_info && data.ext_info.request_id) {
                 sData.request_id = data.ext_info.request_id;
             }
         }
@@ -292,12 +291,16 @@ export class AdData {
     /** 检查是否显示插屏、互推（概率弹出）
      * @type  1:弹出全屏插屏广告  2:延时弹出大插屏  3:先弹出插屏，再弹出大插屏  4:互推红包
      */
-    checkShowFullInter(type, des = null) {
+    checkShowFullInter(type, des = null, rateType = null) {
         let per = 0;
         let pop = true;
         switch (type) {
             case 1:
-                per = this.getPerByEcpm(RateConfig.RC_fullScreen);
+                if (rateType != null) {
+                    per = this.getPerByEcpm(rateType);
+                } else {
+                    per = this.getPerByEcpm(RateConfig.RC_fullScreen);
+                }
                 pop = Math.random() < per;
                 if (!pop) {
                     return pop;
@@ -308,7 +311,11 @@ export class AdData {
                 mk.ad.showInterAd(1, des);
                 break;
             case 2:
-                per = this.getPerByEcpm(RateConfig.RC_tableScreen);
+                if (rateType != null) {
+                    per = this.getPerByEcpm(rateType);
+                } else {
+                    per = this.getPerByEcpm(RateConfig.RC_tableScreen);
+                }
                 pop = Math.random() < per;
                 if (!pop) {
                     return pop;
@@ -322,8 +329,11 @@ export class AdData {
                 }, delay);
                 break;
             case 3:
-
-                per = this.getPerByEcpm(RateConfig.RC_tableScreen);
+                if (rateType != null) {
+                    per = this.getPerByEcpm(rateType);
+                } else {
+                    per = this.getPerByEcpm(RateConfig.RC_tableScreen);
+                }
                 pop = Math.random() < per;
                 if (!pop) {
                     return pop;
@@ -341,7 +351,11 @@ export class AdData {
                 }, delay1);
                 break;
             case 4:
-                per = this.getPerByEcpm(RateConfig.RC_moreGameRedBag);
+                if (rateType != null) {
+                    per = this.getPerByEcpm(rateType);
+                } else {
+                    per = this.getPerByEcpm(RateConfig.RC_moreGameRedBag);
+                }
                 pop = Math.random() < per;
                 if (!pop) {
                     return pop;
@@ -354,7 +368,7 @@ export class AdData {
     }
 
     /** 弹出插屏 */
-    checkPopInter(des) {
+    checkPopInter(des, rateType = null) {
         if (this.ABCInsertAdArr.indexOf(this.ecpmLevel.toString()) == -1) {
             return;
         }
@@ -369,7 +383,7 @@ export class AdData {
             }
         }
 
-        this.checkShowFullInter(index, des);
+        this.checkShowFullInter(index, des, rateType);
     }
 
     /** 点击提现弹出全屏插屏 */
@@ -411,9 +425,15 @@ export class AdData {
         let span = this.AutoRedMoneyMap.get(this.ecpmLevel);
         if (this.timeAd >= span) {
             this.timeAd = 0;
-            mk.ad.videoAdType = VideoAdType.video_init_19;
-            gData.gameData.init_hideRedBag = true;
-            mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
+            // mk.ad.videoAdType = VideoAdType.video_init_19;
+            // gData.gameData.init_hideRedBag = true;
+            // mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
+
+            //this.checkPopInter(InterAdType.interstitial1_click_19);
+
+            if (gData.gameData.insertAdSwitch[13] == "1") {
+                gData.adData.checkShowFullInter(1, InterFullAdType.interstitial2_init_4);
+            }
         }
     }
 
@@ -492,10 +512,15 @@ export class AdData {
                         return per;
                     }
                 case RateConfig.RC_popSpeedUp:
-                    if (gData.gameData.adShowConfig.average_ecpm <= parseInt(forceAd[i].ecpmMax)){
+                    if (gData.gameData.adShowConfig.average_ecpm <= parseInt(forceAd[i].ecpmMax)) {
                         per = parseFloat(forceAd[i].jsPercent);
                         return per;
                     }
+                case RateConfig.RC_afterVideo:
+                    if (gData.gameData.adShowConfig.average_ecpm <= parseInt(forceAd[i].ecpmMax)) {
+                        per = parseFloat(forceAd[i].cpjlPercent);
+                        return per;
+                    }
             }
         }
 
@@ -508,8 +533,7 @@ export class AdData {
         if (!times) {
             console.log('savePreLoadEcpm  data ', data.adsource_price)
             let response = await mk.http.sendData('user/savePreLoadEcpm', data);
-            if(response.errcode != 0)
-            {
+            if (response.errcode != 0) {
                 return;
             }
 
@@ -517,17 +541,15 @@ export class AdData {
         }
     }
 
-    async getOrderTaskInfo(isDefault)
-    {
-        if(!gData.gameData.playerProp.orderData)
-        {
+    async getOrderTaskInfo(isDefault) {
+        if (!gData.gameData.playerProp.orderData) {
             let data = {};
             data["isDefault"] = isDefault;
             let response = await mk.http.sendData('orderTask/getUserOrderTaskInfo', data);
-            if(response.errcode != 0){
+            if (response.errcode != 0) {
                 return;
             }
-            gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;  
+            gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
 
             mk.event.emit("initOrderUi");
         }
@@ -559,5 +581,6 @@ export enum RateConfig {
     RC_splash,
     RC_superDouble,
     RC_moreGameRedBag,
-    RC_popSpeedUp
+    RC_popSpeedUp,
+    RC_afterVideo
 }

assets/script/game/data/AppData.ts

@@ -17,9 +17,6 @@ export class AppData {
     /** api版本 */
     public version: string = '';
 
-    /** UserAgent */
-    UA = '';
-
     IP = '';
 
     /** 测试服/正式服的appId */

assets/script/game/data/GameData.ts

@@ -129,6 +129,16 @@ export class GameData {
 
     //富翁银行教学
     richBankTeachTag = false;
+
+    //订单奖励类型
+    orderRewardType = 1;
+    //提现X次后显示任务红包
+    taskRedBagAutoShowLimit = 0;
+    //提现x次后显示生虫
+    insectAutoShowLimit = 0;
+
+    public insertAdLimit = 0;
+    public insertAdSwitch: string[] = [];
     /**
      * 初始化游戏数据：网络配置信息，用户信息
      * @returns 
@@ -163,13 +173,7 @@ export class GameData {
             }
         }
 
-        data = {};
-        response = await mk.http.sendData('user/adShowConfig', data);
-        if (response.errcode != 0) {
-            return;
-        }
-        this.adShowConfig = response.data;
-        mk.console.logSingle("user/adShowConfig", response.data);
+        await this.uploadAverageEcpm();
         gData.adData.initEcpmData();
 
         // data = {};
@@ -188,6 +192,17 @@ export class GameData {
         this.dataFinish = true;
     }
 
+    public async uploadAverageEcpm(){
+        let response = await mk.http.sendData('user/adShowConfig', {});
+        if (response.errcode != 0) {
+            return;
+        }
+        this.adShowConfig = response.data;
+        mk.data.setTAEventUser(0, "average_ecpm", this.adShowConfig.average_ecpm);
+        
+        mk.console.logSingle("user/adShowConfig", response.data);
+    }
+
     private initConfigs(data) {
         // console.log('config  ', data);
         this.configs = data;
@@ -220,6 +235,13 @@ export class GameData {
         }else{
             LogUtil.ifShowLog = false;
         }
+
+        gData.gameData.orderRewardType = parseInt(this.configs.ServerConfig.OrderReward);
+        //gData.gameData.taskRedBagAutoShowLimit = parseInt(this.configs.ServerConfig.harvestSwitch);
+        gData.gameData.insectAutoShowLimit = parseInt(this.configs.ServerConfig.StopProductionSwitch);
+
+        gData.gameData.insertAdLimit = parseInt(this.configs.ServerConfig.InsertAdCash);
+        gData.gameData.insertAdSwitch = this.configs.ServerConfig.InsertAdScene.split(",");
     }
 
     /**
@@ -440,7 +462,7 @@ export class GameData {
         this.initProductTimes();
         this.initLeftTimes();
         this.initFarmMapGetRewardData();
-        this.initCashOutTimes();
+        //this.initCashOutTimes();
         // let isNewTask = this.getProp(GameProp.redBagTaskRefresh);
         // if (isNewTask != undefined) {
         //     this.init_redBagTask = isNewTask;
@@ -919,6 +941,7 @@ export class GameData {
                 let next2 = gData.factorySystem.nextFactoryExtra();
                 if (!next2) {
                     this.nextType = 0;
+                    //gData.gameData.nextMake = null;
                 }
                 else {
                     //this.nextType = 3;
@@ -1882,6 +1905,81 @@ export class GameData {
             console.log("------");
         }
     }
+
+    popTableScreenADLogic(type: number) {
+        let str = null;
+        switch (type) {
+            case 0:
+                str = InterAdType.interstitial1_click_1;
+                break;
+            case 1:
+                str = InterAdType.interstitial1_click_2;
+                break;
+            case 2:
+                str = InterAdType.interstitial1_click_3;
+                break;
+            case 3:
+                str = InterAdType.interstitial1_click_4;
+                break;
+            case 4:
+                str = InterAdType.interstitial1_click_5;
+                break;
+            case 5:
+                str = InterAdType.interstitial1_click_6;
+                break;
+            case 6:
+                str = InterAdType.interstitial1_click_7;
+                break;
+            case 7:
+                str = InterAdType.interstitial1_click_8;
+                break;
+            case 8:
+                str = InterAdType.interstitial1_click_9;
+                break;
+            case 9:
+                str = InterAdType.interstitial1_click_10;
+                break;
+            case 10:
+                str = InterAdType.interstitial1_click_11;
+                break;
+            case 11:
+                str = InterAdType.interstitial1_click_12;
+                break;
+            case 12:
+                str = InterAdType.interstitial1_click_13;
+                break;
+            case 13:
+                str = InterAdType.interstitial1_click_14;
+                break;
+            case 14:
+                str = InterAdType.interstitial1_click_15;
+                break;
+            case 15:
+                str = InterAdType.interstitial1_click_16;
+                break;
+            case 16:
+                str = InterAdType.interstitial1_click_17;
+                break;
+            case 17:
+                str = InterAdType.interstitial1_click_18;
+                break;
+        }
+        let index = 0;
+        let rateType = null;
+        if(type <= 11){
+            index = type;
+        }else{
+            index = 12;
+            rateType = RateConfig.RC_afterVideo;
+        }
+        if(str != null){
+            let cashTimes = gData.gameData.getProp(GameProp.cashTimes);
+            let is = gData.gameData.insertAdSwitch[index];
+            if(is == "1" && cashTimes >= gData.gameData.insertAdLimit){
+                gData.adData.checkPopInter(str, rateType);
+            }
+        }
+    }
 }
 
 /**
@@ -2010,6 +2108,12 @@ class PlayerProp {
         gData.gameData.init_wallet_redMoney = true;
         mk.event.emit('refreshCoin');
 
+        if(this._redMoney >= 300000){
+            let isHaveUI = mk.ui.isPopPanel();
+            if(!isHaveUI){
+                mk.guide.open(14);
+            }    
+        }
         mk.data.setTAEventUser(0, 'current_redmoney_stock', this._redMoney);
     }
     get redMoney(): number {
@@ -2205,6 +2309,8 @@ export enum EVENT_TYPE {
 
 
 /** 数据事件Id */
+
+
 export enum DataEventId {
     /** 点击 */
     guide = "guide",
@@ -2245,7 +2351,8 @@ export enum DataEventId {
     /**互推红包弹出位置 */
     htRedBag_scene = "htRedBag_scene",
     /**互推红包领取次数*/
-    htRedBag_eject = "htRedBag_eject"
+    htRedBag_eject = "htRedBag_eject",
+    interstita11_eject = "interstita11_eject"
 }
 
 
@@ -2272,18 +2379,36 @@ export enum VideoAdType {
     video_init_19 = '定时弹出红包',
     video_init_20 = '插队',
     video_init_21 = '恢复生产次数',
+    //video_init_22 = '长时间未操作弹出视频',
 }
 
 export enum InterFullAdType {
     interstitial2_init_1 = '点击红包的关闭按钮',
     interstitial2_init_2 = '普通收获',
-    interstitial2_init_3 = '点击鸟和狗'
+    interstitial2_init_3 = '点击鸟和狗',
+    interstitial2_init_4 = "长时间未操作弹出"
 }
 
 export enum InterAdType {
     interstitial1_click_1 = '恭喜发财红包弹出后',
     interstitial1_click_2 = '恭喜获得弹窗弹出后',
-    interstitial1_click_3 = '生虫/生病/停电弹出后'
+    interstitial1_click_3 = '生虫/生病/停电弹出后',
+    interstitial1_click_4 = '关闭抽奖界面后',
+    interstitial1_click_5 = '关闭任务红包后',
+    interstitial1_click_6 = '关闭富翁银行后',
+    interstitial1_click_7 = '打开领取生产次数界面',
+    interstitial1_click_8 = '农作物点击可收获',
+    interstitial1_click_9 = '关闭全体加速后',
+    interstitial1_click_10 = '关闭福利后',
+    interstitial1_click_11 = '打开个人资料页',
+    interstitial1_click_12 = '打开更多游戏页',
+    interstitial1_click_13 = '全体加速激励视频播完后',
+    interstitial1_click_14 = '离线奖励激励视频播完后',
+    interstitial1_click_15 = '抽奖激励视频播完后',
+    interstitial1_click_16 = '图鉴领奖激励视频播完后',
+    interstitial1_click_17 = '拓建激励视频播完后',
+    interstitial1_click_18 = '收获超级加倍激励视频播完后',
+    //interstitial1_click_19 = '定时弹出插屏',
 }
 
 export enum BannerAdType {
@@ -2295,7 +2420,8 @@ export enum BannerAdType {
     banner_click_6 = '收获弹窗',
     banner_click_7 = '拓建弹窗',
     banner_click_8 = '三个恢复弹窗',
-    banner_click_9 = '抽奖'
+    banner_click_9 = '抽奖',
+    banner_click_10  = '提现账单'
 }
 
 export enum ExpAddType {
@@ -2362,5 +2488,7 @@ export enum FunctionSwitch{
     FS_addCashBtn = 10,                 //提现界面的加现金按钮
     FS_order = 11,                      //订单
     FS_floatFarmMap = 12,               //图鉴浮窗
-    FS_richManBank = 13                 //富翁银行
+    FS_richManBank = 13,                //富翁银行
+    FS_openPushNotice = 14,             //打开推送通知权限
+    FS_cashOutBill = 15,                //提现账单
 }

assets/script/game/data/LoginData.ts

@@ -201,6 +201,9 @@ export class LoginData {
                 //清除缓存
                 console.log('restart  errcode ', response.errcode)
                 this.reload();
+            } else if (response.errcode == 403) {
+                console.log('block 403');
+                gData.warnTipData.setSolution(4);
             }
             return;
         }
@@ -232,67 +235,67 @@ export class LoginData {
         this.checkLogin();
     }
 
-  /**
-     * 检测登录
-     * @returns 
-     */
-   private async checkLogin() {
-    //checkLogin
-    let tmp_key = '';
-    if (gData.wechatData.code != null) {
-        tmp_key = this.sessionKey;
-    }
-    else {
-        tmp_key = mk.encrypt.randomString();
-    }
-
-    let data = {
-        "tmp_key": tmp_key,
-        "uin": this.uin,
-        "login_ticket": this.loginTicket,
-        "appId": gData.appData.appId
-    }
-    let response = await mk.http.sendRequest('checklogin', 'POST', JSON.stringify(data));
-    if (response.errcode != 0) {
-        if (response.errcode == 403) {
-            console.log('block 403');
-            gData.warnTipData.setSolution(4);
+    /**
+       * 检测登录
+       * @returns 
+       */
+    private async checkLogin() {
+        //checkLogin
+        let tmp_key = '';
+        if (gData.wechatData.code != null) {
+            tmp_key = this.sessionKey;
+        }
+        else {
+            tmp_key = mk.encrypt.randomString();
         }
-        return;
-    }
-    let decryptData;
-    if (gData.wechatData.code != null) {
-        decryptData = mk.encrypt.decrypt(response.encrypt, this.sessionKey, gData.appData.appId);
-    }
-    else {
-        decryptData = mk.encrypt.decrypt(response.encrypt, tmp_key, gData.appData.appId);
-    }
 
-    let parseData = JSON.parse(decryptData);
-    this.sessionKey = parseData.session_key;
-    mk.console.logSingle("[FC]checkLogin decrypt", parseData);
-    console.log("this.sessionKey  ", this.sessionKey);
-    mk.storage.setStorage(StorageKey.sessionKey, this.sessionKey);
-    if (gData.wechatData.code != null) {
-        if (this.isNew) {
-            console.log('KKKK 1 ', this.uin)
-            this.getUserInfo();
+        let data = {
+            "tmp_key": tmp_key,
+            "uin": this.uin,
+            "login_ticket": this.loginTicket,
+            "appId": gData.appData.appId
+        }
+        let response = await mk.http.sendRequest('checklogin', 'POST', JSON.stringify(data));
+        if (response.errcode != 0) {
+            if (response.errcode == 403) {
+                console.log('block 403');
+                gData.warnTipData.setSolution(4);
+            }
+            return;
+        }
+        let decryptData;
+        if (gData.wechatData.code != null) {
+            decryptData = mk.encrypt.decrypt(response.encrypt, this.sessionKey, gData.appData.appId);
         }
         else {
-            console.log('KKKK 2 ', this.uin)
-            this.isNew = false;
-            gData.wechatData.code = null;
+            decryptData = mk.encrypt.decrypt(response.encrypt, tmp_key, gData.appData.appId);
+        }
 
-            cc.audioEngine.stopAll();
-            //调用Android的更好
-            cc.game.restart();
+        let parseData = JSON.parse(decryptData);
+        this.sessionKey = parseData.session_key;
+        mk.console.logSingle("[FC]checkLogin decrypt", parseData);
+        console.log("this.sessionKey  ", this.sessionKey);
+        mk.storage.setStorage(StorageKey.sessionKey, this.sessionKey);
+        if (gData.wechatData.code != null) {
+            if (this.isNew) {
+                console.log('KKKK 1 ', this.uin)
+                this.getUserInfo();
+            }
+            else {
+                console.log('KKKK 2 ', this.uin)
+                this.isNew = false;
+                gData.wechatData.code = null;
+
+                cc.audioEngine.stopAll();
+                //调用Android的更好
+                cc.game.restart();
+            }
+        }
+        else {
+            console.log('KKKK 3 ', this.uin)
+            this.getUserInfo();
         }
     }
-    else {
-        console.log('KKKK 3 ', this.uin)
-        this.getUserInfo();
-    }
-}
 
     private async getUserInfo() {
         this.getAccountInfo();

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

@@ -124,12 +124,12 @@ export class BlessingBagData extends Data {
         mk.data.sendDataEvent(DataEventId.fudaiFunction, `视频红包第${this.taskRbId}档提现成功`);
         mk.data.sendDataEvent(DataEventId.Sundry, '福利提现成功');
         gData.gameData.doPointToXYLogic();
-        gData.gameData.addCashOutTimes();
+        //gData.gameData.addCashOutTimes();
 
         gData.receiptNotice.receip_rmb = gData.blessingBag.rbNum;
         mk.ui.openPanel('module/newNotice/newNotice');
 
-        gData.safeDepositBoxData.updateQipao();
+        //gData.safeDepositBoxData.updateQipao();
         gData.cashNormal.getRecord();
         return response
     }

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

@@ -0,0 +1,17 @@
+import { Data } from "../../../mk/data/Data";
+
+const {ccclass, property} = cc._decorator;
+
+@ccclass
+export default class NewClass extends Data {
+
+
+    async getUserBillInfo(){
+        let response = await mk.http.sendData('bill/getUserBillInfo', {});
+        if (response.errcode != 0) {
+            return null;
+        }
+
+        gData.gameData.playerProp.cashOutBillData = response.data.billOrderInfoView;
+    }
+}

assets/script/game/data/module/CashOutBillData.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "20af6fc4-4c3a-492a-8be8-2534309a5ad8",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

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

@@ -13,6 +13,8 @@ export default class CashProData {
 
     callBack: Function = null;
 
+    isOrderCashOut = false;
+
     openCashPro(money) {
         this.cashPro_money = money;
         this.init_load = true;

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

@@ -36,7 +36,7 @@ export class GradeRewardData extends Data {
         mk.data.sendDataEvent(DataEventId.Sundry, '农场等级奖励提现成功');
         gData.gameData.doPointToXYLogic();
 
-        gData.gameData.addCashOutTimes();
+        //gData.gameData.addCashOutTimes();
 
         this.changeExp = true;
         gData.gameData.playerProp.farmGradeData = response.data.userFarmGrageRewardInfo
@@ -47,7 +47,7 @@ export class GradeRewardData extends Data {
         // gData.cashPro.init_success = true;
 
         gData.gameData.init_red_point = true;
-        gData.safeDepositBoxData.updateQipao();
+        //gData.safeDepositBoxData.updateQipao();
         gData.cashNormal.getRecord();
         return response
     }

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

@@ -14,6 +14,7 @@ export class GuideData {
     public crtID: number = null;
 
     public async init() {
+        console.log("=========1");
         let config = gData.gameData.configs.Guide
         if (!config || (config && config.length <= 0)) {
             let result = await mk.loader.load("data/guide_data", cc.JsonAsset);
@@ -21,6 +22,7 @@ export class GuideData {
                 config = result.json;
             }
             cc.log('无远程引导数据，使用本地测试数据');
+            console.log("=========2");
         }
         this.data = new Map<number, GuideVO[]>();
         let arr = [];
@@ -45,6 +47,7 @@ export class GuideData {
             guide.lag_next = parseFloat(o.lagNext);
             guide.display_type = parseInt(o.trNum);
             guide.continue = o.continue;
+            guide.isShowSkip = o.isShowSkip;
             if (id != guide.id) {
                 this.data.set(id, arr);
                 arr = [];

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

@@ -31,6 +31,10 @@ export class MoreGameData extends Data {
     //哪个位置打开互推红包界面
     openType = -1;
 
+    /** 点击格子时互推位信息 */
+    placement_id = '';
+    nebulaAppId = '';
+
     /** 测试数据 */
     private testData = {
         "normal": [
@@ -114,9 +118,10 @@ export class MoreGameData extends Data {
     /**
      * 下载
      * @param data 
+     * @param from 下载界面 1 插屏下载  2 信息流下载  3 互推banner下载  4 互推底部位下载
      * @returns 下载任务
      */
-    createNewTask(data): DownloadTaskClazz {
+    createNewTask(data, from = 0): DownloadTaskClazz {
         let name = data.nebulaAppId;
         let url = data.downloadUrl;
         let packageName = data.packageName;
@@ -124,7 +129,7 @@ export class MoreGameData extends Data {
         if (packageName != "") {
             let isExist = JsbSystem.ifCanStartGame(packageName, true)
             if (isExist) {
-                // JsbSystem.sendEvent('hutuiEventLaunch_' + data.nebulaAppId, "互推启动" + data.title, 'hutuiEventLaunch')
+                mk.data.sendXYEvent('hutuiEventDown_' + data.nebulaAppId, "互推启动" + data.title);
                 //判断在原生环境下存在就直接启动
                 return null
             }
@@ -160,7 +165,8 @@ export class MoreGameData extends Data {
         })
         downLoadTask.downloadTask = curTask
         MoreGameData.downLoadTaskMap[data.nebulaAppId] = downLoadTask
-        // AdM.onSendEvent('hutuiEventDown_' + data.nebulaAppId, "互推下载" + data.title, 'hutuiEventDown')
+        mk.data.sendXYEvent('hutuiEventDown_' + data.nebulaAppId, "互推下载" + data.title);
+        mk.data.sendXYEvent('hutuiEventFrom_' + from, "互推下载途径");
         return downLoadTask
     }
 
@@ -220,6 +226,24 @@ export class MoreGameData extends Data {
             mk.ui.openPanel('module/reward/reward');
         }
     }
+
+    /**
+     * 互推行为埋点
+     * @param recommend_type 互推位类型（1：banner展示；2：banner点击；3：格子展示；4：格子点击；5：信息流展示；6：信息流点击；7：插屏展示；8：插屏点击）
+     * @param placement_id 互推位id
+     * @param toAppId 跳转应用id
+     */
+    userBehaveLog(recommend_type: number, placement_id: string, toAppId: string) {
+        let data = {
+            toAppId: toAppId,
+            recommend_type: recommend_type,
+            placement_id: placement_id,
+            ip: gData.appData.IP,
+            ua: gData.appData.machineInfo.UA,
+        }
+
+        mk.http.sendData('fission/userBehaveLog', data);
+    }
 }
 
 /** 下载任务 */

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

@@ -28,6 +28,9 @@ export class RewardData extends Data {
      */
     subType: number = 1;
 
+    //reward界面关闭回调
+    closeUICallBack: Function = null;
+
     /**
     * 奖励添加
     */

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

@@ -108,14 +108,16 @@ export default class SafeDepositBoxData {
         //福利银行教学
         if(gData.gameData.richBankTeachTag){
             gData.gameData.richBankTeachTag = false;
-            let isOpenRichBankUI = mk.ui.isPopPanel();
+            
+            if(mk.guide.isGuideComplete()){
+                return;
+            }
+            mk.ui.closeAllUI();
             let times = gData.gameData.getProp(GameProp.cashTimes);
-            console.log(`=========${isOpenRichBankUI}===${times}=====${this.cashRecordData.length}====${this.cashRecordDataLength}`);
-            if(gData.gameData.funOpenData[13] == "1" && !isOpenRichBankUI && times >=gData.gameData.showRichBankIconLimit){
-                if(this.cashRecordData.length >= this.cashRecordDataLength){
-                    this.cashRecordDataLength = this.cashRecordData.length;
-                    this.isTeach =  mk.guide.open(13);
-                }
+            //let times = gData.gameData.playerProp.orderData.overTimes;
+            console.log(`=========${times}=====${this.cashRecordData.length}====${this.cashRecordDataLength}`);
+            if(gData.gameData.funOpenData[13] == "1" && times >=gData.gameData.showRichBankIconLimit){
+                this.isTeach =  mk.guide.open(13);
             }       
         }
     }

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

@@ -151,11 +151,11 @@ export class SignData extends Data {
                 return;
             }
 
-            gData.gameData.addCashOutTimes();
+            //gData.gameData.addCashOutTimes();
             const rewardNum = Math.round(adData.videoRedMoney.videoRewardList[0].rewardNum * 100);
             gData.receiptNotice.receip_rmb = rewardNum;
             mk.ui.openPanel('module/newNotice/newNotice', OpenActionType.closeLast);
-            gData.safeDepositBoxData.updateQipao();
+            //gData.safeDepositBoxData.updateQipao();
             gData.cashNormal.getRecord();
         } else if (reward_data.rewardType === RewardType.pigRmb) {
             // 金猪现金

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

@@ -37,10 +37,10 @@ export class WalletCashOutData extends Data {
         gData.receiptNotice.receip_rmb = value;
         mk.ui.openPanel('module/newNotice/newNotice');
 
-        gData.safeDepositBoxData.updateQipao();
+        //gData.safeDepositBoxData.updateQipao();
         gData.cashNormal.getRecord();
         gData.gameData.doPointToXYLogic();
-        gData.gameData.addCashOutTimes();
+        //gData.gameData.addCashOutTimes();
     }
 
     async addProgress() {
@@ -99,11 +99,11 @@ export class WalletCashOutData extends Data {
             mk.ui.openPanel('module/newNotice/newNotice');
         }
 
-        gData.safeDepositBoxData.updateQipao();
+        //gData.safeDepositBoxData.updateQipao();
         gData.cashNormal.getRecord();
         mk.data.sendDataEvent(DataEventId.Sundry, '红包币提现成功');
         gData.gameData.doPointToXYLogic();
-        gData.gameData.addCashOutTimes();
+        //gData.gameData.addCashOutTimes();
     }
 
 }

assets/script/game/game/FunBtns.ts

@@ -26,6 +26,8 @@ export default class FunBtns extends cc.Component {
     btn12: cc.Node = null;
     @property({ type: cc.Node, displayName: "富翁银行" })
     btn14: cc.Node = null;
+    @property({ type: cc.Node, displayName: "提现账单" })
+    btn16: cc.Node = null;
 
     private addCount = 0;
     onLoad() {
@@ -48,12 +50,23 @@ export default class FunBtns extends cc.Component {
                     this.addCount += 1;
                 } else if (i == 2 && data[i] == "0") {
                     this.btn4.y = this.btn4.y + 170;
+                    this.btn16.y = this.btn16.y + 170;
                 }
-                else if (i == 4 && data[i] == "0") {
-                    this.addCount += 1;
+                else if (i == 4) {
+                    if(data[i] == "1"){
+                        let times = gData.gameData.getProp(GameProp.cashTimes);
+                        if(!times){times = 0;}
+                        if(times < gData.gameData.taskRedBagAutoShowLimit){
+                            node_btn.active = false;
+                            mk.event.register("showTaskRedBagAction", this.doShowTaskRedBagActionLogic.bind(this), this);
+                        }
+                    }else{
+                        this.addCount += 1;
+                    }   
                 }
                 else if (i == 13 && data[i] == "1") {
                     let times = gData.gameData.getProp(GameProp.cashTimes);
+                    //let times = gData.gameData.playerProp.orderData.overTimes;
                     console.log(`cashTimes======${times}`);
                     if (!times || times < gData.gameData.showRichBankIconLimit) {
                         node_btn.active = false;
@@ -79,6 +92,25 @@ export default class FunBtns extends cc.Component {
         this.btn8.active = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
     }
 
+    doShowTaskRedBagActionLogic(){
+        if(gData.gameData.funOpenData[8] == "1"){
+            let posY = this.btn9.y + 130;
+            cc.tween(this.btn9).to(0.2, {y: posY}).call(()=>{
+                this.doAction();
+            }).start();
+        }else{
+            this.doAction();
+        }
+    }
+
+    doAction(){
+        let posX = this.btn5.x;
+        this.btn5.x = posX + 430;
+        cc.tween(this.btn5).to(0.4, {x: posX}).call(()=>{
+
+        }).start();
+    }
+
     showRichBankIcon() {
         this.btn14.active = true;
         mk.event.remove("showRichBankIcon", this);

assets/script/game/game/Game.ts

@@ -114,8 +114,8 @@ export default class Game extends cc.Component {
 
     @property({ type: cc.Node, displayName: '增加效果文本2' })
     ani_add4: cc.Node = null;
-    @property({ displayName: '红包币', type: cc.Label })
-    lbl_addRedMoney: cc.Label = null;
+    @property({ displayName: '现金', type: cc.Label })
+    lbl_addCash: cc.Label = null;
     @property({ displayName: '红包币图标', type: cc.Node })
     node_orderHb: cc.Node = null;
 
@@ -129,6 +129,13 @@ export default class Game extends cc.Component {
     @property({ displayName: '订单红包', type: cc.Node })
     node_orderHbIcon: cc.Node = null;
 
+    @property({ displayName: '显示现金', type: cc.Node })
+    node_showCash: cc.Node = null;
+    @property({ displayName: '显示红包币', type: cc.Node })
+    node_showRedMoney: cc.Node = null;
+    @property({ displayName: '订单红包币', type: cc.Label })
+    lbl_orderRedMoney: cc.Label = null;
+
     posY = 0;
     /** 是否开始增加次数倒计时 */
     private lastTimeSpan = 0;
@@ -160,6 +167,10 @@ export default class Game extends cc.Component {
 
         this.initRefreshEvent();
 
+        if(gData.gameData.orderRewardType == 1){
+            this.node_showCash.active = false;
+            this.node_showRedMoney.active = true;
+        }
         if (gData.gameData.playerProp.orderData) {
             this.initOrderUI();
         } else {
@@ -186,11 +197,14 @@ export default class Game extends cc.Component {
         //     this.autoPopSign = false;        
         // }
         if (gData.gameData.funOpenData[11] == "1") {
-            let isTeach = mk.guide.open(10);
-            if (isTeach) {
-                mk.event.register("event_guide", this.initGuideEvent.bind(this), this);
-                //mk.guide.continueCallBack = this.judgeContinueTeach;
-            }
+            let isPopUi = mk.ui.isPopPanel();
+            if(!isPopUi){
+                let isTeach = mk.guide.open(10);
+                if (isTeach) {
+                    mk.event.register("event_guide", this.initGuideEvent.bind(this), this);
+                    //mk.guide.continueCallBack = this.judgeContinueTeach;
+                }
+            }  
         }
 
         let value = mk.storage.getStorage('loadingFinish');
@@ -481,6 +495,7 @@ export default class Game extends cc.Component {
     /** 点击互推 */
     public onClickHuTui() {
         mk.data.sendDataEvent(DataEventId.button_click, "互推icon");
+        gData.moreGame.userBehaveLog(4, gData.moreGame.placement_id, gData.moreGame.nebulaAppId);
     }
 
     /** 点击福利 */
@@ -572,7 +587,7 @@ export default class Game extends cc.Component {
         }
 
         if (gData.gameData.isProducting) {
-            mk.tip.pop('点击太快了');
+            //mk.tip.pop('点击太快了');
             return;
         }
 
@@ -599,6 +614,8 @@ export default class Game extends cc.Component {
 
             this.dpFlyRedAni();
         }
+
+        mk.data.sendDataEvent(DataEventId.button_click, "一键生产按钮");
     }
 
     public dpFlyRedAni(starPos: cc.Vec2 = null) {
@@ -1000,7 +1017,12 @@ export default class Game extends cc.Component {
         let productJson = gData.gameData.configs.Product;
         let data = gData.gameData.playerProp.orderData;
         if (data) {
-            this.lbl_addRedMoney.string = (data.cashMoney / 100).toFixed(2);
+            //红包币
+            if(gData.gameData.orderRewardType == 1){
+                this.lbl_orderRedMoney.string = data.redMoneyAddition/100 + ""; 
+            }else{
+                this.lbl_addCash.string = (data.cashMoney / 100).toFixed(2);
+            }
             let len = data.orderTaskList.length;
             if (len == 3) {
                 let completeCount = 0;
@@ -1071,44 +1093,70 @@ export default class Game extends cc.Component {
         return !this.isGray;
     }
 
-    public async getOrderReward() {
-        if (cc.sys.isNative) {
-            if (!gData.loginData.isAuth) {
-                // JsbSystem.WxAuth();
-                gData.gameData.authUIType = 0;
-                mk.ui.openPanel('module/authUI/authUI');
-                return;
+    public async getOrderReward(isGame = true) {
+        //现金提现
+        if (gData.gameData.orderRewardType == 2) {
+            if (cc.sys.isNative) {
+                if (!gData.loginData.isAuth) {
+                    // JsbSystem.WxAuth();
+                    gData.gameData.authUIType = 0;
+                    mk.ui.openPanel('module/authUI/authUI');
+                    return;
+                }
             }
-        }
 
-        let data = {};
-        let response = await mk.http.sendData('orderTask/receiveRewardCash', data);
-        if (response.errcode != 0) {
-            if (response.errcode == 405) {
-                mk.tip.pop("今日提现额度已到上限，请明天再提现");
-                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            let response = await mk.http.sendData('orderTask/receiveRewardCash', {});
+            if (response.errcode != 0) {
+                if (response.errcode == 405) {
+                    mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                    mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+                }
+                return null;
             }
-            return null;
+            let addMoney = gData.gameData.playerProp.orderData.cashMoney;
+            gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
+
+            gData.safeDepositBoxData.setCashRecordDataLength();
+            //处理提现逻辑
+            gData.cashPro.isOrderCashOut = true;
+            gData.cashPro.callBack = this.getRewardCallBack.bind(this);
+            gData.receiptNotice.receip_rmb = addMoney;
+            mk.ui.openPanel('module/newNotice/newNotice');
+
+            if(isGame){
+                this.node_crop.forEach((v) => {
+                    v.active = false;
+                })
+                this.node_orderHbIcon.active = false;
+                this.node_getOrderReward.node.active = false;
+            }else{
+                this.showRefreshLogic();
+            }
+            
+        } else {
+            let data = {};
+            let response = await mk.http.sendData('orderTask/receiveReward', data);
+            if (response.errcode != 0) {
+                return null;
+            }
+            let addMoney = gData.gameData.playerProp.orderData.redMoneyAddition;
+            gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
+            //处理红包币逻辑
+            gData.reward.closeUICallBack = this.getRewardCallBack.bind(this);
+            gData.reward.adData = { videoRedMoney: { videoRewardList: null } };
+            gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 1, rewardNum: addMoney}]
+            mk.ui.openPanel('module/reward/reward');
+
+            if(isGame){
+                this.node_crop.forEach((v) => {
+                    v.active = false;
+                })
+                this.node_orderHbIcon.active = false;
+                this.node_getOrderReward.node.active = false;
+            }else{
+                this.showRefreshLogic();
+            }       
         }
-        let addMoney = gData.gameData.playerProp.orderData.cashMoney;
-        gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
-        //gData.gameData.cloneOrderData(true);
-
-        //处理红包币逻辑
-        // gData.reward.adData = { videoRedMoney: { videoRewardList: null } };
-        // gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 1, rewardNum: addMoney }]
-        // mk.ui.openPanel('module/reward/reward');
-        gData.safeDepositBoxData.setCashRecordDataLength();
-        //处理提现逻辑
-        gData.cashPro.callBack = this.getRewardCallBack.bind(this);
-        gData.receiptNotice.receip_rmb = addMoney;
-        mk.ui.openPanel('module/newNotice/newNotice');
-
-        this.node_crop.forEach((v) => {
-            v.active = false;
-        })
-        this.node_orderHbIcon.active = false;
-        this.node_getOrderReward.node.active = false;
     }
 
     //停止农民产红包币
@@ -1135,8 +1183,10 @@ export default class Game extends cc.Component {
         this.showTips();
         gData.gameData.init_order = true;
         gData.gameData.checkTaskFinishUnLock();
-        gData.gameData.richBankTeachTag = true;
-        gData.safeDepositBoxData.updateQipao();
+        if(gData.gameData.orderRewardType == 2){
+            gData.gameData.richBankTeachTag = true;
+            gData.safeDepositBoxData.updateQipao();
+        }
         gData.cashNormal.getRecord();
 
         if (this.isStopFarm) {

assets/script/game/game/TouchListener.ts

@@ -22,7 +22,7 @@ const { ccclass, property } = cc._decorator;
             gData.gameData.isTouchScreen = true;
         }  
         
-        //mk.ui.openPanel('module/newNotice/richBankWarmPrompt');
+        //mk.ui.openPanel('module/cashOutBill/cashOutBill');
     }
 
  }

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

@@ -297,4 +297,9 @@ export default class BlessingBag extends cc.Component {
             mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭福利界面");
         }
     }
+
+    onDestroy(){
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_10);
+        gData.gameData.popTableScreenADLogic(9);
+    }
 }

assets/script/game/module/cashOutBill.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "704d0857-425a-437d-b29c-a762c191a8a1",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/game/module/cashOutBill/CashOutBill.ts

@@ -0,0 +1,49 @@
+import TableView from "../../component/TableView";
+import { BannerAdType } from "../../data/GameData";
+
+const {ccclass, property} = cc._decorator;
+
+@ccclass
+export default class CashOutBill extends cc.Component {
+
+    @property({ displayName: '滚动视图', type: cc.ScrollView })
+    private scroll_view: cc.ScrollView = null;
+    @property({ displayName: '提示文本节点', type: cc.Node})
+    private node_tip: cc.Node = null;
+
+    private tableview: TableView = null;
+
+    onLoad(){
+        this.tableview = this.scroll_view.node.getComponent(TableView);
+    }
+    start () {
+
+        let list_data = [{}, {}, {}, {}, {}, {}];
+
+        this.scroll_view.node.emit('srollview-init', list_data)
+        this.scroll_view.vertical = false;
+        cc.tween(this.node).delay(0.06).call(() => {
+            let allItem = this.tableview.getFrontPositionItemByCount(5);
+            for (let i = 0; i != allItem.length; ++i) {
+                allItem[i].x = 600;
+                cc.tween(allItem[i]).delay(i * 0.1 + 0.2).to(0.3, { x: 0 }, cc.easeSineOut()).start();
+            }
+        }).delay(1).call(() => {
+            this.scroll_view.vertical = true;
+        }).start();
+    }
+
+    onEnable(){
+        mk.ad.showBanner(BannerAdType.banner_click_10);
+    }
+
+    onDisable(){
+        mk.ad.destoryBanner();
+    }
+
+    onDestroy(){
+        
+    }
+
+    // update (dt) {}
+}

assets/script/game/module/cashOutBill/CashOutBill.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "f8c18359-5fdb-47c4-9f53-9cc5081bf465",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/game/module/cashOutBill/CashOutBillItem.ts

@@ -0,0 +1,33 @@
+import SetGray from "../../component/SetGray";
+
+const {ccclass, property} = cc._decorator;
+
+@ccclass
+export default class CashOutBillItem extends cc.Component {
+
+    @property({displayName: "金额", type: cc.Label})
+    lab_value: cc.Label = null;
+    @property({displayName: "状态", type: cc.Label})
+    lab_status: cc.Label = null;
+    @property({displayName: "操作描述", type: cc.Label})
+    lab_operate: cc.Label = null;
+    @property({displayName: "操作按钮", type: SetGray})
+    node_setGray: SetGray = null;
+    
+    private mData_ = null;
+    private mStatus_;
+    setItemData(data){
+        this.initUI(data);
+    }
+
+    initUI(data){
+        this.mData_ = data;
+    }
+
+    clickBtn(){
+        
+    }
+    
+
+    // update (dt) {}
+}

assets/script/game/module/cashOutBill/CashOutBillItem.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "fd084cf5-77c9-44a6-b613-a11420cc8887",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/game/module/cashPro/CashPro.ts

@@ -75,4 +75,14 @@ export default class CashPro extends cc.Component {
             gData.cashPro.callBack = null;
         }
     }
+
+    protected onDestroy(): void {
+
+        if(!gData.cashPro.isOrderCashOut){
+            gData.gameData.richBankTeachTag = true;
+            gData.safeDepositBoxData.updateQipao();
+        }else{
+            gData.cashPro.isOrderCashOut = false;
+        }    
+    }
 }

assets/script/game/module/farmMap/FarmItem.ts

@@ -182,7 +182,9 @@ export default class FarmItem extends cc.Component {
                     this.node_unluckBtn.active = false;
                     this.node_redPoint.active = false;
                     gData.gameData.setFarmMapRewardState(this.getIndex(), 1);
-                }        
+                }   
+                
+                gData.gameData.popTableScreenADLogic(15);
             }
         })
     }

assets/script/game/module/guide/Guide.ts

@@ -28,6 +28,8 @@ export default class Guide extends cc.Component {
     rich_dialog: cc.RichText = null;
     @property({ type: cc.RichText, displayName: "对话内容1" })
     rich_dialog1: cc.RichText = null;
+    @property({ type: cc.Node, displayName: "对话内容1" })
+    node_skip: cc.Node = null;
 
 
     private guides: GuideVO[];
@@ -49,6 +51,7 @@ export default class Guide extends cc.Component {
             return;
         }
         this.reset();
+        console.log(`=========${gData.guideData.crtID}`);
         this.guides = gData.guideData.getGuidesByID(gData.guideData.crtID);
         this.crtStep = -1;
         this.nextStep();
@@ -59,6 +62,11 @@ export default class Guide extends cc.Component {
         this.crtGuide = this.guides[this.crtStep];
         mk.guide.curGuideIdStr = gData.guideData.crtID + "_" + this.crtStep;
         this.updateGuide();
+        if(this.crtGuide.isShowSkip == "true"){
+            this.node_skip.active = true;
+        }else{
+            this.node_skip.active = false;
+        }
         mk.data.sendDataEvent(DataEventId.guide, `新手引导第${gData.guideData.crtID}_${this.crtStep}步完成`);
     }
 

assets/script/game/module/guide/GuideVO.ts

@@ -31,4 +31,6 @@ export default class GuideVO {
     display_type: number = 0;
     /** 是否继续当前步骤 */
     continue: string = null;
+    /** 是否显示跳过按钮 */
+    isShowSkip: string = null;
 }

assets/script/game/module/login/Login.ts

@@ -292,7 +292,7 @@ export default class Login extends cc.Component {
         if (CC_DEBUG) {
             //测试用配置版本号
             gData.appData.tfChannel = "1";
-            gData.appData.appVersion = "1.0.0";
+            gData.appData.appVersion = "1.1.9";
         }
         let data: any = {
             appId: gData.appData.appId,

assets/script/game/module/moreGame/BtnMoreGame.ts

@@ -56,5 +56,9 @@ export default class BtnMoreGame extends cc.Component {
         }
 
         this.lab_moregame.string = data.title
+
+        gData.moreGame.placement_id = data.placement_id;
+        gData.moreGame.nebulaAppId = data.nebulaAppId;
+        gData.moreGame.userBehaveLog(3, gData.moreGame.placement_id, gData.moreGame.nebulaAppId);
     }
 }

assets/script/game/module/moreGame/MoreGame.ts

@@ -20,6 +20,8 @@ export default class MoreGame extends cc.Component {
     start() {
         this.node.setContentSize(cc.winSize)
         gData.moreGame.init();
+
+        gData.gameData.popTableScreenADLogic(11);
     }
 
     update() {

assets/script/game/module/moreGame/MoreGameNormalItem.ts

@@ -110,7 +110,7 @@ export default class MoreGameNormalItem extends cc.Component {
         }, 3)
 
         if (this.data.appType == 1) {
-            let result = gData.moreGame.createNewTask(this.data)
+            let result = gData.moreGame.createNewTask(this.data, 4)
             if (result != null) {
                 this.schedule(() => {
                     this.showDownloadProgress()

assets/script/game/module/moreGame/MoreGamePicItem.ts

@@ -78,14 +78,14 @@ export default class MoreGamePicItem extends cc.Component {
         if (this.cool) {
             return
         }
-        mk.data.sendDataEvent(DataEventId.hutuiFunction,"互推推荐位banner下载");
+        mk.data.sendDataEvent(DataEventId.hutuiFunction, "互推推荐位banner下载");
         this.cool = true
         this.scheduleOnce(() => {
             this.cool = false
         }, 3)
 
         if (this.data.appType == 1) {
-            let result = gData.moreGame.createNewTask(this.data)
+            let result = gData.moreGame.createNewTask(this.data, 3)
             if (result != null) {
                 this.schedule(() => {
                     this.showDownloadProgress()

assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -113,7 +113,11 @@ export default class WalletCashOut extends cc.Component {
         let data = gData.gameData.funOpenData;
         if(data[10] == '1')
         {
-            this.node_addCash.active = gData.gameData._cashOutTimes >= parseInt(gData.gameData.configs.ServerConfig.CashIncrease);
+            let cashTimes = gData.gameData.getProp(GameProp.cashTimes);
+            if(!cashTimes){
+                cashTimes = 0;
+            }
+            this.node_addCash.active = cashTimes >= parseInt(gData.gameData.configs.ServerConfig.CashIncrease);
         }else{
             this.node_addCash.active = false;
         }
@@ -234,9 +238,10 @@ export default class WalletCashOut extends cc.Component {
         mk.audio.playEffect("button");
         if (this.isCanCash) {
 
-            if (this.checkShowTip()) {
-                mk.tip.pop('请先提现完前一档次数');
-            } else {
+            // if (this.checkShowTip()) {
+            //     mk.tip.pop('请先提现完前一档次数');
+            // } else 
+            {
 
                 if (cc.sys.isNative) {
                     if (!gData.loginData.isAuth) {
@@ -247,13 +252,13 @@ export default class WalletCashOut extends cc.Component {
                     }
                 }
                 
-                gData.adData.checkPopCashFull();
+                gData.adData.checkShowFullInter(1);
                 //this.check_button[this.curChooseIndex].setIsCanNotChoose();
                 gData.walletCashOutData.HttpCashOut2(this.curChooseIndex + 1);
             }
 
         }else{
-            mk.tip.pop('红包币不足');
+            mk.tip.pop('收获农作物可获得红包币');
         }
     }
 

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

@@ -28,6 +28,10 @@ export default class NewNotice extends cc.Component {
         if(gData.gameData.showRichBankIconLimit == times && gData.gameData.funOpenData[13] == "1"){
             mk.event.emit("showRichBankIcon");   
         }
+
+        if(gData.gameData.taskRedBagAutoShowLimit == times && gData.gameData.funOpenData[4] == "1"){
+            mk.event.emit("showTaskRedBagAction");
+        }
     }
 
     onEnable()

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -75,7 +75,8 @@ export default class NewOpenRedBag extends cc.Component {
     }
 
     onEnable() {
-        gData.adData.checkPopInter(InterAdType.interstitial1_click_1);
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_1);
+        gData.gameData.popTableScreenADLogic(0);
 
         if (this.showNativeAd) {
             mk.ad.showNative();
@@ -220,7 +221,7 @@ export default class NewOpenRedBag extends cc.Component {
         mk.data.sendDataEvent(DataEventId.hutuiFunction, "互推插屏下载");
         if (this.data.appType == 1) {
             if (!JsbSystem.ifCanStartGame(this.data.packageName, true)) {
-                gData.moreGame.createNewTask(this.data)
+                gData.moreGame.createNewTask(this.data, 1)
             }
         }
         else if (this.data.appType == 2) {

assets/script/game/module/redBagTask/RedBagTask.ts

@@ -323,9 +323,9 @@ export default class RedBagTask extends cc.Component {
             mk.data.sendXYEvent('guide_harvest', '首次领取任务红包');
         }
         gData.gameData.doPointToXYLogic();
-        gData.gameData.addCashOutTimes();
+        //gData.gameData.addCashOutTimes();
         gData.adData.checkPopCashFull();
-        gData.safeDepositBoxData.updateQipao();
+        //gData.safeDepositBoxData.updateQipao();
         gData.cashNormal.getRecord();
     }
 
@@ -344,4 +344,9 @@ export default class RedBagTask extends cc.Component {
 
         mk.audio.playEffect("button");
     }
+
+    onDestroy(){
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_5);
+        gData.gameData.popTableScreenADLogic(4);
+    }
 }

assets/script/game/module/reward/Reward.ts

@@ -45,7 +45,8 @@ export default class Reward extends cc.Component {
     }
 
     onEnable() {
-        gData.adData.checkPopInter(InterAdType.interstitial1_click_2);
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_2);
+        gData.gameData.popTableScreenADLogic(1);
 
         mk.ad.showBanner(BannerAdType.banner_click_1);
     }
@@ -146,6 +147,11 @@ export default class Reward extends cc.Component {
         if (this.cur_stage === LidType.none) {
             mk.audio.playEffect("button");
         }
+
+        if(gData.reward.closeUICallBack){
+            gData.reward.closeUICallBack();
+            gData.reward.closeUICallBack = null;
+        }
     }
 
     onClickClose() {

assets/script/game/module/safeDepositBox/MoneySaveItem.ts

@@ -49,26 +49,26 @@ export default class MoneySaveItem extends cc.Component {
         this.yuanlabel.string = "元"
 
         let cashTypeDes = '';
-        switch (this.data.cashType) {
-            case 1:
-                cashTypeDes = '常规提现';
-                break;
-            case 10:
-                cashTypeDes = '福袋提现';
-                break;
-            case 11:
-                cashTypeDes = '视频红包提现';
-                break;
-            case 12:
-                cashTypeDes = '金猪币提现';
-                break;
-            case 13:
-                cashTypeDes = '现金提现';
-                break;
-            default:
-                cashTypeDes = '';
-                break;
-        }
+        // switch (this.data.cashType) {
+        //     case 1:
+        //         cashTypeDes = '常规提现';
+        //         break;
+        //     case 10:
+        //         cashTypeDes = '福袋提现';
+        //         break;
+        //     case 11:
+        //         cashTypeDes = '视频红包提现';
+        //         break;
+        //     case 12:
+        //         cashTypeDes = '金猪币提现';
+        //         break;
+        //     case 13:
+        //         cashTypeDes = '现金提现';
+        //         break;
+        //     default:
+        //         cashTypeDes = '';
+        //         break;
+        // }
         this.sourceType.string = cashTypeDes;
         this.sourceType.node.parent.active = true;
 

assets/script/game/module/safeDepositBox/SafeDepositBox.ts

@@ -796,4 +796,9 @@ export default class SafeDepositBox extends cc.Component {
             }
         }    
     }
+
+    onDestroy(){
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_6);
+        gData.gameData.popTableScreenADLogic(5);
+    }
 }

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

@@ -42,6 +42,8 @@ export default class Setting extends cc.Component {
     start() {
         //mk.ad.showNative(4);    
         this.initData();
+
+        gData.gameData.popTableScreenADLogic(10);
     }
 
     private async initData() {

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

@@ -31,8 +31,16 @@ export default class ProductReward extends cc.Component {
     @property({ type: cc.Label, displayName: '订单提现金额' })
     lbl_orderValue: cc.Label = null;
 
+    @property({ type: cc.Label, displayName: '奖励类型描述' })
+    lbl_rewardDes: cc.Label = null;
+
     private btnCanClick = true;
 
+    start(){
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_7);
+        gData.gameData.popTableScreenADLogic(6);
+    }
+    
     onEnable() {
 
         this.lbl_times.string = `生产次数+${gData.gameData.configs.ServerConfig.ProductionAd}`;
@@ -149,9 +157,18 @@ export default class ProductReward extends cc.Component {
                         }, 0.2)
                     }
 
+                    if(gData.gameData.orderRewardType == 1){
+                        this.lbl_rewardDes.string = `领取${data.redMoneyAddition/100}红包币`;
+                    }
+
                 } else {
-                    let v = gData.gameData.playerProp.orderData.cashMoney;
-                    this.lbl_orderValue.string = "订单已完成，可提现" + (v/100).toFixed(2) + "元";
+                    // if(gData.gameData.orderRewardType == 1){
+                    //     let v = gData.gameData.playerProp.orderData.redMoneyAddition;
+                    //     this.lbl_orderValue.string = "订单已完成，可领取" + (v/100) + "红包币";
+                    // }else{
+                    //     let v = gData.gameData.playerProp.orderData.cashMoney;
+                    //     this.lbl_orderValue.string = "订单已完成，可提现" + (v/100).toFixed(2) + "元";
+                    // }
                     this.sp_taskProgress.fillRange = 1;
                     this.lbl_progress.string = `${allCount}/${allCount}`;
                     this.node_Uncomplete.active = false;
@@ -255,6 +272,6 @@ export default class ProductReward extends cc.Component {
 
     private clickGetOrderRewardBtn()
     {
-        gData.gameData.gameStyle.getOrderReward();
+        gData.gameData.gameStyle.getOrderReward(false);
     }
 }

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

@@ -37,6 +37,8 @@ export default class RestoreProductTimes extends cc.Component {
                 gData.reward.data = rewardData;
                 gData.reward.callback = this.addDoubleTimes;
                 mk.ui.openPanel('module/reward/reward');
+
+                gData.gameData.popTableScreenADLogic(13);
             }
         })
     }

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

@@ -100,6 +100,7 @@ export default class SpeedUpUI extends cc.Component {
                     }
                     gData.gameData.setHarvest();
                     mk.tip.pop('加速成功！');
+                    //gData.gameData.popTableScreenADLogic(12);
                 }
             })
         }
@@ -111,4 +112,9 @@ export default class SpeedUpUI extends cc.Component {
     private clickCloseBtn() {
         mk.audio.playEffect("button");
     }
+
+    onDestroy(){
+        //gData.adData.checkPopInter(InterAdType.interstitial1_click_9);
+        gData.gameData.popTableScreenADLogic(8);
+    }
 }

assets/script/game/module/turntable/Turnable.ts

@@ -80,6 +80,7 @@ export default class Turnable extends cc.Component {
                 mk.console.log("watchAD:" + success);
                 if (success) {
                     gData.adData.watchVideo(AdFun.turntable);
+                    //gData.gameData.popTableScreenADLogic(14);
                 }
             });
         }
@@ -194,7 +195,7 @@ export default class Turnable extends cc.Component {
     }
 
     onDestroy() {
-
+        gData.gameData.popTableScreenADLogic(3);
     }
 
     onClickClose() {

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts

@@ -166,6 +166,9 @@ export default class ATInterstitial extends zgSingleton {
         if (type == 0 || type == 2) {
             id = 2
             this.singleClick = true;
+            if(type == 2){
+                mk.data.sendDataEvent(DataEventId.interstita11_eject, mk.ad.interAdType);
+            }
         }
         else if (type == 1) {
             id = 9

assets/script/mk/system/AdSystem.ts

@@ -118,6 +118,7 @@ export default class AdSystem {
                 this.videoAdcallBack(true);
             }
             this.initLastTimeStamp();
+            gData.gameData.uploadAverageEcpm();
         }, 0)
     }
 

assets/script/mk/system/DataSystem.ts

@@ -106,7 +106,7 @@ export default class DataSystem {
             user_id: gData.loginData.uin,
             device_id: "",
             os_type: 1,
-            user_agent: gData.appData.UA,
+            user_agent: gData.appData.machineInfo.UA,
             imei: gData.appData.machineInfo.imei,
             ifda: gData.appData.machineInfo.idfa,
             oaid: gData.appData.machineInfo.oaid,

assets/script/mk/system/FlySystem2.ts

@@ -130,6 +130,7 @@ export default class FlySystem2 extends cc.Component {
     {
         if(gData.gameData.gameStyle.lbl_redMoney)
         {         
+            gData.gameData.addHb = value;
             gData.gameData.playerProp.redMoney += value;
             //gData.gameData.gameStyle.lbl_redMoney.string = gData.gameData.playerProp.redMoney.toString();
             //cc.tween(gData.gameData.gameStyle.lbl_redMoney.node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();

assets/script/mk/system/GuideSystem.ts

@@ -50,7 +50,7 @@ export default class GuideSystem {
 
     /** 开启一个引导后直接默认已完成 */
     private setGuideID(id: number) {
-        if (id == 13) {
+        if (id == 14) {
             id = 9999;
             mk.data.sendXYEvent("guide_end", "新手引导结束");
         }
@@ -67,7 +67,8 @@ export default class GuideSystem {
      * @returns true 已完成
      */
     public isGuideComplete(): boolean {
-        if (!this.crtGuideID || this.crtGuideID === 9999) {
+        let id = gData.gameData.getProp(GameProp.guideID);
+        if (!this.crtGuideID || id === 9999) {
             return true;
         } else {
             return false;

assets/script/mk/system/JsbSystem.ts

@@ -151,7 +151,7 @@ export default class JsbSystem {
             //gData.appData.appId = "wx3c0cc2f730c5ad5a";
             //gData.appData.version = "1.0.0";
             gData.appData.appId = "wxd98fe9d52af10e59";
-            gData.appData.version = "1.1.9";
+            gData.appData.version = "99.99.99";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public static ifShowLog: boolean = false;
+    public static ifShowLog: boolean = true;
 
     /**
      * 标签符号

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/18/1896f4b5-a351-483a-841e-1b4f52337d72.json

@@ -0,0 +1 @@
+[1,["ecpdLyjvZBwrvm+cedCcQy","b4eBm1qexJFokJ20Ivebu3","5au/fBpD5KipaCIChRwFx+"],["node","_N$file","_spriteFrame","root","data"],[["cc.Node",["_name","_components","_prefab","_contentSize","_trs","_children","_parent","_anchorPoint"],2,9,4,5,7,2,1,5],["cc.PrefabInfo",["fileId","root"],2,1],["cc.Prefab",["_name"],2],["cc.Label",["_string","_isSystemFontUsed","_N$horizontalAlign","_N$verticalAlign","node","_materials","_N$file"],-1,1,3,6],["cc.LabelOutline",["_width","node","_color"],2,1,5],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6]],[[2,0,2],[0,0,5,1,2,3,4,2],[0,0,6,1,2,3,7,4,2],[3,0,1,2,3,4,5,6,5],[4,0,1,2,2],[1,0,1,2],[1,1,1],[5,0,1,2,1]],[[0,"flyHb"],[1,"flyHb",[-3],[[7,-2,[2],3]],[6,-1],[5,64,71],[0,0,0,0,0,0,1,1.2,1.2,1]],[2,"New Label",1,[[3,"+2000",false,1,1,-4,[0],1],[4,2,-5,[4,4278867707]]],[5,"b0sGGQHgJKrrK5hTgE+6nG",1],[5,119.04,54.4],[0,0,0.5],[40.403000000000006,3.58,0,0,0,0,1,1.2,1.2,1]]],0,[0,3,1,0,0,1,0,-1,2,0,0,2,0,0,2,0,4,1,5],[0,0,0,0],[-1,1,-1,2],[0,1,0,2]]

build/jsb-link/assets/resources/import/7f/7f7db6cb-423d-448d-8357-d5e130bfca30.json

@@ -0,0 +1 @@
+[1,["d6o1UoAuJGQrZK5/pJPzLI"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"line","rect":[4,0,692,19],"offset":[2,0],"originalSize":[696,19],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/d6/d6a35528-02e2-4642-b64a-e7fa493f32c8.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/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

@@ -1 +1 @@
-{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/version.manifest"}
+{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/version.manifest"}

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties

@@ -10,7 +10,7 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wxd98fe9d52af10e59"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5f00\u519c\u573a\u5f53\u9996\u5bcc
 PACKAGE_NAME=com.aries.kncdsf.qxb
-VERSION_NAME=1.1.9
-VERSION_CODE=1000
+VERSION_NAME=99.99.99
+VERSION_CODE=1
 TOPON="a60af425829e4e,66b742dd0e502b64d783d9c66a9d30c4,b60af42bb7253c,b60af42bbb9a8a,b60af42bc3ee53,b60af42bba453f,b60af42bc9e854,b60af42bc0de73,b6167ea26616bf"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏,大插屏
-APP_CONFIG_CODE="1.1.9"
+APP_CONFIG_CODE="99.99.99"

packages-hot-update/cfg.json

@@ -1,5 +1,5 @@
 {
-    "version": "1.0.5",
+    "version": "1.0.6",
     "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/",
     "resourceRootDir": "D:\\projects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
@@ -14,7 +14,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQXB/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfQxb/baseRemote/"
     ],
-    "buildTime": 1639040905246,
-    "genTime": 1639040905246,
+    "buildTime": 1639448486004,
+    "genTime": 1639448486004,
     "genVersion": null
 }