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

assets/resources/game/prefab/game.prefab

@@ -30,11 +30,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 46
     },
     "_opacity": 255,
     "_color": {
@@ -276,11 +276,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -354,19 +354,22 @@
       },
       {
         "__id__": 33
+      },
+      {
+        "__id__": 38
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 40
       },
       {
-        "__id__": 36
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 42
     },
     "_opacity": 255,
     "_color": {
@@ -379,7 +382,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 120,
-      "height": 605
+      "height": 794
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -458,7 +461,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        263,
+        357.5,
         0,
         0,
         0,
@@ -582,7 +585,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        164,
+        258.5,
         0,
         0,
         0,
@@ -716,7 +719,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        65,
+        159.5,
         0,
         0,
         0,
@@ -850,7 +853,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -34,
+        60.5,
         0,
         0,
         0,
@@ -984,7 +987,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -133,
+        -38.5,
         0,
         0,
         0,
@@ -1077,12 +1080,146 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "btn6",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 34
+      },
+      {
+        "__id__": 35
+      }
+    ],
+    "_prefab": {
+      "__id__": 37
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 80,
+      "height": 79
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -137.5,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 33
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "c53d92da-02b7-4ea1-9d09-e0c26277ea0a"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 33
+    },
+    "_enabled": true,
+    "panel_name": "module/receiptNotice/receiptNotice",
+    "open_type": 0,
+    "transition_type": 0,
+    "onComplete": {
+      "__id__": 36
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "c7gRG9Hi5FT7QOmHQeliCO",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
     "_objFlags": 0,
     "_parent": {
       "__id__": 8
     },
     "_prefab": {
-      "__id__": 34
+      "__id__": 39
     },
     "_name": "btnMoreGame",
     "_active": true,
@@ -1091,7 +1228,7 @@
       "ctor": "Float64Array",
       "array": [
         -2.842170943040401e-14,
-        -247.5,
+        -297,
         0,
         0,
         0,
@@ -1113,7 +1250,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 33
+      "__id__": 38
     },
     "asset": {
       "__uuid__": "87af2d92-1d51-45d4-9ffe-c343a549a2a0"
@@ -1132,7 +1269,7 @@
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 120,
-      "height": 605
+      "height": 794
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -1214,7 +1351,7 @@
       "__id__": 23
     },
     "btn5": {
-      "__id__": 33
+      "__id__": 38
     },
     "_id": ""
   },

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/receiptNotice/receiptNotice.prefab

@@ -19,31 +19,25 @@
     "_children": [
       {
         "__id__": 2
-      },
-      {
-        "__id__": 5
-      },
-      {
-        "__id__": 58
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 62
       },
       {
-        "__id__": 66
+        "__id__": 63
       },
       {
-        "__id__": 67
+        "__id__": 64
       },
       {
-        "__id__": 68
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 66
     },
     "_opacity": 255,
     "_color": {
@@ -94,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__": "7fe555ed-39aa-435c-a1ae-c47748d0ff9e"
-    },
-    "_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": "2bN/lJJHdCD6ibxPF+eHOm",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "动画节点",
     "_objFlags": 0,
     "_parent": {
@@ -208,6 +95,9 @@
     },
     "_children": [
       {
+        "__id__": 3
+      },
+      {
         "__id__": 6
       },
       {
@@ -220,7 +110,7 @@
         "__id__": 15
       },
       {
-        "__id__": 18
+        "__id__": 23
       },
       {
         "__id__": 26
@@ -247,17 +137,17 @@
         "__id__": 47
       },
       {
-        "__id__": 50
+        "__id__": 53
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 61
     },
     "_opacity": 255,
     "_color": {
@@ -311,17 +201,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": {
@@ -375,7 +265,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 6
+      "__id__": 3
     },
     "_enabled": true,
     "_materials": [
@@ -418,17 +308,17 @@
     "_name": "白色板子",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
@@ -482,7 +372,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 6
     },
     "_enabled": true,
     "_materials": [
@@ -525,17 +415,17 @@
     "_name": "横线",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -589,7 +479,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 9
     },
     "_enabled": true,
     "_materials": [
@@ -632,17 +522,17 @@
     "_name": "标题",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 14
     },
     "_opacity": 255,
     "_color": {
@@ -696,7 +586,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 12
     },
     "_enabled": true,
     "_materials": [
@@ -739,24 +629,24 @@
     "_name": "btn继续提现",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 16
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 20
       },
       {
-        "__id__": 24
+        "__id__": 21
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -810,20 +700,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 15
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 17
       },
       {
-        "__id__": 21
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
@@ -877,7 +767,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 16
     },
     "_enabled": true,
     "_materials": [
@@ -912,7 +802,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 16
     },
     "_enabled": true,
     "_color": {
@@ -941,7 +831,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 15
     },
     "_enabled": true,
     "_materials": [
@@ -969,71 +859,18 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 15
     },
     "_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
+    "node_panel": {
+      "__id__": 1
     },
-    "_N$normalSprite": null,
-    "_N$pressedSprite": null,
-    "pressedSprite": null,
-    "_N$hoverSprite": null,
-    "hoverSprite": null,
-    "_N$disabledSprite": null,
-    "_N$target": null,
+    "transition_type": 3,
+    "onComplete": [],
     "_id": ""
   },
   {
@@ -1052,17 +889,17 @@
     "_name": "收款描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -1116,7 +953,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 23
     },
     "_enabled": true,
     "_materials": [
@@ -1162,17 +999,17 @@
     "_name": "lbl收款金额",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -1226,7 +1063,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 26
     },
     "_enabled": true,
     "_materials": [
@@ -1272,17 +1109,17 @@
     "_name": "账户名描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 31
     },
     "_opacity": 255,
     "_color": {
@@ -1336,7 +1173,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 29
     },
     "_enabled": true,
     "_materials": [
@@ -1382,17 +1219,17 @@
     "_name": "lbl用户名",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -1446,7 +1283,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 32
     },
     "_enabled": true,
     "_materials": [
@@ -1492,17 +1329,17 @@
     "_name": "收款描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1556,7 +1393,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 35
     },
     "_enabled": true,
     "_materials": [
@@ -1602,17 +1439,17 @@
     "_name": "lbl收款游戏",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1666,7 +1503,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 38
     },
     "_enabled": true,
     "_materials": [
@@ -1712,17 +1549,17 @@
     "_name": "提现描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -1776,7 +1613,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 41
     },
     "_enabled": true,
     "_materials": [
@@ -1822,17 +1659,17 @@
     "_name": "lbl累计提现",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 46
     },
     "_opacity": 255,
     "_color": {
@@ -1886,7 +1723,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1932,21 +1769,21 @@
     "_name": "btn提现记录",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 51
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 52
     },
     "_opacity": 255,
     "_color": {
@@ -2000,17 +1837,17 @@
     "_name": "lbl提现记录",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 50
+      "__id__": 47
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -2064,7 +1901,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -2110,7 +1947,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 50
+      "__id__": 47
     },
     "_enabled": true,
     "panel_name": "",
@@ -2131,66 +1968,28 @@
     "sync": false
   },
   {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 5
-    },
-    "_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.Node",
     "_name": "关闭按钮",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 59
+        "__id__": 54
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 57
       },
       {
-        "__id__": 63
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -2244,17 +2043,17 @@
     "_name": "纹理",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 58
+      "__id__": 53
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -2308,7 +2107,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 59
+      "__id__": 54
     },
     "_enabled": true,
     "_materials": [
@@ -2343,7 +2142,7 @@
     "asset": {
       "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
     },
-    "fileId": "703po8KKRCa64gGpGMCjah",
+    "fileId": "ec7xDDZ25JFKC/Eq8e7p5f",
     "sync": false
   },
   {
@@ -2351,7 +2150,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 58
+      "__id__": 53
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2419,12 +2218,13 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 58
+      "__id__": 53
     },
     "_enabled": true,
     "node_panel": {
       "__id__": 1
     },
+    "transition_type": 0,
     "onComplete": [],
     "_id": ""
   },
@@ -2436,7 +2236,45 @@
     "asset": {
       "__uuid__": "44d9346c-ae5c-4f7a-a16a-3c7841e67b78"
     },
-    "fileId": "168YVy5dRGxbnkVFwgdXzm",
+    "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
   },
   {
@@ -2494,7 +2332,7 @@
     },
     "_enabled": true,
     "effect_par": {
-      "__id__": 5
+      "__id__": 2
     },
     "open_effect": 1,
     "close_effect": 1,
@@ -2510,16 +2348,16 @@
     },
     "_enabled": true,
     "lbl_receipt_rmb": {
-      "__id__": 30
+      "__id__": 27
     },
     "lbl_rmb_total": {
-      "__id__": 48
+      "__id__": 45
     },
     "lbl_game_name": {
-      "__id__": 42
+      "__id__": 39
     },
     "lbl_user_name": {
-      "__id__": 36
+      "__id__": 33
     },
     "_id": ""
   },

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/data/GData.ts

@@ -11,12 +11,13 @@ import { SignData } from "./module/SignData";
 import { PushData } from "./module/PushData";
 import { FissionData } from "./module/FissionData";
 import { LuckyBagData } from "./module/LuckyBagData";
-import { CashNormalData } from "./module/CashNormalData";
 import { CashPigData } from "./module/CashPigData";
 import { AdData } from "./AdData";
 import { RewardData } from "./module/RewardData";
 import MoreGameData from "./MoreGameData";
 import { Data } from "../../mk/data/Data";
+import { RedBagCashData } from "./module/RedBagCashData";
+import { ReceiptNoticeData } from "./module/ReceiptNoticeData";
 
 /**
  * 数据集合全局类
@@ -44,10 +45,12 @@ class GData {
     public pigbank: PigBankData;
     public luckybag: LuckyBagData;
     public sign: SignData;
-    public cashNormal: CashNormalData;
+    public receiptNotice: ReceiptNoticeData;
+    public redBagCash: RedBagCashData;
+
     public moreGame: MoreGameData;
 
-    public moduleData:Map<number,Data>;
+    public moduleData: Map<number, Data>;
 
     init() {
         this.appData = new AppData();
@@ -65,17 +68,18 @@ class GData {
         this.pigbank = new PigBankData();
         this.luckybag = new LuckyBagData();
         this.sign = new SignData();
-        this.cashNormal = new CashNormalData();
+        this.receiptNotice = new ReceiptNoticeData();
+        this.redBagCash = new RedBagCashData();
         this.moreGame = new MoreGameData();
 
-        this.moduleData = new Map<number,Data>();
-        this.moduleData.set(Fun.moreGame,this.moreGame);
-        this.moduleData.set(Fun.turnable,this.turnable);
-        this.moduleData.set(Fun.fission,this.fission);
-        this.moduleData.set(Fun.pigbank,this.pigbank);
-        this.moduleData.set(Fun.luckybag,this.luckybag);
-        this.moduleData.set(Fun.sign,this.sign);
-        this.moduleData.set(Fun.cashNormal,this.cashNormal);
+        this.moduleData = new Map<number, Data>();
+        this.moduleData.set(Fun.moreGame, this.moreGame);
+        this.moduleData.set(Fun.turnable, this.turnable);
+        this.moduleData.set(Fun.fission, this.fission);
+        this.moduleData.set(Fun.pigbank, this.pigbank);
+        this.moduleData.set(Fun.luckybag, this.luckybag);
+        this.moduleData.set(Fun.sign, this.sign);
+        this.moduleData.set(Fun.redBagCash, this.redBagCash);
     }
 }
 
@@ -89,7 +93,7 @@ export enum Fun {
     pigbank = 4,    //存钱罐
     luckybag = 5,   //福袋
     sign = 6,       //签到
-    cashNormal = 7, //常规提现
+    redBagCash = 7, //常规提现
 }
 
 declare global {

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

@@ -1,10 +0,0 @@
-import { Data } from "../../../mk/data/Data";
-
-/**
- * @description 常规提现数据
- * @author 邹勇
- */
- export class CashNormalData extends Data{
-
-    
-}

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

@@ -1,9 +0,0 @@
-{
-  "ver": "1.0.8",
-  "uuid": "5b3e05c3-511b-41b8-819c-83fffa683414",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
-}

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

@@ -1,17 +1,33 @@
+import { Data } from "../../../mk/data/Data";
+
 /**
  * 到账通知
  * @author 
  */
-export class ReceiptNoticeData {
+export class ReceiptNoticeData extends Data {
     /**
      * 标志位 - 是否刷新样式
      */
     public init_style = true;
-    private _receip: number = 1
-    set receip(value: number) {
 
+    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;
     }
-    get receip() {
-        return
+
+    private _receip_total_rmb: number = 0;
+    /** 到账毛币总数 */
+    set receip_total_rmb(value: number) {
+        this._receip_total_rmb = value;
+        this.init_style = true;
     }
+    get receip_total_rmb() {
+        return this._receip_total_rmb;
+    }
+
 }

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

@@ -1,8 +1,9 @@
+import { Data } from "../../../mk/data/Data";
 /**
  * 红包提现数据
  * @author 薛鸿潇
  */
-export class RedBagCashData {
+export class RedBagCashData extends Data {
     
 
     public async getRecord(){

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

@@ -28,5 +28,20 @@ export default class ReceiptNotice extends cc.Component {
 
     }
 
-    // update (dt) {}
+    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.receiptNotice.receip_total_rmb + '元';
+        this.lbl_user_name.string = '用户名';
+        this.lbl_game_name.string = '轻松连连消提现';
+    }
 }

assets/script/game/module/module/redBagCash/RedBagCash.ts

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

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

@@ -5,7 +5,7 @@ import { GameProp, RewardState } from "../../../data/GameData";
  * 签到界面
  * - 每天第一次上线默认弹出一次【除首日】。待处理
  * - 全部签完后，不可再签到。此处需要判断上次签到天数。
- * - 签到数据几点刷新？什么方式刷新？ 与后端沟通
+ * - 滑动列表需要滚动到对应签到条目的高度，待处理。
  * @author 薛鸿潇
  */
 const { ccclass, property } = cc._decorator;