Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

# Conflicts:
#	assets/script/game/data/GData.ts

assets/resources/game/prefab/tips.prefab

@@ -0,0 +1,326 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "tips",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 9
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 249,
+      "g": 247,
+      "b": 247,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 280,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "bg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 77,
+      "g": 80,
+      "b": 215,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 300,
+      "height": 52
+    },
+    "_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__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+    },
+    "_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__": "1c822cf1-c786-4767-bdce-797a0dea57f0"
+    },
+    "fileId": "ec6ZgK4ZlN6L7tbuM63yIW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lbl",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 7
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 227,
+      "g": 218,
+      "b": 80,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 258,
+      "height": 42.32
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 5
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "按时发放按时发放",
+    "_N$string": "按时发放按时发放",
+    "_fontSize": 32,
+    "_lineHeight": 32,
+    "_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__": 5
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c822cf1-c786-4767-bdce-797a0dea57f0"
+    },
+    "fileId": "65NUZpWApGdq6Ay+zLBxpD",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c822cf1-c786-4767-bdce-797a0dea57f0"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/game/prefab/tips.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "1c822cf1-c786-4767-bdce-797a0dea57f0",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/redBagCash/redBagCash.prefab → assets/resources/module/cashNormal/cashNormal.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "redBagCash",
+    "_name": "cashNormal",
     "_objFlags": 0,
     "_parent": null,
     "_children": [
@@ -1596,7 +1596,7 @@
       "__id__": 39
     },
     "_enabled": true,
-    "panel_name": "",
+    "panel_name": "module/cashOutRecord/cashOutRecord",
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [],
@@ -1905,7 +1905,7 @@
       }
     ],
     "scr_item": [
-      "RedBagItem"
+      "CashNormalItem"
     ],
     "itemInterval": 20,
     "_id": ""
@@ -2145,6 +2145,7 @@
     "node_panel": {
       "__id__": 1
     },
+    "transition_type": 0,
     "onComplete": [],
     "_id": ""
   },

assets/resources/module/cashOutRecord/cashOutItem.prefab

@@ -28,16 +28,19 @@
       },
       {
         "__id__": 11
+      },
+      {
+        "__id__": 14
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 15
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -195,7 +198,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "累计提现",
+    "_name": "提现类型",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -305,7 +308,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "时间",
+    "_name": "提现时间",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -453,7 +456,7 @@
       "ctor": "Float64Array",
       "array": [
         281.342,
-        -82.622,
+        -82,
         0,
         0,
         0,
@@ -524,6 +527,116 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "lbl红包码",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 16
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 251,
+      "g": 78,
+      "b": 49,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 228.52,
+      "height": 37.8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        2.342,
+        -82,
+        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": "红包码：AABBCC",
+    "_N$string": "红包码：AABBCC",
+    "_fontSize": 30,
+    "_lineHeight": 30,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "df64bc88-b41c-4d91-b8c9-b1fd9c02e630"
+    },
+    "fileId": "aaxr4TzH5HLqvWiFnKF0Gp",
+    "sync": false
+  },
+  {
     "__type__": "32077nk5NlGLqPEuyJfau+t",
     "_name": "",
     "_objFlags": 0,
@@ -531,8 +644,18 @@
       "__id__": 1
     },
     "_enabled": true,
-    "label": null,
-    "text": "hello",
+    "lbl_cash_type": {
+      "__id__": 6
+    },
+    "lbl_cash_time": {
+      "__id__": 9
+    },
+    "lbl_red_ma": {
+      "__id__": 15
+    },
+    "lbl_rmb_value": {
+      "__id__": 12
+    },
     "_id": ""
   },
   {

assets/resources/module/cashOutRecord/cashOutRecord.prefab

@@ -21,26 +21,23 @@
         "__id__": 2
       },
       {
-        "__id__": 5
-      },
-      {
-        "__id__": 35
+        "__id__": 32
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 38
       },
       {
-        "__id__": 42
+        "__id__": 39
       },
       {
-        "__id__": 43
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -91,113 +88,6 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "提现记录",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 3
-      }
-    ],
-    "_prefab": {
-      "__id__": 4
-    },
-    "_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.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 2
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "b382d198-7122-4aee-9f0b-5fcab91d94d9"
-    },
-    "_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__": "18ca563c-e8dc-4633-bf04-5fdd65113bb0"
-    },
-    "fileId": "47M0jz/iZFa7eLLWB41QaD",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "动画节点",
     "_objFlags": 0,
     "_parent": {
@@ -205,26 +95,26 @@
     },
     "_children": [
       {
-        "__id__": 6
+        "__id__": 3
       },
       {
-        "__id__": 9
+        "__id__": 6
       },
       {
-        "__id__": 15
+        "__id__": 12
       },
       {
-        "__id__": 24
+        "__id__": 21
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 31
     },
     "_opacity": 255,
     "_color": {
@@ -278,17 +168,17 @@
     "_name": "背景",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 4
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 5
     },
     "_opacity": 255,
     "_color": {
@@ -301,7 +191,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1700
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -342,7 +232,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 6
+      "__id__": 3
     },
     "_enabled": true,
     "_materials": [
@@ -353,10 +243,10 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "644b06fc-7d3a-45bc-b5f5-2955e3d25ab8"
+      "__uuid__": "14d2d441-f2eb-454a-8847-a690bf9a3c60"
     },
-    "_type": 0,
-    "_sizeMode": 1,
+    "_type": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -377,7 +267,7 @@
     "asset": {
       "__uuid__": "18ca563c-e8dc-4633-bf04-5fdd65113bb0"
     },
-    "fileId": "27RrNCetBAL5QRJcw7pdWR",
+    "fileId": "85rQ5jzvZACrh5Y70Ts7wT",
     "sync": false
   },
   {
@@ -385,21 +275,21 @@
     "_name": "标题地板",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 10
+        "__id__": 7
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -453,17 +343,17 @@
     "_name": "标题",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 9
+      "__id__": 6
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 12
+      "__id__": 9
     },
     "_opacity": 255,
     "_color": {
@@ -517,7 +407,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 7
     },
     "_enabled": true,
     "_materials": [
@@ -563,7 +453,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 6
     },
     "_enabled": true,
     "_materials": [
@@ -606,24 +496,24 @@
     "_name": "顶部底板",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 16
+        "__id__": 13
       },
       {
-        "__id__": 19
+        "__id__": 16
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -677,17 +567,17 @@
     "_name": "累计提现",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 15
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 17
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 15
     },
     "_opacity": 255,
     "_color": {
@@ -741,7 +631,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 16
+      "__id__": 13
     },
     "_enabled": true,
     "_materials": [
@@ -784,20 +674,20 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "提现金额",
+    "_name": "lbl累计提现",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 15
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -851,7 +741,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 16
     },
     "_enabled": true,
     "_materials": [
@@ -897,9 +787,9 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 12
     },
-    "_enabled": false,
+    "_enabled": true,
     "_materials": [
       {
         "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
@@ -940,24 +830,24 @@
     "_name": "滚动视图",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 25
+        "__id__": 22
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 27
       },
       {
-        "__id__": 31
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -1011,21 +901,21 @@
     "_name": "view",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 21
     },
     "_children": [
       {
-        "__id__": 26
+        "__id__": 23
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -1079,13 +969,13 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 22
     },
     "_children": [],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 27
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -1150,7 +1040,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -1181,7 +1071,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 21
     },
     "_enabled": true,
     "horizontal": false,
@@ -1193,10 +1083,10 @@
     "scrollEvents": [],
     "cancelInnerEvents": false,
     "_N$content": {
-      "__id__": 26
+      "__id__": 23
     },
     "content": {
-      "__id__": 26
+      "__id__": 23
     },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
@@ -1207,7 +1097,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 21
     },
     "_enabled": true,
     "pre_item": [
@@ -1237,7 +1127,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 5
+      "__id__": 2
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1279,17 +1169,17 @@
     },
     "_children": [
       {
-        "__id__": 36
+        "__id__": 33
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1343,17 +1233,17 @@
     "_name": "按钮纹理",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 35
+      "__id__": 32
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -1407,7 +1297,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 33
     },
     "_enabled": true,
     "_materials": [
@@ -1450,12 +1340,13 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 32
     },
     "_enabled": true,
     "node_panel": {
       "__id__": 1
     },
+    "transition_type": 3,
     "onComplete": [],
     "_id": ""
   },
@@ -1505,8 +1396,12 @@
       "__id__": 1
     },
     "_enabled": true,
-    "label": null,
-    "text": "hello",
+    "sroll_view": {
+      "__id__": 27
+    },
+    "lbl_rmb_total": {
+      "__id__": 17
+    },
     "_id": ""
   },
   {

assets/resources/module/cashOutRecord/texture/bg2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "1c4104cc-5d3e-479a-bc32-35e4635990d4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 50,
+  "height": 50,
+  "platformSettings": {},
+  "subMetas": {
+    "bg2": {
+      "ver": "1.0.4",
+      "uuid": "14d2d441-f2eb-454a-8847-a690bf9a3c60",
+      "rawTextureUuid": "1c4104cc-5d3e-479a-bc32-35e4635990d4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 50,
+      "height": 50,
+      "rawWidth": 50,
+      "rawHeight": 50,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/moreGame/btnMoreGame.prefab

@@ -62,7 +62,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 116,
-      "height": 110
+      "height": 200
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -74,7 +74,7 @@
       "ctor": "Float64Array",
       "array": [
         -2.842170943040401e-14,
-        -247.5,
+        -297,
         0,
         0,
         0,

assets/resources/module/pigBank/pigBank.prefab

@@ -827,9 +827,9 @@
       "__id__": 16
     },
     "_enabled": true,
-    "panel_name": "help",
+    "panel_name": "module/help/help",
     "open_type": 0,
-    "panel_type": 2,
+    "transition_type": 0,
     "onComplete": [
       {
         "__id__": 21
@@ -2293,6 +2293,7 @@
       "b": 0,
       "a": 120
     },
+    "design_block_node": null,
     "bClickClose": false,
     "_id": ""
   },

assets/resources/module/receiptNotice.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "c74c5249-1158-4904-93cd-84392298836d",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/module/receiptNotice/receiptNotice.prefab

@@ -0,0 +1,2375 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "receiptNotice",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 62
+      },
+      {
+        "__id__": 63
+      },
+      {
+        "__id__": 64
+      },
+      {
+        "__id__": 65
+      }
+    ],
+    "_prefab": {
+      "__id__": 66
+    },
+    "_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
+      },
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 23
+      },
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 32
+      },
+      {
+        "__id__": 35
+      },
+      {
+        "__id__": 38
+      },
+      {
+        "__id__": 41
+      },
+      {
+        "__id__": 44
+      },
+      {
+        "__id__": 47
+      },
+      {
+        "__id__": 53
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 60
+      }
+    ],
+    "_prefab": {
+      "__id__": 61
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "背景板",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 630,
+      "height": 811
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        32.304,
+        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__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "312eaf53-30f2-4496-bd79-1d7ce32fd3c9"
+    },
+    "_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__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "90dZfI8o9IBbBWAbqkqWg0",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "白色板子",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 594,
+      "height": 506
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        56.22,
+        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__": 6
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "7642b53a-ce1c-4ebf-b10a-aea5858b5ca2"
+    },
+    "_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__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "acbBgTOVBIdZbog32d/QT7",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "横线",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 10
+      }
+    ],
+    "_prefab": {
+      "__id__": 11
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 580,
+      "height": 1
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -78.635,
+        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__": 9
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "54c2fa30-aaed-4e64-be9e-5c6e47877e49"
+    },
+    "_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__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "f2am2XsPBNOqSmp6cdWYB6",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "标题",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 180,
+      "height": 45
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        381.346,
+        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__": 12
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "2e1f788f-b981-45ae-a2ae-96daa43c37b8"
+    },
+    "_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__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "1716nN1WxOha0UVuM7uF/+",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn继续提现",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 16
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 21
+      }
+    ],
+    "_prefab": {
+      "__id__": 22
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 377,
+      "height": 95
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -280.088,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 15
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 17
+      },
+      {
+        "__id__": 18
+      }
+    ],
+    "_prefab": {
+      "__id__": 19
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 162,
+      "height": 52.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        2.891,
+        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__": 16
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "继续提现",
+    "_N$string": "继续提现",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_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__": 16
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 102
+    },
+    "_width": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "43wWGRgmNEca0VVQQNhDE2",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "ea8161b3-2f0b-4ecb-81fa-f532d666ff74"
+    },
+    "_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__": 15
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 3,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "adXad47JFPx4myC8xNy5JV",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "收款描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 24
+      }
+    ],
+    "_prefab": {
+      "__id__": 25
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 119,
+      "g": 119,
+      "b": 119,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 104,
+      "height": 32.76
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        226.433,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "收款金额",
+    "_N$string": "收款金额",
+    "_fontSize": 26,
+    "_lineHeight": 26,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "497jV76ylAKJupI7yvYBKX",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lbl收款金额",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 27
+      }
+    ],
+    "_prefab": {
+      "__id__": 28
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 251,
+      "g": 78,
+      "b": 49,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 357.89,
+      "height": 113.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -10,
+        155,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 26
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "￥3.00元",
+    "_N$string": "￥3.00元",
+    "_fontSize": 90,
+    "_lineHeight": 90,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "665LNvDgND+aa+gu70ZOD7",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "账户名描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 30
+      }
+    ],
+    "_prefab": {
+      "__id__": 31
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 119,
+      "g": 119,
+      "b": 119,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 130,
+      "height": 32.76
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -185.118,
+        51.577,
+        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__": 29
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "收款账户：",
+    "_N$string": "收款账户：",
+    "_fontSize": 26,
+    "_lineHeight": 26,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "ce5ku8cMRNzooVKOpzMUCo",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lbl用户名",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 33
+      }
+    ],
+    "_prefab": {
+      "__id__": 34
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 180,
+      "height": 45.36
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -104.656,
+        52.008,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 32
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "用户微信名",
+    "_N$string": "用户微信名",
+    "_fontSize": 36,
+    "_lineHeight": 36,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "8fkynd3N1PC5YM6OyO8QWo",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "收款描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 36
+      }
+    ],
+    "_prefab": {
+      "__id__": 37
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 119,
+      "g": 119,
+      "b": 119,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 130,
+      "height": 32.76
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -185.118,
+        -8.912,
+        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__": 35
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "转账备注：",
+    "_N$string": "转账备注：",
+    "_fontSize": 26,
+    "_lineHeight": 26,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "79mf7Cw4pKGLMI+OlIX5p8",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lbl收款游戏",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 39
+      }
+    ],
+    "_prefab": {
+      "__id__": 40
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 144,
+      "height": 45.36
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -104.728,
+        -8.221,
+        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__": 38
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "游戏福利",
+    "_N$string": "游戏福利",
+    "_fontSize": 36,
+    "_lineHeight": 36,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "cb35fSpwpCWY+bZi3/iyLd",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "提现描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 42
+      }
+    ],
+    "_prefab": {
+      "__id__": 43
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 150,
+      "height": 37.8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -182.027,
+        -128.935,
+        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__": 41
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "累计提现：",
+    "_N$string": "累计提现：",
+    "_fontSize": 30,
+    "_lineHeight": 30,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "26YbBxepdNtLnIyUt3KgCT",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lbl累计提现",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 45
+      }
+    ],
+    "_prefab": {
+      "__id__": 46
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 251,
+      "g": 78,
+      "b": 49,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 156.38,
+      "height": 45.36
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -26.208,
+        -131.244,
+        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__": 44
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "￥15.00元",
+    "_N$string": "￥15.00元",
+    "_fontSize": 36,
+    "_lineHeight": 36,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "bcnAlkgSZFK6XYOPQL4WF5",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn提现记录",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 48
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 51
+      }
+    ],
+    "_prefab": {
+      "__id__": 52
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 119,
+      "g": 119,
+      "b": 119,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 119.54,
+      "height": 32.76
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        203.2,
+        -131.244,
+        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": "lbl提现记录",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 47
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 49
+      }
+    ],
+    "_prefab": {
+      "__id__": 50
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 119,
+      "g": 119,
+      "b": 119,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 119.54,
+      "height": 32.76
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 48
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "提现记录>",
+    "_N$string": "提现记录>",
+    "_fontSize": 26,
+    "_lineHeight": 26,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "8bdEiudGJGcJe+XgM/B9Yv",
+    "sync": false
+  },
+  {
+    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 47
+    },
+    "_enabled": true,
+    "panel_name": "",
+    "open_type": 0,
+    "transition_type": 3,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "82nKD4hEtIm4lBmzvaJ5mp",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "关闭按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 54
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 57
+      },
+      {
+        "__id__": 58
+      }
+    ],
+    "_prefab": {
+      "__id__": 59
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        268.871,
+        382.337,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "纹理",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 53
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 55
+      }
+    ],
+    "_prefab": {
+      "__id__": 56
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 42,
+      "height": 42
+    },
+    "_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,
+        0
+      ]
+    },
+    "_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__": 54
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "e753d5fc-4250-43a3-9e08-8dd1ba7e96f1"
+    },
+    "_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__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "ec7xDDZ25JFKC/Eq8e7p5f",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 53
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 53
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 0,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "87A1nH39dOoKBx5hYOYF83",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_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": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "94yiGj0RFACpXt5xGEvfHf",
+    "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": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "58495/rJOBNGoxELFSp8G2a",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 120
+    },
+    "design_block_node": null,
+    "bClickClose": false,
+    "_id": ""
+  },
+  {
+    "__type__": "ac053zwqaRD6IJmTlQWmefZ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "effect_par": {
+      "__id__": 2
+    },
+    "open_effect": 1,
+    "close_effect": 1,
+    "close_toPoint": "",
+    "_id": ""
+  },
+  {
+    "__type__": "99444HkDZpKyIj1SS34tIOi",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "lbl_receipt_rmb": {
+      "__id__": 27
+    },
+    "lbl_rmb_total": {
+      "__id__": 45
+    },
+    "lbl_game_name": {
+      "__id__": 39
+    },
+    "lbl_user_name": {
+      "__id__": 33
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/module/receiptNotice/receiptNotice.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/receiptNotice/texture.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "a31f7fae-439b-4f56-b147-36291ef21213",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/module/receiptNotice/texture/bg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "e5c098c8-fbbf-4216-8f5a-f00001dbba37",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 594,
+  "height": 506,
+  "platformSettings": {},
+  "subMetas": {
+    "bg": {
+      "ver": "1.0.4",
+      "uuid": "7642b53a-ce1c-4ebf-b10a-aea5858b5ca2",
+      "rawTextureUuid": "e5c098c8-fbbf-4216-8f5a-f00001dbba37",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 594,
+      "height": 506,
+      "rawWidth": 594,
+      "rawHeight": 506,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/receiptNotice/texture/bg1.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "d0dc1741-9641-44f4-897c-2f31bcf6f407",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 580,
+  "height": 1,
+  "platformSettings": {},
+  "subMetas": {
+    "bg1": {
+      "ver": "1.0.4",
+      "uuid": "54c2fa30-aaed-4e64-be9e-5c6e47877e49",
+      "rawTextureUuid": "d0dc1741-9641-44f4-897c-2f31bcf6f407",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 580,
+      "height": 1,
+      "rawWidth": 580,
+      "rawHeight": 1,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/receiptNotice/texture/button.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b9168911-10d7-44b6-9200-356f20d3761e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 377,
+  "height": 95,
+  "platformSettings": {},
+  "subMetas": {
+    "button": {
+      "ver": "1.0.4",
+      "uuid": "ea8161b3-2f0b-4ecb-81fa-f532d666ff74",
+      "rawTextureUuid": "b9168911-10d7-44b6-9200-356f20d3761e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 377,
+      "height": 95,
+      "rawWidth": 377,
+      "rawHeight": 95,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/receiptNotice/texture/close.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "3050a07d-7514-41dc-81bc-0a48587a471c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 42,
+  "height": 42,
+  "platformSettings": {},
+  "subMetas": {
+    "close": {
+      "ver": "1.0.4",
+      "uuid": "e753d5fc-4250-43a3-9e08-8dd1ba7e96f1",
+      "rawTextureUuid": "3050a07d-7514-41dc-81bc-0a48587a471c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 42,
+      "height": 42,
+      "rawWidth": 42,
+      "rawHeight": 42,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/receiptNotice/texture/popup.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "f5223b2e-df0b-4e74-be18-700cfe2257ce",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 630,
+  "height": 811,
+  "platformSettings": {},
+  "subMetas": {
+    "popup": {
+      "ver": "1.0.4",
+      "uuid": "312eaf53-30f2-4496-bd79-1d7ce32fd3c9",
+      "rawTextureUuid": "f5223b2e-df0b-4e74-be18-700cfe2257ce",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 630,
+      "height": 811,
+      "rawWidth": 630,
+      "rawHeight": 811,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/receiptNotice/texture/title_dztz.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "2ecedcba-946b-4305-ac9b-67284b48dc41",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 180,
+  "height": 45,
+  "platformSettings": {},
+  "subMetas": {
+    "title_dztz": {
+      "ver": "1.0.4",
+      "uuid": "2e1f788f-b981-45ae-a2ae-96daa43c37b8",
+      "rawTextureUuid": "2ecedcba-946b-4305-ac9b-67284b48dc41",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 180,
+      "height": 45,
+      "rawWidth": 180,
+      "rawHeight": 45,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/reward/reward.prefab

@@ -3082,7 +3082,7 @@
         "__id__": 84
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 87

assets/resources/module/sign/sign.prefab

@@ -1602,6 +1602,7 @@
     "node_panel": {
       "__id__": 1
     },
+    "transition_type": 0,
     "onComplete": [],
     "_id": ""
   },
@@ -1654,6 +1655,9 @@
     "scroll_view": {
       "__id__": 12
     },
+    "node_content": {
+      "__id__": 8
+    },
     "anim_btn": {
       "__id__": 33
     },

assets/scene/MainScene.fire

@@ -81,18 +81,15 @@
         "__id__": 8
       },
       {
-        "__id__": 9
+        "__id__": 10
       },
       {
-        "__id__": 10
+        "__id__": 11
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 11
-      },
-      {
         "__id__": 12
       },
       {
@@ -100,6 +97,9 @@
       },
       {
         "__id__": 14
+      },
+      {
+        "__id__": 15
       }
     ],
     "_prefab": null,
@@ -387,7 +387,11 @@
     },
     "_children": [],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 9
+      }
+    ],
     "_prefab": null,
     "_opacity": 255,
     "_color": {
@@ -399,8 +403,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -437,6 +441,37 @@
     "_id": "75aso/yzBLpLz+LJ97b9pt"
   },
   {
+    "__type__": "5b808c7i9JMAJCR/OQTRrlG",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "tween_time": 1,
+    "src_x": 0,
+    "src_y": 0,
+    "tar_x": 0,
+    "tar_y": 200,
+    "bg_opacity": 100,
+    "bg_color": {
+      "__type__": "cc.Color",
+      "r": 36,
+      "g": 47,
+      "b": 232,
+      "a": 82
+    },
+    "tip_color": {
+      "__type__": "cc.Color",
+      "r": 220,
+      "g": 220,
+      "b": 80,
+      "a": 255
+    },
+    "tip_size": 32,
+    "_id": "41Yz88THFLQYf9GACa9dX1"
+  },
+  {
     "__type__": "cc.Node",
     "_name": "特效层",
     "_objFlags": 0,

assets/script/game/component/BtnClosePanel.ts

@@ -9,13 +9,18 @@ export default class BtnClosePanel extends cc.Component {
 
     @property({ displayName: '关闭界面', tooltip: '', type: cc.Node })
     private node_panel: cc.Node = null!;;
+    @property({ displayName: '点击效果', tooltip: "仅支持 NONE 和 SCALE", type: cc.Enum(cc.Button.Transition) })
+    public transition_type: cc.Button.Transition = cc.Button.Transition.NONE;
     @property({ displayName: '完成回调', tooltip: "面板打开完成后触发", type: cc.Component.EventHandler })
     public onComplete: cc.Component.EventHandler[] = [];
 
     /** 阻断点击 */
     public block_click: boolean = false;
     onLoad() {
-        if (!this.node.getComponent(cc.Button)) this.node.addComponent(cc.Button);
+        if (!this.node.getComponent(cc.Button)) {
+            let btn_comp = this.node.addComponent(cc.Button);
+            btn_comp.transition = this.transition_type;
+        }
     }
 
     start() {

assets/script/game/component/TableView.ts

@@ -27,7 +27,7 @@ export default class TableView extends cc.Component {
     /** item预制体组 */
     private item: Array<any> = null;
     /** 滑动列表的内容节点 */
-    private content: any = null;
+    private content: cc.Node = null;
     /** 列表高 */
     private layerHeight: any = null;
     /** ？ */
@@ -94,7 +94,7 @@ export default class TableView extends cc.Component {
         // }
         // cc.log(this.testTime(0));// 消耗计时
         this.initItem();
-        this.getItemPos(0);
+        this.initItemPos(0);
         this.scrollView.node.on('scrolling', this.callback, this);
         // cc.log('tableView结束:' + this.testTime());
     }
@@ -107,7 +107,7 @@ export default class TableView extends cc.Component {
 
     }
 
-    private getItemPos(index: number) {
+    private initItemPos(index: number) {
         let item_data_count = this.itemData.length;
         for (let i = index; i < item_data_count; i++) {
             let obj: any = {}
@@ -295,7 +295,7 @@ export default class TableView extends cc.Component {
     }
 
     /** 滚动到底部 */
-    private itemMoveDown(num: number) {
+    public itemMoveDown(num: number) {
         if (num < 0 || this.firstItemIndex - 1 > num || num + 1 > this.itemData.length) {
             return;
         }
@@ -348,6 +348,15 @@ export default class TableView extends cc.Component {
     }
 
     /**
+     * 内容滚动到指定下标位置
+     * @param index 条目index
+     */
+    public contentMoveByIndex(index: number) {
+        let pos_y = this.itemPosMap.get(index).startPos;
+        this.scrollView.scrollToOffset(new cc.Vec2(this.content.x, pos_y), 0.5);
+    }
+
+    /**
      * 得到相关位置的排序index
      * 方法待验证，可能有问题
      * @param pos 坐标
@@ -368,7 +377,7 @@ export default class TableView extends cc.Component {
      */
     public addItem(obj: any) {
         this.itemData.push(obj);
-        this.getItemPos(this.itemData.length - 1);
+        this.initItemPos(this.itemData.length - 1);
         let endPos = this.itemPosMap.get(this.itemData.length - 1).endPos;
         if (endPos - this.layerHeight > 0) {
             let startPos = endPos - this.layerHeight;
@@ -416,7 +425,7 @@ export default class TableView extends cc.Component {
         this.itemData.splice(i, 1);
         const item_data_count = this.itemData.length;
         if (item_data_count <= 0) return;
-        this.getItemPos(item_data_count - 1);
+        this.initItemPos(item_data_count - 1);
 
         //改变this.itemArr的内容
         for (let j = 0; j < this.itemArr.length; j++) {

assets/script/game/data/GData.ts

@@ -9,11 +9,12 @@ import { PigBankData } from "./module/PigBankData";
 import { TurnableData } from "./module/TurnableData";
 import { SignData } from "./module/SignData";
 import { FissionData } from "./module/FissionData";
-import { CashNormalData } from "./module/CashNormalData";
 import { AdData } from "./AdData";
 import { RewardData } from "./module/RewardData";
 import MoreGameData from "./MoreGameData";
 import { Data } from "../../mk/data/Data";
+import { CashNormalData } from "./module/CashNormalData";
+import { ReceiptNoticeData } from "./module/ReceiptNoticeData";
 import { BlessingBagData } from "./module/BlessingBagData";
 import CashProData from "./module/CashProData";
 
@@ -36,13 +37,22 @@ class GData {
     public storageData: StorageData;
 
     //module
+    /** 领取红包奖励 */
     public reward: RewardData;
+    /** 帮助 */
     public help: HelpData;
+    /** 转盘 */
     public turnable: TurnableData;
+    /** 裂变数据 */
     public fission: FissionData;
+    /** 存钱罐 */
     public pigbank: PigBankData;
     public sign: SignData;
+    /** 到账通知 */
+    public receiptNotice: ReceiptNoticeData;
+    /** 红包提现（常规提现） */
     public cashNormal: CashNormalData;
+    /** 更多游戏 */
     public moreGame: MoreGameData;
     public blessingBag: BlessingBagData;
     public cashPro: CashProData;
@@ -64,6 +74,7 @@ class GData {
         this.fission = new FissionData();
         this.pigbank = new PigBankData();
         this.sign = new SignData();
+        this.receiptNotice = new ReceiptNoticeData();
         this.cashNormal = new CashNormalData();
         this.moreGame = new MoreGameData();
         this.blessingBag = new BlessingBagData();

assets/script/game/data/GameData.ts

@@ -15,10 +15,14 @@ export class GameData {
 
 
     public configs: any = {};
-    public gameData:any;
+    public gameData: PlayerInfoType;
 
     public props: Map<number, number>;
 
+    public pools = [
+        { url: "game/prefab/tips", num: 20 }
+    ];
+
 
     /**
      * 初始化游戏数据：网络配置信息，用户信息
@@ -48,7 +52,6 @@ export class GameData {
         gData.moduleData.forEach(element => {
             element.init();
         });
-
         this.dataFinish = true;
     }
 
@@ -162,6 +165,18 @@ export enum RewardState {
 }
 
 /**
+ * 奖励类型
+ */
+export enum RewardType {
+    /** 红包币 */
+    redBag = 1,
+    /** 毛币 */
+    rmb = 2,
+    /** 金猪币 */
+    pigRmb = 3,
+}
+
+/**
  * 音频路径
  */
 export enum AUDIO_TYPE {
@@ -170,4 +185,32 @@ export enum AUDIO_TYPE {
     turntableDraw = 'turntable1',           //转盘抽奖结束
     turntableDrawEnd = 'turntable_2',           //转盘抽奖音效
     getGold = 'Get_gold',       //获取金币音效
+}
+
+type PlayerInfoType = {
+    /** 自定义不需要校验的数据 */
+    gameUserData: object,
+    /** 今日是否有签到 */
+    isSignInToday: boolean,
+    /** 存钱罐存款 */
+    piggyBank: number,
+    /** 存钱罐能否提现 */
+    isWithdrawable: boolean,
+    /** 存钱罐每日提现次数 */
+    piggyBankCashTimes: number,
+    /** 累计存钱罐每日提现次数 */
+    totalPiggyBankCashTimes: number,
+    /** 上次登录时间 */
+    lastTime: number,
+    /** 登录天数 */
+    loginDays: number,
+    newPlayer: Boolean,
+    /** 红包币数量 */
+    redMoney: number,
+    /** 累计签到次数 客户端理解 上次签到天数 */
+    signInDay: number,
+    /** 转盘次数 */
+    turntableTimes: number,
+    /** 版本号 */
+    versioncfg: string,
 }

assets/script/game/data/LoginData.ts

@@ -44,6 +44,7 @@ export class LoginData {
      */
     public async login() {
         this.isLogin = true;
+        mk.pool.init(gData.gameData.pools);
         gData.appData.init();
         gData.adData.init();
 

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

@@ -1,10 +1,35 @@
 import { Data } from "../../../mk/data/Data";
-
 /**
- * @description 常规提现数据
- * @author 邹勇
+ * 红包提现数据
+ * @author 薛鸿潇
  */
- export class CashNormalData extends Data{
+export class CashNormalData extends Data {
+    public init() {
+        // 提现记录数据
+        gData.cashNormal.getRecord()
+    }
+
 
+    public async getRecord() {
+        let response = await mk.http.sendData('getCashRecord', {});
+        if (response.errcode != 0) {
+            return;
+        }
+        console.log(response.data);
+    }
     
-}
+    /**
+     * 标志位 - 是否刷新样式
+     */
+     public init_rmb_style = true;
+
+    private _receip_total_rmb: number = 0;
+    /** 到账毛币总数 */
+    set receip_total_rmb(value: number) {
+        this._receip_total_rmb = value;
+        this.init_rmb_style = true;
+    }
+    get receip_total_rmb() {
+        return this._receip_total_rmb;
+    }
+}

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

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "5b3e05c3-511b-41b8-819c-83fffa683414",
+  "uuid": "64bb43f6-36f2-4666-a3db-08486fec8aff",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

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

@@ -1,5 +1,6 @@
 import { Data } from "../../../mk/data/Data";
 
+
 /**
  * 存钱罐数据
  * - 提现描述显示：
@@ -11,6 +12,16 @@ import { Data } from "../../../mk/data/Data";
  * @author 薛鸿潇
  */
 export class PigBankData extends Data {
+    /**
+     * 数据初始化
+     */
+    public init() {
+        // 提现状态
+        this.cash_enable = gData.gameData.gameData.isWithdrawable;
+        // 存款金额
+        this._cur_cash_count = gData.gameData.gameData.piggyBank;
+    }
+
     /** 标志位：是否需要刷新数据 */
     public init_data: boolean = true;
     /** 是否可提现 */
@@ -26,7 +37,7 @@ export class PigBankData extends Data {
     }
 
     /** 当前存款 */
-    private _cur_cash_count: number = 0.36;
+    private _cur_cash_count: number = 0;
     set cur_cash_count(value: number) {
         if (this._cur_cash_count != value) {
             this._cur_cash_count = value;

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

@@ -0,0 +1,24 @@
+import { Data } from "../../../mk/data/Data";
+
+/**
+ * 到账通知
+ * @author 
+ */
+export class ReceiptNoticeData extends Data {
+    /**
+     * 标志位 - 是否刷新样式
+     */
+    public init_style = true;
+
+    private _receip_rmb: number = 0;
+    /** 到账毛币数量 */
+    set receip_rmb(value: number) {
+        this._receip_rmb = value;
+        this.init_style = true;
+    }
+    get receip_rmb() {
+        return this._receip_rmb;
+    }
+
+
+}

assets/script/game/data/module/RedBagCashData.ts.meta → assets/script/game/data/module/ReceiptNoticeData.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.0.8",
-  "uuid": "64bb43f6-36f2-4666-a3db-08486fec8aff",
+  "uuid": "470a4abb-9c9c-411a-aed0-139cc08be7e0",
   "isPlugin": false,
   "loadPluginInWeb": true,
   "loadPluginInNative": true,

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

@@ -1,7 +0,0 @@
-/**
- * 红包提现数据
- * @author 薛鸿潇
- */
-export default class RedBagCashData {
-    
-}

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

@@ -12,29 +12,38 @@ export class RewardData extends Data {
     public init_luck_style: boolean = false;
 
     /** 默认幸运红包 */
-    private _is_luck: boolean = true;
+    private _lid_type: LidType = LidType.none;
     /** 是幸运红包 不是通关红包 */
-    set is_luck(value: boolean) {
-        this._is_luck = value;
+    set lid_type(value: LidType) {
+        this._lid_type = value;
         this.init_luck_style = true;
     }
-    get is_luck() {
-        return this._is_luck;
+    get lid_type(): LidType {
+        return this._lid_type;
     }
 
     /** 奖励列表 */
-    data: Array<DataType> = [];
+    data: Array<any> = [];
     /** 
      * 标志位 
      * - 初始化提现样式
     */
     public init_cash_style: boolean = true;
+
+    /** 
+     * 盖子类型
+     * - 外部赋值 lid_type 时，使用此变量赋值
+     */
+    public type_lid: typeof LidType = LidType
 }
-type DataType = {
-    /** 奖励类型 */
-    rewardType: number,
-    /** 奖励数量 */
-    rewardNum: number,
-    /** 玩家剩余数量 */
-    rewardTotal: number
+/**
+ * 盖子类型
+ */
+enum LidType {
+    /** 无盖子 */
+    none = 0,
+    /** 幸运红包盖子 */
+    luck = 1,
+    /** 通关红包盖子 */
+    mission = 2
 }

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

@@ -1,19 +1,51 @@
 import { Data } from "../../../mk/data/Data";
-import { GameProp, RewardState } from "../GameData";
+import { GameProp, RewardState, RewardType } from "../GameData";
 
 /**
  * @description 签到数据
  * @author 邹勇 薛鸿潇
  */
 export class SignData extends Data {
+    /**
+     * 数据初始化
+     */
+    public init() {
+        // 签到配置表
+        if (gData.gameData.configs.SignIn) {
+            gData.gameData.configs.SignIn.forEach(item_data => {
+                for (const key in item_data) {
+                    item_data[key] = parseInt(item_data[key])
+                }
+            });
+            this.c_sign = gData.gameData.configs.SignIn;
+            this.init_list = true;
+        }
+        // 服务端数据不对
+        // this.sign_last_bar = gData.gameData.gameData.signInDay;
+        // this.sign_can = gData.gameData.gameData.isSignInToday;
+
+        // 客户端测试数据
+        this.sign_last_bar = gData.gameData.getProp(GameProp.sign_last_bar);
+        // this.sign_can = gData.gameData.getProp(GameProp.sign_can);
+    }
+
     /** 标志位：是否需要刷新数据 */
     public init_data: boolean = false;
+    /** 标志位：是否初始化配置列表 */
+    public init_list: boolean = false;
 
     /** 配置数据 签到 */
-    public c_sign = [];
+    private _c_sign: Array<CSignType> = [];
+    set c_sign(value: Array<CSignType>) {
+        this._c_sign = value;
+        this.init_data = true;
+    }
+    get c_sign(): Array<CSignType> {
+        return this._c_sign;
+    }
 
-    // 服务端数据 上次签到天数
-    private _sign_last_bar = 3;
+    private _sign_last_bar = 0;
+    /** 上次签到天数 */
     set sign_last_bar(value: number) {
         this._sign_last_bar = value;
         this.init_data = true;
@@ -22,8 +54,8 @@ export class SignData extends Data {
         return this._sign_last_bar;
     }
 
-    // 服务端数据 能够签到
     private _sign_can = 1;
+    /** 能够签到 */
     set sign_can(value: number) {
         this._sign_can = value;
         this.init_data = true;
@@ -33,10 +65,10 @@ export class SignData extends Data {
     }
 
     /** 签到列表数据 */
-    public list_data = [];
+    public list_data: Array<Array<CSignType>> = [];
     /** 初始化列表数据 */
     public initListData() {
-        if (!this.c_sign.length) this.c_sign = this.getSignConfig();
+        // if (!this.c_sign.length) this.c_sign = this.getSignConfig();
         let list_data = [];
         for (let i = 0; i < 30;) {
             let item_data = [];
@@ -51,20 +83,20 @@ export class SignData extends Data {
     }
 
     /** 客户端造的假配置 */
-    private getSignConfig() {
-        let c_sign = [];
-        for (let i = 0; i < 30; i++) {
-            const id = i + 1;
-            let data: any = {};
-            data.id = id;
-            data.reward_type = i % 3;
-            data.count = id;
-            data.login_day = id;
-            data.video_limit = 0;
-            c_sign.push(data);
-        }
-        return c_sign;
-    }
+    // private getSignConfig() {
+    //     let c_sign = [];
+    //     for (let i = 0; i < 30; i++) {
+    //         const id = i + 1;
+    //         let data: any = {};
+    //         data.id = id;
+    //         data.reward_type = i % 3;
+    //         data.count = id;
+    //         data.login_day = id;
+    //         data.video_limit = 0;
+    //         c_sign.push(data);
+    //     }
+    //     return c_sign;
+    // }
 
     /**
      * 获取奖励状态
@@ -101,6 +133,7 @@ export class SignData extends Data {
     public signComplete() {
         this.sign_can = 0;
         this.sign_last_bar++;
+        // 自定义状态
         let new_data = [
             {
                 key: GameProp.sign_can,
@@ -112,6 +145,58 @@ export class SignData extends Data {
             }
         ]
         gData.gameData.setProps(new_data);
+        // 奖励展示
+        let reward_data = this.c_sign[this.sign_last_bar - 1];
+        if (reward_data.rewardType === RewardType.redBag) {
+            gData.reward.lid_type = gData.reward.type_lid.none;// 无盖子类型
+            gData.reward.data = [reward_data];// 数据列表
+            mk.ui.openPanel('module/reward/reward')
+        } else if (reward_data.rewardType === RewardType.rmb || reward_data.rewardType === RewardType.pigRmb) {
+            gData.receiptNotice.receip_rmb = reward_data.rewardNum;
+            gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
+            mk.ui.openPanel('module/receiptNotice/receiptNotice');
+        }
+
+        // 获得奖励
+    }
+
+    /**
+     * 获取数据列表中第一个可签到条目的index
+     * @returns index
+     */
+    public getItemIndexByCanSign(): number {
+        let index = 0;
+        const l_count = this.list_data.length;
+        for (let i = 0; i < l_count; i++) {
+            const i_count = this.list_data[i].length;
+            for (let j = 0; j < i_count; j++) {
+                let state = this.getStateByDay(this.list_data[i][j].loginDay);
+                if (this.sign_can) {
+                    if (state === RewardState.unlock) {
+                        index = i;
+                        return index
+                    }
+                } else {
+                    if (state === RewardState.lock) {
+                        index = i;
+                        return index
+                    }
+                }
+            }
+        }
+        return index;
     }
 
+}
+
+export type CSignType = {
+    id: number,
+    /** 天数 */
+    loginDay: number,
+    /** 奖励数量 */
+    rewardNum: number,
+    /** 奖励类型 */
+    rewardType: number,
+    /** 视频限制 */
+    videoNum: number,
 }

assets/script/game/module/module/redBagCash/RedBagCash.ts → assets/script/game/module/module/cashNormal/CashNormal.ts

@@ -16,6 +16,8 @@ export default class RedBagCash extends cc.Component {
 
     start() {
         this.initScrollView();
+        // 请求记录
+        // gData.cashNormal.getRecord()
     }
 
     // update (dt) {}

assets/script/game/module/module/redBagCash/RedBagItem.ts → assets/script/game/module/module/cashNormal/CashNormalItem.ts

@@ -1,7 +1,7 @@
 
 const { ccclass, property } = cc._decorator;
 /**
- * 红包提现条目
+ * 常规提现条目
  * @author 薛鸿潇
  */
 @ccclass

assets/script/game/module/module/cashOutRecord/CashOutItem.ts

@@ -1,28 +1,38 @@
-// Learn TypeScript:
-//  - https://docs.cocos.com/creator/manual/en/scripting/typescript.html
-// Learn Attribute:
-//  - https://docs.cocos.com/creator/manual/en/scripting/reference/attributes.html
-// Learn life-cycle callbacks:
-//  - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
-
-const {ccclass, property} = cc._decorator;
 
+const { ccclass, property } = cc._decorator;
+/**
+ * 提现记录条目
+ * @author 薛鸿潇
+ */
 @ccclass
-export default class NewClass extends cc.Component {
-
-    @property(cc.Label)
-    label: cc.Label = null;
-
-    @property
-    text: string = 'hello';
+export default class CashOutItem extends cc.Component {
 
-    // LIFE-CYCLE CALLBACKS:
+    @property({ displayName: 'lbl提现类型', type: cc.Label })
+    private lbl_cash_type: cc.Label = null;
+    @property({ displayName: 'lbl提现时间', type: cc.Label })
+    private lbl_cash_time: cc.Label = null;
+    @property({ displayName: 'lbl红包码', type: cc.Label })
+    private lbl_red_ma: cc.Label = null;
+    @property({ displayName: 'lbl毛币数量', type: cc.Label })
+    private lbl_rmb_value: cc.Label = null;
 
     // onLoad () {}
 
-    start () {
+    // start () {
 
+    // }
+
+    /**
+     * 初始化数据
+     */
+    public async setItemData(item_data) {
+        await this.initStyle(item_data);
     }
+    private initStyle(item_data) {
 
-    // update (dt) {}
+        this.lbl_cash_type.string = '签到提现';
+        this.lbl_cash_time.string = '2021.03.05';
+        this.lbl_red_ma.string = '红包码：' + "AABB左右左右BABA";
+        this.lbl_rmb_value.string = '￥' + 0.30 + '元';
+    }
 }

assets/script/game/module/module/cashOutRecord/CashOutRecord.ts

@@ -1,28 +1,43 @@
-// Learn TypeScript:
-//  - https://docs.cocos.com/creator/manual/en/scripting/typescript.html
-// Learn Attribute:
-//  - https://docs.cocos.com/creator/manual/en/scripting/reference/attributes.html
-// Learn life-cycle callbacks:
-//  - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
-
-const {ccclass, property} = cc._decorator;
 
+const { ccclass, property } = cc._decorator;
+/**
+ * 提现记录
+ * @author 薛鸿潇
+ */
 @ccclass
-export default class NewClass extends cc.Component {
-
-    @property(cc.Label)
-    label: cc.Label = null;
+export default class CashOutRecord extends cc.Component {
 
-    @property
-    text: string = 'hello';
-
-    // LIFE-CYCLE CALLBACKS:
+    @property({ displayName: '滚动视图', type: cc.ScrollView })
+    sroll_view: cc.ScrollView = null!;
+    @property({ displayName: 'lbl累计提现', type: cc.Label })
+    private lbl_rmb_total: cc.Label = null;
 
     // onLoad () {}
 
-    start () {
-
+    start() {
+        this.initTotal();
+        this.initScrollView();
     }
 
     // update (dt) {}
+
+    /**
+     * 初始化滚动视图
+     */
+    private initScrollView() {
+        // 测试数据
+        let data = []
+        for (let i = 0; i < 10; i++) {
+            let obj = {};
+            data.push(666)
+        }
+        this.sroll_view.node.emit('srollview-init', data);
+    }
+
+    /**
+     * 初始化累计提现
+     */
+    private initTotal() {
+        this.lbl_rmb_total.string = '￥' + gData.cashNormal.receip_total_rmb + '元';
+    }
 }

assets/script/game/module/module/pigBank/PigBank.ts

@@ -29,6 +29,10 @@ export default class PigBank extends cc.Component {
             gData.pigbank.init_data = false;
             this.initCashDesc();
         }
+        if (gData.pigbank.adData) {
+            cc.log('存钱罐提现', gData.pigbank.adData)
+            gData.pigbank.adData = null;
+        }
     }
 
     /** 
@@ -65,6 +69,7 @@ export default class PigBank extends cc.Component {
      * 提现操作
      */
     private clickCashOP() {
+        if (!gData.pigbank.cash_enable) return;
         gData.pigbank.cashOP();
         mk.ui.closePanel(this.node.name);
     }

assets/script/game/module/module/receiptNotice.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "e13fc909-6624-4cfe-97f5-2381bd10e53c",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/game/module/module/receiptNotice/ReceiptNotice.ts

@@ -0,0 +1,42 @@
+
+const { ccclass, property } = cc._decorator;
+
+/**
+ * 到账通知样式
+ * @author 薛鸿潇
+ */
+@ccclass
+export default class ReceiptNotice extends cc.Component {
+
+    @property({ displayName: 'lbl收款金额', type: cc.Label })
+    private lbl_receipt_rmb: cc.Label = null!;
+    @property({ displayName: 'lbl累计提现', type: cc.Label })
+    private lbl_rmb_total: cc.Label = null!;
+    @property({ displayName: 'lbl用户名', type: cc.Label })
+    private lbl_user_name: cc.Label = null!;
+
+
+    // onLoad() {
+
+    // }
+
+    // start() {
+
+    // }
+
+    update(dt) {
+        if (gData.receiptNotice.init_style) {
+            gData.receiptNotice.init_style = false;
+            this.initStyle();
+        }
+    }
+
+    /**
+     * 初始化样式
+     */
+    private initStyle() {
+        this.lbl_receipt_rmb.string = '￥' + gData.receiptNotice.receip_rmb + '元';
+        this.lbl_rmb_total.string = '￥' + gData.cashNormal.receip_total_rmb + '元';
+        this.lbl_user_name.string = gData.wechatData.nickName || '';
+    }
+}

assets/script/game/module/module/receiptNotice/ReceiptNotice.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "994441e4-0d9a-4ac8-88f5-492df8b483a2",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

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

@@ -1,4 +1,5 @@
 import { AdFun } from "../../../data/AdData";
+import { RewardType } from "../../../data/GameData";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -35,15 +36,6 @@ export default class Reward extends cc.Component {
 
     onLoad() {
         this.lbl_reward_value.string = '0';
-        // 测试数据
-        gData.reward.data.push({
-            /** 奖励类型 */
-            rewardType: 1,
-            /** 奖励数量 */
-            rewardNum: 100,
-            /** 玩家剩余数量 */
-            rewardTotal: 0
-        })
     }
 
     start() {
@@ -74,10 +66,14 @@ export default class Reward extends cc.Component {
      * 初始化封面样式
      */
     private initLid() {
-        if (gData.reward.is_luck) {
-            this.node_luck.active = true;
+        if (gData.reward.lid_type === gData.reward.type_lid.none) {// 无盖子样式
+            this.node_luck.active = false;
             this.node_mission.active = false;
-        } else {
+            this.watchVideoCall();
+        } else if (gData.reward.lid_type === gData.reward.type_lid.luck) {
+            this.node_luck.active = false;
+            this.node_mission.active = true;
+        } else if (gData.reward.lid_type === gData.reward.type_lid.mission) {
             this.node_luck.active = false;
             this.node_mission.active = true;
         }
@@ -111,21 +107,21 @@ export default class Reward extends cc.Component {
      * 看广告回调：开奖
      */
     private watchVideoCall() {
-        gData.reward.data = gData.reward.adData;
+        if (!gData.reward.data || !gData.reward.data.length) return;
         // 数据排序：多条奖励，只展示红包，把红包放在首位
-        const r_count = gData.reward.adData.length;
+        const r_count = gData.reward.data.length;
         if (r_count >= 2) {
             for (let i = 0; i < r_count; i++) {
-                if (gData.reward.adData[i].rewardType === 1) {
-                    let new_data = gData.reward.adData.splice(i, 1);
-                    gData.reward.adData.unshift(new_data);
+                if (gData.reward.data[i].rewardType === 1) {
+                    let new_data = gData.reward.data.splice(i, 1);
+                    gData.reward.data.unshift(new_data);
                     break;
                 }
             }
         }
 
         // 图标展示
-        if (gData.reward.data[0].rewardType === 1) {
+        if (gData.reward.data[0].rewardType === RewardType.redBag) {
             this.node_redBag.active = true;
             this.node_pig.active = false;
         } else {
@@ -147,6 +143,7 @@ export default class Reward extends cc.Component {
      */
     private clickGetReward() {
         cc.log('获取奖励：', gData.reward.data);
+        gData.reward.data = null;
     }
 
     /**

assets/script/game/module/module/sign/Sign.ts

@@ -1,3 +1,4 @@
+import TableView from "../../../component/TableView";
 import { AdFun } from "../../../data/AdData";
 import { GameProp, RewardState } from "../../../data/GameData";
 
@@ -5,7 +6,7 @@ import { GameProp, RewardState } from "../../../data/GameData";
  * 签到界面
  * - 每天第一次上线默认弹出一次【除首日】。待处理
  * - 全部签完后，不可再签到。此处需要判断上次签到天数。
- * - 签到数据几点刷新？什么方式刷新？ 与后端沟通
+ * - 滑动列表需要滚动到对应签到条目的高度，待处理。
  * @author 薛鸿潇
  */
 const { ccclass, property } = cc._decorator;
@@ -15,9 +16,13 @@ export default class Sign extends cc.Component {
 
     @property({ type: cc.ScrollView, displayName: '滚动视图' })
     private scroll_view: cc.ScrollView = null!;
+    @property({ type: cc.Node, displayName: '滚动内容容器' })
+    private node_content: cc.Node = null!;
+
     @property({ type: cc.Animation, displayName: '按钮_动画' })
     private anim_btn: cc.Animation = null!;
 
+    private tableview: TableView = null;
     onLoad() {
 
     }
@@ -34,16 +39,24 @@ export default class Sign extends cc.Component {
     private initScollView() {
         let list_data = gData.sign.list_data;
         this.scroll_view.node.emit('srollview-init', list_data)
+        this.tableview = this.scroll_view.node.getComponent('TableView')
+
+        let index = gData.sign.getItemIndexByCanSign();
+        this.tableview.contentMoveByIndex(index)
     }
 
 
     update(dt) {
         if (gData.sign.init_data) {
             gData.sign.init_data = false;
-            this.initScollView();
             this.initBtnStyle();
             return;
         }
+        if (gData.sign.init_list) {
+            gData.sign.init_list = false;
+            this.initScollView();
+            return;
+        }
         if (gData.sign.adData) {
             // 展示奖励
             this.getReward();
@@ -66,7 +79,13 @@ export default class Sign extends cc.Component {
      * 拿奖励
      */
     private getReward() {
+        let index_old = gData.sign.getItemIndexByCanSign();
+        // 完成展示
         gData.sign.signComplete();
+
+        // 指定条目数据刷新
+        this.tableview.resetItemData(index_old, gData.sign.list_data[index_old]);
+
         // 打开奖励界面
         // to do
     }

assets/script/game/module/module/sign/SignIconItem.ts

@@ -1,4 +1,5 @@
-import { RewardState } from "../../../data/GameData";
+import { RewardState, RewardType } from "../../../data/GameData";
+import { CSignType } from "../../../data/module/SignData";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -18,19 +19,18 @@ export default class SignIconItem extends cc.Component {
 
     @property({ displayName: '天数', type: cc.Label })
     private lbl_day: cc.Label = null!;
-    @property({ type: cc.Node, displayName: '蒙版' })
+    @property({ displayName: '蒙版', type: cc.Node })
     private node_mask: cc.Node = null!;
-    @property({ type: cc.Node, displayName: '勾' })
+    @property({ displayName: '勾', type: cc.Node })
     private node_gou: cc.Node = null!;
 
     /** 数据 */
-    private icon_data = {
+    private icon_data: CSignType = {
         id: 0,
-        reward_type: 0,
-        count: 0,
-        login_day: 0,
-        video_limit: 0,
-        state: RewardState.none,
+        rewardType: 0,
+        rewardNum: 0,
+        loginDay: 0,
+        videoNum: 0
     }
 
     /**
@@ -45,12 +45,13 @@ export default class SignIconItem extends cc.Component {
      * @param icon_data 数据
      */
     private initIcon(icon_data) {
-        if (!icon_data) {
+        this.icon_data = icon_data;
+        if (!this.icon_data) {
             this.node.active = false;
             return
         }
-        this.lbl_day.string = '第' + icon_data.login_day + '天';
-        if (icon_data.reward_type) {
+        this.lbl_day.string = '第' + this.icon_data.loginDay + '天';
+        if (this.icon_data.rewardType == RewardType.rmb || this.icon_data.rewardType == RewardType.pigRmb) {
             this.node_cash.active = true;
             this.node_redbag.active = false;
             this.lbl_day.node.getComponent(cc.LabelOutline).color = cc.color(DayOutLineColor.cash);
@@ -59,10 +60,9 @@ export default class SignIconItem extends cc.Component {
             this.node_redbag.active = true;
             this.lbl_day.node.getComponent(cc.LabelOutline).color = cc.color(DayOutLineColor.red_bag);
         }
-        this.icon_data = icon_data;
 
         // 状态样式
-        let state = gData.sign.getStateByDay(icon_data.login_day);
+        let state = gData.sign.getStateByDay(this.icon_data.loginDay);
         if (state == RewardState.none) {
             this.node_mask.active = true;
             this.node_gou.active = true;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/ATBannerJSSDK.js

@@ -1,186 +1,221 @@
-
-var ATAndroidBannerJS = require("./Android/ATAndroidBannerJS");
-var ATiOSBannerJS = require("./iOS/ATiOSBannerJS");
-
-var initPlatformBridge = function() {  
-    if (cc.sys.os === cc.sys.OS_IOS) {           
-        return ATiOSBannerJS;
-    } else if (cc.sys.os === cc.sys.OS_ANDROID) {
-        return ATAndroidBannerJS;
-    }
-};
-
-var platformBridge = initPlatformBridge();
-
-
-var ATBannerSDK = ATBannerSDK || {
-    kATBannerAdLoadingExtraBannerAdSizeStruct: "banner_ad_size_struct",
-	kATBannerAdShowingPositionTop : "top",
-    kATBannerAdShowingPositionBottom : "bottom",
-	
-	kATBannerAdInlineAdaptiveWidth : "inline_adaptive_width",
-	kATBannerAdInlineAdaptiveOrientation : "inline_adaptive_orientation",
-	kATBannerAdInlineAdaptiveOrientationCurrent : 0,
-	kATBannerAdInlineAdaptiveOrientationPortrait : 1,
-	kATBannerAdInlineAdaptiveOrientationLandscape : 2,
-	
-
-    ATBannerListener : {
-        developerCallback : null,
-
-        onBannerAdLoaded : function (placementId) {
-            if(this.developerCallback != null && this.developerCallback.onBannerAdLoaded != null && undefined != this.developerCallback.onBannerAdLoaded) {
-                this.developerCallback.onBannerAdLoaded(placementId);
-            }
-        },
-
-        onBannerAdLoadFail : function(placementId, errorInfo) {
-          if(this.developerCallback != null && this.developerCallback.onBannerAdLoadFail != null && undefined != this.developerCallback.onBannerAdLoadFail) {
-                this.developerCallback.onBannerAdLoadFail(placementId, errorInfo);
-            }
-        },
-
-        onBannerAdShow : function(placementId, callbackInfo) {
-           if(this.developerCallback != null && this.developerCallback.onBannerAdShow != null && undefined != this.developerCallback.onBannerAdShow) {
-                this.developerCallback.onBannerAdShow(placementId, callbackInfo);
-            }
-        },
-
-        onBannerAdClick : function(placementId, callbackInfo) {
-            if(this.developerCallback != null && this.developerCallback.onBannerAdClick != null && undefined != this.developerCallback.onBannerAdClick) {
-                this.developerCallback.onBannerAdClick(placementId, callbackInfo);
-            }
-        },
-
-        onBannerAdAutoRefresh : function(placementId, callbackInfo) {
-            if(this.developerCallback != null && this.developerCallback.onBannerAdAutoRefresh != null && undefined != this.developerCallback.onBannerAdAutoRefresh) {
-                this.developerCallback.onBannerAdAutoRefresh(placementId, callbackInfo);
-            }
-        },
-
-        onBannerAdAutoRefreshFail : function(placementId, errorInfo) {
-            if(this.developerCallback != null && this.developerCallback.onBannerAdAutoRefreshFail != null && undefined != this.developerCallback.onBannerAdAutoRefreshFail) {
-                this.developerCallback.onBannerAdAutoRefreshFail(placementId, errorInfo);
-            }
-        },
-
-        onBannerAdCloseButtonTapped : function(placementId, callbackInfo) {
-            if(this.developerCallback != null && this.developerCallback.onBannerAdCloseButtonTapped != null && undefined != this.developerCallback.onBannerAdCloseButtonTapped) {
-                this.developerCallback.onBannerAdCloseButtonTapped(placementId, callbackInfo);
-            }
-        }
-        
-    },
-    
-    loadBanner : function(placementId, settings={}) {
-
-        if (undefined != platformBridge && platformBridge != null) {
-			
-			if (settings.hasOwnProperty(ATBannerSDK.kATBannerAdLoadingExtraBannerAdSizeStruct)) {
-				var loadAdSize = settings[ATBannerSDK.kATBannerAdLoadingExtraBannerAdSizeStruct];
-				settings["width"] = loadAdSize["width"];
-				settings["height"] = loadAdSize["height"];
-			}
-			
-            platformBridge.loadBanner(placementId, JSON.stringify(settings));
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    setAdListener : function(listener) {
-        var eventJSON = {};
-        eventJSON[LoadedCallbackKey]= "ATBannerJSSDK.ATBannerListener.onBannerAdLoaded",
-        eventJSON[LoadFailCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdLoadFail",
-        eventJSON[CloseCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdCloseButtonTapped",
-        eventJSON[ClickCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdClick",
-        eventJSON[ShowCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdShow",
-        eventJSON[RefreshCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdAutoRefresh",
-        eventJSON[RefreshFailCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdAutoRefreshFail"
-        if (undefined != platformBridge && platformBridge != null) {
-            platformBridge.setAdListener(JSON.stringify(eventJSON));
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-
-        this.ATBannerListener.developerCallback = listener;
-    },
-
-    hasAdReady : function(placementId) {
-        if (undefined != platformBridge && platformBridge != null) {
-            return platformBridge.hasAdReady(placementId);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-        return false;
-    },
-
-    showAdInPosition : function(placementId, position) {
-        if (undefined != platformBridge && platformBridge != null) {
-           platformBridge.showAdInPosition(placementId, position);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    showAdInRectangle : function(placementId, showAdRect) {
-        if (undefined != platformBridge && platformBridge != null) {
-           platformBridge.showAdInRectangle(placementId, JSON.stringify(showAdRect));
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-
-    removeAd : function(placementId) {
-        if (undefined != platformBridge && platformBridge != null) {
-           platformBridge.removeAd(placementId);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    reShowAd : function(placementId) {
-        if (undefined != platformBridge && platformBridge != null) {
-           platformBridge.reShowAd(placementId);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    hideAd : function(placementId) {
-        if (undefined != platformBridge && platformBridge != null) {
-           platformBridge.hideAd(placementId);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    createLoadAdSize : function(width, height) {
-    	var loadAdSize = {};
-    	loadAdSize["width"] = width;
-    	loadAdSize["height"] = height;
-    	return loadAdSize;
-    },
-
-    createShowAdRect : function(x, y, width, height) {
-    	var adRect = {};
-    	adRect["x"] = x;
-    	adRect["y"] = y;
-    	adRect["width"] = width;
-    	adRect["height"] = height;
-    	return adRect;
-    }
-
-  
-};
-
-const LoadedCallbackKey = "BannerLoaded";
-const LoadFailCallbackKey = "BannerLoadFail";
-const CloseCallbackKey = "BannerCloseButtonTapped";
-const ClickCallbackKey = "BannerClick";
-const ShowCallbackKey = "BannerShow";
-const RefreshCallbackKey = "BannerRefresh";
-const RefreshFailCallbackKey = "BannerRefreshFail";
-
+
+var ATAndroidBannerJS = require("./Android/ATAndroidBannerJS");
+var ATiOSBannerJS = require("./iOS/ATiOSBannerJS");
+
+var initPlatformBridge = function() {  
+    if (cc.sys.os === cc.sys.OS_IOS) {           
+        return ATiOSBannerJS;
+    } else if (cc.sys.os === cc.sys.OS_ANDROID) {
+        return ATAndroidBannerJS;
+    }
+};
+
+var platformBridge = initPlatformBridge();
+
+
+var ATBannerSDK = ATBannerSDK || {
+    kATBannerAdLoadingExtraBannerAdSizeStruct: "banner_ad_size_struct",
+	kATBannerAdShowingPositionTop : "top",
+    kATBannerAdShowingPositionBottom : "bottom",
+	
+	kATBannerAdInlineAdaptiveWidth : "inline_adaptive_width",
+	kATBannerAdInlineAdaptiveOrientation : "inline_adaptive_orientation",
+	kATBannerAdInlineAdaptiveOrientationCurrent : 0,
+	kATBannerAdInlineAdaptiveOrientationPortrait : 1,
+	kATBannerAdInlineAdaptiveOrientationLandscape : 2,
+
+	kATBannerAdAdaptiveWidth : "adaptive_width",
+	kATBannerAdAdaptiveOrientation : "adaptive_orientation",
+	kATBannerAdAdaptiveOrientationCurrent : 0,
+	kATBannerAdAdaptiveOrientationPortrait : 1,
+	kATBannerAdAdaptiveOrientationLandscape : 2,
+
+
+    ATBannerListener : {
+        developerCallback : null,
+
+        onBannerAdLoaded : function (placementId) {
+            if(this.developerCallback != null && this.developerCallback.onBannerAdLoaded != null && undefined != this.developerCallback.onBannerAdLoaded) {
+                this.developerCallback.onBannerAdLoaded(placementId);
+            }
+        },
+
+        onBannerAdLoadFail : function(placementId, errorInfo) {
+          if(this.developerCallback != null && this.developerCallback.onBannerAdLoadFail != null && undefined != this.developerCallback.onBannerAdLoadFail) {
+                this.developerCallback.onBannerAdLoadFail(placementId, errorInfo);
+            }
+        },
+
+        onBannerAdShow : function(placementId, callbackInfo) {
+           if(this.developerCallback != null && this.developerCallback.onBannerAdShow != null && undefined != this.developerCallback.onBannerAdShow) {
+                this.developerCallback.onBannerAdShow(placementId, callbackInfo);
+            }
+        },
+
+        onBannerAdClick : function(placementId, callbackInfo) {
+            if(this.developerCallback != null && this.developerCallback.onBannerAdClick != null && undefined != this.developerCallback.onBannerAdClick) {
+                this.developerCallback.onBannerAdClick(placementId, callbackInfo);
+            }
+        },
+
+        onBannerAdAutoRefresh : function(placementId, callbackInfo) {
+            if(this.developerCallback != null && this.developerCallback.onBannerAdAutoRefresh != null && undefined != this.developerCallback.onBannerAdAutoRefresh) {
+                this.developerCallback.onBannerAdAutoRefresh(placementId, callbackInfo);
+            }
+        },
+
+        onBannerAdAutoRefreshFail : function(placementId, errorInfo) {
+            if(this.developerCallback != null && this.developerCallback.onBannerAdAutoRefreshFail != null && undefined != this.developerCallback.onBannerAdAutoRefreshFail) {
+                this.developerCallback.onBannerAdAutoRefreshFail(placementId, errorInfo);
+            }
+        },
+
+        onBannerAdCloseButtonTapped : function(placementId, callbackInfo) {
+            if(this.developerCallback != null && this.developerCallback.onBannerAdCloseButtonTapped != null && undefined != this.developerCallback.onBannerAdCloseButtonTapped) {
+                this.developerCallback.onBannerAdCloseButtonTapped(placementId, callbackInfo);
+            }
+        }
+        
+    },
+    
+    loadBanner : function(placementId, settings={}) {
+
+        if (undefined != platformBridge && platformBridge != null) {
+			
+			if (settings.hasOwnProperty(ATBannerSDK.kATBannerAdLoadingExtraBannerAdSizeStruct)) {
+				var loadAdSize = settings[ATBannerSDK.kATBannerAdLoadingExtraBannerAdSizeStruct];
+				settings["width"] = loadAdSize["width"];
+				settings["height"] = loadAdSize["height"];
+			}
+			
+            platformBridge.loadBanner(placementId, JSON.stringify(settings));
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    setAdListener : function(listener) {
+        var eventJSON = {};
+        eventJSON[LoadedCallbackKey]= "ATBannerJSSDK.ATBannerListener.onBannerAdLoaded",
+        eventJSON[LoadFailCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdLoadFail",
+        eventJSON[CloseCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdCloseButtonTapped",
+        eventJSON[ClickCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdClick",
+        eventJSON[ShowCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdShow",
+        eventJSON[RefreshCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdAutoRefresh",
+        eventJSON[RefreshFailCallbackKey]=  "ATBannerJSSDK.ATBannerListener.onBannerAdAutoRefreshFail"
+        if (undefined != platformBridge && platformBridge != null) {
+            platformBridge.setAdListener(JSON.stringify(eventJSON));
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+
+        this.ATBannerListener.developerCallback = listener;
+    },
+
+    hasAdReady : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+            return platformBridge.hasAdReady(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+        return false;
+    },
+
+    checkAdStatus : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+            return platformBridge.checkAdStatus(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+        return "";
+    },
+
+    showAdInPosition : function(placementId, position) {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.showAdInPosition(placementId, position);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    showAdInPositionAndScenario : function(placementId, position, scenario) {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.showAdInPosition(placementId, position, scenario);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    showAdInRectangle : function(placementId, showAdRect) {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.showAdInRectangle(placementId, JSON.stringify(showAdRect));
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    showAdInRectangleAndScenario : function(placementId, showAdRect, scenario) {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.showAdInRectangle(placementId, JSON.stringify(showAdRect), scenario);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    removeAd : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.removeAd(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    reShowAd : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.reShowAd(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    hideAd : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.hideAd(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    createLoadAdSize : function(width, height) {
+    	var loadAdSize = {};
+    	loadAdSize["width"] = width;
+    	loadAdSize["height"] = height;
+    	return loadAdSize;
+    },
+
+    createShowAdRect : function(x, y, width, height) {
+    	var adRect = {};
+    	adRect["x"] = x;
+    	adRect["y"] = y;
+    	adRect["width"] = width;
+    	adRect["height"] = height;
+    	return adRect;
+    }
+
+  
+};
+
+
+
+
+
+
+const LoadedCallbackKey = "BannerLoaded";
+const LoadFailCallbackKey = "BannerLoadFail";
+const CloseCallbackKey = "BannerCloseButtonTapped";
+const ClickCallbackKey = "BannerClick";
+const ShowCallbackKey = "BannerShow";
+const RefreshCallbackKey = "BannerRefresh";
+const RefreshFailCallbackKey = "BannerRefreshFail";
+
 window.ATBannerJSSDK = ATBannerSDK;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/ATInterstitialJSSDK.js

@@ -1,146 +1,155 @@
-var ATiOSInterstitialJS = require("./iOS/ATiOSInterstitialJS");
-var ATAndroidInterstitialJS = require("./Android/ATAndroidInterstitialJS");
-
-var initPlatformBridge = function() {  
-    if (cc.sys.os === cc.sys.OS_IOS) {           
-        return ATiOSInterstitialJS;
-    } else if (cc.sys.os === cc.sys.OS_ANDROID) {
-        return ATAndroidInterstitialJS;
-    }
-};
-
-var platformBridge = initPlatformBridge();
-
-
-var ATInterstitialSDK = ATInterstitialSDK || {
-
-	UseRewardedVideoAsInterstitial: "UseRewardedVideoAsInterstitial",
-
-    ATInterstitialListener : {
-        developerCallback : null,
-
-        onInterstitialAdLoaded : function (placementId) {
-            if(this.developerCallback != null && this.developerCallback.onInterstitialAdLoaded != null && undefined != this.developerCallback.onInterstitialAdLoaded) {
-                this.developerCallback.onInterstitialAdLoaded(placementId);
-            }
-        },
-
-        onInterstitialAdLoadFail : function(placementId, errorInfo) {
-          if(this.developerCallback != null && this.developerCallback.onInterstitialAdLoadFail != null && undefined != this.developerCallback.onInterstitialAdLoadFail) {
-                this.developerCallback.onInterstitialAdLoadFail(placementId, errorInfo);
-            }
-        },
-
-        onInterstitialAdShow : function(placementId, callbackInfo) {
-           if(this.developerCallback != null && this.developerCallback.onInterstitialAdShow != null && undefined != this.developerCallback.onInterstitialAdShow) {
-                this.developerCallback.onInterstitialAdShow(placementId, callbackInfo);
-            }
-        },
-
-        onInterstitialAdStartPlayingVideo : function(placementId, callbackInfo) {
-            if(this.developerCallback != null && this.developerCallback.onInterstitialAdStartPlayingVideo != null && undefined != this.developerCallback.onInterstitialAdStartPlayingVideo) {
-                this.developerCallback.onInterstitialAdStartPlayingVideo(placementId, callbackInfo);
-            }
-        },
-
-        onInterstitialAdEndPlayingVideo : function(placementId, callbackInfo) {
-            if(this.developerCallback != null && this.developerCallback.onInterstitialAdEndPlayingVideo != null && undefined != this.developerCallback.onInterstitialAdEndPlayingVideo) {
-                this.developerCallback.onInterstitialAdEndPlayingVideo(placementId, callbackInfo);
-            }
-        },
-
-        onInterstitialAdFailedToPlayVideo : function(placementId, errorInfo) {
-            if(this.developerCallback != null && this.developerCallback.onInterstitialAdFailedToPlayVideo != null && undefined != this.developerCallback.onInterstitialAdFailedToPlayVideo) {
-                this.developerCallback.onInterstitialAdFailedToPlayVideo(placementId, errorInfo);
-            }
-        },
-
-        onInterstitialAdFailedToShow : function(placementId) {
-            if(this.developerCallback != null && this.developerCallback.onInterstitialAdFailedToShow != null && undefined != this.developerCallback.onInterstitialAdFailedToShow) {
-                this.developerCallback.onInterstitialAdFailedToShow(placementId);
-            }
-        },
-
-        onInterstitialAdClose : function(placementId, callbackInfo) {
-            if(this.developerCallback != null && this.developerCallback.onInterstitialAdClose != null && undefined != this.developerCallback.onInterstitialAdClose) {
-                this.developerCallback.onInterstitialAdClose(placementId, callbackInfo);
-            }
-        },
-
-        onInterstitialAdClick : function(placementId, callbackInfo) {
-            if(this.developerCallback != null && this.developerCallback.onInterstitialAdClick != null && undefined != this.developerCallback.onInterstitialAdClick) {
-                this.developerCallback.onInterstitialAdClick(placementId, callbackInfo);
-            }
-        }
-        
-    },
-    
-	loadInterstitial : function(placementId, settings={}) {
-
-        if (undefined != platformBridge && platformBridge != null) {
-            platformBridge.loadInterstitial(placementId, JSON.stringify(settings));
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    setAdListener : function(listener) {
-        var eventJSON = {};
-        eventJSON[LoadedCallbackKey]="ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdLoaded",
-        eventJSON[LoadFailCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdLoadFail",
-        eventJSON[PlayStartCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdStartPlayingVideo",
-        eventJSON[PlayEndCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdEndPlayingVideo",
-        eventJSON[PlayFailCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdFailedToPlayVideo",
-        eventJSON[CloseCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdClose",
-        eventJSON[ClickCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdClick",
-        eventJSON[ShowCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdShow",
-        eventJSON[ShowFailCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdFailedToShow"
-
-        if (undefined != platformBridge && platformBridge != null) {
-             platformBridge.setAdListener(JSON.stringify(eventJSON));
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-
-        this.ATInterstitialListener.developerCallback = listener;
-    },
-
-    hasAdReady : function(placementId) {
-        if (undefined != platformBridge && platformBridge != null) {
-            return platformBridge.hasAdReady(placementId);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-        return false;
-    },
-
-    showAd : function(placementId) {
-        if (undefined != platformBridge && platformBridge != null) {
-           platformBridge.showAd(placementId);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    showAdInScenario : function(placementId, scenario="") {
-        if (undefined != platformBridge && platformBridge != null) {
-           platformBridge.showAdInScenario(placementId, scenario);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    } 
-  
-  
-};
-
-const LoadedCallbackKey = "InterstitialLoaded";
-const LoadFailCallbackKey = "InterstitialLoadFail";
-const PlayStartCallbackKey = "InterstitialPlayStart";
-const PlayEndCallbackKey = "InterstitialPlayEnd";
-const PlayFailCallbackKey = "InterstitialPlayFail";
-const CloseCallbackKey = "InterstitialClose";
-const ClickCallbackKey = "InterstitialClick";
-const ShowCallbackKey = "InterstitialAdShow";
-const ShowFailCallbackKey = "InterstitialAdShowFail";
-
+var ATiOSInterstitialJS = require("./iOS/ATiOSInterstitialJS");
+var ATAndroidInterstitialJS = require("./Android/ATAndroidInterstitialJS");
+
+var initPlatformBridge = function() {  
+    if (cc.sys.os === cc.sys.OS_IOS) {           
+        return ATiOSInterstitialJS;
+    } else if (cc.sys.os === cc.sys.OS_ANDROID) {
+        return ATAndroidInterstitialJS;
+    }
+};
+
+var platformBridge = initPlatformBridge();
+
+
+var ATInterstitialSDK = ATInterstitialSDK || {
+
+	UseRewardedVideoAsInterstitial: "UseRewardedVideoAsInterstitial",
+
+    ATInterstitialListener : {
+        developerCallback : null,
+
+        onInterstitialAdLoaded : function (placementId) {
+            if(this.developerCallback != null && this.developerCallback.onInterstitialAdLoaded != null && undefined != this.developerCallback.onInterstitialAdLoaded) {
+                this.developerCallback.onInterstitialAdLoaded(placementId);
+            }
+        },
+
+        onInterstitialAdLoadFail : function(placementId, errorInfo) {
+          if(this.developerCallback != null && this.developerCallback.onInterstitialAdLoadFail != null && undefined != this.developerCallback.onInterstitialAdLoadFail) {
+                this.developerCallback.onInterstitialAdLoadFail(placementId, errorInfo);
+            }
+        },
+
+        onInterstitialAdShow : function(placementId, callbackInfo) {
+           if(this.developerCallback != null && this.developerCallback.onInterstitialAdShow != null && undefined != this.developerCallback.onInterstitialAdShow) {
+                this.developerCallback.onInterstitialAdShow(placementId, callbackInfo);
+            }
+        },
+
+        onInterstitialAdStartPlayingVideo : function(placementId, callbackInfo) {
+            if(this.developerCallback != null && this.developerCallback.onInterstitialAdStartPlayingVideo != null && undefined != this.developerCallback.onInterstitialAdStartPlayingVideo) {
+                this.developerCallback.onInterstitialAdStartPlayingVideo(placementId, callbackInfo);
+            }
+        },
+
+        onInterstitialAdEndPlayingVideo : function(placementId, callbackInfo) {
+            if(this.developerCallback != null && this.developerCallback.onInterstitialAdEndPlayingVideo != null && undefined != this.developerCallback.onInterstitialAdEndPlayingVideo) {
+                this.developerCallback.onInterstitialAdEndPlayingVideo(placementId, callbackInfo);
+            }
+        },
+
+        onInterstitialAdFailedToPlayVideo : function(placementId, errorInfo) {
+            if(this.developerCallback != null && this.developerCallback.onInterstitialAdFailedToPlayVideo != null && undefined != this.developerCallback.onInterstitialAdFailedToPlayVideo) {
+                this.developerCallback.onInterstitialAdFailedToPlayVideo(placementId, errorInfo);
+            }
+        },
+
+        onInterstitialAdFailedToShow : function(placementId) {
+            if(this.developerCallback != null && this.developerCallback.onInterstitialAdFailedToShow != null && undefined != this.developerCallback.onInterstitialAdFailedToShow) {
+                this.developerCallback.onInterstitialAdFailedToShow(placementId);
+            }
+        },
+
+        onInterstitialAdClose : function(placementId, callbackInfo) {
+            if(this.developerCallback != null && this.developerCallback.onInterstitialAdClose != null && undefined != this.developerCallback.onInterstitialAdClose) {
+                this.developerCallback.onInterstitialAdClose(placementId, callbackInfo);
+            }
+        },
+
+        onInterstitialAdClick : function(placementId, callbackInfo) {
+            if(this.developerCallback != null && this.developerCallback.onInterstitialAdClick != null && undefined != this.developerCallback.onInterstitialAdClick) {
+                this.developerCallback.onInterstitialAdClick(placementId, callbackInfo);
+            }
+        }
+        
+    },
+    
+	loadInterstitial : function(placementId, settings={}) {
+
+        if (undefined != platformBridge && platformBridge != null) {
+            platformBridge.loadInterstitial(placementId, JSON.stringify(settings));
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    setAdListener : function(listener) {
+        var eventJSON = {};
+        eventJSON[LoadedCallbackKey]="ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdLoaded",
+        eventJSON[LoadFailCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdLoadFail",
+        eventJSON[PlayStartCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdStartPlayingVideo",
+        eventJSON[PlayEndCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdEndPlayingVideo",
+        eventJSON[PlayFailCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdFailedToPlayVideo",
+        eventJSON[CloseCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdClose",
+        eventJSON[ClickCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdClick",
+        eventJSON[ShowCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdShow",
+        eventJSON[ShowFailCallbackKey]= "ATInterstitialJSSDK.ATInterstitialListener.onInterstitialAdFailedToShow"
+
+        if (undefined != platformBridge && platformBridge != null) {
+             platformBridge.setAdListener(JSON.stringify(eventJSON));
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+
+        this.ATInterstitialListener.developerCallback = listener;
+    },
+
+    hasAdReady : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+            return platformBridge.hasAdReady(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+        return false;
+    },
+
+    checkAdStatus : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+            return platformBridge.checkAdStatus(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+        return "";
+    },
+
+    showAd : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.showAd(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    showAdInScenario : function(placementId, scenario="") {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.showAdInScenario(placementId, scenario);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    } 
+  
+  
+};
+
+const LoadedCallbackKey = "InterstitialLoaded";
+const LoadFailCallbackKey = "InterstitialLoadFail";
+const PlayStartCallbackKey = "InterstitialPlayStart";
+const PlayEndCallbackKey = "InterstitialPlayEnd";
+const PlayFailCallbackKey = "InterstitialPlayFail";
+const CloseCallbackKey = "InterstitialClose";
+const ClickCallbackKey = "InterstitialClick";
+const ShowCallbackKey = "InterstitialAdShow";
+const ShowFailCallbackKey = "InterstitialAdShowFail";
+
 window.ATInterstitialJSSDK = ATInterstitialSDK;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/ATJSSDK.js

@@ -1,125 +1,182 @@
-
-var ATAndroidJS = require("./Android/ATAndroidJS");
-var ATiOSJS = require("./iOS/ATiOSJS");
-var isDebugLog = false;
-
-var initPlatformBridge = function() {  
-    if (cc.sys.os === cc.sys.OS_IOS) {           
-        return ATiOSJS;
-    } else if (cc.sys.os === cc.sys.OS_ANDROID) {
-        return ATAndroidJS;
-    }
-};
-
-var platformBridge = initPlatformBridge();
-
-
-var ATSDK = ATSDK || {
-
-    kATUserLocationUnknown : 0,
-    kATUserLocationInEU : 1,
-    kATUserLocationOutOfEU : 2,
-
-
-    PERSONALIZED : 0,
-    NONPERSONALIZED :1,
-    UNKNOWN : 2,
-
-    ATSDKListener : {
-        userLocationCallback : null,
-
-        getUserLocationCallback : function(userLocation) {
-            if(undefined != this.userLocationCallback && this.userLocationCallback != null ){
-                this.userLocationCallback(userLocation);
-            }
-        }
-    },
-    
-    initSDK : function(appId, appKey) {
-
-        if (undefined != platformBridge && platformBridge != null) {
-            platformBridge.initSDK(appId, appKey);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    initCustomMap : function(customMap) {
-        if (undefined != platformBridge && platformBridge != null) {
-            if(undefined != customMap && customMap != null) {
-                platformBridge.initCustomMap(JSON.stringify(customMap));
-            }
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    setPlacementCustomMap : function(placmentId, customMap) {
-        if (undefined != platformBridge && platformBridge != null) {
-            if(undefined != customMap && customMap != null) {
-                 platformBridge.setPlacementCustomMap(placmentId, JSON.stringify(customMap));
-            }
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    setGDPRLevel : function(level) {
-        if (undefined != platformBridge && platformBridge != null) {
-            platformBridge.setGDPRLevel(level);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    getGDPRLevel : function() {
-        if (undefined != platformBridge && platformBridge != null) {
-            return platformBridge.getGDPRLevel();
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-        return this.UNKNOWN;
-    },
-
-    getUserLocation : function(userLocationCallback) {
-        this.ATSDKListener.userLocationCallback = userLocationCallback;
-        if (undefined != platformBridge && platformBridge != null) {
-            platformBridge.getUserLocation(GetUserLocationJsCallback);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    showGDPRAuth : function () {
-        if (undefined != platformBridge && platformBridge != null) {
-            platformBridge.showGDPRAuth();
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    setLogDebug : function (debug) {
-        isDebugLog = debug;
-        if (undefined != platformBridge && platformBridge != null) {
-            platformBridge.setLogDebug(debug);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    printLog : function(msg) {
-        if (undefined != msg && null != msg && isDebugLog && platformBridge != null ) {
-            if (undefined != platformBridge && platformBridge != null) {
-                platformBridge.printJsLog(msg); 
-            } else {
-                cc.log("You must run on Android or iOS.");
-            }
-                
-        }
-    }
-  
-};
-
-const GetUserLocationJsCallback = "ATJSSDK.ATSDKListener.getUserLocationCallback";
-
+
+var ATAndroidJS = require("./Android/ATAndroidJS");
+var ATiOSJS = require("./iOS/ATiOSJS");
+var isDebugLog = false;
+
+var initPlatformBridge = function() {  
+    if (cc.sys.os === cc.sys.OS_IOS) {           
+        return ATiOSJS;
+    } else if (cc.sys.os === cc.sys.OS_ANDROID) {
+        return ATAndroidJS;
+    }
+};
+
+var platformBridge = initPlatformBridge();
+
+
+var ATSDK = ATSDK || {
+
+    kATUserLocationUnknown : 0,
+    kATUserLocationInEU : 1,
+    kATUserLocationOutOfEU : 2,
+
+
+    PERSONALIZED : 0,
+    NONPERSONALIZED :1,
+    UNKNOWN : 2,
+    
+    
+    //for android and ios
+    OS_VERSION_NAME : "os_vn",
+    OS_VERSION_CODE : "os_vc",
+    APP_PACKAGE_NAME : "package_name",
+    APP_VERSION_NAME : "app_vn",
+    APP_VERSION_CODE : "app_vc",
+
+    BRAND : "brand",
+    MODEL : "model",
+    DEVICE_SCREEN_SIZE : "screen",
+    MNC : "mnc",
+    MCC : "mcc",
+
+    LANGUAGE : "language",
+    TIMEZONE : "timezone",
+    USER_AGENT : "ua",
+    ORIENTATION : "orient",
+    NETWORK_TYPE : "network_type",
+
+    //for android
+    INSTALLER : "it_src",
+    ANDROID_ID : "android_id",
+    GAID : "gaid",
+    MAC : "mac",
+    IMEI : "imei",
+    OAID : "oaid",
+    
+    //for ios
+    IDFA : "idfa",
+    IDFV : "idfv",
+
+    ATSDKListener : {
+        userLocationCallback : null,
+
+        getUserLocationCallback : function(userLocation) {
+            if(undefined != this.userLocationCallback && this.userLocationCallback != null ){
+                this.userLocationCallback(userLocation);
+            }
+        }
+    },
+    
+    initSDK : function(appId, appKey) {
+
+        if (undefined != platformBridge && platformBridge != null) {
+            platformBridge.initSDK(appId, appKey);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    initCustomMap : function(customMap) {
+        if (undefined != platformBridge && platformBridge != null) {
+            if(undefined != customMap && customMap != null) {
+                platformBridge.initCustomMap(JSON.stringify(customMap));
+            }
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    setPlacementCustomMap : function(placmentId, customMap) {
+        if (undefined != platformBridge && platformBridge != null) {
+            if(undefined != customMap && customMap != null) {
+                 platformBridge.setPlacementCustomMap(placmentId, JSON.stringify(customMap));
+            }
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    setGDPRLevel : function(level) {
+        if (undefined != platformBridge && platformBridge != null) {
+            platformBridge.setGDPRLevel(level);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    getGDPRLevel : function() {
+        if (undefined != platformBridge && platformBridge != null) {
+            return platformBridge.getGDPRLevel();
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+        return this.UNKNOWN;
+    },
+
+    getUserLocation : function(userLocationCallback) {
+        this.ATSDKListener.userLocationCallback = userLocationCallback;
+        if (undefined != platformBridge && platformBridge != null) {
+            platformBridge.getUserLocation(GetUserLocationJsCallback);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    showGDPRAuth : function () {
+        if (undefined != platformBridge && platformBridge != null) {
+            platformBridge.showGDPRAuth();
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    setLogDebug : function (debug) {
+        isDebugLog = debug;
+        if (undefined != platformBridge && platformBridge != null) {
+            platformBridge.setLogDebug(debug);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    printLog : function(msg) {
+        if (undefined != msg && null != msg && isDebugLog && platformBridge != null ) {
+            if (undefined != platformBridge && platformBridge != null) {
+                platformBridge.printJsLog(msg); 
+            } else {
+                cc.log("You must run on Android or iOS.");
+            }
+                
+        }
+    },
+
+    deniedUploadDeviceInfo : function (deniedInfo) {
+        if (undefined != platformBridge && platformBridge != null) {
+			
+			if (deniedInfo != null) {
+				var length = deniedInfo.length;
+				var deniedInfoString = "";
+				for (var i = 0; i < length; i++) {
+					var info = deniedInfo[i];
+					if (i == 0) {
+						deniedInfoString = info;
+					} else {
+						deniedInfoString = deniedInfoString + "," + info;
+					}
+				}
+				
+				cc.log("test__" + deniedInfoString)
+				
+				platformBridge.deniedUploadDeviceInfo(deniedInfoString);
+			}
+			
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+  
+};
+
+const GetUserLocationJsCallback = "ATJSSDK.ATSDKListener.getUserLocationCallback";
+
 window.ATJSSDK = ATSDK;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/ATNativeJSSDK.js

@@ -1,197 +1,220 @@
-
-var ATAndroidNativeJS = require("./Android/ATAndroidNativeJS");
-var ATiOSNativeJS = require("./iOS/ATiOSNativeJS");
-var initPlatformBridge = function() {  
-    if (cc.sys.os === cc.sys.OS_IOS) {           
-        return ATiOSNativeJS;
-    } else if (cc.sys.os === cc.sys.OS_ANDROID) {
-        return ATAndroidNativeJS;
-    }
-};
-
-var platformBridge = initPlatformBridge();
-
-
-var ATNativeSDK = ATNativeSDK || {   
-
-    ATNativeListener : {
-        developerCallback : null,
-
-        onNativeAdLoaded : function (placementId) {
-            if(this.developerCallback != null && this.developerCallback.onNativeAdLoaded != null && undefined != this.developerCallback.onNativeAdLoaded) {
-                this.developerCallback.onNativeAdLoaded(placementId);
-            }
-        },
-
-        onNativeAdLoadFail : function(placementId, errorInfo) {
-          if(this.developerCallback != null && this.developerCallback.onNativeAdLoadFail != null && undefined != this.developerCallback.onNativeAdLoadFail) {
-                this.developerCallback.onNativeAdLoadFail(placementId, errorInfo);
-            }
-        },
-
-        onNativeAdShow : function(placementId, callbackInfo) {
-           if(this.developerCallback != null && this.developerCallback.onNativeAdShow != null && undefined != this.developerCallback.onNativeAdShow) {
-                this.developerCallback.onNativeAdShow(placementId, callbackInfo);
-            }
-        },
-
-        onNativeAdClick : function(placementId, callbackInfo) {
-            if(this.developerCallback != null && this.developerCallback.onNativeAdClick != null && undefined != this.developerCallback.onNativeAdClick) {
-                this.developerCallback.onNativeAdClick(placementId, callbackInfo);
-            }
-        },
-
-        onNativeAdVideoStart : function(placementId) {
-            if(this.developerCallback != null && this.developerCallback.onNativeAdVideoStart != null && undefined != this.developerCallback.onNativeAdVideoStart) {
-                this.developerCallback.onNativeAdVideoStart(placementId,);
-            }
-        },
-
-        onNativeAdVideoEnd : function(placementId) {
-            if(this.developerCallback != null && this.developerCallback.onNativeAdVideoEnd != null && undefined !=this.developerCallback.onNativeAdVideoEnd) {
-                this.developerCallback.onNativeAdVideoEnd(placementId);
-            }
-        },
-
-        onNativeAdCloseButtonTapped : function(placementId, callbackInfo) {
-            if(this.developerCallback != null && this.developerCallback.onNativeAdCloseButtonTapped != null && undefined != this.developerCallback.onNativeAdCloseButtonTapped) {
-                this.developerCallback.onNativeAdCloseButtonTapped(placementId, callbackInfo);
-            }
-        }
-        
-    },
-    
-    loadNative : function(placementId, settings={}) {
-
-        if (undefined != platformBridge && platformBridge != null) {
-            platformBridge.loadNative(placementId, JSON.stringify(settings));
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    setAdListener : function(listener) {
-        var eventJSON = {};
-        eventJSON[LoadedCallbackKey]="ATNativeJSSDK.ATNativeListener.onNativeAdLoaded",
-        eventJSON[LoadFailCallbackKey]= "ATNativeJSSDK.ATNativeListener.onNativeAdLoadFail",
-        eventJSON[CloseCallbackKey]="ATNativeJSSDK.ATNativeListener.onNativeAdCloseButtonTapped",
-        eventJSON[ClickCallbackKey]= "ATNativeJSSDK.ATNativeListener.onNativeAdClick",
-        eventJSON[ShowCallbackKey]= "ATNativeJSSDK.ATNativeListener.onNativeAdShow",
-        eventJSON[VideoStartKey]= "ATNativeJSSDK.ATNativeListener.onNativeAdVideoStart",
-        eventJSON[VideoEndKey]= "ATNativeJSSDK.ATNativeListener.onNativeAdVideoEnd"
-
-        if (undefined != platformBridge && platformBridge != null) {
-            platformBridge.setAdListener(JSON.stringify(eventJSON));
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-
-        this.ATNativeListener.developerCallback = listener;
-    },
-
-    hasAdReady : function(placementId) {
-        if (undefined != platformBridge && platformBridge != null) {
-            return platformBridge.hasAdReady(placementId);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-        return false;
-    },
-
-    showAd : function(placementId, adViewProperty) {
-        if (undefined != platformBridge && platformBridge != null) {
-           platformBridge.showAd(placementId, JSON.stringify(adViewProperty.getAdViewProperty()));
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    removeAd : function(placementId) {
-        if (undefined != platformBridge && platformBridge != null) {
-           platformBridge.removeAd(placementId);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    createLoadAdSize : function(width, height) {
-        var loadAdSize = {};
-        loadAdSize["width"] = width;
-        loadAdSize["height"] = height;
-        return loadAdSize;
-    },
-
-    AdViewProperty : cc.Class({
-
-        parent : null,
-        appIcon : null,
-        mainImage: null,
-        title:null,
-        desc:null,
-        adLogo:null,
-        cta:null,
-        rating:null,
-
-        createItemViewProperty: function(x, y ,width ,height ,backgroundColor ,textColor ,textSize) {
-            var itemProperty = {};
-            itemProperty["x"] = x;
-            itemProperty["y"] = y;
-            itemProperty["width"] = width;
-            itemProperty["height"] = height;
-            itemProperty["backgroundColor"] = backgroundColor;
-            itemProperty["textColor"] = textColor;
-            itemProperty["textSize"] = textSize;
-
-            return itemProperty;
-        },
-
-        getAdViewProperty: function() {
-            var nativeViewProperty = {};
-
-            if(this.parent != null){
-                nativeViewProperty["parent"] = this.parent; 
-            }
-            
-            if(this.appIcon != null){
-                nativeViewProperty["icon"] = this.appIcon;
-            }
-            
-            if(this.mainImage != null){
-                nativeViewProperty["mainImage"] = this.mainImage;
-            }
-           
-            if(this.title != null){
-                nativeViewProperty["title"] = this.title;
-            }
-           
-            if(this.desc != null){
-                nativeViewProperty["desc"] = this.desc;
-            }
-
-            if(this.adLogo != null){
-                nativeViewProperty["adLogo"] = this.adLogo;
-            }
-
-            if(this.cta != null){
-                nativeViewProperty["cta"] = this.cta;
-            }
-
-            if(this.rating != null){
-                nativeViewProperty["rating"] = this.rating;
-            }
-           
-            return nativeViewProperty;
-        }
-    })
-  
-};
-
-const LoadedCallbackKey = "NativeLoaded";
-const LoadFailCallbackKey = "NativeLoadFail";
-const CloseCallbackKey = "NativeCloseButtonTapped";
-const ClickCallbackKey = "NativeClick";
-const ShowCallbackKey = "NativeShow";
-const VideoStartKey = "NativeVideoStart";
-const VideoEndKey = "NativeVideoEnd";
-
+
+var ATAndroidNativeJS = require("./Android/ATAndroidNativeJS");
+var ATiOSNativeJS = require("./iOS/ATiOSNativeJS");
+var initPlatformBridge = function() {  
+    if (cc.sys.os === cc.sys.OS_IOS) {           
+        return ATiOSNativeJS;
+    } else if (cc.sys.os === cc.sys.OS_ANDROID) {
+        return ATAndroidNativeJS;
+    }
+};
+
+var platformBridge = initPlatformBridge();
+
+
+var ATNativeSDK = ATNativeSDK || {   
+
+    ATNativeListener : {
+        developerCallback : null,
+
+        onNativeAdLoaded : function (placementId) {
+            if(this.developerCallback != null && this.developerCallback.onNativeAdLoaded != null && undefined != this.developerCallback.onNativeAdLoaded) {
+                this.developerCallback.onNativeAdLoaded(placementId);
+            }
+        },
+
+        onNativeAdLoadFail : function(placementId, errorInfo) {
+          if(this.developerCallback != null && this.developerCallback.onNativeAdLoadFail != null && undefined != this.developerCallback.onNativeAdLoadFail) {
+                this.developerCallback.onNativeAdLoadFail(placementId, errorInfo);
+            }
+        },
+
+        onNativeAdShow : function(placementId, callbackInfo) {
+           if(this.developerCallback != null && this.developerCallback.onNativeAdShow != null && undefined != this.developerCallback.onNativeAdShow) {
+                this.developerCallback.onNativeAdShow(placementId, callbackInfo);
+            }
+        },
+
+        onNativeAdClick : function(placementId, callbackInfo) {
+            if(this.developerCallback != null && this.developerCallback.onNativeAdClick != null && undefined != this.developerCallback.onNativeAdClick) {
+                this.developerCallback.onNativeAdClick(placementId, callbackInfo);
+            }
+        },
+
+        onNativeAdVideoStart : function(placementId) {
+            if(this.developerCallback != null && this.developerCallback.onNativeAdVideoStart != null && undefined != this.developerCallback.onNativeAdVideoStart) {
+                this.developerCallback.onNativeAdVideoStart(placementId,);
+            }
+        },
+
+        onNativeAdVideoEnd : function(placementId) {
+            if(this.developerCallback != null && this.developerCallback.onNativeAdVideoEnd != null && undefined !=this.developerCallback.onNativeAdVideoEnd) {
+                this.developerCallback.onNativeAdVideoEnd(placementId);
+            }
+        },
+
+        onNativeAdCloseButtonTapped : function(placementId, callbackInfo) {
+            if(this.developerCallback != null && this.developerCallback.onNativeAdCloseButtonTapped != null && undefined != this.developerCallback.onNativeAdCloseButtonTapped) {
+                this.developerCallback.onNativeAdCloseButtonTapped(placementId, callbackInfo);
+            }
+        }
+        
+    },
+    
+    loadNative : function(placementId, settings={}) {
+
+        if (undefined != platformBridge && platformBridge != null) {
+            platformBridge.loadNative(placementId, JSON.stringify(settings));
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    setAdListener : function(listener) {
+        var eventJSON = {};
+        eventJSON[LoadedCallbackKey]="ATNativeJSSDK.ATNativeListener.onNativeAdLoaded",
+        eventJSON[LoadFailCallbackKey]= "ATNativeJSSDK.ATNativeListener.onNativeAdLoadFail",
+        eventJSON[CloseCallbackKey]="ATNativeJSSDK.ATNativeListener.onNativeAdCloseButtonTapped",
+        eventJSON[ClickCallbackKey]= "ATNativeJSSDK.ATNativeListener.onNativeAdClick",
+        eventJSON[ShowCallbackKey]= "ATNativeJSSDK.ATNativeListener.onNativeAdShow",
+        eventJSON[VideoStartKey]= "ATNativeJSSDK.ATNativeListener.onNativeAdVideoStart",
+        eventJSON[VideoEndKey]= "ATNativeJSSDK.ATNativeListener.onNativeAdVideoEnd"
+
+        if (undefined != platformBridge && platformBridge != null) {
+            platformBridge.setAdListener(JSON.stringify(eventJSON));
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+
+        this.ATNativeListener.developerCallback = listener;
+    },
+
+    hasAdReady : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+            return platformBridge.hasAdReady(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+        return false;
+    },
+
+    checkAdStatus : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+            return platformBridge.checkAdStatus(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+        return "";
+    },
+
+    showAd : function(placementId, adViewProperty) {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.showAd(placementId, JSON.stringify(adViewProperty.getAdViewProperty()));
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    showAdInScenario : function(placementId, adViewProperty, scenario="") {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.showAdInScenario(placementId, JSON.stringify(adViewProperty.getAdViewProperty()), scenario);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    removeAd : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.removeAd(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    createLoadAdSize : function(width, height) {
+        var loadAdSize = {};
+        loadAdSize["width"] = width;
+        loadAdSize["height"] = height;
+        return loadAdSize;
+    },
+
+    AdViewProperty : cc.Class({
+
+        parent : null,
+        appIcon : null,
+        mainImage: null,
+        title:null,
+        desc:null,
+        adLogo:null,
+        cta:null,
+        rating:null,
+        dislike:null,
+
+        createItemViewProperty: function(x, y ,width ,height ,backgroundColor ,textColor ,textSize, isCustomClick = false) {
+            var itemProperty = {};
+            itemProperty["x"] = x;
+            itemProperty["y"] = y;
+            itemProperty["width"] = width;
+            itemProperty["height"] = height;
+            itemProperty["backgroundColor"] = backgroundColor;
+            itemProperty["textColor"] = textColor;
+            itemProperty["textSize"] = textSize;
+            itemProperty["isCustomClick"] = isCustomClick;
+
+            return itemProperty;
+        },
+
+        getAdViewProperty: function() {
+            var nativeViewProperty = {};
+
+            if(this.parent != null){
+                nativeViewProperty["parent"] = this.parent; 
+            }
+            
+            if(this.appIcon != null){
+                nativeViewProperty["icon"] = this.appIcon;
+            }
+            
+            if(this.mainImage != null){
+                nativeViewProperty["mainImage"] = this.mainImage;
+            }
+           
+            if(this.title != null){
+                nativeViewProperty["title"] = this.title;
+            }
+           
+            if(this.desc != null){
+                nativeViewProperty["desc"] = this.desc;
+            }
+
+            if(this.adLogo != null){
+                nativeViewProperty["adLogo"] = this.adLogo;
+            }
+
+            if(this.cta != null){
+                nativeViewProperty["cta"] = this.cta;
+            }
+
+            if(this.rating != null){
+                nativeViewProperty["rating"] = this.rating;
+            }
+
+            if(this.dislike != null){
+                nativeViewProperty["dislike"] = this.dislike;
+            }
+           
+            return nativeViewProperty;
+        }
+    })
+  
+};
+
+const LoadedCallbackKey = "NativeLoaded";
+const LoadFailCallbackKey = "NativeLoadFail";
+const CloseCallbackKey = "NativeCloseButtonTapped";
+const ClickCallbackKey = "NativeClick";
+const ShowCallbackKey = "NativeShow";
+const VideoStartKey = "NativeVideoStart";
+const VideoEndKey = "NativeVideoEnd";
+
 window.ATNativeJSSDK = ATNativeSDK;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/ATRewardedVideoJSSDK.js

@@ -1,138 +1,147 @@
-var ATAndroidRewardedVideoJS = require("./Android/ATAndroidRewardedVideoJS");
-var ATiOSRewardedVideoJS = require("./iOS/ATiOSRewardedVideoJS");
-
-var initPlatformBridge = function() {  
-    if (cc.sys.os === cc.sys.OS_IOS) {           
-        return ATiOSRewardedVideoJS;
-    } else if (cc.sys.os === cc.sys.OS_ANDROID) {
-        return ATAndroidRewardedVideoJS;
-    }
-};
-
-var platformBridge = initPlatformBridge();
-
-
-var ATRewardedVideoSDK = ATRewardedVideoSDK || {
-    userIdKey: "userID",
-    userDataKey: "media_ext",
-
-    ATRewardedVideoListener : {
-        developerCallback : null,
-
-        onRewardedVideoAdLoaded : function (placementId) {
-            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdLoaded(" + placementId + ")");
-            if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdLoaded != null && undefined != this.developerCallback.onRewardedVideoAdLoaded) {
-                this.developerCallback.onRewardedVideoAdLoaded(placementId);
-            }
-        },
-        onRewardedVideoAdFailed : function(placementId, errorInfo) {
-            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
-          if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdFailed != null && undefined != this.developerCallback.onRewardedVideoAdFailed) {
-                this.developerCallback.onRewardedVideoAdFailed(placementId, errorInfo);
-            }
-        },
-        onRewardedVideoAdPlayStart : function(placementId, callbackInfo) {
-            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
-           if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdPlayStart != null && undefined != this.developerCallback.onRewardedVideoAdPlayStart) {
-                this.developerCallback.onRewardedVideoAdPlayStart(placementId, callbackInfo);
-            }
-        },
-        onRewardedVideoAdPlayEnd : function(placementId, callbackInfo) {
-            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
-            if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdPlayEnd != null && undefined != this.developerCallback.onRewardedVideoAdPlayEnd) {
-                this.developerCallback.onRewardedVideoAdPlayEnd(placementId, callbackInfo);
-            }
-        },
-        onRewardedVideoAdPlayFailed : function(placementId, errorInfo, callbackInfo) {
-            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayFailed(" + placementId + ", " + callbackInfo + ")");
-            if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdPlayFailed != null && undefined != this.developerCallback.onRewardedVideoAdPlayFailed) {
-                this.developerCallback.onRewardedVideoAdPlayFailed(placementId, errorInfo, callbackInfo);
-            }
-        },
-        onRewardedVideoAdClosed : function(placementId, callbackInfo) {
-            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
-            if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdClosed != null && undefined != this.developerCallback.onRewardedVideoAdClosed) {
-                this.developerCallback.onRewardedVideoAdClosed(placementId, callbackInfo);
-            }
-        },
-        onRewardedVideoAdPlayClicked : function(placementId, callbackInfo) {
-            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayClicked(" + placementId + ", " + callbackInfo + ")");
-            if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdPlayClicked != null && undefined != this.developerCallback.onRewardedVideoAdPlayClicked) {
-                this.developerCallback.onRewardedVideoAdPlayClicked(placementId, callbackInfo);
-            }
-        },
-        onReward : function(placementId, callbackInfo) {
-            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onReward(" + placementId + ", " + callbackInfo + ")");
-            if(this.developerCallback != null && this.developerCallback.onReward != null && undefined != this.developerCallback.onReward) {
-                this.developerCallback.onReward(placementId, callbackInfo);
-            }
-        }
-    },
-    
-    loadRewardedVideo : function(placementId, settings={}) {
-
-        if (undefined != platformBridge && platformBridge != null) {
-            platformBridge.loadRewardedVideo(placementId, JSON.stringify(settings));
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    setAdListener : function(listener) {
-        var eventJSON = {};
-        eventJSON[LoadedCallbackKey]= "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdLoaded",
-        eventJSON[LoadFailCallbackKey]= "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdFailed",
-        eventJSON[PlayStartCallbackKey]=  "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayStart",
-        eventJSON[PlayEndCallbackKey]=  "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayEnd",
-        eventJSON[PlayFailCallbackKey] = "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayFailed",
-        eventJSON[CloseCallbackKey]= "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdClosed",
-        eventJSON[ClickCallbackKey]= "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayClicked",
-        eventJSON[RewardCallbackKey]= "ATRewardedVideoJSSDK.ATRewardedVideoListener.onReward"
-
-        if (undefined != platformBridge && platformBridge != null) {
-            platformBridge.setAdListener(JSON.stringify(eventJSON));
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-
-        this.ATRewardedVideoListener.developerCallback = listener;
-    },
-
-    hasAdReady : function(placementId) {
-        if (undefined != platformBridge && platformBridge != null) {
-            return platformBridge.hasAdReady(placementId);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-        return false;
-    },
-
-    showAd : function(placementId) {
-        if (undefined != platformBridge && platformBridge != null) {
-           platformBridge.showAd(placementId);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    },
-
-    showAdInScenario : function(placementId, scenario="") {
-        if (undefined != platformBridge && platformBridge != null) {
-           platformBridge.showAdInScenario(placementId, scenario);
-        } else {
-            cc.log("You must run on Android or iOS.");
-        }
-    } 
-  
-};
-
-const LoadedCallbackKey = "RewardedVideoLoaded";
-const LoadFailCallbackKey = "RewardedVideoLoadFail";
-const PlayStartCallbackKey = "RewardedVideoPlayStart";
-const PlayEndCallbackKey = "RewardedVideoPlayEnd";
-const PlayFailCallbackKey = "RewardedVideoPlayFail";
-const CloseCallbackKey = "RewardedVideoClose";
-const ClickCallbackKey = "RewardedVideoClick";
-const RewardCallbackKey = "RewardedVideoReward";
-
-
+var ATAndroidRewardedVideoJS = require("./Android/ATAndroidRewardedVideoJS");
+var ATiOSRewardedVideoJS = require("./iOS/ATiOSRewardedVideoJS");
+
+var initPlatformBridge = function() {  
+    if (cc.sys.os === cc.sys.OS_IOS) {           
+        return ATiOSRewardedVideoJS;
+    } else if (cc.sys.os === cc.sys.OS_ANDROID) {
+        return ATAndroidRewardedVideoJS;
+    }
+};
+
+var platformBridge = initPlatformBridge();
+
+
+var ATRewardedVideoSDK = ATRewardedVideoSDK || {
+    userIdKey: "userID",
+    userDataKey: "media_ext",
+
+    ATRewardedVideoListener : {
+        developerCallback : null,
+
+        onRewardedVideoAdLoaded : function (placementId) {
+            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdLoaded(" + placementId + ")");
+            if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdLoaded != null && undefined != this.developerCallback.onRewardedVideoAdLoaded) {
+                this.developerCallback.onRewardedVideoAdLoaded(placementId);
+            }
+        },
+        onRewardedVideoAdFailed : function(placementId, errorInfo) {
+            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
+          if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdFailed != null && undefined != this.developerCallback.onRewardedVideoAdFailed) {
+                this.developerCallback.onRewardedVideoAdFailed(placementId, errorInfo);
+            }
+        },
+        onRewardedVideoAdPlayStart : function(placementId, callbackInfo) {
+            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
+           if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdPlayStart != null && undefined != this.developerCallback.onRewardedVideoAdPlayStart) {
+                this.developerCallback.onRewardedVideoAdPlayStart(placementId, callbackInfo);
+            }
+        },
+        onRewardedVideoAdPlayEnd : function(placementId, callbackInfo) {
+            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
+            if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdPlayEnd != null && undefined != this.developerCallback.onRewardedVideoAdPlayEnd) {
+                this.developerCallback.onRewardedVideoAdPlayEnd(placementId, callbackInfo);
+            }
+        },
+        onRewardedVideoAdPlayFailed : function(placementId, errorInfo, callbackInfo) {
+            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayFailed(" + placementId + ", " + callbackInfo + ")");
+            if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdPlayFailed != null && undefined != this.developerCallback.onRewardedVideoAdPlayFailed) {
+                this.developerCallback.onRewardedVideoAdPlayFailed(placementId, errorInfo, callbackInfo);
+            }
+        },
+        onRewardedVideoAdClosed : function(placementId, callbackInfo) {
+            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
+            if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdClosed != null && undefined != this.developerCallback.onRewardedVideoAdClosed) {
+                this.developerCallback.onRewardedVideoAdClosed(placementId, callbackInfo);
+            }
+        },
+        onRewardedVideoAdPlayClicked : function(placementId, callbackInfo) {
+            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayClicked(" + placementId + ", " + callbackInfo + ")");
+            if(this.developerCallback != null && this.developerCallback.onRewardedVideoAdPlayClicked != null && undefined != this.developerCallback.onRewardedVideoAdPlayClicked) {
+                this.developerCallback.onRewardedVideoAdPlayClicked(placementId, callbackInfo);
+            }
+        },
+        onReward : function(placementId, callbackInfo) {
+            ATJSSDK.printLog("ATRewardedVideoJSSDK.ATRewardedVideoListener.onReward(" + placementId + ", " + callbackInfo + ")");
+            if(this.developerCallback != null && this.developerCallback.onReward != null && undefined != this.developerCallback.onReward) {
+                this.developerCallback.onReward(placementId, callbackInfo);
+            }
+        }
+    },
+    
+    loadRewardedVideo : function(placementId, settings={}) {
+
+        if (undefined != platformBridge && platformBridge != null) {
+            platformBridge.loadRewardedVideo(placementId, JSON.stringify(settings));
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    setAdListener : function(listener) {
+        var eventJSON = {};
+        eventJSON[LoadedCallbackKey]= "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdLoaded",
+        eventJSON[LoadFailCallbackKey]= "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdFailed",
+        eventJSON[PlayStartCallbackKey]=  "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayStart",
+        eventJSON[PlayEndCallbackKey]=  "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayEnd",
+        eventJSON[PlayFailCallbackKey] = "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayFailed",
+        eventJSON[CloseCallbackKey]= "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdClosed",
+        eventJSON[ClickCallbackKey]= "ATRewardedVideoJSSDK.ATRewardedVideoListener.onRewardedVideoAdPlayClicked",
+        eventJSON[RewardCallbackKey]= "ATRewardedVideoJSSDK.ATRewardedVideoListener.onReward"
+
+        if (undefined != platformBridge && platformBridge != null) {
+            platformBridge.setAdListener(JSON.stringify(eventJSON));
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+
+        this.ATRewardedVideoListener.developerCallback = listener;
+    },
+
+    hasAdReady : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+            return platformBridge.hasAdReady(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+        return false;
+    },
+
+    checkAdStatus : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+            return platformBridge.checkAdStatus(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+        return "";
+    },
+
+    showAd : function(placementId) {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.showAd(placementId);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    },
+
+    showAdInScenario : function(placementId, scenario="") {
+        if (undefined != platformBridge && platformBridge != null) {
+           platformBridge.showAdInScenario(placementId, scenario);
+        } else {
+            cc.log("You must run on Android or iOS.");
+        }
+    } 
+  
+};
+
+const LoadedCallbackKey = "RewardedVideoLoaded";
+const LoadFailCallbackKey = "RewardedVideoLoadFail";
+const PlayStartCallbackKey = "RewardedVideoPlayStart";
+const PlayEndCallbackKey = "RewardedVideoPlayEnd";
+const PlayFailCallbackKey = "RewardedVideoPlayFail";
+const CloseCallbackKey = "RewardedVideoClose";
+const ClickCallbackKey = "RewardedVideoClick";
+const RewardCallbackKey = "RewardedVideoReward";
+
+
 window.ATRewardedVideoJSSDK = ATRewardedVideoSDK;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/Android/ATAndroidBannerJS.js

@@ -1,46 +1,61 @@
-var classJavaName = "com/anythink/cocosjs/ATBannerJSBridge";
-var ATAndroidBannerJS = ATAndroidBannerJS || {
-  
-    loadBanner : function (placementId, settings) {
-        cc.log("Android-loadBanner:" + settings);
-		jsb.reflection.callStaticMethod(classJavaName, "load", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, settings);
-    },
-
-    setAdListener : function (listener) {
-        cc.log("Android-setAdListener");
-		jsb.reflection.callStaticMethod(classJavaName, "setAdListener", "(Ljava/lang/String;)V", listener);
-    },
-
-    hasAdReady : function (placementId) {
-         cc.log("Android-hasAdReady");
-        return jsb.reflection.callStaticMethod(classJavaName, "isAdReady", "(Ljava/lang/String;)Z", placementId);;
-    },
-
-    showAdInPosition : function(placementId, position) {
-        cc.log("Android-showAdInPosistion");
-		jsb.reflection.callStaticMethod(classJavaName, "showWithPosition", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, position);
-    },
-
-    showAdInRectangle : function(placementId, showAdRect) {
-        cc.log("Android-showAdInRectangle");
-		jsb.reflection.callStaticMethod(classJavaName, "showWithRect", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, showAdRect);
-    },
-    
-    removeAd : function(placementId) {
-         cc.log("Android-removeAd");
-		 jsb.reflection.callStaticMethod(classJavaName, "remove", "(Ljava/lang/String;)V", placementId);
-    },
-
-    reShowAd : function(placementId) {
-        cc.log("Android-reShowAd");
-		jsb.reflection.callStaticMethod(classJavaName, "reshow", "(Ljava/lang/String;)V", placementId);
-    },
-
-    hideAd : function(placementId) {
-         cc.log("Android-hideAd");
-		 jsb.reflection.callStaticMethod(classJavaName, "hide", "(Ljava/lang/String;)V", placementId);
-    }
-  
-};
-
+var classJavaName = "com/anythink/cocosjs/ATBannerJSBridge";
+var ATAndroidBannerJS = ATAndroidBannerJS || {
+  
+    loadBanner : function (placementId, settings) {
+        cc.log("Android-loadBanner:" + settings);
+		jsb.reflection.callStaticMethod(classJavaName, "load", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, settings);
+    },
+
+    setAdListener : function (listener) {
+        cc.log("Android-setAdListener");
+		jsb.reflection.callStaticMethod(classJavaName, "setAdListener", "(Ljava/lang/String;)V", listener);
+    },
+
+    hasAdReady : function (placementId) {
+         cc.log("Android-hasAdReady");
+        return jsb.reflection.callStaticMethod(classJavaName, "isAdReady", "(Ljava/lang/String;)Z", placementId);;
+    },
+
+    checkAdStatus : function(placementId) {
+        cc.log("Android-checkAdStatus:" + placementId);
+        return jsb.reflection.callStaticMethod(classJavaName, "checkAdStatus", "(Ljava/lang/String;)Ljava/lang/String;", placementId);
+    },
+
+    showAdInPosition : function(placementId, position) {
+        cc.log("Android-showAdInPosistion");
+		jsb.reflection.callStaticMethod(classJavaName, "showWithPosition", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", placementId, position, "");
+    },
+
+    showAdInPositionAndScenario : function(placementId, position, scenario) {
+        cc.log("Android-showAdInPositionAndScenario");
+        jsb.reflection.callStaticMethod(classJavaName, "showWithPosition", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", placementId, position, scenario);
+    },
+
+    showAdInRectangle : function(placementId, showAdRect) {
+        cc.log("Android-showAdInRectangle");
+		jsb.reflection.callStaticMethod(classJavaName, "showWithRect", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", placementId, showAdRect, "");
+    },
+
+    showAdInRectangleAndScenario : function(placementId, showAdRect, scenario) {
+        cc.log("Android-showAdInRectangleAndScenario");
+        jsb.reflection.callStaticMethod(classJavaName, "showWithRect", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", placementId, showAdRect, scenario);
+    },
+    
+    removeAd : function(placementId) {
+         cc.log("Android-removeAd");
+		 jsb.reflection.callStaticMethod(classJavaName, "remove", "(Ljava/lang/String;)V", placementId);
+    },
+
+    reShowAd : function(placementId) {
+        cc.log("Android-reShowAd");
+		jsb.reflection.callStaticMethod(classJavaName, "reshow", "(Ljava/lang/String;)V", placementId);
+    },
+
+    hideAd : function(placementId) {
+         cc.log("Android-hideAd");
+		 jsb.reflection.callStaticMethod(classJavaName, "hide", "(Ljava/lang/String;)V", placementId);
+    }
+  
+};
+
 module.exports = ATAndroidBannerJS;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/Android/ATAndroidInterstitialJS.js

@@ -1,31 +1,36 @@
-var classJavaName = "com/anythink/cocosjs/ATInterstitialJSBridge";
-var ATAndroidInterstitialJS = ATAndroidInterstitialJS || {
-	
-	loadInterstitial : function (placementId, settings) {
-        cc.log("Android-loadInterstitial");
-		jsb.reflection.callStaticMethod(classJavaName, "load", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, settings);
-    },
-
-    setAdListener : function (listener) {
-        cc.log("Android-setAdListener");
-		jsb.reflection.callStaticMethod(classJavaName, "setAdListener", "(Ljava/lang/String;)V", listener);
-    },
-
-    hasAdReady : function (placementId) {
-         cc.log("Android-hasAdReady");
-        return jsb.reflection.callStaticMethod(classJavaName, "isAdReady", "(Ljava/lang/String;)Z", placementId);
-    },
-
-    showAd : function(placementId) {
-        cc.log("Android-showAd:" + placementId);
-		jsb.reflection.callStaticMethod(classJavaName, "show", "(Ljava/lang/String;)V", placementId);
-    },
-
-    showAdInScenario : function(placementId, scenario) {
-         cc.log("Android-showAdInScenario:" + placementId + "---" + scenario);
-		 jsb.reflection.callStaticMethod(classJavaName, "show", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, scenario);
-    } 
-  
-};
-
+var classJavaName = "com/anythink/cocosjs/ATInterstitialJSBridge";
+var ATAndroidInterstitialJS = ATAndroidInterstitialJS || {
+	
+	loadInterstitial : function (placementId, settings) {
+        cc.log("Android-loadInterstitial");
+		jsb.reflection.callStaticMethod(classJavaName, "load", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, settings);
+    },
+
+    setAdListener : function (listener) {
+        cc.log("Android-setAdListener");
+		jsb.reflection.callStaticMethod(classJavaName, "setAdListener", "(Ljava/lang/String;)V", listener);
+    },
+
+    hasAdReady : function (placementId) {
+         cc.log("Android-hasAdReady");
+        return jsb.reflection.callStaticMethod(classJavaName, "isAdReady", "(Ljava/lang/String;)Z", placementId);
+    },
+
+    checkAdStatus : function(placementId) {
+        cc.log("Android-checkAdStatus:" + placementId);
+        return jsb.reflection.callStaticMethod(classJavaName, "checkAdStatus", "(Ljava/lang/String;)Ljava/lang/String;", placementId);
+    },
+
+    showAd : function(placementId) {
+        cc.log("Android-showAd:" + placementId);
+		jsb.reflection.callStaticMethod(classJavaName, "show", "(Ljava/lang/String;)V", placementId);
+    },
+
+    showAdInScenario : function(placementId, scenario) {
+         cc.log("Android-showAdInScenario:" + placementId + "---" + scenario);
+		 jsb.reflection.callStaticMethod(classJavaName, "show", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, scenario);
+    }
+
+};
+
 module.exports = ATAndroidInterstitialJS;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/Android/ATAndroidJS.js

@@ -1,43 +1,47 @@
-var classJavaName = "com/anythink/cocosjs/ATJSBridge";
-var ATAndroidJS = ATAndroidJS || {
-    printJsLog : function(msg) {
-        if (undefined != msg && msg != null) {
-            jsb.reflection.callStaticMethod("android/util/Log", "i", "(Ljava/lang/String;Ljava/lang/String;)I", "AT-Cocos-JS", msg);
-        }
-    },
-
-    initSDK : function(appid, appkey) {
-        jsb.reflection.callStaticMethod(classJavaName, "initSDK", "(Ljava/lang/String;Ljava/lang/String;)V", appid, appkey);
-    },
-
-    initCustomMap : function(customMap) {      
-        jsb.reflection.callStaticMethod(classJavaName, "initCustomMap", "(Ljava/lang/String;)V", customMap);
-    },
-
-    setPlacementCustomMap : function(placmentId, customMap) {
-        jsb.reflection.callStaticMethod(classJavaName, "setPlacementCustomMap", "(Ljava/lang/String;Ljava/lang/String;)V", placmentId, customMap);
-    },
-
-    setGDPRLevel : function(level) {
-        jsb.reflection.callStaticMethod(classJavaName, "setGDPRLevel", "(I)V", level);
-    },
-
-    getGDPRLevel : function() {
-        return jsb.reflection.callStaticMethod(classJavaName, "getGDPRLevel", "()I");
-    },
-
-    getUserLocation : function(callbackMethod) {
-        jsb.reflection.callStaticMethod(classJavaName, "getUserLocation", "(Ljava/lang/String;)V", callbackMethod);
-    },
-
-    showGDPRAuth : function () {
-        jsb.reflection.callStaticMethod(classJavaName, "showGDPRAuth", "()V");
-    },
-
-    setLogDebug : function (debug) {
-        jsb.reflection.callStaticMethod(classJavaName, "setLogDebug", "(Z)V", debug);
-    }
-  
-};
-
+var classJavaName = "com/anythink/cocosjs/ATJSBridge";
+var ATAndroidJS = ATAndroidJS || {
+    printJsLog : function(msg) {
+        if (undefined != msg && msg != null) {
+            jsb.reflection.callStaticMethod("android/util/Log", "i", "(Ljava/lang/String;Ljava/lang/String;)I", "AT-Cocos-JS", msg);
+        }
+    },
+
+    initSDK : function(appid, appkey) {
+        jsb.reflection.callStaticMethod(classJavaName, "initSDK", "(Ljava/lang/String;Ljava/lang/String;)V", appid, appkey);
+    },
+
+    initCustomMap : function(customMap) {      
+        jsb.reflection.callStaticMethod(classJavaName, "initCustomMap", "(Ljava/lang/String;)V", customMap);
+    },
+
+    setPlacementCustomMap : function(placmentId, customMap) {
+        jsb.reflection.callStaticMethod(classJavaName, "setPlacementCustomMap", "(Ljava/lang/String;Ljava/lang/String;)V", placmentId, customMap);
+    },
+
+    setGDPRLevel : function(level) {
+        jsb.reflection.callStaticMethod(classJavaName, "setGDPRLevel", "(I)V", level);
+    },
+
+    getGDPRLevel : function() {
+        return jsb.reflection.callStaticMethod(classJavaName, "getGDPRLevel", "()I");
+    },
+
+    getUserLocation : function(callbackMethod) {
+        jsb.reflection.callStaticMethod(classJavaName, "getUserLocation", "(Ljava/lang/String;)V", callbackMethod);
+    },
+
+    showGDPRAuth : function () {
+        jsb.reflection.callStaticMethod(classJavaName, "showGDPRAuth", "()V");
+    },
+
+    setLogDebug : function (debug) {
+        jsb.reflection.callStaticMethod(classJavaName, "setLogDebug", "(Z)V", debug);
+    },
+
+    deniedUploadDeviceInfo : function (deniedInfo) {
+        jsb.reflection.callStaticMethod(classJavaName, "deniedUploadDeviceInfo", "(Ljava/lang/String;)V", deniedInfo);
+    }
+  
+};
+
 module.exports = ATAndroidJS;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/Android/ATAndroidNativeJS.js

@@ -1,31 +1,41 @@
-var classJavaName = "com/anythink/cocosjs/ATNativeJSBridge";
-var ATAndroidBannerJS = ATAndroidBannerJS || {
-  
-    loadNative : function (placementId, settings) {
-        cc.log("Android-loadNative");
-		jsb.reflection.callStaticMethod(classJavaName, "load", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, settings);
-    },
-
-    setAdListener : function (listener) {
-        cc.log("Android-setAdListener");
-		jsb.reflection.callStaticMethod(classJavaName, "setAdListener", "(Ljava/lang/String;)V", listener);
-    },
-
-    hasAdReady : function (placementId) {
-         cc.log("Android-hasAdReady");
-        return jsb.reflection.callStaticMethod(classJavaName, "isAdReady", "(Ljava/lang/String;)Z", placementId);;
-    },
-
-    showAd : function(placementId, adViewProperty) {
-        cc.log("Android-showAd");
-		jsb.reflection.callStaticMethod(classJavaName, "show", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, adViewProperty);
-    },
-    
-    removeAd : function(placementId) {
-         cc.log("Android-removeAd");
-		 jsb.reflection.callStaticMethod(classJavaName, "remove", "(Ljava/lang/String;)V", placementId);
-    }
-  
-};
-
+var classJavaName = "com/anythink/cocosjs/ATNativeJSBridge";
+var ATAndroidBannerJS = ATAndroidBannerJS || {
+  
+    loadNative : function (placementId, settings) {
+        cc.log("Android-loadNative");
+		jsb.reflection.callStaticMethod(classJavaName, "load", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, settings);
+    },
+
+    setAdListener : function (listener) {
+        cc.log("Android-setAdListener");
+		jsb.reflection.callStaticMethod(classJavaName, "setAdListener", "(Ljava/lang/String;)V", listener);
+    },
+
+    hasAdReady : function (placementId) {
+         cc.log("Android-hasAdReady");
+        return jsb.reflection.callStaticMethod(classJavaName, "isAdReady", "(Ljava/lang/String;)Z", placementId);;
+    },
+
+    checkAdStatus : function(placementId) {
+        cc.log("Android-checkAdStatus:" + placementId);
+        return jsb.reflection.callStaticMethod(classJavaName, "checkAdStatus", "(Ljava/lang/String;)Ljava/lang/String;", placementId);
+    },
+
+    showAd : function(placementId, adViewProperty) {
+        cc.log("Android-showAd");
+		jsb.reflection.callStaticMethod(classJavaName, "show", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", placementId, adViewProperty, "");
+    },
+
+    showAdInScenario : function(placementId, adViewProperty, scenario) {
+        cc.log("Android-showAdInScenario");
+        jsb.reflection.callStaticMethod(classJavaName, "show", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", placementId, adViewProperty, scenario);
+    },
+
+    removeAd : function(placementId) {
+         cc.log("Android-removeAd");
+		 jsb.reflection.callStaticMethod(classJavaName, "remove", "(Ljava/lang/String;)V", placementId);
+    }
+  
+};
+
 module.exports = ATAndroidBannerJS;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/Android/ATAndroidRewardedVideoJS.js

@@ -1,31 +1,36 @@
-var classJavaName = "com/anythink/cocosjs/ATRewardedVideoJSBridge";
-var ATAndroidRewardedVideoJS = ATAndroidRewardedVideoJS || {
-  
-    loadRewardedVideo : function (placementId, settings) {
-        cc.log("Android-loadRewardedVideo");
-		jsb.reflection.callStaticMethod(classJavaName, "load", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, settings);
-    },
-
-    setAdListener : function (listener) {
-        cc.log("Android-setAdListener");
-		jsb.reflection.callStaticMethod(classJavaName, "setAdListener", "(Ljava/lang/String;)V", listener);
-    },
-
-    hasAdReady : function (placementId) {
-        cc.log("Android-hasAdReady");
-        return jsb.reflection.callStaticMethod(classJavaName, "isAdReady", "(Ljava/lang/String;)Z", placementId);
-    },
-
-    showAd : function(placementId) {
-        cc.log("Android-rv_showAd:" + placementId);
-		jsb.reflection.callStaticMethod(classJavaName, "show", "(Ljava/lang/String;)V", placementId);
-    },
-
-    showAdInScenario : function(placementId, scenario) {
-        cc.log("Android-rv_showAdInScenario:" + placementId + "---" + scenario);
-		jsb.reflection.callStaticMethod(classJavaName, "show", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, scenario);
-    } 
-  
-};
-
+var classJavaName = "com/anythink/cocosjs/ATRewardedVideoJSBridge";
+var ATAndroidRewardedVideoJS = ATAndroidRewardedVideoJS || {
+  
+    loadRewardedVideo : function (placementId, settings) {
+        cc.log("Android-loadRewardedVideo");
+		jsb.reflection.callStaticMethod(classJavaName, "load", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, settings);
+    },
+
+    setAdListener : function (listener) {
+        cc.log("Android-setAdListener");
+		jsb.reflection.callStaticMethod(classJavaName, "setAdListener", "(Ljava/lang/String;)V", listener);
+    },
+
+    hasAdReady : function (placementId) {
+        cc.log("Android-hasAdReady");
+        return jsb.reflection.callStaticMethod(classJavaName, "isAdReady", "(Ljava/lang/String;)Z", placementId);
+    },
+
+    checkAdStatus : function(placementId) {
+        cc.log("Android-checkAdStatus:" + placementId);
+        return jsb.reflection.callStaticMethod(classJavaName, "checkAdStatus", "(Ljava/lang/String;)Ljava/lang/String;", placementId);
+    },
+
+    showAd : function(placementId) {
+        cc.log("Android-rv_showAd:" + placementId);
+		jsb.reflection.callStaticMethod(classJavaName, "show", "(Ljava/lang/String;)V", placementId);
+    },
+
+    showAdInScenario : function(placementId, scenario) {
+        cc.log("Android-rv_showAdInScenario:" + placementId + "---" + scenario);
+		jsb.reflection.callStaticMethod(classJavaName, "show", "(Ljava/lang/String;Ljava/lang/String;)V", placementId, scenario);
+    }
+  
+};
+
 module.exports = ATAndroidRewardedVideoJS;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/iOS/ATiOSBannerJS.js

@@ -1,45 +1,60 @@
-var ATiOSJS = require("ATiOSJS");
-const OC_WRAPPER_CLASS = "ATBannerAdWrapper";
-var ATiOSBannerJS = ATiOSBannerJS || {
-    loadBanner: function(placementId, extra) {
-        ATiOSJS.printJsLog("ATiOSBannerJS::loadBanner(" + placementId + ", " + extra + ")");
-        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "loadBannerWithPlacementID:extra:", placementId, extra);
-    },
-
-    setAdListener : function (listener) {
-        ATiOSJS.printJsLog("ATiOSBannerJS::setAdListener(" + listener + ")");
-        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "setDelegates:", listener);
-    },
-  
-    hasAdReady : function(placementId) {
-        ATiOSJS.printJsLog("ATiOSBannerJS::hasAdReady(" + placementId + ")");
-        return jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "bannerReadyForPlacementID:", placementId);
-    },
-
-    showAdInPosition : function(placementId, position) { 
-        ATiOSJS.printJsLog("ATiOSBannerJS::showAdInPosition(" + placementId + ", " + position + ")");
-        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "showBannerWithPlacementID:position:", placementId, position);
-    },
-
-    showAdInRectangle : function(placementId, showAdRect) {
-        ATiOSJS.printJsLog("ATiOSBannerJS::showAdInRectangle(" + placementId + ", " + showAdRect + ")");
-        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "showBannerWithPlacementID:rect:", placementId, showAdRect);
-    },
-
-    removeAd : function(placementId) {
-        ATiOSJS.printJsLog("ATiOSBannerJS::removeAd(" + placementId + ")");
-        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "removeAd:", placementId);
-    },
-
-    reShowAd : function(placementId) {
-        ATiOSJS.printJsLog("ATiOSBannerJS::reShowAd(" + placementId + ")");
-        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "reShowAd:", placementId);
-    },
-
-    hideAd : function(placementId) {
-        ATiOSJS.printJsLog("ATiOSBannerJS::hideAd(" + placementId + ")");
-        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "hideAd:", placementId);
-    }
-};
-
-module.exports = ATiOSBannerJS;
+var ATiOSJS = require("ATiOSJS");
+const OC_WRAPPER_CLASS = "ATBannerAdWrapper";
+var ATiOSBannerJS = ATiOSBannerJS || {
+    loadBanner: function(placementId, extra) {
+        ATiOSJS.printJsLog("ATiOSBannerJS::loadBanner(" + placementId + ", " + extra + ")");
+        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "loadBannerWithPlacementID:extra:", placementId, extra);
+    },
+
+    setAdListener : function (listener) {
+        ATiOSJS.printJsLog("ATiOSBannerJS::setAdListener(" + listener + ")");
+        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "setDelegates:", listener);
+    },
+  
+    hasAdReady : function(placementId) {
+        ATiOSJS.printJsLog("ATiOSBannerJS::hasAdReady(" + placementId + ")");
+        return jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "bannerReadyForPlacementID:", placementId);
+    },
+
+    checkAdStatus : function(placementId) {
+        ATiOSJS.printJsLog("ATiOSBannerJS::checkAdStatus(" + placementId + ")");
+        return jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "bannerCheckAdStatusForPlacementID:", placementId);
+    },
+
+    showAdInPosition : function(placementId, position) { 
+        ATiOSJS.printJsLog("ATiOSBannerJS::showAdInPosition(" + placementId + ", " + position + ")");
+        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "showBannerWithPlacementID:scene:position:", placementId, null, position);
+    },
+
+    showAdInPositionAndScenario : function(placementId, position, scenario) { 
+        ATiOSJS.printJsLog("ATiOSBannerJS::showAdInPositionAndScenario(" + placementId + ", " + position + ", " + scenario + ")");
+        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "showBannerWithPlacementID:scene:position:", placementId, scenario, position);
+    },
+
+    showAdInRectangle : function(placementId, showAdRect) {
+        ATiOSJS.printJsLog("ATiOSBannerJS::showAdInRectangle(" + placementId + ", " + showAdRect + ")");
+        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "showBannerWithPlacementID:scene:rect:", placementId, null, showAdRect);
+    },
+
+    showAdInRectangleAndScenario : function(placementId, showAdRect, scenario) {
+        ATiOSJS.printJsLog("ATiOSBannerJS::showAdInRectangleAndScenario(" + placementId + ", " + showAdRect + ", " + scenario + ")");
+        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "showBannerWithPlacementID:scene:rect:", placementId, scenario, showAdRect);
+    },
+
+    removeAd : function(placementId) {
+        ATiOSJS.printJsLog("ATiOSBannerJS::removeAd(" + placementId + ")");
+        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "removeAd:", placementId);
+    },
+
+    reShowAd : function(placementId) {
+        ATiOSJS.printJsLog("ATiOSBannerJS::reShowAd(" + placementId + ")");
+        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "reShowAd:", placementId);
+    },
+
+    hideAd : function(placementId) {
+        ATiOSJS.printJsLog("ATiOSBannerJS::hideAd(" + placementId + ")");
+        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "hideAd:", placementId);
+    }
+};
+
+module.exports = ATiOSBannerJS;

assets/script/mk/sdk/ad/toppon/AnyThinkAds/iOS/ATiOSInterstitialJS.js

@@ -1,36 +1,41 @@
-var ATiOSJS = require("ATiOSJS");
-const OC_WRAPPER_CLASS = "ATInterstitialAdWrapper";
-var ATiOSInterstitialJS = ATiOSInterstitialJS || {
-    loadInterstitial : function (placementId, extra) {
-        ATiOSJS.printJsLog("ATiOSInterstitialJS::loadInterstitial(" + placementId + ", " + extra + ")");
-        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "loadInterstitialWithPlacementID:extra:", placementId, extra);
-    },
-
-    setAdListener : function (listener) {
-        ATiOSJS.printJsLog("ATiOSInterstitialJS::setAdListener(" + listener + ")");
-        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "setDelegates:", listener);
-    },
-
-    hasAdReady : function (placementId) {
-        ATiOSJS.printJsLog("ATiOSInterstitialJS::hasAdReady(" + placementId + ")");
-        return jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "interstitialReadyForPlacementID:", placementId);
-    },
-
-    setUserData : function (placementId, userId, userData) {
-         cc.log("Android-setUserData");
-    },
-
-    showAd : function(placementId) {
-        ATiOSJS.printJsLog("ATiOSInterstitialJS::showAd(" + placementId + ")");
-        return jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "showInterstitialWithPlacementID:scene:", placementId, null);
-        
-    },
-
-    showAdInScenario : function(placementId, scenario) {
-        ATiOSJS.printJsLog("ATiOSInterstitialJS::showAd(" + placementId  + ", " + scenario + ")");
-        return jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "showInterstitialWithPlacementID:scene:", placementId, scenario);
-    } 
-  
-};
-
+var ATiOSJS = require("ATiOSJS");
+const OC_WRAPPER_CLASS = "ATInterstitialAdWrapper";
+var ATiOSInterstitialJS = ATiOSInterstitialJS || {
+    loadInterstitial : function (placementId, extra) {
+        ATiOSJS.printJsLog("ATiOSInterstitialJS::loadInterstitial(" + placementId + ", " + extra + ")");
+        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "loadInterstitialWithPlacementID:extra:", placementId, extra);
+    },
+
+    setAdListener : function (listener) {
+        ATiOSJS.printJsLog("ATiOSInterstitialJS::setAdListener(" + listener + ")");
+        jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "setDelegates:", listener);
+    },
+
+    hasAdReady : function (placementId) {
+        ATiOSJS.printJsLog("ATiOSInterstitialJS::hasAdReady(" + placementId + ")");
+        return jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "interstitialReadyForPlacementID:", placementId);
+    },
+
+    checkAdStatus : function (placementId) {
+        ATiOSJS.printJsLog("ATiOSInterstitialJS::checkAdStatus(" + placementId + ")");
+        return jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "checkAdStatus:", placementId);
+    },
+
+    setUserData : function (placementId, userId, userData) {
+         cc.log("Android-setUserData");
+    },
+
+    showAd : function(placementId) {
+        ATiOSJS.printJsLog("ATiOSInterstitialJS::showAd(" + placementId + ")");
+        return jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "showInterstitialWithPlacementID:scene:", placementId, null);
+        
+    },
+
+    showAdInScenario : function(placementId, scenario) {
+        ATiOSJS.printJsLog("ATiOSInterstitialJS::showAd(" + placementId  + ", " + scenario + ")");
+        return jsb.reflection.callStaticMethod(OC_WRAPPER_CLASS, "showInterstitialWithPlacementID:scene:", placementId, scenario);
+    } 
+  
+};
+
 module.exports = ATiOSInterstitialJS;