1.1.9抢先版

assets/resources/data/guide_data.json

@@ -85,7 +85,7 @@
 		"trNum": "0",
 		"btnEnable": "0",
 		"trForm": "1",
-		"dialogPos": "800:::::",
+		"dialogPos": "400:::::",
 		"dialogPos1": "",
 		"dialogAlignment": "0",
 		"dialog": "<color=8A4312>太棒啦！你完成了订单！\n快<color=ff0000>点击提现</c>吧！</color>",
@@ -94,5 +94,21 @@
 		"finger": "",
 		"lagNext": "0",
 		"continue": "false"
+	},
+	{
+		"id": "13_0",
+		"trigger": "0",
+		"trNum": "0",
+		"btnEnable": "1",
+		"trForm": "1",
+		"dialogPos": ":200::::",
+		"dialogPos1": "",
+		"dialogAlignment": "0",
+		"dialog": "<color=8A4312>已提现金额可以<color=ff0000>再次提现</c>\n哦，快点击银行吧！</color>",
+		"displayRect": "",
+		"clickRect": "主界面层/game/功能按钮/底部按钮/富翁银行",
+		"finger": "",
+		"lagNext": "",
+		"continue": "false"
 	}
 ]

assets/resources/game/prefab/uiPanel/PlantPanel.prefab

@@ -33,11 +33,11 @@
         "__id__": 27
       },
       {
-        "__id__": 29
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -948,24 +948,10 @@
       "__id__": 2
     },
     "bClickClose": true,
-    "onComplete": [
-      {
-        "__id__": 28
-      }
-    ],
+    "onComplete": [],
     "_id": ""
   },
   {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "afc7c9y+IlK2pswzhp7XL30",
-    "handler": "closeUI",
-    "customEventData": ""
-  },
-  {
     "__type__": "afc7c9y+IlK2pswzhp7XL30",
     "_name": "",
     "_objFlags": 0,

assets/resources/game/texture/title.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "166ce504-0ec2-447c-90a8-7f02d93337eb",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 465,
+  "height": 103,
+  "platformSettings": {},
+  "subMetas": {
+    "title": {
+      "ver": "1.0.4",
+      "uuid": "b4eaabe5-d038-4b48-a048-e13ac16399de",
+      "rawTextureUuid": "166ce504-0ec2-447c-90a8-7f02d93337eb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 465,
+      "height": 103,
+      "rawWidth": 465,
+      "rawHeight": 103,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/cashPro/cashPro.prefab

@@ -27,11 +27,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 97
+        "__id__": 104
       }
     ],
     "_prefab": {
-      "__id__": 98
+      "__id__": 105
     },
     "_opacity": 255,
     "_color": {
@@ -991,38 +991,38 @@
         "__id__": 60
       },
       {
-        "__id__": 63
+        "__id__": 70
       },
       {
-        "__id__": 66
+        "__id__": 73
       },
       {
-        "__id__": 69
+        "__id__": 76
       },
       {
-        "__id__": 72
+        "__id__": 79
       },
       {
-        "__id__": 75
+        "__id__": 82
       },
       {
-        "__id__": 78
+        "__id__": 85
       },
       {
-        "__id__": 81
+        "__id__": 88
       },
       {
-        "__id__": 84
+        "__id__": 91
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 95
+        "__id__": 102
       }
     ],
     "_prefab": {
-      "__id__": 96
+      "__id__": 103
     },
     "_opacity": 255,
     "_color": {
@@ -2173,10 +2173,13 @@
     "_components": [
       {
         "__id__": 61
+      },
+      {
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 69
     },
     "_opacity": 255,
     "_color": {
@@ -2259,6 +2262,104 @@
     "_id": ""
   },
   {
+    "__type__": "a20d9E+N7FBiIV7z1whuT6J",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 60
+    },
+    "_enabled": true,
+    "fromData": {
+      "__id__": 63
+    },
+    "targetData": [
+      {
+        "__id__": 64
+      },
+      {
+        "__id__": 66
+      }
+    ],
+    "target": {
+      "__id__": 60
+    },
+    "tweenEasing": 21,
+    "repeat": 1,
+    "onOneRepeatComplete": {
+      "__id__": 68
+    },
+    "playOnLoad": true,
+    "actType": 0,
+    "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
+    "_id": ""
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": -227.994,
+      "y": 246.685
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": true
+  },
+  {
+    "__type__": "TweenData",
+    "propsData": {
+      "__id__": 65
+    },
+    "duration": 0.2,
+    "delay": 0.3,
+    "isOffset": false,
+    "onComplete": [],
+    "onStart": [],
+    "onUpdate": []
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": -227.994,
+      "y": 246.685
+    },
+    "angle": 0,
+    "scale": 1.4,
+    "active": true
+  },
+  {
+    "__type__": "TweenData",
+    "propsData": {
+      "__id__": 67
+    },
+    "duration": 0.2,
+    "delay": 0.4,
+    "isOffset": false,
+    "onComplete": [],
+    "onStart": [],
+    "onUpdate": []
+  },
+  {
+    "__type__": "PropsData",
+    "position": {
+      "__type__": "cc.Vec2",
+      "x": -227.994,
+      "y": 246.685
+    },
+    "angle": 0,
+    "scale": 1,
+    "active": true
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -2280,11 +2381,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 72
     },
     "_opacity": 255,
     "_color": {
@@ -2338,7 +2439,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 63
+      "__id__": 70
     },
     "_enabled": true,
     "_materials": [
@@ -2388,11 +2489,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 75
     },
     "_opacity": 255,
     "_color": {
@@ -2446,7 +2547,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 73
     },
     "_enabled": true,
     "_materials": [
@@ -2496,11 +2597,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2554,7 +2655,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 69
+      "__id__": 76
     },
     "_enabled": true,
     "_materials": [
@@ -2604,11 +2705,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 73
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -2662,7 +2763,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 72
+      "__id__": 79
     },
     "_enabled": true,
     "_materials": [
@@ -2712,11 +2813,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 84
     },
     "_opacity": 255,
     "_color": {
@@ -2770,7 +2871,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 75
+      "__id__": 82
     },
     "_enabled": true,
     "_materials": [
@@ -2820,11 +2921,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 87
     },
     "_opacity": 255,
     "_color": {
@@ -2878,7 +2979,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 78
+      "__id__": 85
     },
     "_enabled": true,
     "_materials": [
@@ -2928,11 +3029,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 89
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 90
     },
     "_opacity": 255,
     "_color": {
@@ -2986,7 +3087,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 81
+      "__id__": 88
     },
     "_enabled": true,
     "_materials": [
@@ -3034,23 +3135,23 @@
     },
     "_children": [
       {
-        "__id__": 85
+        "__id__": 92
       },
       {
-        "__id__": 88
+        "__id__": 95
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 91
+        "__id__": 98
       },
       {
-        "__id__": 92
+        "__id__": 99
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 101
     },
     "_opacity": 255,
     "_color": {
@@ -3104,17 +3205,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 84
+      "__id__": 91
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 86
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 94
     },
     "_opacity": 255,
     "_color": {
@@ -3168,7 +3269,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 85
+      "__id__": 92
     },
     "_enabled": true,
     "_materials": [
@@ -3212,17 +3313,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 84
+      "__id__": 91
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 96
       }
     ],
     "_prefab": {
-      "__id__": 90
+      "__id__": 97
     },
     "_opacity": 255,
     "_color": {
@@ -3276,7 +3377,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 88
+      "__id__": 95
     },
     "_enabled": true,
     "_materials": [
@@ -3320,7 +3421,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 84
+      "__id__": 91
     },
     "_enabled": true,
     "_materials": [
@@ -3352,7 +3453,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 84
+      "__id__": 91
     },
     "_enabled": true,
     "node_panel": {
@@ -3361,7 +3462,7 @@
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 93
+        "__id__": 100
       }
     ],
     "_id": ""
@@ -3435,7 +3536,7 @@
       "__id__": 27
     },
     "labMoney": {
-      "__id__": 76
+      "__id__": 83
     },
     "_id": ""
   },

assets/resources/module/guide/guide.prefab

@@ -808,7 +808,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 330,
+      "width": 350,
       "height": 112.99999999999999
     },
     "_anchorPoint": {
@@ -820,7 +820,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        18.928,
+        15.928,
         4,
         0,
         0,
@@ -884,7 +884,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -165,
+        -175,
         -6.499999999999993,
         0,
         0,
@@ -953,7 +953,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "f0+/GBQDFN2pcI+RdpJVBQ",
+    "fileId": "c1uDp0OnlEzrdiFIVZHAC5",
     "sync": false
   },
   {
@@ -995,7 +995,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -165,
+        -175,
         -56.49999999999999,
         0,
         0,
@@ -1064,7 +1064,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "a5YhxffqVAcKkrjfX/aNJ5",
+    "fileId": "edmgiH38ZDAIwLNVfAQVCI",
     "sync": false
   },
   {
@@ -1084,7 +1084,7 @@
       "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
     },
     "_N$cacheMode": 0,
-    "_N$maxWidth": 330,
+    "_N$maxWidth": 350,
     "_N$lineHeight": 50,
     "_N$imageAtlas": null,
     "_N$handleTouchEvent": false,
@@ -1612,7 +1612,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "06vwrc7BRFCpRVQIF5B61b",
+    "fileId": "5bOZw0rPtG6JPoObaga/v0",
     "sync": false
   },
   {
@@ -1723,7 +1723,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "b0Z4x2HX5Gp5rq/LwJ2GZR",
+    "fileId": "647dEku+VPH4WdDsmTpwJ6",
     "sync": false
   },
   {

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

@@ -1 +1 @@
-{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}
+{"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"}

assets/resources/module/newNotice/permissionWarmPrompt.prefab

@@ -0,0 +1,1097 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "permissionWarmPrompt",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 31
+      },
+      {
+        "__id__": 32
+      }
+    ],
+    "_prefab": {
+      "__id__": 33
+    },
+    "_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__": 28
+    },
+    "_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": "bg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 22
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 26
+      }
+    ],
+    "_prefab": {
+      "__id__": 27
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 640,
+      "height": 440
+    },
+    "_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": "title",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 148,
+      "g": 82,
+      "b": 37,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        155,
+        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__": 4
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "温馨提示",
+    "_N$string": "温馨提示",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "15d28d2e-505b-4051-9e03-e447ab0ed1b6"
+    },
+    "fileId": "deIpL6YWRHnYefCM861K/1",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 9
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 138,
+      "g": 67,
+      "b": 18,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 256,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        60,
+        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__": 7
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "建议打开消息通知",
+    "_N$string": "建议打开消息通知",
+    "_fontSize": 32,
+    "_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__": "15d28d2e-505b-4051-9e03-e447ab0ed1b6"
+    },
+    "fileId": "13bO3TzK5FnplZDyblQpFo",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 138,
+      "g": 67,
+      "b": 18,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 320,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        2,
+        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": 32,
+    "_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__": "15d28d2e-505b-4051-9e03-e447ab0ed1b6"
+    },
+    "fileId": "166N5ev8xOmJXbhsYCzcfz",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "确定按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 14
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 19
+      }
+    ],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 283,
+      "height": 112
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -3.882,
+        -156.759,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.8,
+        0.8,
+        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__": 13
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 251,
+      "b": 237,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 106,
+      "height": 69
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        5,
+        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__": 14
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "确定",
+    "_N$string": "确定",
+    "_fontSize": 50,
+    "_lineHeight": 50,
+    "_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__": 14
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 178,
+      "g": 77,
+      "b": 18,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "15d28d2e-505b-4051-9e03-e447ab0ed1b6"
+    },
+    "fileId": "f6grT9x6hHPIc9GCx/5TOZ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 13
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "c3f3ce70-5592-4b5a-bb79-363c0338d77f"
+    },
+    "_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__": 13
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 0,
+    "onComplete": [
+      {
+        "__id__": 20
+      }
+    ],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "86a88Fiqv9N4rA1+aFt1Rn7",
+    "handler": "clickSureBtn",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "15d28d2e-505b-4051-9e03-e447ab0ed1b6"
+    },
+    "fileId": "c914LvBORBc4nuXxpErCzN",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "关闭按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 23
+      },
+      {
+        "__id__": 24
+      }
+    ],
+    "_prefab": {
+      "__id__": 25
+    },
+    "_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": [
+        312.106,
+        228.122,
+        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__": 22
+    },
+    "_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__": 22
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 3,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "15d28d2e-505b-4051-9e03-e447ab0ed1b6"
+    },
+    "fileId": "518MUeX+FNrrY4FAGiPRIK",
+    "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__": "583e8dba-cff4-4047-b497-9a963c4f8f8c"
+    },
+    "_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__": "15d28d2e-505b-4051-9e03-e447ab0ed1b6"
+    },
+    "fileId": "3aDHUWdXdFsqUq8Pt8TbfW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "15d28d2e-505b-4051-9e03-e447ab0ed1b6"
+    },
+    "fileId": "bfZmc8NhZLmqu8BJnFLEvm",
+    "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__": "ac053zwqaRD6IJmTlQWmefZ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "effect_par": {
+      "__id__": 3
+    },
+    "open_effect": 1,
+    "isOpenCloseEffect": true,
+    "close_effect": 1,
+    "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": true,
+    "_id": ""
+  },
+  {
+    "__type__": "86a88Fiqv9N4rA1+aFt1Rn7",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "15d28d2e-505b-4051-9e03-e447ab0ed1b6"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/module/newNotice/permissionWarmPrompt.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "15d28d2e-505b-4051-9e03-e447ab0ed1b6",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/newNotice/richBankWarmPrompt.prefab

@@ -0,0 +1,1250 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "richBankWarmPrompt",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 32
+      },
+      {
+        "__id__": 33
+      },
+      {
+        "__id__": 34
+      },
+      {
+        "__id__": 35
+      }
+    ],
+    "_prefab": {
+      "__id__": 36
+    },
+    "_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__": 31
+    },
+    "_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": "tipNode",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 27
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 30
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        52.733,
+        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": "money_bg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 626,
+      "height": 751
+    },
+    "_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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 4
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "4451ccff-3cd5-49f6-b076-f6f760aeff33"
+    },
+    "_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__": "a8fdeda9-d9ff-43a3-b994-b67dc52729db"
+    },
+    "fileId": "d9eubALsFBQ7BTlr3xw75w",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "currency_tit",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 587,
+      "height": 140
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        396.403,
+        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": "money_txt",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 7
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 141,
+      "height": 77
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        7,
+        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": "money_txt<Sprite>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "34fc65df-80d3-4259-9346-b74f6ca97dbf"
+    },
+    "_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__": "a8fdeda9-d9ff-43a3-b994-b67dc52729db"
+    },
+    "fileId": "a8zO6rlodHCZpLp/NCIb+K",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "currency_tit<Sprite>",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "8ee6b92d-381c-4a55-a562-19022eb39f3b"
+    },
+    "_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__": "a8fdeda9-d9ff-43a3-b994-b67dc52729db"
+    },
+    "fileId": "39TiCwlnJP44GznHtbDc4l",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "tc_btn_1",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 14
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 19
+      }
+    ],
+    "_prefab": {
+      "__id__": 20
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 366,
+      "height": 127
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -191.063,
+        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": "New Label copy",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 13
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_prefab": {
+      "__id__": 17
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 112.23,
+      "height": 85.6
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        5.547,
+        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__": 14
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "确  定",
+    "_N$string": "确  定",
+    "_fontSize": 40,
+    "_lineHeight": 60,
+    "_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.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 207,
+      "g": 165,
+      "b": 38,
+      "a": 255
+    },
+    "_width": 5,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a8fdeda9-d9ff-43a3-b994-b67dc52729db"
+    },
+    "fileId": "47esak2p9DqatO4cAlu32V",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 13
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "e67e0565-eae8-4e9a-919d-65cc31ad1887"
+    },
+    "_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__": 13
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 3,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a8fdeda9-d9ff-43a3-b994-b67dc52729db"
+    },
+    "fileId": "db4sayy4pMg6J7BZJfX+rt",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 23
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 138,
+      "g": 67,
+      "b": 18,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 396.72,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        61.397999999999996,
+        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__": 21
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "未能连续登录，登录增加{0}天",
+    "_N$string": "未能连续登录，登录增加{0}天",
+    "_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__": "a8fdeda9-d9ff-43a3-b994-b67dc52729db"
+    },
+    "fileId": "b8lVKLMUFEuar/Gl94gx//",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 25
+      }
+    ],
+    "_prefab": {
+      "__id__": 26
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 224,
+      "g": 62,
+      "b": 35,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 448,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -5.459000000000003,
+        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__": 24
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "连续登录并完成任务，即可提现",
+    "_N$string": "连续登录并完成任务，即可提现",
+    "_fontSize": 32,
+    "_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__": "a8fdeda9-d9ff-43a3-b994-b67dc52729db"
+    },
+    "fileId": "40ge0D80pF8JXWJyfvzsSj",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 28
+      }
+    ],
+    "_prefab": {
+      "__id__": 29
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 349,
+      "height": 101
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        204.811,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.9,
+        0.9,
+        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__": 27
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "e062f560-2367-4e1d-9268-52bb12e99e96"
+    },
+    "_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__": "a8fdeda9-d9ff-43a3-b994-b67dc52729db"
+    },
+    "fileId": "6f54CSz11KN7a/w7dc6Ijk",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a8fdeda9-d9ff-43a3-b994-b67dc52729db"
+    },
+    "fileId": "c9Bi7tH3ZFcr9Lq4wdoJpd",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a8fdeda9-d9ff-43a3-b994-b67dc52729db"
+    },
+    "fileId": "bfZmc8NhZLmqu8BJnFLEvm",
+    "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__": "ac053zwqaRD6IJmTlQWmefZ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "effect_par": {
+      "__id__": 2
+    },
+    "open_effect": 1,
+    "isOpenCloseEffect": true,
+    "close_effect": 1,
+    "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": true,
+    "_id": ""
+  },
+  {
+    "__type__": "d6daf2d0klIEJ/KSirLluER",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "lbl_tip": {
+      "__id__": 22
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "a8fdeda9-d9ff-43a3-b994-b67dc52729db"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/module/newNotice/richBankWarmPrompt.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "a8fdeda9-d9ff-43a3-b994-b67dc52729db",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/script/before/main/FactoryCountDown.ts

@@ -1,47 +0,0 @@
-import Util from "../util/Util";
-
-const { ccclass, property } = cc._decorator;
-
-@ccclass
-export class FactoryCountDown extends cc.Component {
-    @property({ tooltip: "配置ID" }) configID: number = 0;
-    @property({ type: cc.Component.EventHandler, tooltip: "商品制作完成时的回调" }) onComplete: cc.Component.EventHandler = null;
-    public progress: number = 0;
-    public timerString: string = "";
-
-    private config: any;
-    async start() {
-        this.config = gData.configData.configMap.get("product");
-    }
-
-    update() {
-        let producting = gData.gameData.getProductingList(this.configID);
-        let now = Date.now();
-        if (producting.length > 0 && this.config) {
-            let totleTime = this.config[producting[0].productID]["time"];
-            if (producting[0].ripeDate > now) {
-                this.progress = 1 - ((producting[0].ripeDate - now) / (totleTime * 1000));
-                this.timerString = Util.formatCountDown(producting[0].ripeDate - now);
-            } else {
-                this.onComplete && this.onComplete.emit([producting[0].productID]);
-                gData.gameData.getProductingList(this.configID).shift();
-            }
-        }
-    }
-
-    public async ripe() {
-        let producting = gData.gameData.getProductingList(this.configID);
-        this.onComplete && this.onComplete.emit([producting[0].productID]);
-        let build = gData.configData.configMap.get("build");
-        if (build[this.configID]["sequence"] == 1) {
-            let lastTime = producting[0].ripeDate - Date.now();
-            gData.gameData.getProductingList(this.configID).shift();
-            for (let i = 0; i < gData.gameData.getProductingList(this.configID).length; i++) {
-                gData.gameData.getProductingList(this.configID)[i].ripeDate -= lastTime;
-            }
-        } else {
-            gData.gameData.getProductingList(this.configID).shift();
-        }
-    }
-}
-

assets/script/before/main/FactoryIcon.ts

@@ -100,8 +100,13 @@ export class FactoryIcon extends cc.Component {
         switch (this.data.state) {
             case FactroyState.Lock:
                 let arr = gData.gameData.getProductArrByType(this.tab);
-                let lv = arr[0].value - gData.gameData.playerProp.orderData.overTimes;
-                mk.tip.pop(`订单提现${lv}次后解锁`);
+                if(gData.gameData.playerProp.orderData)
+                {
+                    let lv = arr[0].value - gData.gameData.playerProp.orderData.overTimes;
+                    mk.tip.pop(`订单提现${lv}次后解锁`);
+                }else{
+                    mk.tip.pop(`提现订单后解锁`);
+                }        
                 break;
             case FactroyState.Empty:
                 gData.factorySystem.currSelectFactory = this;
@@ -131,22 +136,20 @@ export class FactoryIcon extends cc.Component {
             this.data.state = FactroyState.Producting;
             this.data.productID = config.picture;
             this.data.growSpan = growSpan;
-            gData.gameData.setFactoryDataMap(this.configID, this.data);
-
-            this.getComponent(MoveToCenter).move();
-
-            gData.gameData.changeLeftTimes(-1);
-
             gData.adData.checkPopRed();
-            gData.gameData.addProductMakeTimesById(this.data.productID);
-
-           
-
-            //gData.gameData.updateOrderTaskCopyData(this.data.productID);
-            await gData.gameData.gameStyle.doCropFlyLogic(this.data.productID, this.node, parentNode);
+            this.getComponent(MoveToCenter).move();
+            try {
+                gData.gameData.setFactoryDataMap(this.configID, this.data);
+                gData.gameData.changeLeftTimes(-1);
+                gData.gameData.addProductMakeTimesById(this.data.productID);
+                await gData.gameData.gameStyle.doCropFlyLogic(this.data.productID, this.node, parentNode);
+            } catch (error) {
+                console.log("========factoryIcon");
+            }
+            //gData.gameData.updateOrderTaskCopyData(this.data.productID);  
             gData.gameData.nextMake = null;
             gData.gameData.setNextProduct(false);
-            
+
             gData.gameData.isProducting = false;
 
             let flyRed = await gData.gameData.updateNewTaskProgress();
@@ -179,7 +182,7 @@ export class FactoryIcon extends cc.Component {
         gData.gameData.setFactoryDataMap(this.configID, this.data, sendToServer);
     }
 
-    public async onHarvest(){
+    public async onHarvest() {
         this.countDown.cleanRiped();
         this.clean();
         gData.factorySystem.currSelectFactory = null;

assets/script/before/main/FactorySystem.ts

@@ -48,12 +48,11 @@ export default class FactorySystem {
                             let len = this.factoryIcons.length;
                             for (let j = 0; j < len; j++) {
                                 let tab = gData.gameData.getTabByConfigID(this.factoryIcons[j].configID);
-                                let max = gData.gameData.getMaxProduct(tab);
-                                if (tab == productData.tab && this.factoryIcons[j].data.state == FactroyState.Empty && productData.picture <= max) {
+                                //let max = gData.gameData.getMaxProduct(tab);
+                                if (tab == productData.tab && this.factoryIcons[j].data.state == FactroyState.Empty) {
                                     gData.gameData.nextCanProduct = gData.gameData.getProductMap(productData.picture);
                                     gData.gameData.nextMake = this.factoryIcons[j];
                                     gData.gameData.nextType = 3;
-                                    console.log("nextFactory ===== successs");
                                     return this.factoryIcons[j];
                                 }
                             }
@@ -83,6 +82,71 @@ export default class FactorySystem {
         return null;
     }
 
+    nextFactoryExtra() {
+        let factoryArray = [];
+        let data = gData.gameData.playerProp.orderData;
+        if (data) {
+            let orderData = data.orderTaskList;
+            let productJson = gData.gameData.configs.Product;
+            for (let i = 0; i != orderData.length; ++i) {
+                let dataE = orderData[i];
+                if (dataE.completeCount < dataE.taskCount) {
+                    if (dataE.Id <= productJson.length) {
+                        let productData = productJson[dataE.Id - 1];
+                        if (productData.tab == ProductType.nzw || productData.tab == ProductType.dw) {
+                            continue;
+                        } else {
+                            factoryArray.push(productData);
+                        }
+                    }
+                }
+            }
+
+            //从两种类型随机选择逻辑
+            let isMatch = false;
+            let matchSuccessFactorys = null;
+            if (factoryArray.length > 0) {
+                matchSuccessFactorys = this.isHaveEmptyFactory(factoryArray);
+                if (matchSuccessFactorys.length > 0) {
+                    isMatch = true;
+                }
+            }
+            if (isMatch) {
+                let randFactory = mk.math.random(0, matchSuccessFactorys.length-1);
+                let factory = matchSuccessFactorys[randFactory];
+                gData.gameData.nextCanProduct = gData.gameData.getProductMap(factory.picture);
+                gData.gameData.nextMake = factory.key;
+                gData.gameData.nextType = 3;
+                return gData.gameData.nextMake;
+            } else {
+                let len = this.factoryIcons.length;
+                for (let i = 0; i < len; i++) {
+                    if (this.factoryIcons[i].data.state == FactroyState.Empty) {
+                        gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
+                        gData.gameData.nextMake = this.factoryIcons[i];
+                        gData.gameData.nextType = 3;
+                        console.log(`nextFactoryExtra========${this.factoryIcons[i].configID}`);
+                        console.log(`nextFactoryExtra22========${gData.gameData.nextCanProduct}`);
+                        return this.factoryIcons[i];
+                    }
+                }
+            }
+        } else {
+
+            let len = this.factoryIcons.length;
+            for (let i = 0; i < len; i++) {
+                if (this.factoryIcons[i].data.state == FactroyState.Empty) {
+                    gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
+                    gData.gameData.nextMake = this.factoryIcons[i];
+                    gData.gameData.nextType = 3;
+                    return this.factoryIcons[i];
+                }
+            }
+        }
+
+        return null;
+    }
+
     doSameCheckLogic(out: any) {
         if (out.state == 0) {
             let len = this.factoryIcons.length;
@@ -178,4 +242,20 @@ export default class FactorySystem {
 
         return can;
     }
+
+    isHaveEmptyFactory(factoryTabArray: any[]) {
+        let factoryArr = [];
+        for (let i = 0; i != factoryTabArray.length; ++i) {
+            let len = this.factoryIcons.length;
+            for (var j = 0; j < len; j++) {
+                let tab = gData.gameData.getTabByConfigID(this.factoryIcons[j].configID);
+                if (tab == factoryTabArray[i].tab && this.factoryIcons[j].data.state == FactroyState.Empty) {
+                    let map = new Map();
+                    map.set(this.factoryIcons[j], factoryTabArray[i].picture);
+                    factoryArr.push(map);
+                }
+            }
+        }
+        return factoryArr;
+    }
 }

assets/script/before/main/FarmCountDown.ts

@@ -104,7 +104,7 @@ export class FarmCountDown extends cc.Component {
         this.counting = false;
         this.normalGroup.active = false;
         let sick = false;
-        if (gData.gameData.playerProp.orderData.overTimes >= 1 && Math.random() < parseFloat(gData.gameData.configs.ServerConfig.StopProduction)) {
+        if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= 1 && 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

@@ -26,6 +26,7 @@ export class FarmIcon extends cc.Component {
     public get state(): FarmState { return this._state; }
     public data = null;
     onLoad() {
+        //this.plantIcon.node.active = false;
         let helper = this.getComponent(IDHelper);
         this.configID = helper.buildID;
         this.sortID = helper.sortID;
@@ -133,7 +134,7 @@ 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);
+                gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true);
                 break;
             case FarmState.Sick:
                 // mk.tip.pop(`生虫了！`);
@@ -143,7 +144,7 @@ export class FarmIcon extends cc.Component {
         }
     }
 
-    public async onHarvest(){
+    public async onHarvest() {
         this.countDown.cleanRiped();
         this.process.cleanProcess();
         gData.farmSystem.currSelectFarm = null;
@@ -172,25 +173,26 @@ export class FarmIcon extends cc.Component {
             gData.gameData.isProducting = true;
 
             this.plantIcon.node.active = true;
-            gData.gameData.changeLeftTimes(-1);
 
             gData.farmSystem.currSelectFarm = this;
-
             gData.adData.checkPopRed();
 
-            gData.gameData.addProductMakeTimesById(this.plantID);
-     
             //gData.gameData.updateOrderTaskCopyData(id);
-            await gData.gameData.gameStyle.doCropFlyLogic(this.plantID, this.node, parentNode);
+            try {
+                gData.gameData.changeLeftTimes(-1);
+                gData.gameData.addProductMakeTimesById(this.plantID);
+                await gData.gameData.gameStyle.doCropFlyLogic(this.plantID, this.node, parentNode);
+            } catch (error) {
+                console.log(`==========framIcon`);
+            }
+
             gData.gameData.nextMake = null;
             gData.gameData.setNextProduct(false);
 
-            
-
             this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame);
             this.plantIcon.getComponent(cc.Animation).play();
             this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
-
+            //this.doMakePlantFinishLogic();
             let flyRed = await gData.gameData.updateNewTaskProgress();
             return flyRed;
         }
@@ -212,26 +214,28 @@ export class FarmIcon extends cc.Component {
         gData.gameData.setFarmDataMap(this.configID, this.data, sendToServer);
     }
 
-    private async onPlantAnimationFinish() {
-        this.plantIcon.getComponent(cc.Animation).off(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
-        this.plantIcon.node.active = false;
-
+    private doMakePlantFinishLogic() {
         let config = gData.gameData.getProductMap(this.plantID);
-        if(mk.guide.getCurGuideIdString() == "10_2")
-        {
+        if (mk.guide.getCurGuideIdString() == "10_2") {
             this.data.growSpan = 0;
             this.data.state = FarmState.Ripe;
-        }else{
+        } else {
             let growSpan = Date.now() + config.time * 1000;
             this.data.growSpan = growSpan;
             this.data.state = FarmState.Growing;
         }
         this.data.productID = this.plantID;
         gData.gameData.setFarmDataMap(this.configID, this.data);
-
         gData.gameData.isProducting = false;
     }
 
+    private async onPlantAnimationFinish() {
+        this.plantIcon.getComponent(cc.Animation).off(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
+        this.plantIcon.node.active = false;
+
+        this.doMakePlantFinishLogic();
+    }
+
     public novice_plant(): void {
         this.process.setData(this.data);
     }
@@ -242,7 +246,7 @@ export class FarmIcon extends cc.Component {
 
     public canHarvest() {
         gData.farmSystem.currSelectFarm = this;
-        gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
+        gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true);
     }
 
     public canClearSick() {
@@ -251,12 +255,10 @@ export class FarmIcon extends cc.Component {
         gData.adClearSickData.openPanel(ProductType.nzw, this.configID);
     }
 
-    public clickGuideBtn()
-    {
-        if(mk.guide.isGuiding())
-        {
+    public clickGuideBtn() {
+        if (mk.guide.isGuiding()) {
             //gData.farmSystem.currSelectFarm = this;
-            gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, false, true);
+            gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, true, false, true);
         }
     }
 }

assets/script/before/main/FarmSystem.ts

@@ -62,7 +62,8 @@ export class FarmSystem {
         for (let i = 0; i < len; i++) {
             if (this.farms[i] != this.currSelectFarm && this.farms[i].data.state == FarmState.Empty) {
                 out.state = 0;
-                let nextProduct = gData.gameData.getRandomPlantConfig(out);
+                //let nextProduct = gData.gameData.getRandomPlantConfig(out);
+                let nextProduct = gData.gameData.getRandomPlantConfigExtra(out);
                 if(nextProduct)
                 {
                     if(gData.gameData.nextType == 1)

assets/script/before/main/PastureIcon.ts

@@ -151,8 +151,12 @@ export default class PastureIcon extends cc.Component {
             case PastureState.Lock:
                 let config = gData.gameData.getProductMap(this.data.productID);
                 if (config.unlock == 2) {
-                    let times =config.value - gData.gameData.playerProp.orderData.overTimes;
-                    mk.tip.pop(`订单提现${times}次后解锁`);
+                    if(gData.gameData.playerProp.orderData){
+                        let times =config.value - gData.gameData.playerProp.orderData.overTimes;
+                        mk.tip.pop(`订单提现${times}次后解锁`);
+                    }else{
+                        mk.tip.pop(`提现订单后解锁`);
+                    }              
                 }
                 else if (config.unlock == 1) {
                     mk.tip.pop(`喂食${config.name}${config.value}次解锁`)
@@ -221,13 +225,16 @@ export default class PastureIcon extends cc.Component {
             this.data.state = PastureState.Growing;
             this.data.productID = this.data.productID;
             this.data.growSpan = growSpan;
-            gData.gameData.setPastureDataMap(this.configID, this.data);
             this.eatNode.active = false;
             this.getComponent(MoveToCenter).move();
-            gData.gameData.changeLeftTimes(-1);
-
-            //gData.gameData.updateOrderTaskCopyData(this.data.productID);
-            await gData.gameData.gameStyle.doCropFlyLogic(this.data.productID, this.node);
+            try {
+                gData.gameData.setPastureDataMap(this.configID, this.data);
+                gData.gameData.changeLeftTimes(-1);
+                await gData.gameData.gameStyle.doCropFlyLogic(this.data.productID, this.node);
+            } catch (error) {
+                console.log("=======pastureIcon");
+            }
+            //gData.gameData.updateOrderTaskCopyData(this.data.productID);    
             gData.gameData.nextMake = null;
             gData.gameData.setNextProduct(false);
             

assets/script/before/main/PastureSystem.ts

@@ -55,7 +55,6 @@ export default class PastureSystem {
 
             //工厂有匹配的
             if (out.state == 1) {
-                console.log("nextPasture=======null");
                 return null;
             } else
             {
@@ -67,6 +66,91 @@ export default class PastureSystem {
         return null;
     }
 
+    nextPastureExtra() {
+        let factoryArray = [];
+        let animalArray = [];
+        let data = gData.gameData.playerProp.orderData;
+        if (data) {
+            let orderData = data.orderTaskList;
+            let productJson = gData.gameData.configs.Product;
+            for (let i = 0; i != orderData.length; ++i) {
+                let dataE = orderData[i];
+                if (dataE.completeCount < dataE.taskCount) {
+                    if (dataE.Id <= productJson.length) {
+                        let productData = productJson[dataE.Id - 1];
+                        if (productData.tab == ProductType.nzw) {
+                            continue;
+                        } else if (productData.tab == ProductType.dw) {
+                            animalArray.push(productData.picture);
+                        } else {
+                            factoryArray.push(productData);
+                        }
+                    }
+                }
+            }
+
+            //从两种类型随机选择逻辑
+            let typeArr = [];
+            let matchSuccessFactorys = null;
+            let matchSuccessPastures = null;
+
+            if (factoryArray.length > 0) {
+                matchSuccessFactorys = gData.factorySystem.isHaveEmptyFactory(factoryArray);
+                if(matchSuccessFactorys.length > 0){
+                    typeArr.push(1);
+                }
+            }
+            if (animalArray.length > 0) {
+                matchSuccessPastures = this.isHaveEmptyPasture(animalArray);
+                if(matchSuccessPastures.length > 0){
+                    typeArr.push(2);
+                }
+            }
+            if(typeArr.length > 0)
+            {
+                let rand = mk.math.random(0, typeArr.length-1);
+                let type = typeArr[rand];
+                if (type == 1) {
+                    let randFactory = mk.math.random(0, matchSuccessFactorys.length-1);
+                    let factory = matchSuccessFactorys[randFactory];
+                    gData.gameData.nextCanProduct = gData.gameData.getProductMap(factory.picture);
+                    gData.gameData.nextMake = factory.key;
+                    gData.gameData.nextType = 3;
+                    return gData.gameData.nextMake;
+                } else if (type == 2) {
+                    let randPasture = mk.math.random(0, matchSuccessPastures.length-1);
+                    let pasture = matchSuccessPastures[randPasture];
+                    gData.gameData.nextCanProduct = gData.gameData.getProductMap(pasture.data.productID);
+                    gData.gameData.nextMake = pasture
+                    gData.gameData.nextType = 2;
+                    return pasture;
+                }
+            }else{
+                let len = this.pastureIcons.length;
+                for (var i = 0; i < len; i++) {
+                    if (this.pastureIcons[i].data.state == PastureState.Empty) {
+                        gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[i].data.productID);
+                        gData.gameData.nextMake = this.pastureIcons[i];
+                        gData.gameData.nextType = 2;
+                        return this.pastureIcons[i];
+                    }
+                }
+            }
+
+        } else {
+            let len = this.pastureIcons.length;
+            for (var i = 0; i < len; i++) {
+                if (this.pastureIcons[i].data.state == PastureState.Empty) {
+                    gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[i].data.productID);
+                    gData.gameData.nextMake = this.pastureIcons[i];
+                    gData.gameData.nextType = 2;
+                    return this.pastureIcons[i];
+                }
+            }
+        }
+        return null;
+    }
+
     doSameCheckLogic(out:any)
     {
         if (out.state == 0) {
@@ -170,4 +254,17 @@ export default class PastureSystem {
 
         return can;
     }
+
+    isHaveEmptyPasture(animalIdArray: any[]) {
+        let pastureArr = [];
+        for (let i = 0; i != animalIdArray.length; ++i) {
+            let len = this.pastureIcons.length;
+            for (var j = 0; j < len; j++) {
+                if (this.pastureIcons[j].data.productID == animalIdArray[i] && this.pastureIcons[j].data.state == PastureState.Empty) {
+                    pastureArr.push(this.pastureIcons[j]);
+                }
+            }
+        }
+        return pastureArr;
+    }
 }

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

@@ -1,6 +1,7 @@
 /**收获界面数据类 */
 
 import { RateConfig } from "../../../game/data/AdData";
+import { DataEventId } from "../../../game/data/GameData";
 import Guide from "../../../game/module/guide/Guide";
 import { Data } from "../../../mk/data/Data";
 
@@ -19,7 +20,7 @@ export default class HarvestData extends Data {
     isMatchOrder = false;
     //是否是点击一键生产按钮
     isTouchBtn = false;
-    openPanel(configID, plantID, call, node, isTouchBtn =false, isTeach = false) {
+    openPanel(configID, plantID, call, node, isCrops = false, isTouchBtn =false, isTeach = false) {
 
         this.configID = configID;
         this.plantID = plantID;
@@ -29,7 +30,7 @@ export default class HarvestData extends Data {
         this.config = gData.gameData.getProductMap(this.plantID);
         //this.judgeIsMatchOrder();
 
-        if(!isTeach)
+        if(!isTeach && !isCrops)
         {
             let isTeaching = mk.guide.isGuiding();
             let rand = Math.random();
@@ -98,7 +99,6 @@ export default class HarvestData extends Data {
                 hand.parent = mk.fly.node;
                 hand.setPosition(pos);
                 cc.tween(hand).delay(0.4).call(()=>{
-                    console.log("=========isCdOver == true");
                     this.getType = 0;
                     let rewardData = [{ rewardType: 1, rewardNum: response.data.redMoneyAddition }];
                     gData.reward.data = rewardData;
@@ -121,6 +121,15 @@ export default class HarvestData extends Data {
             }
             
         }
+        let isTeaching = mk.guide.isGuiding();
+        if(!isTeaching)
+        {
+            let pop =  gData.adData.checkShowFullInter(4);
+            if(pop){
+                gData.moreGame.openType = 0;
+                mk.data.sendDataEvent(DataEventId.htRedBag_scene, "点击可收获");
+            }
+        }
     }
 
     public judgeIsMatchOrder()

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

@@ -3,7 +3,7 @@
  */
 
 import { AdFun } from "../../../game/data/AdData";
-import { BannerAdType, InterFullAdType, VideoAdType } from "../../../game/data/GameData";
+import { BannerAdType, DataEventId, InterFullAdType, VideoAdType } from "../../../game/data/GameData";
 
 const { ccclass, property } = cc._decorator;
 
@@ -69,6 +69,12 @@ export default class HarvestPanel extends cc.Component {
     onEnable() {
         //mk.ad.showBanner(BannerAdType.banner_click_6);
         mk.ad.showNative();
+
+        let pop = gData.adData.checkShowFullInter(4);
+        if(pop){
+            gData.moreGame.openType = 0;
+            mk.data.sendDataEvent(DataEventId.htRedBag_scene, "点击可收获");
+        }
     }
 
     onDisable() {

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

@@ -18,6 +18,7 @@ export default class PlantPanel extends cc.Component {
         gData.plantData.init_lock = -1;
         this.initScollView();
         mk.event.emit("moveUpAndDownFarmMapUI", true);
+        mk.event.register("close-panel", this.closeUI.bind(this), this);
     }
 
     getItemDataByID(id) {
@@ -80,11 +81,11 @@ export default class PlantPanel extends cc.Component {
 
     onDestroy() {
         // this.tableView.clearItem();
-       
+        mk.event.remove("close-panel", this);
     }
 
     public closeUI()
     {
-        mk.event.emit("moveUpAndDownFarmMapUI", false);
+        mk.event.emit("moveUpAndDownFarmMapUI", false); 
     }
 }

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

@@ -69,14 +69,17 @@ export default class PlantItem extends cc.Component {
         let times = 0;
         //根据上个商品种植次数
         if (list_data.unlock == 1) {
-            times = gData.gameData.getProductMakeTimesById(list_data.picture - 1);
-            if (times >= list_data.value) {
-                unlock = true;
+            unlock = gData.gameData.getProductUnlockById(this.data.tab, this.data.picture);
+            if (!unlock) {
+                times = gData.gameData.getProductMakeTimesById(list_data.picture - 1);
+                if (times >= list_data.value) {
+                    unlock = true;
+                }
             }
         }
         //根据农场等级
         else if (list_data.unlock == 2) {
-            if (gData.gameData.playerProp.orderData.overTimes >= list_data.value) {
+            if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= list_data.value) {
                 unlock = true;
             }
         }
@@ -86,7 +89,7 @@ export default class PlantItem extends cc.Component {
         if (!unlock) {
             let des = this.getDesByType();
             let plantName = gData.gameData.getProductMap(this.data.picture - 1).name;
-            if (list_data.picture - 1 == gData.gameData.getMaxProduct(this.data.tab)) {
+            if (list_data.picture - 1 == gData.gameData.getMaxProductExtra(this.data.tab)) {
                 this.labUnlock.string = `${des}${this.data.value}次\n${plantName}`;
                 this.lbl_progress.string = `${times}/${this.data.value}`;
                 this.labUnlock.node.active = true;
@@ -128,14 +131,14 @@ export default class PlantItem extends cc.Component {
             flyRed = await gData.factorySystem.make(this.data.picture, this.nameIcon.node);
         }
 
-        // if (flyRed) {
-        //     if (gData.gameData.funOpenData[4] == "0") {
-        //         return;
-        //     }
-        //     gData.plantData.init_ani = true;
-        //     let pos = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
-        //     gData.gameData.gameStyle.dpFlyRedAni(pos);
-        // }
+        if (flyRed) {
+            if (gData.gameData.funOpenData[4] == "0") {
+                return;
+            }
+            gData.plantData.init_ani = true;
+            let pos = this.nameIcon.node.parent.convertToWorldSpaceAR(this.nameIcon.node.getPosition());
+            gData.gameData.gameStyle.dpFlyRedAni(pos);
+        }
     }
 
     getDesByType() {

assets/script/game/data/AdData.ts

@@ -20,6 +20,7 @@ export class AdData {
     public publisher_revenue = '';
     public precision = '';
     public ecpm_level = '';
+    public request_id = '';
 
     /** 视频类型 */
     public ad_subType: AdFun;
@@ -102,6 +103,10 @@ export class AdData {
         this.publisher_revenue = data.publisher_revenue;
         this.precision = data.precision;
         this.ecpm_level = data.ecpm_level;
+        this.request_id = '';
+        if(data.ext_info && data.ext_info.request_id){
+            this.request_id = data.ext_info.request_id;
+        }
     }
 
 
@@ -130,6 +135,7 @@ export class AdData {
             "cfg_version": gData.appData.version,
             "adsource_ecpm": gData.gameData.adShowConfig.average_ecpm,
             "ad_sbuType": this.ad_subType,
+            "request_id": this.request_id,
         }
         mk.console.logSingle("updateVideoData:", data);
 
@@ -155,6 +161,17 @@ export class AdData {
         {
             callBack(response.data);
         }
+        
+        //达到任务之后计算视频
+        if (gData.safeDepositBoxData.isStartBankTask > 0) {
+            gData.safeDepositBoxData.richBankDailyVideoTimes++
+
+            if (gData.safeDepositBoxData.richBankDailyVideoTimes == gData.safeDepositBoxData.richBankDailyTotelVideoTimes) {
+                mk.data.sendDataEvent("Bank", "银行-当日任务完成")
+
+                gData.safeDepositBoxData.addJGTags();
+            }
+        }
     }
 
     /** 更新其他广告次数
@@ -186,7 +203,8 @@ export class AdData {
                 "publisher_revenue": '',
                 "precision": '',
                 "ecpm_level": '',
-                "platformRisk": 1
+                "platformRisk": 1,
+                "request_id": '',
             }
         }
         else {
@@ -210,7 +228,11 @@ export class AdData {
                 "publisher_revenue": data.publisher_revenue,
                 "precision": data.precision,
                 "ecpm_level": data.ecpm_level,
-                "platformRisk": 1
+                "platformRisk": 1,
+                "request_id": '',
+            }
+            if(data.ext_info && data.ext_info.request_id){
+                sData.request_id = data.ext_info.request_id;
             }
         }
 
@@ -278,7 +300,7 @@ export class AdData {
                 per = this.getPerByEcpm(RateConfig.RC_fullScreen);
                 pop = Math.random() < per;
                 if (!pop) {
-                    return;
+                    return pop;
                 }
                 if (this.FullScreenAdArr.indexOf(this.ecpmLevel.toString()) == -1) {
                     return;
@@ -289,7 +311,7 @@ export class AdData {
                 per = this.getPerByEcpm(RateConfig.RC_tableScreen);
                 pop = Math.random() < per;
                 if (!pop) {
-                    return;
+                    return pop;
                 }
                 let delayArr = gData.gameData.configs.ServerConfig.AdDelay.split(',');
                 let min = parseFloat(delayArr[0]);
@@ -304,7 +326,7 @@ export class AdData {
                 per = this.getPerByEcpm(RateConfig.RC_tableScreen);
                 pop = Math.random() < per;
                 if (!pop) {
-                    return;
+                    return pop;
                 }
                 let delayArr1 = gData.gameData.configs.ServerConfig.AdDelay.split(',');
                 let min1 = parseFloat(delayArr1[0]);
@@ -322,12 +344,13 @@ export class AdData {
                 per = this.getPerByEcpm(RateConfig.RC_moreGameRedBag);
                 pop = Math.random() < per;
                 if (!pop) {
-                    return;
+                    return pop;
                 }
 
                 gData.moreGame.popNewOpenRedBag();
                 break;
         }
+        return pop;
     }
 
     /** 弹出插屏 */
@@ -468,18 +491,45 @@ export class AdData {
                         per = parseFloat(forceAd[i].htPercent);
                         return per;
                     }
+                case RateConfig.RC_popSpeedUp:
+                    if (gData.gameData.adShowConfig.average_ecpm <= parseInt(forceAd[i].ecpmMax)){
+                        per = parseFloat(forceAd[i].jsPercent);
+                        return per;
+                    }
             }
         }
 
         return per;
     }
 
-    savePreLoadEcpm(data) {
+    async savePreLoadEcpm(data) {
         let times = gData.gameData.getProp(GameProp.videoTimes);
         console.log('savePreLoadEcpm  times ', times)
         if (!times) {
             console.log('savePreLoadEcpm  data ', data.adsource_price)
-            mk.http.sendData('user/savePreLoadEcpm', data);
+            let response = await mk.http.sendData('user/savePreLoadEcpm', data);
+            if(response.errcode != 0)
+            {
+                return;
+            }
+
+            this.getOrderTaskInfo(0);
+        }
+    }
+
+    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){
+                return;
+            }
+            gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;  
+
+            mk.event.emit("initOrderUi");
         }
     }
 }
@@ -508,5 +558,6 @@ export enum RateConfig {
     RC_infrormationFlow,
     RC_splash,
     RC_superDouble,
-    RC_moreGameRedBag
+    RC_moreGameRedBag,
+    RC_popSpeedUp
 }

assets/script/game/data/LoginData.ts

@@ -145,7 +145,7 @@ export class LoginData {
             "versioncfg": gData.appData.version,
             "idfa": gData.appData.machineInfo.idfa,
             "imei": gData.appData.machineInfo.imei,
-            "mac": gData.appData.mac,
+            "mac": gData.appData.machineInfo.mac,
             "oaid": gData.appData.machineInfo.oaid,
             "szlm_did": mk.shuzilmM.szlm_did,
             "black_box": mk.tongdunM.tdEquipID,
@@ -232,48 +232,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();
-        }
+   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);
-            }
-            return;
+    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);
         }
-        let decryptData;
-        if (gData.wechatData.code != null) {
-            decryptData = mk.encrypt.decrypt(response.encrypt, this.sessionKey, gData.appData.appId);
+        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();
         }
         else {
-            decryptData = mk.encrypt.decrypt(response.encrypt, tmp_key, gData.appData.appId);
-        }
+            console.log('KKKK 2 ', this.uin)
+            this.isNew = false;
+            gData.wechatData.code = null;
 
-        let parseData = JSON.parse(decryptData);
-        this.sessionKey = parseData.session_key;
-        mk.console.logSingle("[FC]checkLogin decrypt", parseData);
-        mk.storage.setStorage(StorageKey.sessionKey, this.sessionKey);
+            cc.audioEngine.stopAll();
+            //调用Android的更好
+            cc.game.restart();
+        }
+    }
+    else {
+        console.log('KKKK 3 ', this.uin)
         this.getUserInfo();
     }
+}
 
     private async getUserInfo() {
         this.getAccountInfo();
@@ -294,7 +313,10 @@ export class LoginData {
             "uin": this.uin,
             "login_ticket": this.loginTicket,
             "szlm_did": mk.shuzilmM.szlm_did,
-            "black_box": mk.tongdunM.tdEquipID
+            "black_box": mk.tongdunM.tdEquipID,
+            "mac": gData.appData.machineInfo.mac,
+            "appVersion": gData.appData.appVersion,
+            "tfChannel": gData.appData.tfChannel,
         };
 
         let data = {

assets/script/game/data/StorageData.ts

@@ -24,4 +24,6 @@ export enum StorageKey{
     isAuth = 'isAuth',
     avatar = 'avatar',
     copyOrderData = 'copyOrderData',
+    richBankAddLoginDays = "richBankAddLoginDays",
+    isPopSet = 'isPopSet'
 }

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

@@ -32,7 +32,6 @@ export class BlessingBagData extends Data {
     init() {
         this.isPlayAniUpdate = false;
         this.videoRbData = gData.gameData.playerProp.userTuCaoInfo;
-        // console.log("福袋数据---------------->", this.videoRbData);
     }
 
     setAdData(data) {
@@ -111,6 +110,10 @@ export class BlessingBagData extends Data {
         mk.console.logSingle("'welFare/welFareCash", response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
+            if (response.errcode == 405) {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            }
             return null;
         }
 
@@ -126,6 +129,8 @@ export class BlessingBagData extends Data {
         gData.receiptNotice.receip_rmb = gData.blessingBag.rbNum;
         mk.ui.openPanel('module/newNotice/newNotice');
 
+        gData.safeDepositBoxData.updateQipao();
+        gData.cashNormal.getRecord();
         return response
     }
 

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

@@ -1,4 +1,5 @@
 import { Data } from "../../../mk/data/Data";
+import JsbSystem from "../../../mk/system/JsbSystem";
 /**
  * 红包提现数据
  * @author 薛鸿潇
@@ -28,6 +29,22 @@ export class CashNormalData extends Data {
             this.initReceipTotalRMB();
             this.update_list = true;
         }
+
+        if(gData.gameData.adShowConfig.average_ecpm >= 50){
+            if(this.list_data.length >= 1){
+                let isSave = mk.storage.getStorage("ecpm");
+                if(!isSave){
+                    JsbSystem.addJGTags("ecpm大于50");
+                    mk.storage.setStorage("ecpm", 1);
+                }
+            }
+        }else{
+            let isSave = mk.storage.getStorage("ecpm");
+            if(isSave){
+                JsbSystem.deleteTags("ecpm大于50");
+                cc.sys.localStorage.removeItem("ecpm大于50");
+            }
+        }
     }
     /** 数据列表 */
     public list_data: Array<TCashList> = [];

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

@@ -27,6 +27,6 @@ export class FarmMapData extends Data {
 
     setChooseType(t: ProductType) {
         this.chooseType = t;
-        this.maxUnluckValue = gData.gameData.getMaxProduct(t);
+        this.maxUnluckValue = gData.gameData.getMaxProductExtra(t);
     }
 }

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

@@ -21,12 +21,15 @@ export class GradeRewardData extends Data {
         // gData.cashPro.openCashPro(0);
         this.cashId = id;
         let data = { id: this.cashId };
-        // console.log(`农场等级提现数据=======>${this.cashId}`);
         let response = await mk.http.sendData('farmGrade/farmGradeCash', data);
 
         mk.console.logSingle("农场等级提现数据=>", response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
+            if (response.errcode == 405) {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            }
             return null;
         }
 
@@ -37,13 +40,15 @@ export class GradeRewardData extends Data {
 
         this.changeExp = true;
         gData.gameData.playerProp.farmGradeData = response.data.userFarmGrageRewardInfo
-    
+
         gData.receiptNotice.receip_rmb = response.data.userFarmGrageRewardInfo.farmGradeRewardList[this.cashId - 1].money;
         mk.ui.openPanel('module/newNotice/newNotice');
         // gData.cashPro.cashPro_money = response.data.userFarmGrageRewardInfo.farmGradeRewardList[this.cashId - 1].money;
         // gData.cashPro.init_success = true;
 
         gData.gameData.init_red_point = true;
+        gData.safeDepositBoxData.updateQipao();
+        gData.cashNormal.getRecord();
         return response
     }
 

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

@@ -14,16 +14,13 @@ export class LineUpUIData extends Data {
     public popType = 0;
 
     showTips() {
-        console.log(`showTips======${gData.gameData.playerProp.lineRedMoney}`);
         if (gData.gameData.playerProp.lineRedMoney > 0) {
             cc.tween(this).delay(0.5).call(() => {
                 let add = Math.round(this.redMoney / 100);
                 mk.tip.pop(`插队成功,并获得${add}红包币`);
             }).start();
         } else {
-            console.log("showTips================");
             cc.tween(this).delay(0.5).call(() => {
-                console.log("showTips================2");
                 mk.tip.pop("插队成功");
             }).start();
         }
@@ -32,7 +29,6 @@ export class LineUpUIData extends Data {
     setAdData(data) {
         //mk.console.logSingle('LineUpUIData  addata ', this.adData);
         super.setAdData(data);
-        console.log(`LineUpUIData=========${data}`);
         this.redMoney = 0;
         let rewardData = this.adData.videoRedMoney.videoRewardList;
         for (let i = 0; i != rewardData.length; ++i) {

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

@@ -28,6 +28,9 @@ export class MoreGameData extends Data {
 
     init_newOpenRedBag = false;
 
+    //哪个位置打开互推红包界面
+    openType = -1;
+
     /** 测试数据 */
     private testData = {
         "normal": [

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

@@ -1,5 +1,9 @@
 /** 富翁银行数据类 */
 
+import JsbSystem from "../../../mk/system/JsbSystem";
+import { GameProp } from "../GameData";
+import { StorageKey } from "../StorageData";
+
 const { ccclass } = cc._decorator;
 
 @ccclass
@@ -9,7 +13,7 @@ export default class SafeDepositBoxData {
     /** 银行存入金额 */
     richBankCashAmount = 0
     /** 当前任务的id，也就是index字段 */
-    currentRichBankCashTaskIndex = 0
+    currentRichBankCashTaskIndex = null
 
     /** 开始银行任务后 每日观看的视频数 */
     richBankDailyVideoTimes = 0
@@ -18,14 +22,24 @@ export default class SafeDepositBoxData {
     /** 开始银行任务后 今日需要视频总次数 */
     richBankDailyTotelVideoTimes = 0
 
+    /** 开始银行任务后 今日需要登陆总次数 */
+    richBankTotelLoginDays = 0;
+
     //富翁银行正在进行过的档位
     addRichBankFinishIndex = 0;
 
+    //是否开启任务
+    isStartBankTask = 0;
+
     qipaoType = -1;
 
     freshQipao = false;
     cashRecordData = null;
 
+    cashRecordDataLength = 0;
+
+    isTeach = false;
+
     /** 现金进入富翁银行动画 */
     creatPacketAnim(type) {
         this.qipaoType = type;
@@ -60,12 +74,89 @@ export default class SafeDepositBoxData {
         }
     }
 
+    getBankTaskIndexExtra(isMinusOne = false){
+        let configInfo = gData.safeDepositBoxData.richBankConfig
+        if (configInfo == null || configInfo == undefined) {
+            return
+        }
+
+        let curIndex = gData.safeDepositBoxData.currentRichBankCashTaskIndex;
+        if(isMinusOne)
+        {
+            curIndex -= 1;
+        }
+        if (curIndex > configInfo.length) {
+            return configInfo[configInfo.length - 1]
+        }
+        for (let entry of configInfo) {
+            if (entry.index == curIndex) {
+                return entry
+            }
+        }
+    }
+
     async updateQipao() {
         await mk.time.WaitForSeconds(1);
-        let response = await mk.http.sendData('richbank/getCashRecord', {});
+        //let response = await mk.http.sendData('richbank/getCashRecord', {});
+        let response = await mk.http.sendData('newrichbank/getCashRecord', {});
         if (response && response.errcode == 0) {
             this.cashRecordData = response.data;
+            console.log("--------------");
             this.freshQipao = true;
         }
+
+        //福利银行教学
+        if(gData.gameData.richBankTeachTag){
+            gData.gameData.richBankTeachTag = false;
+            let isOpenRichBankUI = mk.ui.isPopPanel();
+            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);
+                }
+            }       
+        }
+    }
+
+    setCashRecordDataLength(){
+        if(this.cashRecordData){
+            this.cashRecordDataLength = this.cashRecordData.length;
+            console.log(`setCashRecordDataLength==========${this.cashRecordDataLength}`);
+        }else{
+            this.cashRecordDataLength = 0;
+        }      
+    }
+
+    /**
+     * 当前时间和目标时间是否是同一天
+     * @param targetTime  记录的时间戳
+     */
+     checkSameDay(targetTime: number): boolean {
+        let currentDay = new Date().getDate()
+        let lastData = new Date(targetTime).getDate()
+        if (currentDay == lastData) {
+            return true
+        }
+        return false
+    }
+
+    addJGTags(){
+        JsbSystem.addJGTags("富翁银行完成当天的任务");
+        gData.gameData.setProp(GameProp.finishRichBankTodayTask, Date.now() + "");
+    }
+
+    deleteJGTags(){
+        if(this.richBankDailyVideoTimes < this.richBankDailyTotelVideoTimes && this.isStartBankTask > 0){
+            let time = gData.gameData.getProp(GameProp.finishRichBankTodayTask);
+            if(time){
+                let same = gData.safeDepositBoxData.checkSameDay(new Number(time).valueOf())
+                if(!same){
+                    JsbSystem.deleteTags("富翁银行完成当天的任务");
+                    gData.gameData.setProp(GameProp.finishRichBankTodayTask, Date.now() + "");
+                }
+            }
+        }    
     }
 }

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

@@ -1,6 +1,6 @@
 import { Data } from "../../../mk/data/Data";
 import { OpenActionType } from "../../../mk/system/UISystem";
-import { GameProp, RewardState, RewardType } from "../GameData";
+import { DataEventId, GameProp, RewardState, RewardType } from "../GameData";
 
 /**
  * @description 签到数据
@@ -144,22 +144,19 @@ export class SignData extends Data {
             if (response.errcode != 0) {
                 mk.tip.pop('系统异常');
                 // gData.cashPro.init_fail = true;
+                if (response.errcode == 405) {
+                    mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                    mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+                }
                 return;
             }
 
-            if (response.CashMode == 0) {//星云打款
-            } else if (response.CashMode == 1) {//公众号打款
-            }
-
             gData.gameData.addCashOutTimes();
-            
             const rewardNum = Math.round(adData.videoRedMoney.videoRewardList[0].rewardNum * 100);
             gData.receiptNotice.receip_rmb = rewardNum;
-
-            // mk.ui.closePanel('sign');
-            // gData.cashPro.cashPro_money = rewardNum;
-            // gData.cashPro.init_success = true;
             mk.ui.openPanel('module/newNotice/newNotice', OpenActionType.closeLast);
+            gData.safeDepositBoxData.updateQipao();
+            gData.cashNormal.getRecord();
         } else if (reward_data.rewardType === RewardType.pigRmb) {
             // 金猪现金
             // gData.reward.data = [{ rewardNum: reward_data.rewardNum, rewardType: reward_data.rewardType }]

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

@@ -22,6 +22,11 @@ export class WalletCashOutData extends Data {
         mk.console.logSingle('wallet1=>', response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
+            if(response.errcode == 405)
+            {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            }
             return null;
         }
         this.init_novice = true;
@@ -32,6 +37,8 @@ export class WalletCashOutData extends Data {
         gData.receiptNotice.receip_rmb = value;
         mk.ui.openPanel('module/newNotice/newNotice');
 
+        gData.safeDepositBoxData.updateQipao();
+        gData.cashNormal.getRecord();
         gData.gameData.doPointToXYLogic();
         gData.gameData.addCashOutTimes();
     }
@@ -57,6 +64,12 @@ export class WalletCashOutData extends Data {
 
         mk.console.logSingle('wallet2=>', response);
         if (response.errcode != 0) {
+            if(response.errcode == 405)
+            {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+                return;
+            }
             if (response.data.count > 0) {
                 // gData.cashPro.init_fail = true;  
                 gData.lineUpUIData.personCount = response.data.count;
@@ -86,6 +99,8 @@ export class WalletCashOutData extends Data {
             mk.ui.openPanel('module/newNotice/newNotice');
         }
 
+        gData.safeDepositBoxData.updateQipao();
+        gData.cashNormal.getRecord();
         mk.data.sendDataEvent(DataEventId.Sundry, '红包币提现成功');
         gData.gameData.doPointToXYLogic();
         gData.gameData.addCashOutTimes();

assets/script/game/game/AniControl.ts

@@ -267,7 +267,6 @@ export default class AniControl extends cc.Component {
 
 
         let add = response.data.redMoneyAddition;
-        console.log('addCoin===============>', add);
         if (add > 0) {
             const several = 3;
             let intV = Math.floor(add / several);

assets/script/game/game/FunBtns.ts

@@ -1,3 +1,5 @@
+import { GameProp } from "../data/GameData";
+
 const { ccclass, property } = cc._decorator;
 
 @ccclass
@@ -22,7 +24,10 @@ export default class FunBtns extends cc.Component {
     btn9: cc.Node = null;
     @property({ type: cc.Node, displayName: "订单" })
     btn12: cc.Node = null;
+    @property({ type: cc.Node, displayName: "富翁银行" })
+    btn14: cc.Node = null;
 
+    private addCount = 0;
     onLoad() {
         gData.gameData.funBtns = this;
     }
@@ -32,41 +37,71 @@ export default class FunBtns extends cc.Component {
     }
 
     init() {
-        let add = 0;
         let data = gData.gameData.funOpenData;
         for (let i = 0; i < data.length; i++) {
             let node_btn = this['btn' + (i + 1)];
             if (node_btn) {
                 node_btn.active = data[i] == "1";
                 //订单
-                if(i == 11 && data[i] == "0" )
-                {
+                if (i == 11 && data[i] == "0") {
                     this.btn5.y = this.btn5.y + 170;
-                    add += 1;
-                }else if (i == 4 && data[i] == "0")
-                {
-                    add += 1;
+                    this.addCount += 1;
+                } else if (i == 2 && data[i] == "0") {
+                    this.btn4.y = this.btn4.y + 170;
+                }
+                else if (i == 4 && data[i] == "0") {
+                    this.addCount += 1;
+                }
+                else if (i == 13 && data[i] == "1") {
+                    let times = gData.gameData.getProp(GameProp.cashTimes);
+                    console.log(`cashTimes======${times}`);
+                    if (!times || times < gData.gameData.showRichBankIconLimit) {
+                        node_btn.active = false;
+                        mk.event.register("showRichBankIcon", this.showRichBankIcon.bind(this), this);
+                    }
                 }
             }
         }
 
-        this.btn9.y = this.btn9.y + 130 * add;
+        this.btn9.y = this.btn9.y + 130 * this.addCount;
 
-        if(this.btn8.active)
-        {
+        if (this.btn8.active) {
             let isShow = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
             this.btn8.active = isShow;
 
-            if(!isShow)
-            {
+            if (!isShow) {
                 mk.event.register("refreshBubble", this.refreshStatus.bind(this), this);
             }
         }
     }
 
-    refreshStatus()
-    {
+    refreshStatus() {
         this.btn8.active = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
     }
+
+    showRichBankIcon() {
+        this.btn14.active = true;
+        mk.event.remove("showRichBankIcon", this);
+
+        this.updateRichBankTaskIndex();
+    }
+
+    async updateRichBankTaskIndex() {
+        if (!gData.safeDepositBoxData.currentRichBankCashTaskIndex) {
+            let response = await mk.http.sendData('newrichbank/getRichBankInfo', {});
+            if (response && response.errcode == 0) {
+                let res_data = response.data;
+                //gData.safeDepositBoxData.richBankCashAmount = res_data.richBankCashAmount;
+                gData.safeDepositBoxData.currentRichBankCashTaskIndex = res_data.currentRichBankCashTaskIndex;
+                gData.safeDepositBoxData.isStartBankTask = res_data.isStartRichBankTask;
+                //gData.safeDepositBoxData.richBankDailyVideoTimes = res_data.richBankDailyVideoTimes;
+                gData.safeDepositBoxData.richbankLoginDays = res_data.richbankLoginDays;
+                //gData.safeDepositBoxData.richBankDailyTotelVideoTimes = res_data.richBankDailyTotelVideoTimes;
+                //gData.safeDepositBoxData.richBankTotelLoginDays = res_data.richBankTotelLoginDays;
+                console.log(`currentRichBankCashTaskIndex 11======== ${res_data.currentRichBankCashTaskIndex}`);
+                console.log(`richBankDailyTotelVideoTimes 11======== ${res_data.richBankDailyTotelVideoTimes}`);
+            }
+        }
+    }
 }
 

assets/script/game/game/Game.ts

@@ -4,6 +4,7 @@ import TimeUtil from "../../mk/utils/TimeUtil";
 import SetGray from "../component/SetGray";
 import { AdFun, RateConfig } from "../data/AdData";
 import { DataEventId, FarmState, GameProp, ProductType, VideoAdType } from "../data/GameData";
+import FunBtns from "./FunBtns";
 
 const { ccclass, property } = cc._decorator;
 
@@ -118,6 +119,16 @@ export default class Game extends cc.Component {
     @property({ displayName: '红包币图标', type: cc.Node })
     node_orderHb: cc.Node = null;
 
+    @property({ displayName: '额外订单ui节点', type: cc.Node })
+    node_extraOrderUi: cc.Node = null;
+    @property({ displayName: '额外订单背景节点', type: cc.Node })
+    node_bgUi: cc.Node = null;
+
+    @property({ displayName: '订单显示', type: cc.Node })
+    node_crop: cc.Node[] = [];
+    @property({ displayName: '订单红包', type: cc.Node })
+    node_orderHbIcon: cc.Node = null;
+
     posY = 0;
     /** 是否开始增加次数倒计时 */
     private lastTimeSpan = 0;
@@ -127,6 +138,7 @@ export default class Game extends cc.Component {
 
     private isShowAddProductTimesUI = false;
 
+    private is
     onLoad() {
         this.posY = this.ani_add2.y;
         this.ani_add.node.active = false;
@@ -148,7 +160,11 @@ export default class Game extends cc.Component {
 
         this.initRefreshEvent();
 
-        this.initOrderUI();
+        if (gData.gameData.playerProp.orderData) {
+            this.initOrderUI();
+        } else {
+            mk.event.register("initOrderUi", this.initOrderUI.bind(this), this);
+        }
     }
 
     start() {
@@ -182,6 +198,10 @@ export default class Game extends cc.Component {
             mk.storage.setStorage('loadingFinish', 1);
             mk.data.sendDataEvent(DataEventId.loading, 'loading结束');
         }
+
+        setTimeout(() => {
+            gData.safeDepositBoxData.deleteJGTags();
+        }, 1000)
     }
 
     update(dt) {
@@ -239,6 +259,8 @@ export default class Game extends cc.Component {
                     //add = add > gData.gameData.maxTimes ? gData.gameData.maxTimes : add;
                     gData.gameData.restoreProductTimes = add;
                     mk.ui.openPanel('module/speedUpUI/restoreProductTimes');
+
+                    mk.data.sendDataEvent(DataEventId.offlineProductTimes, "离线生产次数弹出");
                 }
             }
         }
@@ -463,7 +485,18 @@ export default class Game extends cc.Component {
 
     /** 点击福利 */
     public onClickFuli() {
-        mk.data.sendDataEvent(DataEventId.button_click, "福利icon");
+        if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= gData.gameData.welfareOpenLimit) {
+            mk.ui.openPanel('module/blessingBag/blessingBag');
+            mk.data.sendDataEvent(DataEventId.button_click, "福利icon");
+
+            let isClickIcon = mk.storage.getStorage("clickBlessIcon")
+            if (!isClickIcon) {
+                JsbSystem.addJGTags("点击过福利icon");
+                mk.storage.setStorage("clickBlessIcon", 1);
+            }
+        } else {
+            mk.tip.pop(`订单提现${gData.gameData.welfareOpenLimit}次后开启`);
+        }
     }
 
     /** 点击漂浮红包 */
@@ -547,25 +580,25 @@ export default class Game extends cc.Component {
         let flyRed = await gData.gameData.makeProduct();
 
         //任务红包刷新逻辑
-        // if (flyRed) {
-        //     //mk.audio.playEffect('redmoney');
-        //     if (gData.gameData.playerProp.userFarmTaskInfo) {
-        //         let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
-        //         let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-
-        //         let addAni = cc.instantiate(this.ani_add3);
-        //         addAni.parent = this.ani_add3.parent;
-        //         addAni.getComponent(cc.Label).string = `百元红包:${com}/${count}`;
-        //         cc.tween(addAni).call(() => {
-        //             addAni.opacity = 255;
-        //         }).by(0.8, { y: 100 }).to(0.4, { opacity: 0 }).call(() => {
-        //             addAni.destroy();
-        //         }).start();
-        //     }
+        if (flyRed) {
+            //mk.audio.playEffect('redmoney');
+            if (gData.gameData.playerProp.userFarmTaskInfo) {
+                let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+                let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+
+                let addAni = cc.instantiate(this.ani_add3);
+                addAni.parent = this.ani_add3.parent;
+                addAni.getComponent(cc.Label).string = `百元红包:${com}/${count}`;
+                cc.tween(addAni).call(() => {
+                    addAni.opacity = 255;
+                }).by(0.8, { y: 100 }).to(0.4, { opacity: 0 }).call(() => {
+                    addAni.destroy();
+                }).start();
+            }
 
 
-        //     this.dpFlyRedAni();
-        // }
+            this.dpFlyRedAni();
+        }
     }
 
     public dpFlyRedAni(starPos: cc.Vec2 = null) {
@@ -613,7 +646,6 @@ export default class Game extends cc.Component {
     }
 
     public registerCallBack() {
-        console.log('cocos keyDown');
         JsbSystem.callBack = null;
         JsbSystem.callBack = () => {
 
@@ -735,7 +767,7 @@ export default class Game extends cc.Component {
         //1:有可领奖的,2:正在解锁,3:所有奖励都领取完
         this.uiShowType = 3;
         for (let key in ProductType) {
-            let max = gData.gameData.getMaxProduct(ProductType[key]);
+            let max = gData.gameData.getMaxProductExtra(ProductType[key]);
             if (max) {
                 let list_data = gData.gameData.getProductArrByType(ProductType[key]);
                 for (let i = 0; i != list_data.length; ++i) {
@@ -962,7 +994,7 @@ export default class Game extends cc.Component {
 
     private orderPicIdArray = [];
     private isGray = true;
-    public async initOrderUI() {
+    public async initOrderUI(init = true) {
         this.orderPicIdArray = [];
         this.isGray = true;
         let productJson = gData.gameData.configs.Product;
@@ -988,7 +1020,7 @@ export default class Game extends cc.Component {
                             namePath = 'game/coregame/texture/factory_icons/factoryNams/factory_name_icon_';
                         }
 
-                        if (dataE.completeCount == dataE.taskCount) {
+                        if (dataE.completeCount >= dataE.taskCount) {
                             this.lbl_progress[i].node.active = false;
                             this.sp_mark[i].node.active = true;
                             ++completeCount;
@@ -1003,7 +1035,6 @@ export default class Game extends cc.Component {
                         this.sp_cropIcon[i].spriteFrame = await mk.loader.load(plantPath + productData.picture, cc.SpriteFrame);
 
                     } else {
-                        console.log('订单数据错误');
                         return;
                     }
                 }
@@ -1020,12 +1051,7 @@ export default class Game extends cc.Component {
                     this.node_getOrderReward.getComponent(cc.Animation).stop();
                     this.node_orderHand.active = false;
                 }
-            } else {
-                console.log('订单数据错误');
             }
-
-        } else {
-            console.log('订单数据错误');
         }
     }
 
@@ -1035,7 +1061,8 @@ export default class Game extends cc.Component {
             mk.tip.pop("完成订单即可提现");
         } else {
             //smk.tip.pop("测试使用==订单领奖");
-            mk.data.sendDataEvent(DataEventId.button_click, "订单领奖按钮");
+            //mk.data.sendDataEvent(DataEventId.button_click, "订单领奖按钮");
+            mk.data.sendDataEvent(DataEventId.Sundry, "订单领奖按钮");
             this.getOrderReward();
         }
     }
@@ -1045,7 +1072,6 @@ export default class Game extends cc.Component {
     }
 
     public async getOrderReward() {
-
         if (cc.sys.isNative) {
             if (!gData.loginData.isAuth) {
                 // JsbSystem.WxAuth();
@@ -1057,8 +1083,11 @@ export default class Game extends cc.Component {
 
         let data = {};
         let response = await mk.http.sendData('orderTask/receiveRewardCash', data);
-        console.log(`getOrderReward=========${response}`);
         if (response.errcode != 0) {
+            if (response.errcode == 405) {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            }
             return null;
         }
         let addMoney = gData.gameData.playerProp.orderData.cashMoney;
@@ -1069,23 +1098,59 @@ export default class Game extends cc.Component {
         // 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.showTips;
+        gData.cashPro.callBack = this.getRewardCallBack.bind(this);
         gData.receiptNotice.receip_rmb = addMoney;
         mk.ui.openPanel('module/newNotice/newNotice');
-        this.initOrderUI();
+
+        this.node_crop.forEach((v) => {
+            v.active = false;
+        })
+        this.node_orderHbIcon.active = false;
+        this.node_getOrderReward.node.active = false;
+    }
+
+    //停止农民产红包币
+    isStopFarm = false;
+    public getRewardCallBack() {
+        this.node_extraOrderUi.active = true;
+        this.node_bgUi.scale = 0;
+        cc.tween(this.node_bgUi).to(0.4, { scale: 1.4 }).start();
+
+        if (gData.gameData.funOpenData[1] == '1') {
+            gData.gameData.funOpenData[1] = "0";
+            this.isStopFarm = true;
+        }
+    }
+
+    public showRefreshLogic() {
+        this.node_crop.forEach((v) => {
+            v.active = true;
+        })
+        this.node_orderHbIcon.active = true;
+        this.node_getOrderReward.node.active = true;
+
+        this.initOrderUI(false);
+        this.showTips();
         gData.gameData.init_order = true;
         gData.gameData.checkTaskFinishUnLock();
+        gData.gameData.richBankTeachTag = true;
+        gData.safeDepositBoxData.updateQipao();
+        gData.cashNormal.getRecord();
+
+        if (this.isStopFarm) {
+            this.isStopFarm = false;
+            gData.gameData.funOpenData[1] = '1';
+        }
     }
 
-    showTips()
-    {
+    showTips() {
         mk.tip.pop("提现成功，订单已刷新");
     }
 
-    async doCropFlyLogic(plantId: number, farmNode: cc.Node = null, parentNode: cc.Node = null,isNzw = false) {
-        if (gData.gameData.funOpenData[11] == "0") {
+    async doCropFlyLogic(plantId: number, farmNode: cc.Node = null, parentNode: cc.Node = null, isNzw = false) {
+        if (gData.gameData.funOpenData[11] == "0" || !gData.gameData.playerProp.orderData) {
             return;
         }
         for (let i = 0; i != this.orderPicIdArray.length; ++i) {
@@ -1158,13 +1223,12 @@ export default class Game extends cc.Component {
                     mk.tip.pop("订单已完成，快提现吧!");
                 }
             }
-            if(parentNode)
-            {
+            if (parentNode) {
                 let pos = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
                 mk.fly.PlayCoinAnim(1, 5, parentNode, pos, () => {
                     //this.refreshOrderUI(index);
                 }, 0.8);
-            }else{
+            } else {
                 let pos = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
                 mk.fly.PlayCoinAnim(1, 5, this.btn_product, pos, () => {
                     //this.refreshOrderUI(index);
@@ -1183,8 +1247,7 @@ export default class Game extends cc.Component {
         }
     }
 
-    public refreshOrderUI(index)
-    {
+    public refreshOrderUI(index) {
         let orderData = gData.gameData.playerProp.orderData;
         let dataE = orderData.orderTaskList[index];
         if (dataE) {
@@ -1201,6 +1264,7 @@ export default class Game extends cc.Component {
     }
 
     public async updataOrderProgress(id) {
+
         let data = { "id": id };
         let response = await mk.http.sendData('orderTask/updateUserOrderTaskInfo', data);
         if (response.errcode != 0) {
@@ -1230,13 +1294,12 @@ export default class Game extends cc.Component {
             //     mk.guide.curDes = `<color=8A4312><color=ff0000>继续生产${leftTimes}次</c>，很快就\n可以完成订单了！</color>`;
             // }
         } else {
-            if(this.isGray)
-            {
+            if (this.isGray) {
                 mk.tip.pop("完成订单即可提现");
-            }else{
+            } else {
                 mk.tip.pop("订单已完成，快提现吧");
             }
-            
+
         }
 
     }
@@ -1278,5 +1341,35 @@ export default class Game extends cc.Component {
             gData.farmSystem._lastSeletFarm.clickGuideBtn();
         }
     }
+
+    //富翁银行
+    /** 点击富翁银行 */
+    public async onClickSafeDepositBox() {
+        mk.audio.playEffect('button');
+        console.log(`currentRichBankCashTaskIndex 22======== ${gData.safeDepositBoxData.currentRichBankCashTaskIndex}`);
+        if (gData.safeDepositBoxData.currentRichBankCashTaskIndex) {
+            mk.ui.openPanel("module/safeDepositBox/SafeDepositBox");
+            mk.data.sendDataEvent(DataEventId.button_click, "富翁银行icon");
+        }
+    }
+
+    isAdd = true;
+    public setJGTags() {
+        //JsbSystem.addJGTags("富翁银行任务");
+        //let curDes = `<color=8A4312>再生产${23}次，就可以收获\n啦，完成订单立即<color=ff0000>提现</color>！</color>`;
+        //mk.guide.open(11, curDes);
+
+        if (this.isAdd) {
+            this.isAdd = false;
+            JsbSystem.addJGTags("开玩笑");
+        } else {
+            this.isAdd = true;
+            JsbSystem.deleteTags("开玩笑");
+        }
+    }
+
+    public getAllTags() {
+        JsbSystem.getAllTags();
+    }
 }
 

assets/script/game/game/HorseRace.ts

@@ -0,0 +1,207 @@
+import MathUtil from "../../mk/utils/MathUtil";
+import { ProductType } from "../data/GameData";
+
+const { ccclass, property } = cc._decorator;
+@ccclass
+export default class HorseRace extends cc.Component {
+
+    @property({ displayName: '图片节点1', type: cc.Sprite })
+    sp_icon_1: cc.Sprite = null;
+    @property({ displayName: '图片节点2', type: cc.Sprite })
+    sp_icon_2: cc.Sprite = null;
+    @property({ displayName: '延时(秒)' })
+    delayTime = 0;
+    @property({ displayName: '1与2的之间的距离' })
+    distance = 97;
+    @property({ displayName: '速率' })
+    curSpeed = 5;
+    @property({ displayName: '刷新次数' })
+    refreshTimes = 5;
+    @property({ displayName: '最快速度展示的次数' })
+    maxShowTimes = 10;
+    @property({ displayName: '数据索引' })
+    index = 0;
+
+    @property({ displayName: '飞行动画节点', type: cc.Node })
+    node_fly: cc.Node = null;
+    @property({ displayName: '飞行终点节点', type: cc.Node })
+    node_des: cc.Node = null;
+    @property({ displayName: 'hide节点', type: cc.Node })
+    node_hide: cc.Node = null;
+    @property({ displayName: '回调', type: cc.Component.EventHandler })
+    callBack: cc.Component.EventHandler = null;
+    
+    @property({ displayName: '文字节点', type: cc.Node })
+    node_describ: cc.Node = null;
+
+    private node_icon_1: cc.Node = null;
+    private node_icon_2: cc.Node = null;
+    private iconPath = "game/coregame/texture/plant_icons/plantIcon_";
+    private times = 0;
+    private arrData = null;
+    private realyPicture = 0;
+    private delay = 0
+    private isFinish = false;
+    private slowSpeedRefreshTimes = 0
+    private randArr = [];
+    private curRand = -1;
+    private speed = 0
+    start() {
+        this.node_icon_1 = this.sp_icon_1.node;
+        this.node_icon_2 = this.sp_icon_2.node;
+        this.node_icon_2.setPosition(new cc.Vec2(0, this.distance));
+        this.delayTime = Math.floor(this.delayTime * 60);
+        this.arrData = gData.gameData.getProductArrByType(ProductType.nzw);
+        this.delay = this.delayTime;
+        this.speed = this.curSpeed;
+        for (let i = 0; i != this.arrData.length; ++i) {
+            this.randArr.push(i);
+        }
+
+        mk.event.register("flyOrderAni", this.doFlyAni.bind(this), this);
+    }
+
+    onEnable() {
+        let orderData = gData.gameData.playerProp.orderData;
+        let productJson = gData.gameData.configs.Product;
+        let id = orderData.orderTaskList[this.index];
+        this.realyPicture = productJson[id.Id - 1].picture;
+    }
+
+    sss = 6;
+    isDoAct = false;
+    update(dt) {
+ 
+        if (this.delay <= 0 && !this.isFinish) {
+            //节点1
+            if(!this.isDoAct && this.node_describ)
+            {
+                this.isDoAct = true;
+                cc.tween(this.node_describ).to(0.3,{scale: 1.4}).to(0.3, {scale: 1}).start();
+            }
+            this.node_icon_1.setPosition(new cc.Vec2(0, this.node_icon_1.position.y - this.speed));
+            if (this.node_icon_1.position.y <= - this.distance) {
+                ++this.times;
+                if (this.times > this.maxShowTimes) {
+                    if (this.speed != 4) {
+                        // let s = ((this.refreshTimes - (this.times - this.maxShowTimes)) / this.refreshTimes);
+                        // if(s > 1){
+                        //     s = 1;
+                        // }
+                        // this.speed *= s;
+                        // this.speed = Math.ceil(this.speed);
+
+                        ++this.sss;
+                        let aa = 2 + this.sss * 0.4;
+                        this.speed -= aa;
+                        if (this.speed < 4) {
+                            this.speed = 4;
+                            ++this.slowSpeedRefreshTimes;
+                        }
+                    } else {
+                        ++this.slowSpeedRefreshTimes;
+                    }
+                }
+
+                this.node_icon_1.setPosition(new cc.Vec2(0, this.distance));
+                if (this.slowSpeedRefreshTimes >= 1) {
+                    this.refreshIcon(1, true);
+                } else {
+                    this.refreshIcon(1);
+                }
+
+            }
+
+            //节点2
+            this.node_icon_2.setPosition(new cc.Vec2(0, this.node_icon_2.position.y - this.speed));
+            if (this.node_icon_2.position.y <= - this.distance) {
+                this.node_icon_2.setPosition(new cc.Vec2(0, this.distance));
+
+                if (this.slowSpeedRefreshTimes >= 1) {
+                    this.isFinish = true;
+                    this.node_icon_1.setPosition(0, 0);
+                    gData.gameData.setOrderAniFinishNum();
+                } else {
+                    this.refreshIcon(2);
+                }
+            }
+        } else {
+            --this.delay;
+        }
+    }
+
+    tests = 0;
+    private async refreshIcon(index, isOver = false) {
+        if (isOver) {
+            this.sp_icon_1.spriteFrame = await mk.loader.load(this.iconPath + this.realyPicture, cc.SpriteFrame);
+            if (this.curRand != -1) {
+                this.randArr.push(this.curRand);
+            }
+        } else {
+            let rand = mk.math.random(0, this.randArr.length - 1);
+            this.randArr.splice(rand, 1);
+            let picId = this.arrData[rand].picture;
+            if (this.curRand != -1) {
+                this.randArr.push(this.curRand);
+            }
+            this.curRand = rand;
+            if (this.index == 0) {
+                ++this.tests;
+            }
+            if (index == 1) {
+                this.sp_icon_1.spriteFrame = await mk.loader.load(this.iconPath + picId, cc.SpriteFrame);
+            } else {
+                this.sp_icon_2.spriteFrame = await mk.loader.load(this.iconPath + picId, cc.SpriteFrame);
+            }
+        }
+    }
+
+    public doFlyAni() {
+        if (this.node_hide) {
+            cc.tween(this.node_hide).delay(0.3).call(()=>{
+                this.node_hide.active = false
+            }).start();   
+        }
+        let worldPos = this.sp_icon_1.node.parent.convertToWorldSpaceAR(cc.Vec2.ZERO);
+        let pos = this.node_fly.convertToNodeSpaceAR(worldPos);
+
+        let worldPos2 = this.node_des.parent.convertToWorldSpaceAR(this.node_des.getPosition())
+        let pos2 = this.node_fly.convertToNodeSpaceAR(worldPos2);
+
+        for (let i = 0; i != 4; ++i) {
+            let node = cc.instantiate(this.sp_icon_1.node);
+            node.setScale(0.32);
+            node.parent = this.node_fly;
+            node.angle = mk.math.random(-45, 45, false);
+            let dir = cc.v2(mk.math.random(-1, 1, false), mk.math.random(-1, 1, false));
+            dir = dir.normalize();
+            let deltaInit = cc.v2(mk.math.random(10, 100, false) * dir.x, mk.math.random(10, 100, false) * dir.y);
+            node.setPosition(pos);
+            let mPos = pos.add(deltaInit);
+            cc.tween(node).to(0.2, {position: cc.v3(mPos)}).call(()=>{
+                this.moveFly(node, i, pos2);
+            }).start();
+            
+        }
+    }
+
+    moveFly(node: cc.Node, i, desPos)
+    {
+        cc.tween(node).to(0.6 + i * 0.1, { position: cc.v3(desPos) }).removeSelf().call(() => {
+            if (i == 0) {
+                this.callBack && this.callBack.emit(null);
+            }
+        }).start();
+    }
+
+    onDisable() {
+        this.delay = this.delayTime;
+        this.isFinish = false;
+        this.slowSpeedRefreshTimes = 0;
+        this.curRand = -1
+        this.times = 0;
+        this.speed = this.curSpeed;
+        this.sss = 6;
+        this.isDoAct = false;
+    }
+}

assets/script/before/main/FactoryCountDown.ts.meta → assets/script/game/game/HorseRace.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "d6a932d2-9ce3-4e9e-a4a5-b17badb23743",
+  "uuid": "ac69e0aa-ef1a-44b6-9604-d9f84c7cf395",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

assets/script/game/game/RedPointControl.ts

@@ -38,7 +38,7 @@ export class RedPointControl extends cc.Component {
     private changeStatus()
     {
         for (let key in ProductType) {
-            let max = gData.gameData.getMaxProduct(ProductType[key]);
+            let max = gData.gameData.getMaxProductExtra(ProductType[key]);
             if (max) {
                 let list_data = gData.gameData.getProductArrByType(ProductType[key]);        
                 for (let i = 0; i != list_data.length; ++i) {

assets/script/game/game/TouchListener.ts

@@ -13,8 +13,6 @@ const { ccclass, property } = cc._decorator;
     start(){
         this.node.on(cc.Node.EventType.TOUCH_START, this.onTouchStart, this);
         this.node['_touchListener'].swallowTouches  = false;
-
-        //cc.systemEvent.on(cc.SystemEvent.EventType.KEY_DOWN, this.onKeyDown, this);
     }
 
     private onTouchStart(e) 
@@ -24,13 +22,9 @@ const { ccclass, property } = cc._decorator;
             gData.gameData.isTouchScreen = true;
         }  
         
-        //mk.ui.openPanel('module/safeDepositBox/SafeDepositBox');
+        //mk.ui.openPanel('module/newNotice/richBankWarmPrompt');
     }
 
-    onKeyDown(event)
-    {
-        console.log('cocos onKeyDown',event);
-    }
  }
 
 export function Eve(Eve: any) {

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

@@ -6,7 +6,7 @@
 import JsbSystem from "../../../mk/system/JsbSystem";
 import SetGray from "../../component/SetGray";
 import TableView from "../../component/TableView";
-import { VideoAdType } from "../../data/GameData";
+import { DataEventId, VideoAdType } from "../../data/GameData";
 
 
 const { ccclass, property } = cc._decorator;
@@ -176,7 +176,6 @@ export default class BlessingBag extends cc.Component {
         this.delta = (this.targetProgress - this.lastNum) / time;
         this.curValue = this.lastNum;
         this.curTime = 0;
-        console.log("--->Update Time: " + time + " delta: " + this.delta + " curValue: " + this.curValue + " lastNum: " + this.lastNum);
         this.isPlayAni = true;
     }
 
@@ -190,7 +189,6 @@ export default class BlessingBag extends cc.Component {
                     this.curValue = this.targetProgress;
                     this.lastNum = this.targetProgress;
                 }
-                console.log("-->CurValue:" + this.curValue);
             } else {
                 this.isPlayAni = false;
                 this.curTime = this.totalTime;
@@ -227,8 +225,6 @@ export default class BlessingBag extends cc.Component {
             mk.tip.pop('今日观看次数已用完');
             }
         }
-
-        console.log("--->You Click AdProgressBtn  ", gData.blessingBag.videoRbData);
     }
 
     /**
@@ -263,7 +259,6 @@ export default class BlessingBag extends cc.Component {
     }
 
     async Click_CashBtn() {
-        console.log("--->You Click CashBtn");
         mk.audio.playEffect("button");
 
         if (gData.blessingBag.videoRbData.cumulativeAmount >= gData.blessingBag.videoRbData.requestAmount) {
@@ -296,6 +291,10 @@ export default class BlessingBag extends cc.Component {
     }
 
     onDisable() {
-        gData.adData.checkShowFullInter(4);
+        let pop = gData.adData.checkShowFullInter(4);
+        if(pop){
+            gData.moreGame.openType = 2;
+            mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭福利界面");
+        }
     }
 }

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

@@ -169,19 +169,16 @@ export default class BlessingBagItem extends cc.Component {
 
     Click_CashedBtn() {
         mk.audio.playEffect("button");
-        console.log("clicked cashed");
         mk.tip.pop('该红包已提现');
     }
 
     Click_CanCashBtn() {
         mk.audio.playEffect("button");
-        console.log("clicked canCash");
         gData.blessingBag.OpenTaskRbPanel(this.data.Id, this.data.redMoney);
     }
 
     Click_NoFinishBtn() {
         mk.audio.playEffect("button");
-        console.log("clicked noFinish");
         mk.tip.pop('提现进度不足');
     }
 }

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

@@ -58,7 +58,7 @@ export default class FarmMap extends cc.Component {
     private refreshBtnState() {
         let index = 0;
         for (let key in ProductType) {
-            let max = gData.gameData.getMaxProduct(ProductType[key]);
+            let max = gData.gameData.getMaxProductExtra(ProductType[key]);
             if (max) {
                 this.itemName[index].toggle.interactable = true;
                 let list_data = gData.gameData.getProductArrByType(ProductType[key]);

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

@@ -44,8 +44,12 @@ export default class ItemName extends cc.Component{
         let data = gData.gameData.getProductArrByType(this.pt);
         if(data && data.length> 0 && data[0].unlock == 2)
         {
-            let times = data[0].value - gData.gameData.playerProp.orderData.overTimes;
-            mk.tip.pop(`订单提现${times}次后解锁`);
+            if(gData.gameData.playerProp.orderData){
+                let times = data[0].value - gData.gameData.playerProp.orderData.overTimes;
+                mk.tip.pop(`订单提现${times}次后解锁`);
+            }else{
+                mk.tip.pop(`提现订单后解锁`);
+            }
         }
     }
 }

assets/script/game/module/gradeReward/GradeReward.ts

@@ -1,6 +1,6 @@
 import JsbSystem from "../../../mk/system/JsbSystem";
 import { UITween } from "../../component/tween/UITween";
-import { ExpAddType, VideoAdType } from "../../data/GameData";
+import { DataEventId, ExpAddType, VideoAdType } from "../../data/GameData";
 import { GradeRewardItem } from "./GradeRewardItem";
 
 
@@ -190,6 +190,10 @@ export class GradeReward extends cc.Component {
     }
 
     onDisable() {
-        gData.adData.checkShowFullInter(4);
+        let pop = gData.adData.checkShowFullInter(4);
+        if(pop){
+            gData.moreGame.openType = 3;
+            mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭农场等级奖励界面");
+        }
     }
 }

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

@@ -47,6 +47,10 @@ export default class Login extends cc.Component {
 
     private initShuzilm = false;
 
+    //debug使用
+    private initOrderInfo = false;
+
+
     onLoad() {
         this.lbl_progress.node.active = false;
         this.node_load.active = true;
@@ -172,17 +176,21 @@ export default class Login extends cc.Component {
                         if (!gData.loginData.passAnti) {
                             return
                         }
+                    } else {
+                        if (!this.initOrderInfo) {
+                            this.initOrderInfo = true;
+                            gData.adData.getOrderTaskInfo(1);
+                        }
                     }
 
                     if (this.isLoadComplete) {
-                        if(this.addTime >= 120)
-                        {
+                        if (this.addTime >= 120) {
                             this.addToScene();
                             this.isLoadComplete = false;
-                        }else{
+                        } else {
                             return;
-                        }          
-                    }else{
+                        }
+                    } else {
                         return;
                     }
 

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

@@ -32,7 +32,6 @@ export default class NewCashUI extends cc.Component {
 
         this.coolTime = true;
 
-        console.log('clickTeach')
         this.videoNode = cc.instantiate(this.videoPre)
         this.videoNode.getChildByName('video').on("completed", this.onCompleted, this)
         this.node.addChild(this.videoNode)

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

@@ -1,7 +1,7 @@
 import SetGray from "../../component/SetGray";
 import TweenCast from "../../component/tween/TweenCast";
 import { AdFun } from "../../data/AdData";
-import { GameProp, VideoAdType } from "../../data/GameData";
+import { DataEventId, GameProp, VideoAdType } from "../../data/GameData";
 import CheckButton from "./CheckButton";
 
 
@@ -232,7 +232,6 @@ export default class WalletCashOut extends cc.Component {
 
     private clickCashOutBtn() {
         mk.audio.playEffect("button");
-        console.log('=========>', this.isCanCash);
         if (this.isCanCash) {
 
             if (this.checkShowTip()) {
@@ -322,6 +321,10 @@ export default class WalletCashOut extends cc.Component {
     }
 
     onDisable() {
-        gData.adData.checkShowFullInter(4);
+        let pop = gData.adData.checkShowFullInter(4);
+        if(pop){
+            gData.moreGame.openType = 1;
+            mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭提现界面");
+        }
     }
 }

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

@@ -35,7 +35,6 @@ export default class LineUpUI extends cc.Component {
 
     update(dt) {
         if (gData.lineUpUIData.refresh) {
-            console.log('lineUp=====>', gData.lineUpUIData.personCount);
             gData.lineUpUIData.refresh = false;
             this.lbl_tip.string = `<color=#8A4312>提现排队中，你前面还有</c><color=#EF2417>${gData.lineUpUIData.personCount}</color><color=#8A4312>人</color>`;
             cc.tween(this.lbl_tip.node).to(0.3, { scale: 1.4 }).to(0.2, { scale: 1 }).call(() => {

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

@@ -1,3 +1,5 @@
+import { GameProp } from "../../data/GameData";
+
 const { ccclass, property } = cc._decorator;
 @ccclass
 export default class NewNotice extends cc.Component {
@@ -14,6 +16,23 @@ export default class NewNotice extends cc.Component {
 
     start() {
         //mk.audio.playEffect("receiptNotice");
+
+        let times = gData.gameData.getProp(GameProp.cashTimes);
+        if (!times) {
+            times = 0;
+        }
+        gData.gameData.setProp(GameProp.cashTimes, ++times);
+
+        times = gData.gameData.getProp(GameProp.cashTimes);
+        console.log(`cashTimes2222======${times}`);
+        if(gData.gameData.showRichBankIconLimit == times && gData.gameData.funOpenData[13] == "1"){
+            mk.event.emit("showRichBankIcon");   
+        }
+    }
+
+    onEnable()
+    {
+        mk.ad.showNative();
     }
 
     update(dt) {
@@ -24,7 +43,6 @@ export default class NewNotice extends cc.Component {
     }
 
     private initUI() {
-        console.log("newNotices=>" + gData.receiptNotice.receip_rmb);
         this.lbl_reward_value.string = (gData.receiptNotice.receip_rmb / 100).toFixed(2);
         this.lbl_time.string = mk.time.getNowDayStringExtend();
     }
@@ -33,5 +51,7 @@ export default class NewNotice extends cc.Component {
         mk.audio.playEffect('button');
         gData.cashPro.openCashPro(gData.receiptNotice.receip_rmb);
         gData.cashPro.init_success = true;
+
+        mk.ad.destroyNativeAd();
     }
 }

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

@@ -0,0 +1,17 @@
+import JsbSystem from "../../../mk/system/JsbSystem";
+
+const {ccclass, property, menu} = cc._decorator;
+
+@ccclass
+@menu("Notice/PermissionWarmPrompt")
+export default class PermissionWarmPrompt extends cc.Component {
+
+
+    start () {
+
+    }
+
+    clickSureBtn(){
+        JsbSystem.goToSet();
+    }
+}

assets/script/game/module/newNotice/PermissionWarmPrompt.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "86a88162-aaff-4de2-b035-f9a16dd519fb",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

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

@@ -0,0 +1,17 @@
+import StringUtil from "../../../mk/utils/StringUtil";
+
+const {ccclass, property, menu} = cc._decorator;
+
+@ccclass
+@menu("Notice/richBankWarmPrompt")
+export default class richBankWarmPrompt extends cc.Component {
+
+    @property(cc.Label)
+    lbl_tip: cc.Label = null;
+
+    private days = 1;
+
+    start () {
+        this.lbl_tip.string = StringUtil.format(this.lbl_tip.string, gData.gameData.richBankAddLoginDays.toString());
+    }
+}

assets/script/game/module/newNotice/richBankWarmPrompt.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "d6dafd9d-d249-4810-9fca-4a2acb96e111",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

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

@@ -171,6 +171,21 @@ export default class NewOpenRedBag extends cc.Component {
         mk.ui.closePanel(this.name);
         if (this.sp_icon.node.active) {
             this.creatorDownLoadTask();
+            switch (gData.moreGame.openType) {
+                case 0:
+                    mk.data.sendDataEvent(DataEventId.htRedBag_eject, "点击可收获-领取");
+                    break;
+                case 1:
+                    mk.data.sendDataEvent(DataEventId.htRedBag_eject, "关闭提现界面-领取");
+                    break;
+                case 2:
+                    mk.data.sendDataEvent(DataEventId.htRedBag_eject, "关闭福利界面-领取");
+                    break;
+                case 3:
+                    mk.data.sendDataEvent(DataEventId.htRedBag_eject, "关闭农场等级奖励界面-领取");
+                    break;
+            }
+            gData.moreGame.openType = -1;
         }
         else {
             mk.ad.watchAd(async (success: boolean) => {

assets/script/game/module/redBagCode/RedBagCode.ts

@@ -55,7 +55,6 @@ export default class RedBagCode extends cc.Component {
         this.coolTime = true
 
         gData.redCodeData.teachVideoType = 1;
-        console.log('clickTeach')
         this.videoNode = cc.instantiate(this.videoPre)
         this.videoNode.getChildByName('video').on("completed", this.onCompleted, this)
         this.node.addChild(this.videoNode)

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

@@ -285,6 +285,11 @@ export default class RedBagTask extends cc.Component {
         mk.console.logSingle('redBagTask=>', response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
+            if(response.errcode == 405)
+            {
+                mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            }
             return;
         }
         mk.console.logSingle('redBagTaskhttpCashOut=>', response.data.userFarmTaskInfo);
@@ -320,6 +325,8 @@ export default class RedBagTask extends cc.Component {
         gData.gameData.doPointToXYLogic();
         gData.gameData.addCashOutTimes();
         gData.adData.checkPopCashFull();
+        gData.safeDepositBoxData.updateQipao();
+        gData.cashNormal.getRecord();
     }
 
     /**

assets/script/game/module/redCode/RedCode.ts

@@ -75,7 +75,6 @@ export default class RedCode extends cc.Component {
         this.coolTime = true
 
         gData.redCodeData.teachVideoType = 1;
-        console.log('clickTeach')
         this.videoNode = cc.instantiate(this.videoPre)
         this.videoNode.getChildByName('video').on("completed", this.onCompleted, this)
         this.node.addChild(this.videoNode)

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

@@ -30,7 +30,7 @@ export default class BankQipaoTip extends cc.Component {
 
     init(data = null) {
         this.node.opacity = 0;
-        if (gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0) {
+        if (gData.safeDepositBoxData.isStartBankTask > 0) {
             this.node.opacity = 255;
             this.node_tixian.active = true;
             this.node_cunru.active = false;

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

@@ -1,3 +1,6 @@
+import JsbSystem from "../../../mk/system/JsbSystem";
+import { DataEventId } from "../../data/GameData";
+import { StorageKey } from "../../data/StorageData";
 import MoneySaveItem from "./MoneySaveItem";
 
 const { ccclass, property } = cc._decorator;
@@ -152,32 +155,33 @@ export default class SafeDepositBox extends cc.Component {
 
     async start() {
         if (!this.test) {
-            let response = await mk.http.sendData('richbank/getCashRecord', {});
+            //let response = await mk.http.sendData('richbank/getCashRecord', {});
+            let response = await mk.http.sendData('newrichbank/getCashRecord', {});
             mk.console.logSingle('getCashRecord  ', response);
             if (response && response.errcode == 0) {
                 this.updateScrollView(response.data);
             }
 
-            if (gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0) {
-                let response = await mk.http.sendData('richbank/getRichBankInfo', {});
-                mk.console.logSingle('getRichBankInfo  ', response);
-                if (response && response.errcode == 0) {
-                    if (response.data.richBankDailyVideoTimes >= 0) {
-                        gData.safeDepositBoxData.richBankDailyVideoTimes = response.data.richBankDailyVideoTimes;
-                    }
-
-                    if (response.data.richbankLoginDays >= 0) {
-                        gData.safeDepositBoxData.richbankLoginDays = response.data.richbankLoginDays;
-                        if (gData.safeDepositBoxData.richbankLoginDays == 0) {
-                            gData.safeDepositBoxData.richbankLoginDays = 1;
-                        }
-                    }
-
-                    gData.safeDepositBoxData.richBankDailyTotelVideoTimes = response.data.richBankDailyTotelVideoTimes;
-
-                    this.setTaskProgress();
-                }
-            }
+            // if (gData.safeDepositBoxData.isStartBankTask > 0) {
+            //     let response = await mk.http.sendData('richbank/getRichBankInfo', {});
+            //     mk.console.logSingle('getRichBankInfo  ', response);
+            //     if (response && response.errcode == 0) {
+            //         if (response.data.richBankDailyVideoTimes >= 0) {
+            //             gData.safeDepositBoxData.richBankDailyVideoTimes = response.data.richBankDailyVideoTimes;
+            //         }
+
+            //         if (response.data.richbankLoginDays >= 0) {
+            //             gData.safeDepositBoxData.richbankLoginDays = response.data.richbankLoginDays;
+            //             if (gData.safeDepositBoxData.richbankLoginDays == 0) {
+            //                 gData.safeDepositBoxData.richbankLoginDays = 1;
+            //             }
+            //         }
+
+            //         gData.safeDepositBoxData.richBankDailyTotelVideoTimes = response.data.richBankDailyTotelVideoTimes;
+            //     }
+
+            //     this.setTaskProgress();
+            // }
         }
 
         this.initView()
@@ -192,11 +196,12 @@ export default class SafeDepositBox extends cc.Component {
         if (money == null || undefined) {
             money = 0
         }
-        this.startTixian = gData.safeDepositBoxData.currentRichBankCashTaskIndex
+        //this.startTixian = gData.safeDepositBoxData.currentRichBankCashTaskIndex
+        this.startTixian = gData.safeDepositBoxData.isStartBankTask
         if (this.startTixian > 0) {
             this.weitixianNode.active = false
             this.tixianzhongNode.active = true
-            let config = gData.safeDepositBoxData.getBankTaskIndex()
+            let config = gData.safeDepositBoxData.getBankTaskIndexExtra();
             this.tixianzhongMoneyLabel.string = (config.money * 0.01).toFixed(2) + "元"
             this.readyTixianLabel.node.active = false
             this.tixianzhongNode.getChildByName("tixianLabel").active = true
@@ -209,8 +214,8 @@ export default class SafeDepositBox extends cc.Component {
             if (showStep) {
                 this.showInfoByStep()
             }
-            this.noPacketTip.getChildByName("taskLabel").active = gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0
-            this.noPacketTip.getChildByName("noTaskLabel").active = !(gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0)
+            this.noPacketTip.getChildByName("taskLabel").active = gData.safeDepositBoxData.isStartBankTask > 0
+            this.noPacketTip.getChildByName("noTaskLabel").active = !(gData.safeDepositBoxData.isStartBankTask > 0)
         } else {
             this.tixianzhongNode.active = false
             this.weitixianNode.active = true
@@ -244,7 +249,7 @@ export default class SafeDepositBox extends cc.Component {
         this.noPacketTip.position = cc.v3(324, -10)
 
         let count = 0
-        let startTixian = gData.safeDepositBoxData.currentRichBankCashTaskIndex;
+        let startTixian = gData.safeDepositBoxData.isStartBankTask;
         let showFinger: boolean = startTixian > 0
         this.itemP = await mk.loader.load('module/safeDepositBox/prefabs/MoneySaveItem', cc.Prefab);
         for (let entry of data) {
@@ -269,7 +274,7 @@ export default class SafeDepositBox extends cc.Component {
     //将提现金额放入保险箱
     async clickItemEvent(data, node) {
         mk.audio.playEffect('button');
-        if (gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0) {
+        if (gData.safeDepositBoxData.isStartBankTask > 0) {
             mk.tip.pop("提现后可存入")
             return
         }
@@ -278,7 +283,8 @@ export default class SafeDepositBox extends cc.Component {
             gData.safeDepositBoxData.richBankCashAmount = gData.safeDepositBoxData.richBankCashAmount + data.amount;
             this.saveMoneySuccess(gData.safeDepositBoxData.richBankCashAmount);
         } else {
-            let response = await mk.http.sendData('richbank/updateCashRecord', { "partnerTradeNo": data.partnerTradeNo })
+            //let response = await mk.http.sendData('richbank/updateCashRecord', { "partnerTradeNo": data.partnerTradeNo })
+            let response = await mk.http.sendData('newrichbank/updateCashRecord', { "partnerTradeNo": data.partnerTradeNo })
             if (response && response.errcode == 0) {
                 gData.safeDepositBoxData.richBankCashAmount = response.data.RichBankCashAmount;
                 this.saveMoneySuccess(gData.safeDepositBoxData.richBankCashAmount);
@@ -314,7 +320,8 @@ export default class SafeDepositBox extends cc.Component {
             if (this.test) {
                 this.updateScrollView(this.packet)
             } else {
-                let response = await mk.http.sendData('richbank/getCashRecord', {});
+                //let response = await mk.http.sendData('richbank/getCashRecord', {});
+                let response = await mk.http.sendData('newrichbank/getCashRecord', {});
                 if (response && response.errcode == 0) {
                     this.updateScrollView(response.data);
                 }
@@ -327,11 +334,11 @@ export default class SafeDepositBox extends cc.Component {
         mk.audio.playEffect('button');
 
         let minConfig = null;
-        if (gData.safeDepositBoxData.currentRichBankCashTaskIndex == 0) {
-            minConfig = gData.safeDepositBoxData.getBankTaskIndex(true);
+        if (gData.safeDepositBoxData.isStartBankTask == 0) {
+            minConfig = gData.safeDepositBoxData.getBankTaskIndexExtra();
         }
         else {
-            minConfig = gData.safeDepositBoxData.getBankTaskIndex();
+            minConfig = gData.safeDepositBoxData.getBankTaskIndexExtra();
         }
 
         let richBankCashAmount = gData.safeDepositBoxData.richBankCashAmount
@@ -345,7 +352,7 @@ export default class SafeDepositBox extends cc.Component {
             return
         }
 
-        let totaldays = minConfig.loginTimes
+        let totaldays = gData.safeDepositBoxData.richBankTotelLoginDays
         // let totalVideoTimes = minConfig.videotimes
         this.tipLogin.string = "1、连续登陆" + totaldays + "天"
         this.tipPlayVideo.string = "2、每天观看指定数量的视频"
@@ -367,34 +374,42 @@ export default class SafeDepositBox extends cc.Component {
     //点开始任务
     async confirmStartTixian() {
         mk.audio.playEffect('button');
-        let config = gData.safeDepositBoxData.getBankTaskIndex(true);
-        if (!config) {
-            mk.console.logSingle("SafeDepositBox", "can not confirmStartTixian")
-            return
-        }
+        // let config = gData.safeDepositBoxData.getBankTaskIndex(true);
+        // if (!config) {
+        //     mk.console.logSingle("SafeDepositBox", "can not confirmStartTixian")
+        //     return
+        // }
         this.confirmTixianNode.active = false
         this.boxNode.stopAllActions()
         this.boxNode.x = 161
         this.boxNode.y = 0
         this.content.active = true
         if (this.test) {
+            gData.safeDepositBoxData.isStartBankTask = 1;
             this.updateBankTask(1);
         } else {
-            let response = await mk.http.sendData('richbank/openCashTask', { "index": config.index });
+            //let response = await mk.http.sendData('richbank/openCashTask', { "index": config.index });
+            //let response = await mk.http.sendData('richbank/openCashTask', {});
+            let response = await mk.http.sendData('newrichbank/openCashTask', {});
             mk.console.logSingle('openCashTask  ', response);
             if (response && response.errcode == 0) {
                 gData.safeDepositBoxData.richBankDailyTotelVideoTimes = response.data.richBankDailyTotelVideoTimes;
-                this.updateBankTask(config.index);
+                gData.safeDepositBoxData.isStartBankTask = response.data.isStartRichBankTask;
+                gData.safeDepositBoxData.richBankTotelLoginDays = response.data.richBankTotelLoginDays;
+                console.log(`openCashTask=====${response.data.richBankDailyTotelVideoTimes}=======${response.data.isStartBankTask}`);
+                console.log(`openCashTask=====${gData.safeDepositBoxData.richBankTotelLoginDays}`);
+                this.updateBankTask(1);
             }
         }
     }
 
     updateBankTask(index) {
-        gData.safeDepositBoxData.currentRichBankCashTaskIndex = index;
-        gData.safeDepositBoxData.addRichBankFinishIndex = gData.safeDepositBoxData.currentRichBankCashTaskIndex;
+        // gData.safeDepositBoxData.currentRichBankCashTaskIndex = index;
+        // gData.safeDepositBoxData.addRichBankFinishIndex = gData.safeDepositBoxData.currentRichBankCashTaskIndex;
         gData.safeDepositBoxData.richbankLoginDays = 1
-        gData.safeDepositBoxData.richBankDailyVideoTimes = 0
+        // gData.safeDepositBoxData.richBankDailyVideoTimes = 0
         mk.storage.setStorage("bankTaskStartTime", Date.now())
+        mk.storage.setStorage(StorageKey.richBankAddLoginDays, gData.safeDepositBoxData.richBankTotelLoginDays);
         this.initView(true)
         mk.data.sendDataEvent("Bank", "开始任务")
 
@@ -455,11 +470,11 @@ export default class SafeDepositBox extends cc.Component {
         console.log("checkCurrentCanStartTask money:" + money)
 
         let minConfig = null;
-        if (gData.safeDepositBoxData.currentRichBankCashTaskIndex == 0) {
-            minConfig = gData.safeDepositBoxData.getBankTaskIndex(true);
+        if (gData.safeDepositBoxData.isStartBankTask == 0) {
+            minConfig = gData.safeDepositBoxData.getBankTaskIndexExtra();
         }
         else {
-            minConfig = gData.safeDepositBoxData.getBankTaskIndex();
+            minConfig = gData.safeDepositBoxData.getBankTaskIndexExtra();
         }
 
         console.log("checkCurrentCanStartTask minConfig.index:" + minConfig.index)
@@ -478,8 +493,8 @@ export default class SafeDepositBox extends cc.Component {
             this.readyTixianBtn.interactable = true
             outLine.color = cc.color(181, 140, 59)
             showMoney = Math.floor(minConfig.money / 100) > 0 ? (minConfig.money / 100) + "" : (minConfig.money / 100).toFixed(2)
-
-            mk.guide.open(5);
+            console.log("=================checkCurrentCanStartTask");
+            //mk.guide.open(13);
         } else {
             console.log("checkCurrentCanStartTask minConfig.index: money < minMoney")
             this.readyTixianBtn.node.getComponent(cc.Sprite).spriteFrame = this.spriteFrameList[1]
@@ -490,32 +505,33 @@ export default class SafeDepositBox extends cc.Component {
 
     async clickLingqu() {
         mk.audio.playEffect('button');
-        let config = gData.safeDepositBoxData.getBankTaskIndex()
+        let config = gData.safeDepositBoxData.getBankTaskIndexExtra();
         this.labMoeny.string = "¥" + (config.money * 0.01).toFixed(2)
         if (this.test) {
             this.updateBankCash(null)
         } else {
             this.loadPart.active = true
             this.spot1.play('load', 0);
-            let response = await mk.http.sendData('richbank/richbankcash', {
-                "index": config.index,
-                'appVersion': gData.appData.appVersion
-            });
-
+            //let response = await mk.http.sendData('richbank/richbankcash', {});
+            let response = await mk.http.sendData('newrichbank/richbankcash', {});
             if (response) {
                 if (response.errcode == 0) {
                     this.updateBankCash(response.data);
                 }
                 else {
                     this.loadPart.active = false;
-                    if (response.data.count) {
-                        gData.lineUpUIData.popType = 1;
-                        gData.lineUpUIData.personCount = response.data.count;
-                        mk.ui.openPanel("module/newNotice/lineUpUI");
-                    }
-                    else {
-                        mk.tip.pop('提现排队中，多看视频优先提现');
+                    if (response.errcode == 405) {
+                        mk.tip.pop("今日提现额度已到上限，请明天再提现");
+                        mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
                     }
+                    // if (response.data.count) {
+                    //     gData.lineUpUIData.popType = 1;
+                    //     gData.lineUpUIData.personCount = response.data.count;
+                    //     mk.ui.openPanel("module/newNotice/lineUpUI");
+                    // }
+                    // else {
+                    //     mk.tip.pop('提现排队中，多看视频优先提现');
+                    // }
                 }
             }
         }
@@ -533,35 +549,47 @@ export default class SafeDepositBox extends cc.Component {
             }
         }
 
-        gData.safeDepositBoxData.currentRichBankCashTaskIndex = 0
+        let config = gData.safeDepositBoxData.getBankTaskIndexExtra();
+
+        gData.safeDepositBoxData.currentRichBankCashTaskIndex = data.currentRichBankCashTaskIndex;
+        console.log(`currentRichBankCashTaskIndex 222======== ${data.currentRichBankCashTaskIndex}`);
         gData.safeDepositBoxData.richbankLoginDays = 1
         gData.safeDepositBoxData.richBankDailyVideoTimes = 0
+        gData.safeDepositBoxData.isStartBankTask = 0;
         //计算提现后，银行内剩余的
-        let currentConfig = gData.safeDepositBoxData.getBankTaskIndex()
-        gData.safeDepositBoxData.richBankCashAmount = gData.safeDepositBoxData.richBankCashAmount - currentConfig.money
+        //let currentConfig = gData.safeDepositBoxData.getBankTaskIndexExtra(true);
+        gData.safeDepositBoxData.richBankCashAmount = gData.safeDepositBoxData.richBankCashAmount - config.money
         if (gData.safeDepositBoxData.richBankCashAmount < 0) {
             gData.safeDepositBoxData.richBankCashAmount = 0
         }
 
         mk.data.sendDataEvent("Bank", "银行-任务全部完成")
         this.tixianSuccess(true);
+        gData.receiptNotice.receip_rmb = config.money;
+        mk.ui.openPanel('module/newNotice/newNotice');
+
+        cc.sys.localStorage.removeItem(StorageKey.richBankAddLoginDays);
 
         gData.safeDepositBoxData.updateQipao();
+        gData.cashNormal.getRecord();
         //累计成功提现次数
         mk.data.setTAEventUser(1, 'cash_time', 1);
         //累计提现金额
         mk.data.setTAEventUser(1, 'cash_total', cashMoney);
 
+        mk.data.sendDataEvent(DataEventId.Sundry, "富翁银行提现");
         // if (data.CashMode == 2) {
         //     gData.redCodeData.openRedCode(cashMoney, data.withdrawalCode);
         //     mk.data.sendDataEvent('Bank', '公众号提现-富翁银行')
         // }
+
+        JsbSystem.deleteTags("富翁银行完成当天的任务");
     }
 
     tixianSuccess(showPro) {
         this.loadPart.active = false
         if (showPro) {
-            this.cashPro.active = true
+            //this.cashPro.active = true
             gData.adData.checkShowFullInter(1);
         }
 
@@ -570,32 +598,32 @@ export default class SafeDepositBox extends cc.Component {
 
     tixianFail() {
         this.loadPart.active = false
-        mk.ui.hideUI(this.cashPro);
+        //mk.ui.hideUI(this.cashPro);
     }
 
     hideTixianNode() {
         mk.audio.playEffect('button');
-        mk.ui.hideUI(this.cashPro);
+        //mk.ui.hideUI(this.cashPro);
     }
 
     closeTixianNode() {
         mk.audio.playEffect('button');
-        mk.ui.hideUI(this.cashPro);
+        //mk.ui.hideUI(this.cashPro);
     }
 
     setTaskProgress() {
         let richBankDailyVideoTimes = gData.safeDepositBoxData.richBankDailyVideoTimes
         let richbankLoginDays = gData.safeDepositBoxData.richbankLoginDays
 
-        let currentConfig = gData.safeDepositBoxData.getBankTaskIndex()
-        if (currentConfig == null || currentConfig == undefined) {
-            return
-        }
+        // let currentConfig = gData.safeDepositBoxData.getBankTaskIndexExtra();
+        // if (currentConfig == null || currentConfig == undefined) {
+        //     return
+        // }
 
-        let totaldays = currentConfig.loginTimes
+        let totaldays = gData.safeDepositBoxData.richBankTotelLoginDays;//currentConfig.loginTimes
         let progress = "(" + richbankLoginDays + "/" + totaldays + ")"
         this.labDes.string = `连续完成${totaldays}日的每日任务即可提现\n任意一日未完成将重置提现进度`;
-        this.loginProgress.string = "<color=#a87921>1.登陆游戏</>"
+        this.loginProgress.string = "<color=#a87921>1.连续登陆" + progress + "</>";
         if (richbankLoginDays < totaldays) {
             this.logDaysNode.getChildByName("labelNode").active = true
             this.logDaysNode.getChildByName("gou").active = false
@@ -643,7 +671,7 @@ export default class SafeDepositBox extends cc.Component {
             let lastDateStr = mk.storage.getStorage("showBankTaskSuccess")
             if (lastDateStr != null && lastDateStr != undefined) {
                 let lastDate = new Number(lastDateStr).valueOf()
-                if (!this.checkSameDay(lastDate)) {
+                if (!gData.safeDepositBoxData.checkSameDay(lastDate)) {
                     this.scheduleOnce(() => {
                         this.showCompleteNode()
                     }, 0.3)
@@ -656,18 +684,31 @@ export default class SafeDepositBox extends cc.Component {
             }
         }
         //提示任务中断
-        if (richbankLoginDays <= 1) {
+        if (richbankLoginDays <= 1 && richBankDailyVideoTimes == 0) {
             //任务中断的情况
             let showBankTaskRestart = mk.storage.getStorage("showBankTaskRestart")
-            let same = this.checkSameDay(new Number(showBankTaskRestart).valueOf())
-
+            console.log(`1=======${showBankTaskRestart}`);
+            let same = gData.safeDepositBoxData.checkSameDay(new Number(showBankTaskRestart).valueOf())
+            console.log(`2=======${same}`);
             let bankTaskStartTime = mk.storage.getStorage("bankTaskStartTime")
-            let startTimeSame = this.checkSameDay(new Number(bankTaskStartTime).valueOf())
+            console.log(`3=======${bankTaskStartTime}`);
+            let startTimeSame = gData.safeDepositBoxData.checkSameDay(new Number(bankTaskStartTime).valueOf())
+            console.log(`4=======${startTimeSame}`);
             if (!same && !startTimeSame) {
                 this.scheduleOnce(() => {
                     this.showRestartTaskNode()
                 }, 0.3)
-
+            }
+        }else if(richbankLoginDays > 1)
+        {
+            let lastNeedLogindays = mk.storage.getStorage(StorageKey.richBankAddLoginDays);
+            if(lastNeedLogindays){
+                let day = parseInt(lastNeedLogindays);
+                if(day < gData.safeDepositBoxData.richBankTotelLoginDays){
+                    gData.gameData.richBankAddLoginDays = gData.safeDepositBoxData.richBankTotelLoginDays- day;
+                    mk.ui.openPanel('module/newNotice/richBankWarmPrompt');
+                }
+                mk.storage.setStorage(StorageKey.richBankAddLoginDays, gData.safeDepositBoxData.richBankTotelLoginDays);
             }
         }
     }
@@ -678,7 +719,7 @@ export default class SafeDepositBox extends cc.Component {
         //     return
         // }
         this.ruleNode.active = true
-        let config = gData.safeDepositBoxData.getBankTaskIndex()
+        let config = gData.safeDepositBoxData.getBankTaskIndexExtra();
         let money = config.money
         let showMoney = Math.floor(money / 100) > 0 ? (money / 100) + "" : (money / 100).toFixed(2)
         this.rulelabel.string = "2、存入金额达到" + showMoney + "元可开启提现"
@@ -689,19 +730,7 @@ export default class SafeDepositBox extends cc.Component {
         mk.audio.playEffect('button');
         this.ruleNode.active = false
     }
-    /**
-     * 当前时间和目标时间是否是同一天
-     * @param targetTime  记录的时间戳
-     */
-    checkSameDay(targetTime: number): boolean {
-        let currentDay = new Date().getDate()
-        let lastData = new Date(targetTime).getDate()
-        if (currentDay == lastData) {
-            return true
-        }
-        return false
-    }
-
+    
     showInfoByStep() {
         let count = 0
         for (let entry of this.taskStartNodeList) {
@@ -729,24 +758,42 @@ export default class SafeDepositBox extends cc.Component {
 
     clickBoxShowTip() {
         mk.audio.playEffect('button');
-        let config = gData.safeDepositBoxData.getBankTaskIndex()
+        let config = gData.safeDepositBoxData.getBankTaskIndexExtra();
         let money = config.money
         let showMoney = Math.floor(money / 100) > 0 ? (money / 100) + "" : (money / 100).toFixed(2)
 
         let str = "存款达到" + showMoney + "元可提现哦"
-        if (gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0) {
+        if (gData.safeDepositBoxData.isStartBankTask > 0) {
             str = "完成任务可提现，加油哦！"
         }
         mk.tip.pop(str)
     }
 
     showNoPacket() {
-        this.noPacketTip.getChildByName("taskLabel").active = gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0
-        this.noPacketTip.getChildByName("noTaskLabel").active = !(gData.safeDepositBoxData.currentRichBankCashTaskIndex > 0)
+        this.noPacketTip.getChildByName("taskLabel").active = gData.safeDepositBoxData.isStartBankTask > 0
+        this.noPacketTip.getChildByName("noTaskLabel").active = !(gData.safeDepositBoxData.isStartBankTask > 0)
         this.noPacketTip.active = true
         let moveNode = this.noPacketTip
         let x = moveNode.x
         let y = moveNode.y
         moveNode.runAction(cc.repeatForever(cc.sequence(cc.moveTo(1.5, cc.v2(x, y - 5)), cc.moveTo(1.5, cc.v2(x - 5, y - 5)), cc.moveTo(1.2, cc.v2(x, y + 5)))))
     }
+
+    clickCloseBtn(){
+        if(gData.safeDepositBoxData.isTeach){
+            gData.safeDepositBoxData.isTeach = false;
+
+            if(gData.gameData.funOpenData[14] == "0"){
+                return;
+            }
+            let isPop = mk.storage.getStorage(StorageKey.isPopSet);
+            if(!isPop || isPop == "0"){
+                let is = JsbSystem.getNotificationEnabled();
+                if(!is){
+                    mk.ui.openPanel("module/newNotice/permissionWarmPrompt");
+                    mk.storage.setStorage(StorageKey.isPopSet, "1");
+                }
+            }
+        }    
+    }
 }

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

@@ -45,8 +45,6 @@ export default class Setting extends cc.Component {
     }
 
     private async initData() {
-        console.log("=== gData.wechatData.unionid", gData.wechatData.unionid);
-        console.log("=== gData.wechatData.nickName", gData.wechatData.nickName);
         this.lbl_id.string = "ID:" + mk.string.getNewLimitStr(gData.wechatData.unionid, 10);// 14 
         this.lbl_nickname.string = gData.wechatData.nickName;
         this.lbl_version.string = gData.appData.appVersion;
@@ -62,12 +60,10 @@ export default class Setting extends cc.Component {
         this.img_effect.spriteFrame = await mk.loader.load(effect, cc.SpriteFrame);
 
         this.sp_achieve.spriteFrame = await mk.loader.load('module/gradeReward/texture/name' + gData.gameData.playerProp.farmGradeName, cc.SpriteFrame);
-        console.log("=== gData.wechatData.avatar", gData.wechatData.avatar);
         if (gData.wechatData.avatar != '') {
             let result = await mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null);
             if (result) {
                 this.img_head.spriteFrame = new cc.SpriteFrame(result);
-                console.log("=== loadHead:", result);
             }
         }
     }

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

@@ -110,10 +110,10 @@ export default class ProductReward extends cc.Component {
 
         if (gData.gameData.funOpenData[11] == "1") {
             let data = gData.gameData.playerProp.orderData;
-            let orderData = data.orderTaskList;
-            if (data && orderData) {
+            if (data) {
                 let count = 0;
                 let allCount = 0;
+                let orderData = data.orderTaskList;
                 for (let i = 0; i != orderData.length; ++i) {
                     allCount += orderData[i].taskCount;
                     count += (orderData[i].taskCount - orderData[i].completeCount)
@@ -173,29 +173,29 @@ export default class ProductReward extends cc.Component {
     }
 
     update(dt) {
-        if (gData.gameData.init_productTask) {
-            if (gData.gameData.playerProp.userFarmTaskInfo) {
-                let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
-                let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-                if (count <= 10) {
-                    if (count > com) {
-                        this.lbl_taskTimes.string = (count - com).toString();
-                        this.node_Uncomplete.active = true;
-                        this.node_complete.active = false;
-                    } else {
-                        this.node_Uncomplete.active = false;
-                        this.node_complete.active = true;
-                    }
-                    this.lbl_progress.string = `${com}/${count}`;
-                    this.sp_taskProgress.fillRange = com / count;
-                } else {
-                    this.node_1.active = false;
-                    this.node_2.active = true;
-                }
-            }
-
-            gData.gameData.init_productTask = false;
-        }
+        // if (gData.gameData.init_productTask) {
+        //     if (gData.gameData.playerProp.userFarmTaskInfo) {
+        //         let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+        //         let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
+        //         if (count <= 10) {
+        //             if (count > com) {
+        //                 this.lbl_taskTimes.string = (count - com).toString();
+        //                 this.node_Uncomplete.active = true;
+        //                 this.node_complete.active = false;
+        //             } else {
+        //                 this.node_Uncomplete.active = false;
+        //                 this.node_complete.active = true;
+        //             }
+        //             this.lbl_progress.string = `${com}/${count}`;
+        //             this.sp_taskProgress.fillRange = com / count;
+        //         } else {
+        //             this.node_1.active = false;
+        //             this.node_2.active = true;
+        //         }
+        //     }
+
+        //     gData.gameData.init_productTask = false;
+        // }
 
         if(gData.gameData.init_order)
         {
@@ -247,7 +247,7 @@ export default class ProductReward extends cc.Component {
     onDisable() {
         mk.ad.destroyNativeAd();  
     }
-
+    
     private clickCloseBtn() {
         mk.audio.playEffect("button");
         mk.ui.closePanel(this.node.name);

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

@@ -87,7 +87,9 @@ export default class ATBanner extends zgSingleton {
         this.ifLoadShow = false;
         this.ATBannerJS.destroyBanner()
 
-        this.loadBanner();
+        gData.warnTipData.getUserShutdownAds(() => {
+            this.loadBanner();
+        });
     }
 
     //广告回调部分------------------------------------------------------------------------

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

@@ -229,7 +229,9 @@ export default class ATInterstitial extends zgSingleton {
         }
 
         //加载下一个
-        this.loadInter(type);
+        gData.warnTipData.getUserShutdownAds(() => {
+            this.loadInter(type);
+        })
     }
 
     onInterstitialAdFailedToPlayVideo(placementId, errorInfo) {

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

@@ -150,11 +150,13 @@ export class ATNative extends zgSingleton {
 
     /** 销毁baaner */
     destroyNative() {
-
         this.nativeAdState = NativeAdState.Close;
-
+        this.ifLoadShow = false;
         this.ATNativeJS.destroyNative();
-        this.loadNative(this.nativeAdType);
+
+        gData.warnTipData.getUserShutdownAds(() => {
+            this.loadNative(this.nativeAdType);
+        });
     }
 
     //广告回调部分------------------------------------------------------------------------

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

@@ -1,4 +1,4 @@
-import { DataEventId, VideoAdType } from "../../../../../game/data/GameData";
+import { DataEventId, GameProp, VideoAdType } from "../../../../../game/data/GameData";
 import { zgSingleton } from "../../zgSingleton";
 import ATSDKMgr, { AdPlayStateType } from "./ATSDKMgr";
 
@@ -110,6 +110,13 @@ export class ATRewardVideo extends zgSingleton {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
         console.log("ATRewardVideo 失败 ", RewardAdState[this.reawardAdState]);
         this.reawardAdState = RewardAdState.LoadFail;
+
+        //广告加载失败处理订单逻辑
+        let times = gData.gameData.getProp(GameProp.videoTimes);
+        if(!times)
+        {
+            gData.adData.getOrderTaskInfo(1);
+        }
     }
 
     /**

assets/script/mk/system/FlySystem2.ts

@@ -65,8 +65,7 @@ export default class FlySystem2 extends cc.Component {
         cc.tween(target)
             .to(dur, { scale: 0.8 })
             .start();
-
-            console.log('---');
+            
         let end_pos: cc.Vec2 = null;
         let end_node: cc.Node = null;
         if (typeof end === 'string') {

assets/script/mk/system/GuideSystem.ts

@@ -33,7 +33,6 @@ export default class GuideSystem {
         // }
         //test
         // this.crtGuideID = 0
-
         if (this.crtGuideID >= 9999) {
             mk.console.log("新手引导已做完");
             return false;
@@ -51,7 +50,7 @@ export default class GuideSystem {
 
     /** 开启一个引导后直接默认已完成 */
     private setGuideID(id: number) {
-        if (id == 12) {
+        if (id == 13) {
             id = 9999;
             mk.data.sendXYEvent("guide_end", "新手引导结束");
         }

assets/script/mk/system/HttpSystem.ts

@@ -79,6 +79,7 @@ export default class HttpSystem {
             };
             httpRequest.onerror = function (e) {
                 mk.console.error("http.onerror", url);
+                mk.console.logSingle("http.onerror", e);
                 reject({ errcode: 1, errmsg: "onerror" });
             };
             send();

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.6";
+            gData.appData.version = "1.1.9";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)
@@ -680,6 +680,65 @@ export default class JsbSystem {
             jsb.reflection.callStaticMethod("GameConfig", "tongdunInit:", "");
         }
     }
+
+    /** 极光设置tag */
+    public static setJGTags(str:string){
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            jsb.reflection.callStaticMethod(this._JSB_ANDROID_PATH, "setJGTags", "(Ljava/lang/String;)V", str);
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+            jsb.reflection.callStaticMethod("GameConfig", "setJGTags:", "");
+        }
+    }
+
+    /** 极光添加tag */
+    public static addJGTags(str: string){
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            jsb.reflection.callStaticMethod(this._JSB_ANDROID_PATH, "addJGTags", "(Ljava/lang/String;)V", str);
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+            jsb.reflection.callStaticMethod("GameConfig", "addJGTags:", "");
+        }
+    }
+
+    /** 极光删除tag */
+    public static deleteTags(str: string){
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            jsb.reflection.callStaticMethod(this._JSB_ANDROID_PATH, "deleteTags", "(Ljava/lang/String;)V", str);
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+            jsb.reflection.callStaticMethod("GameConfig", "deleteTags:", "");
+        }
+    }
+    
+    public static getAllTags(){
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            jsb.reflection.callStaticMethod(this._JSB_ANDROID_PATH, "getAllTags", "()V");
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+            jsb.reflection.callStaticMethod("GameConfig", "getAllTags:", "");
+        }
+    }
+
+    /** app允许消息通知 */
+    public static getNotificationEnabled(): boolean{
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            return jsb.reflection.callStaticMethod(this._JSB_ANDROID_PATH, "getNotificationEnabled", "()Z");
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+            return jsb.reflection.callStaticMethod("GameConfig", "getNotificationEnabled:", "");
+        }
+    }
+
+    /** 打开app允许消息通知设置界面 */
+    public static goToSet(){
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            jsb.reflection.callStaticMethod(this._JSB_ANDROID_PATH, "gotoSet", "()V");
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+            jsb.reflection.callStaticMethod("GameConfig", "gotoSet:", "");
+        }
+    }
 }
 
 window['JsbMgr'] = JsbSystem

assets/script/mk/system/UISystem.ts

@@ -111,6 +111,20 @@ export default class UISystem extends cc.Component {
         return this.curOnPanelDic[panelName];
     }
 
+     /**
+     * 获取当前是否有除主界面的其他界面打开
+     */
+    isPopPanel(except: string[] = ["game"]){
+        let count = 0;
+        for (let panelName in this.curOnPanelDic) {
+            if(except.indexOf(panelName) != -1){
+                continue;
+            }
+            ++count;
+        }
+        return count > 0;
+    }
+
     /**
      * 关闭panel界面
      * @param panelName 通常使用this.node.name代替，界面名称，不是全路径

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = false;
+    public static ifShowLog: boolean = false;
 
     /**
      * 标签符号
@@ -36,7 +36,7 @@ export default class LogUtil {
      * @param  data 日志内容
      */
     public log(tag: string, ...data: any[]) {
-        if (!this.ifShowLog) {
+        if (!LogUtil.ifShowLog) {
             return;
         }
         let totalTag = tag + this._tagChar;
@@ -50,7 +50,7 @@ export default class LogUtil {
      * @param  data 日志内容
      */
     public logWithColor(tag: string, ...data: any[]) {
-        if (!this.ifShowLog) {
+        if (!LogUtil.ifShowLog) {
             return;
         }
         let totalTag = tag + this._tagChar;
@@ -64,7 +64,7 @@ export default class LogUtil {
      * @param  data  日志内容
      */
     public warn(tag: string, ...data: any[]) {
-        if (!this.ifShowLog) {
+        if (!LogUtil.ifShowLog) {
             return;
         }
         let totalTag = tag + this._tagChar;
@@ -78,7 +78,7 @@ export default class LogUtil {
      * @param  data  日志内容
      */
     public error(tag: string, ...data: any[]) {
-        if (!this.ifShowLog) {
+        if (!LogUtil.ifShowLog) {
             return;
         }
         let totalTag = tag + this._tagChar;
@@ -98,7 +98,7 @@ export default class LogUtil {
             this.log(tag, obj);
             return;
         }
-        if (!this.ifShowLog) {
+        if (!LogUtil.ifShowLog) {
             return;
         }
 

build/jsb-link/.cocos-project.json

@@ -3,5 +3,5 @@
   "has_native": true,
   "project_type": "js",
   "projectName": "kxnly",
-  "packageName": "com.aries.kncdsf.mz"
+  "packageName": "com.aries.kncdsf.qxb"
 }

build/jsb-link/assets/resources/import/16/166ce504-0ec2-447c-90a8-7f02d93337eb.json

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

build/jsb-link/assets/resources/import/b4/b4eaabe5-d038-4b48-a048-e13ac16399de.json

@@ -0,0 +1 @@
+[1,["16bOUEDsJEfJCofwLZMzfr"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"title","rect":[0,0,465,103],"offset":[0,0],"originalSize":[465,103],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/eb/ebfa09f7-ef7d-4aeb-b477-87eb94357dd8.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.AnimationClip",["_name","_duration","wrapMode","curveData"],-1]],[[0,0,1,2,3,5]],[[0,"btnShake",3.5166666666666666,2,{"props":{"angle":[{"frame":0,"value":0},{"frame":0.016666666666666666,"value":15},{"frame":0.16666666666666666,"value":-15},{"frame":0.3333333333333333,"value":10},{"frame":0.5,"value":-10},{"frame":0.6666666666666666,"value":0},{"frame":3.5166666666666666,"value":0}],"scaleY":[{"frame":0.6666666666666666,"value":1}],"scaleX":[{"frame":0.6666666666666666,"value":1}]},"paths":{"homepage_hezi_1":{"props":{"position":[],"angle":[]}}}}]],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/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}
+{"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"}

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/gradle.xml

@@ -13,6 +13,7 @@
             <option value="C:/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/jiguang" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/jarRepositories.xml

@@ -86,5 +86,15 @@
       <option name="name" value="C:\Users\lzg12073\AppData\Local\Android\Sdk\extras\m2repository" />
       <option name="url" value="file:/$USER_HOME$/AppData/Local/Android/Sdk/extras/m2repository" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="http://developer.huawei.com/repo/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://maven.aliyun.com/repository/public/" />
+    </remote-repository>
   </component>
 </project>