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

assets/resources/module/blessingBag/blessingBag.prefab

@@ -8261,7 +8261,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 2

assets/resources/module/cashNormal/cashNormal.prefab

@@ -21,23 +21,23 @@
         "__id__": 2
       },
       {
-        "__id__": 39
+        "__id__": 42
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 49
       },
       {
-        "__id__": 47
+        "__id__": 50
       },
       {
-        "__id__": 48
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 52
     },
     "_opacity": 255,
     "_color": {
@@ -105,16 +105,19 @@
       },
       {
         "__id__": 26
+      },
+      {
+        "__id__": 37
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1360,6 +1363,116 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "无提现描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 38
+      }
+    ],
+    "_prefab": {
+      "__id__": 39
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 240,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 37
+    },
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "18ca563c-e8dc-4633-bf04-5fdd65113bb0"
+    },
+    "fileId": "67vkHiDftAxIXeLHxuXEEu",
+    "sync": false
+  },
+  {
     "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
@@ -1406,20 +1519,20 @@
     },
     "_children": [
       {
-        "__id__": 40
+        "__id__": 43
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 46
       },
       {
-        "__id__": 44
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -1473,17 +1586,17 @@
     "_name": "按钮纹理",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 39
+      "__id__": 42
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1537,7 +1650,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 43
     },
     "_enabled": true,
     "_materials": [
@@ -1580,7 +1693,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 42
     },
     "_enabled": true,
     "node_panel": {
@@ -1595,7 +1708,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 42
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1669,6 +1782,9 @@
     "lbl_rmb_total": {
       "__id__": 19
     },
+    "lbl_none": {
+      "__id__": 38
+    },
     "_id": ""
   },
   {
@@ -1684,9 +1800,11 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
+    },
+    "design_block_node": {
+      "__id__": 37
     },
-    "design_block_node": null,
     "bClickClose": false,
     "_id": ""
   },

assets/resources/module/help/help.prefab

@@ -716,7 +716,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 3

assets/resources/module/login/login.prefab

@@ -21,20 +21,23 @@
         "__id__": 2
       },
       {
-        "__id__": 5
+        "__id__": 6
       },
       {
-        "__id__": 9
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 43
+      },
+      {
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -95,10 +98,13 @@
     "_components": [
       {
         "__id__": 3
+      },
+      {
+        "__id__": 4
       }
     ],
     "_prefab": {
-      "__id__": 4
+      "__id__": 5
     },
     "_opacity": 255,
     "_color": {
@@ -190,6 +196,35 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": {
+      "__id__": 1
+    },
+    "_alignFlags": 4,
+    "_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
@@ -211,14 +246,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 6
+        "__id__": 7
       },
       {
-        "__id__": 7
+        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 9
     },
     "_opacity": 255,
     "_color": {
@@ -272,7 +307,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 5
+      "__id__": 6
     },
     "_enabled": true,
     "_materials": [
@@ -304,11 +339,13 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 5
+      "__id__": 6
     },
     "_enabled": true,
     "alignMode": 1,
-    "_target": null,
+    "_target": {
+      "__id__": 1
+    },
     "_alignFlags": 1,
     "_left": 0,
     "_right": 0,
@@ -346,23 +383,23 @@
     },
     "_children": [
       {
-        "__id__": 10
+        "__id__": 11
       },
       {
-        "__id__": 13
+        "__id__": 14
       },
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 42
     },
     "_opacity": 255,
     "_color": {
@@ -416,17 +453,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 9
+      "__id__": 10
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 12
+      "__id__": 13
     },
     "_opacity": 255,
     "_color": {
@@ -480,7 +517,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 11
     },
     "_enabled": true,
     "_materials": [
@@ -511,10 +548,10 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 13
+      "__id__": 1
     },
     "asset": {
-      "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
+      "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
     "fileId": "39wNmXM8NI4q4sJUt5JvJu",
     "sync": false
@@ -524,24 +561,24 @@
     "_name": "progressbar",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 9
+      "__id__": 10
     },
     "_children": [
       {
-        "__id__": 14
+        "__id__": 15
       },
       {
-        "__id__": 17
+        "__id__": 18
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -595,17 +632,17 @@
     "_name": "jindu1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 13
+      "__id__": 14
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -659,7 +696,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 15
     },
     "_enabled": true,
     "_materials": [
@@ -689,7 +726,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 13
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -702,21 +739,21 @@
     "_name": "jindu2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 13
+      "__id__": 14
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 19
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -770,17 +807,17 @@
     "_name": "jindu2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 18
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 20
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -834,7 +871,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_materials": [
@@ -864,7 +901,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 13
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -877,7 +914,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [
@@ -897,7 +934,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 13
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -910,18 +947,18 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 13
+      "__id__": 14
     },
     "_enabled": true,
     "bar": {
-      "__id__": 19
+      "__id__": 20
     },
     "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 13
+      "__id__": 14
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -934,30 +971,30 @@
     "_name": "New Layout",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 9
+      "__id__": 10
     },
     "_children": [
       {
-        "__id__": 26
+        "__id__": 27
       },
       {
-        "__id__": 29
+        "__id__": 30
       },
       {
-        "__id__": 32
+        "__id__": 33
       },
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1011,17 +1048,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 29
     },
     "_opacity": 200,
     "_color": {
@@ -1075,7 +1112,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 27
     },
     "_enabled": true,
     "_materials": [
@@ -1119,17 +1156,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 32
     },
     "_opacity": 200,
     "_color": {
@@ -1183,7 +1220,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "_materials": [
@@ -1227,17 +1264,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 35
     },
     "_opacity": 200,
     "_color": {
@@ -1291,7 +1328,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 33
     },
     "_enabled": true,
     "_materials": [
@@ -1335,17 +1372,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 25
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 36
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 38
     },
     "_opacity": 200,
     "_color": {
@@ -1399,7 +1436,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 36
     },
     "_enabled": true,
     "_materials": [
@@ -1443,7 +1480,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 26
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1486,7 +1523,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 10
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1528,20 +1565,49 @@
     },
     "_enabled": true,
     "bar": {
-      "__id__": 23
+      "__id__": 24
     },
     "lbl_progress": {
-      "__id__": 11
+      "__id__": 12
     },
     "lbl_server": {
-      "__id__": 30
+      "__id__": 31
     },
     "lbl_privacy": {
-      "__id__": 36
+      "__id__": 37
     },
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": {
+      "__id__": 1
+    },
+    "_alignFlags": 5,
+    "_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": 1334,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/resources/module/moreGame/moreGamePopNode.prefab

@@ -772,7 +772,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 2

assets/resources/module/pigBank/pigBank.prefab

@@ -960,8 +960,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 419,
-      "height": 152
+      "width": 404,
+      "height": 188
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1284,8 +1284,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 360,
-      "height": 120
+      "width": 277,
+      "height": 63
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1297,7 +1297,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -163,
+        -152.225,
         0,
         0,
         0,
@@ -1406,13 +1406,13 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        136.1,
-        -137.652,
+        93,
+        -123.474,
         0,
         0,
         0,
-        0.03656993883114308,
-        0.9993310960707099,
+        0,
+        1,
         1,
         1,
         1
@@ -1422,7 +1422,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 4.19154092523328
+      "z": 0
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -2297,7 +2297,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

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

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 419,
-  "height": 152,
+  "width": 404,
+  "height": 188,
   "platformSettings": {},
   "subMetas": {
     "bg": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 419,
-      "height": 152,
-      "rawWidth": 419,
-      "rawHeight": 152,
+      "width": 404,
+      "height": 188,
+      "rawWidth": 404,
+      "rawHeight": 188,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/module/pigBank/texture/title.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 360,
-  "height": 120,
+  "width": 277,
+  "height": 63,
   "platformSettings": {},
   "subMetas": {
     "title": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 360,
-      "height": 120,
-      "rawWidth": 360,
-      "rawHeight": 120,
+      "width": 277,
+      "height": 63,
+      "rawWidth": 277,
+      "rawHeight": 63,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/module/receiptNotice/receiptNotice.prefab

@@ -2317,7 +2317,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

assets/resources/module/redBagCash/redBagCash.prefab

@@ -2319,7 +2319,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

assets/resources/module/redBagCode/redBagCode.prefab

@@ -966,7 +966,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 3

assets/resources/module/redCode/redCode.prefab

@@ -3993,7 +3993,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 3

assets/resources/module/redeem/RedeemNode.prefab

@@ -9723,7 +9723,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 3

assets/resources/module/reward/reward.prefab

@@ -4367,7 +4367,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

assets/resources/module/reward/rewardLuck.prefab

@@ -4367,7 +4367,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 71

assets/resources/module/reward/rewardMission.prefab

@@ -4395,7 +4395,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

assets/resources/module/setting/rule.prefab

@@ -30,14 +30,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 36
       },
       {
-        "__id__": 38
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -733,14 +733,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 33
       },
       {
-        "__id__": 35
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -1029,7 +1029,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -1186,88 +1186,19 @@
     "sync": false
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 27
     },
     "_enabled": true,
-    "_normalMaterial": null,
-    "_grayMaterial": null,
-    "duration": 0.1,
-    "zoomScale": 1.2,
-    "clickEvents": [
-      {
-        "__id__": 32
-      }
-    ],
-    "_N$interactable": true,
-    "_N$enableAutoGrayEffect": false,
-    "_N$transition": 3,
-    "transition": 3,
-    "_N$normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$pressedColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "pressedColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_N$hoverColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "hoverColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_N$normalSprite": null,
-    "_N$pressedSprite": null,
-    "pressedSprite": null,
-    "_N$hoverSprite": null,
-    "hoverSprite": null,
-    "_N$disabledSprite": null,
-    "_N$target": {
-      "__id__": 27
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
+    "node_panel": {
       "__id__": 1
     },
-    "component": "",
-    "_componentId": "3785cT9t0BKM73CkHfOQdMj",
-    "handler": "close",
-    "customEventData": ""
+    "transition_type": 3,
+    "onComplete": [],
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1364,9 +1295,7 @@
     "lbl_content": {
       "__id__": 9
     },
-    "btn_close": {
-      "__id__": 31
-    },
+    "btn_close": null,
     "_id": ""
   },
   {

assets/resources/module/setting/setting.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 84
       },
       {
-        "__id__": 83
+        "__id__": 85
       },
       {
-        "__id__": 84
+        "__id__": 86
       },
       {
-        "__id__": 85
+        "__id__": 87
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 88
     },
     "_opacity": 255,
     "_color": {
@@ -122,47 +122,47 @@
         "__id__": 32
       },
       {
-        "__id__": 36
+        "__id__": 38
       },
       {
-        "__id__": 39
+        "__id__": 41
       },
       {
-        "__id__": 42
+        "__id__": 44
       },
       {
-        "__id__": 47
+        "__id__": 49
       },
       {
-        "__id__": 52
+        "__id__": 54
       },
       {
-        "__id__": 57
+        "__id__": 59
       },
       {
-        "__id__": 61
+        "__id__": 63
       },
       {
-        "__id__": 66
+        "__id__": 68
       },
       {
-        "__id__": 69
+        "__id__": 71
       },
       {
-        "__id__": 74
+        "__id__": 76
       },
       {
-        "__id__": 77
+        "__id__": 79
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 82
       }
     ],
     "_prefab": {
-      "__id__": 81
+      "__id__": 83
     },
     "_opacity": 255,
     "_color": {
@@ -1268,12 +1268,77 @@
     "_parent": {
       "__id__": 2
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 33
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
-      },
+        "__id__": 36
+      }
+    ],
+    "_prefab": {
+      "__id__": 37
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 150,
+      "height": 150
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        305.291,
+        280.976,
+        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__": 32
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
       {
         "__id__": 34
       }
@@ -1303,8 +1368,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        305.291,
-        280.976,
+        0,
+        0,
         0,
         0,
         0,
@@ -1333,7 +1398,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 33
     },
     "_enabled": true,
     "_materials": [
@@ -1361,6 +1426,17 @@
     "_id": ""
   },
   {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "2f63e38a-f6a2-47c7-bb1d-2bc6a29d26bb"
+    },
+    "fileId": "77q04IebRIXoW+IqyJKBEM",
+    "sync": false
+  },
+  {
     "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
     "_name": "",
     "_objFlags": 0,
@@ -1371,7 +1447,7 @@
     "node_panel": {
       "__id__": 1
     },
-    "transition_type": 0,
+    "transition_type": 3,
     "onComplete": [],
     "_id": ""
   },
@@ -1397,11 +1473,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1455,7 +1531,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 38
     },
     "_enabled": true,
     "_materials": [
@@ -1504,11 +1580,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -1562,7 +1638,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 41
     },
     "_enabled": true,
     "_materials": [
@@ -1611,14 +1687,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 45
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -1672,7 +1748,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1704,7 +1780,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1713,7 +1789,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 45
+        "__id__": 47
       }
     ],
     "_N$interactable": true,
@@ -1769,7 +1845,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 42
+      "__id__": 44
     },
     "_id": ""
   },
@@ -1805,14 +1881,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 50
       },
       {
-        "__id__": 49
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -1866,7 +1942,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 49
     },
     "_enabled": true,
     "_materials": [
@@ -1898,7 +1974,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 49
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1907,7 +1983,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 50
+        "__id__": 52
       }
     ],
     "_N$interactable": true,
@@ -1963,7 +2039,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 47
+      "__id__": 49
     },
     "_id": ""
   },
@@ -1999,14 +2075,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 55
       },
       {
-        "__id__": 54
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "_opacity": 255,
     "_color": {
@@ -2060,7 +2136,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 54
     },
     "_enabled": true,
     "_materials": [
@@ -2092,7 +2168,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 54
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2101,7 +2177,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 55
+        "__id__": 57
       }
     ],
     "_N$interactable": true,
@@ -2157,7 +2233,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 52
+      "__id__": 54
     },
     "_id": ""
   },
@@ -2193,14 +2269,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 60
       },
       {
-        "__id__": 59
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -2254,7 +2330,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "_materials": [
@@ -2287,7 +2363,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "_color": {
@@ -2322,14 +2398,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 64
       },
       {
-        "__id__": 63
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "_opacity": 255,
     "_color": {
@@ -2383,7 +2459,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 61
+      "__id__": 63
     },
     "_enabled": true,
     "_materials": [
@@ -2412,77 +2488,21 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 61
+      "__id__": 63
     },
     "_enabled": true,
-    "_normalMaterial": null,
-    "_grayMaterial": null,
-    "duration": 0.1,
-    "zoomScale": 1.2,
-    "clickEvents": [
+    "panel_name": "module/setting/rule",
+    "open_type": 0,
+    "transition_type": 3,
+    "onComplete": [
       {
-        "__id__": 64
+        "__id__": 66
       }
     ],
-    "_N$interactable": true,
-    "_N$enableAutoGrayEffect": false,
-    "_N$transition": 0,
-    "transition": 0,
-    "_N$normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$pressedColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "pressedColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_N$hoverColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "hoverColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_N$normalSprite": null,
-    "_N$pressedSprite": null,
-    "pressedSprite": null,
-    "_N$hoverSprite": null,
-    "hoverSprite": null,
-    "_N$disabledSprite": null,
-    "_N$target": {
-      "__id__": 61
-    },
     "_id": ""
   },
   {
@@ -2517,11 +2537,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 70
     },
     "_opacity": 255,
     "_color": {
@@ -2575,7 +2595,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 68
     },
     "_enabled": true,
     "_materials": [
@@ -2624,14 +2644,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 72
       },
       {
-        "__id__": 71
+        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "_opacity": 255,
     "_color": {
@@ -2685,7 +2705,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 69
+      "__id__": 71
     },
     "_enabled": true,
     "_materials": [
@@ -2714,77 +2734,21 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 69
+      "__id__": 71
     },
     "_enabled": true,
-    "_normalMaterial": null,
-    "_grayMaterial": null,
-    "duration": 0.1,
-    "zoomScale": 1.2,
-    "clickEvents": [
+    "panel_name": "module/setting/rule",
+    "open_type": 0,
+    "transition_type": 3,
+    "onComplete": [
       {
-        "__id__": 72
+        "__id__": 74
       }
     ],
-    "_N$interactable": true,
-    "_N$enableAutoGrayEffect": false,
-    "_N$transition": 0,
-    "transition": 0,
-    "_N$normalColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$pressedColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "pressedColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_N$hoverColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "hoverColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_N$disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_N$normalSprite": null,
-    "_N$pressedSprite": null,
-    "pressedSprite": null,
-    "_N$hoverSprite": null,
-    "hoverSprite": null,
-    "_N$disabledSprite": null,
-    "_N$target": {
-      "__id__": 69
-    },
     "_id": ""
   },
   {
@@ -2819,11 +2783,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 75
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2877,7 +2841,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 74
+      "__id__": 76
     },
     "_enabled": true,
     "_materials": [
@@ -2926,11 +2890,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 79
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -2984,7 +2948,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 77
+      "__id__": 79
     },
     "_enabled": true,
     "_materials": [
@@ -3081,15 +3045,14 @@
       "__id__": 25
     },
     "img_music": {
-      "__id__": 43
+      "__id__": 45
     },
     "img_effect": {
-      "__id__": 48
+      "__id__": 50
     },
     "lbl_version": {
-      "__id__": 78
+      "__id__": 80
     },
-    "node_rule": null,
     "_id": ""
   },
   {
@@ -3105,7 +3068,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 180
+      "a": 230
     },
     "design_block_node": null,
     "bClickClose": false,

assets/resources/module/sign/sign.prefab

@@ -1793,7 +1793,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 120
+      "a": 230
     },
     "design_block_node": {
       "__id__": 3

assets/resources/module/turnable/texture/zhuanpan2.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b9aad7ee-6434-403a-a2da-f67498d26f41",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 548,
+  "height": 535,
+  "platformSettings": {},
+  "subMetas": {
+    "zhuanpan2": {
+      "ver": "1.0.4",
+      "uuid": "9c29fcc0-719a-4e02-b665-f166d60a1279",
+      "rawTextureUuid": "b9aad7ee-6434-403a-a2da-f67498d26f41",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 548,
+      "height": 535,
+      "rawWidth": 548,
+      "rawHeight": 535,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/music/bgm.mp3.meta

@@ -2,6 +2,6 @@
   "ver": "2.0.1",
   "uuid": "f77ecb31-e3b7-40ef-9acc-6d65df909e02",
   "downloadMode": 0,
-  "duration": 159.320816,
+  "duration": 34.507755,
   "subMetas": {}
 }

assets/script/game/component/BtnClosePanel.ts

@@ -28,6 +28,7 @@ export default class BtnClosePanel extends cc.Component {
     }
 
     private async closePanel() {
+        mk.audio.playEffect("button");
         if (this.block_click) return;
         if (this.node_panel) {
             mk.ui.closePanel(this.node_panel.name);

assets/script/game/data/AppData.ts

@@ -4,6 +4,8 @@
  */
 export class AppData {
 
+    public getDeviceInfoCompelete: boolean = false;
+
     /** 错误日志游戏名标志,尽量短 */
     public appNameBugly: string = '3xiao';
 
@@ -21,15 +23,15 @@ export class AppData {
     public appId: string = 'wxcf31f0e54f7fefda';
 
     /** 友盟渠道 */
-    public umengChannel:string = '';
+    public umengChannel: string = '';
 
     /** 设备型号 */
-    public deviceType:string = '';
+    public deviceType: string = '';
 
     /** 安卓版本号 */
-    public androidVersion:string = '';
+    public androidVersion: string = '';
 
-    public mac: string = 'c9:05:e2:1c:b2:23,f6:60:e4:1a:b7:27';
+    public mac: string = 'c9:24:e2:1c:b2:23,f6:60:e4:1a:b7:27';
 
     /** 设备信息 */
     public machineInfo = {
@@ -48,7 +50,6 @@ export class AppData {
      * @param info  info(Java返回)
      */
     public updateDeviceInfo(info) {
-        mk.console.logSingle("updateDeviceInfo",info)
         let arr = info.split('#')
         this.machineInfo.android_id = arr[0];
         this.machineInfo.idfa = arr[1];
@@ -65,6 +66,8 @@ export class AppData {
         this.deviceType = arr[9];
         /** 安卓版本号 */
         this.androidVersion = arr[10];
+
+        this.getDeviceInfoCompelete = true;
     }
 
     public init() {

assets/script/game/data/GData.ts

@@ -20,6 +20,7 @@ import { RedBagCashData } from "./module/RedBagCashData";
 import RedCodeData from "./module/RedCodeData";
 import RedeemData from "./module/RedeemData";
 import { MoreGameData } from "./module/MoreGameData";
+import { SettingData } from "./module/SettingData";
 
 /**
  * 数据集合全局类
@@ -57,6 +58,7 @@ class GData {
     public redBagCash: RedBagCashData;
     /** 红包提现（常规提现） */
     public cashNormal: CashNormalData;
+    public setting: SettingData;
     /** 更多游戏 */
     public moreGame: MoreGameData;
     public blessingBag: BlessingBagData;
@@ -84,6 +86,7 @@ class GData {
         this.receiptNotice = new ReceiptNoticeData();
         this.redBagCash = new RedBagCashData();
         this.cashNormal = new CashNormalData();
+        this.setting = new SettingData();
         this.moreGame = new MoreGameData();
         this.blessingBag = new BlessingBagData();
         this.cashPro = new CashProData();

assets/script/game/data/GameData.ts

@@ -54,27 +54,25 @@ export class GameData {
         this.initConfigs(response.data);
 
         data = {};
-        response = await mk.http.sendData('user/adShowConfig', data);
-        if (response.errcode != 0) {
-            return;
-        }
-        this.adShowConfig = response.data;
-        mk.console.logSingle("user/adShowConfig", response.data);
-
-        data = {};
         response = await mk.http.sendData('getInfoCrypt', data);
         if (response.errcode != 0) {
             return;
         }
         mk.console.logSingle("getInfoCrypt", response.data);
         this.initPlayerProp(response.data)
-
-
         this.initProps(response.data.gameUserData);
-
         gData.moduleData.forEach(element => {
             element.init();
         });
+
+        data = {};
+        response = await mk.http.sendData('user/adShowConfig', data);
+        if (response.errcode != 0) {
+            return;
+        }
+        this.adShowConfig = response.data;
+        mk.console.logSingle("user/adShowConfig", response.data);
+
         this.dataFinish = true;
     }
 

assets/script/game/data/LoginData.ts

@@ -6,7 +6,7 @@ import { StorageKey } from "./StorageData";
  */
 export class LoginData {
 
-    public loadResCompelete: boolean = false;
+    public loadResCompelete: boolean = false;   
 
     /** 是否登录 */
     public isLogin: boolean = false;
@@ -51,7 +51,6 @@ export class LoginData {
      * 登录流程 initApp-->initAd-->connect-->wxLogin-->checkLogin-->getAccountInfo
      */
     public async login() {
-        this.isLogin = true;
         mk.pool.init(gData.gameData.pools);
         gData.appData.init();
         gData.adData.init();
@@ -95,7 +94,7 @@ export class LoginData {
             };
         }
         else {//游客登录
-            encode = mk.encrypt.encrypt(JSON.stringify({ "code": gData.wechatData.code }), ranKey, gData.appData.appId);
+            encode = mk.encrypt.encrypt(JSON.stringify({ "code": '' }), ranKey, gData.appData.appId);
             data = {
                 "uin": this.tempUin,
                 "encrypt": encode

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

@@ -1,8 +1,18 @@
 /**
  * @description 账号设置数据
- * @author 邹勇
+ * @author 邹勇 薛鸿潇
  */
 
 export class SettingData {
+    public init_rule_tyle: boolean = null;
 
+    private _rule_type: number = 0;
+    /** 规则类型 */
+    set rule_type(value: number) {
+        this._rule_type = value;
+        this.init_rule_tyle = true;
+    }
+    get rule_type() {
+        return this._rule_type;
+    }
 }

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

@@ -235,6 +235,7 @@ export default class BlessingBag extends cc.Component {
 
 
     Click_AdProgressBtn() {
+        mk.audio.playEffect("button");
         if (gData.blessingBag.videoRbData.needToWatchTheVideo != 1) {
             //免费加进度
             gData.blessingBag.HttpNoAdProgress();
@@ -281,6 +282,7 @@ export default class BlessingBag extends cc.Component {
 
     async Click_CashBtn() {
         console.log("--->You Click CashBtn");
+        mk.audio.playEffect("button");
 
         if (gData.blessingBag.videoRbData.cumulativeAmount >= gData.blessingBag.videoRbData.requestAmount) {
             let response = await gData.blessingBag.HttpCashBig();
@@ -298,6 +300,7 @@ export default class BlessingBag extends cc.Component {
     canOpen: boolean = true;
     /**红包界面开按钮*/
     async Click_CashOpenBtn() {
+        mk.audio.playEffect("button");
         if (!this.canOpen) return;
         this.canOpen = false;
         if (this.rbPanelType == 1) {
@@ -328,6 +331,7 @@ export default class BlessingBag extends cc.Component {
     }
 
     Click_InitData() {
+        mk.audio.playEffect("button");
         gData.blessingBag.HttpInitAdRbData();
     }
 

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

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

assets/script/game/module/cashNormal/CashNormal.ts

@@ -11,12 +11,15 @@ export default class CashNormal extends cc.Component {
     private scroll_view: cc.ScrollView = null!;
     @property({ displayName: 'lbl累计提现', type: cc.Label })
     private lbl_rmb_total: cc.Label = null;
+    @property({ displayName: 'lbl暂无提现', type: cc.Label })
+    private lbl_none: cc.Label = null;
 
     // onLoad () {}
 
     start() {
         this.initTotal();
         this.initScrollView();
+        this.initNoneItem();
     }
 
     // update (dt) {}
@@ -34,4 +37,16 @@ export default class CashNormal extends cc.Component {
     private initTotal() {
         this.lbl_rmb_total.string = '￥' + gData.cashNormal.receip_total_rmb + '元';
     }
+
+    /**
+     * 初始化无条目时的提示
+     */
+    private initNoneItem() {
+        const count = gData.cashNormal.list_data.length;
+        if (count) {
+            this.lbl_none.node.active = false;
+        } else {
+            this.lbl_none.node.active = true;
+        }
+    }
 }

assets/script/game/module/help/Help.ts

@@ -11,6 +11,10 @@ export default class Help extends cc.Component {
     @property({ type: cc.Label, displayName: '文字说明' })
     lbl_desc: cc.Label = null;
 
+    start(){
+        mk.audio.playEffect("button");
+    }
+
     update() {
         if (gData.help.init_desc_name) {
             this.lbl_desc.string = gData.help.des;

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

@@ -1,3 +1,5 @@
+
+import JsbSystem from "../../../mk/system/JsbSystem";
 import LoadingBar from "../../component/LoadingBar";
 
 const { ccclass, property } = cc._decorator;
@@ -19,6 +21,7 @@ export default class Login extends cc.Component {
     }
 
     start() {
+        JsbSystem.getDeviceInfo();
     }
 
     private setProgress(current) {
@@ -32,16 +35,19 @@ export default class Login extends cc.Component {
             this.process += 2;
             this.setProgress(this.process);
         }
-        if (!gData.loginData.loadResCompelete) {
-            gData.loginData.loadLocalRes();
-            return;
-        }
-        if (!gData.loginData.isLogin) {
-            gData.loginData.login();
-            return;
+        if (gData.loginData.loadResCompelete) {
+            if (gData.appData.getDeviceInfoCompelete) {
+                gData.loginData.login();
+                gData.appData.getDeviceInfoCompelete = false;
+            }
+            else if (gData.gameData.dataFinish) {//登录流程完毕
+                mk.ui.openPanel("game/prefab/game");
+                gData.gameData.dataFinish = false;
+            }
         }
-        if (gData.gameData.dataFinish) {//登录流程完毕
-            mk.ui.openPanel("game/prefab/game");
+        else {
+            gData.loginData.loadLocalRes();
         }
+
     }
 }

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

@@ -73,6 +73,7 @@ export default class PigBank extends cc.Component {
      * 提现操作
      */
     private clickCashOP() {
+        mk.audio.playEffect("button");
         if (!gData.pigbank.cash_enable) return;
         gData.pigbank.cashOP();
         mk.ui.closePanel(this.node.name);

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

@@ -59,12 +59,12 @@ export default class Reward extends cc.Component {
     start() {
         /** 盖子 */
         this.initLid();
+        gData.reward.init_cash_style = true;
     }
 
     update(dt) {
         if (gData.reward.init_cash_style) {
             this.initCashOutStyle();
-            return;
         }
         if (gData.reward.adData) {
             // 展示奖励
@@ -110,7 +110,7 @@ export default class Reward extends cc.Component {
         let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
         if (!cash_data) return;
 
-        this.lbl_cash.string = cash_data.money + '元';
+        this.lbl_cash.string = cash_data.money / 100 + '元';
         this.lbl_cash_out.string = gData.gameData.gameData.redMoney + '/' + cash_data.type_value;
         this.spr_cash_out.fillRange = gData.gameData.gameData.redMoney / cash_data.type_value;
     }

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

@@ -17,12 +17,21 @@ export default class Rule extends cc.Component {
 
     }
 
+    update() {
+        if (gData.setting.init_rule_tyle) {
+            this.setContent(gData.setting.rule_type)
+        }
+    }
+
+    lateUpdate() {
+        gData.setting.init_rule_tyle = false;
+    }
     /**
      * 
      * @param type 0服务协议  1隐私协议
      */
-    public setContent(type: string = "0") {
-        let arr = type == "0" ? gData.loginData.rule_data : gData.loginData.privacy_data;
+    public setContent(type: number = 0) {
+        let arr = !type ? gData.loginData.rule_data : gData.loginData.privacy_data;
         let str = "";
         for (let i = 0; i < arr.length; i++) {
             str += arr[i] + "\n";
@@ -30,8 +39,4 @@ export default class Rule extends cc.Component {
         this.lbl_content.string = str;
         this.scrollView.scrollToTop();
     }
-
-    private close() {
-        this.node.active = false;
-    }
 }

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

@@ -44,12 +44,14 @@ export default class Setting extends cc.Component {
     }
 
     clickCopy() {
+        mk.audio.playEffect("button");
         JsbSystem.setClipboard(gData.wechatData.unionid);
         mk.tip.pop("复制成功");
     }
 
     async clickMusic() {
         mk.audio.switchMusicFunc();
+        mk.audio.playEffect("button");
 
         let music = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
         this.img_music.spriteFrame = await mk.loader.load(music, cc.SpriteFrame);
@@ -57,6 +59,7 @@ export default class Setting extends cc.Component {
 
     async clickEffect() {
         mk.audio.switchEffectFunc();
+        mk.audio.playEffect("button");
 
         let effect = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");
         this.img_effect.spriteFrame = await mk.loader.load(effect, cc.SpriteFrame);
@@ -66,11 +69,8 @@ export default class Setting extends cc.Component {
 
     }
 
-    async clickRule(e, data) {
-        if (!this.node_rule) this.node_rule = await mk.ui.openPanel('module/setting/rule');
-        let sc = this.node_rule.getComponent(Rule) as Rule;
-        sc.setContent(data);
-        this.node_rule.active = true;
+    async clickRule(data) {
+        gData.setting.rule_type = parseInt(data);
     }
 
     update() {

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

@@ -64,6 +64,7 @@ export default class Sign extends cc.Component {
      * 点击领取按钮
      */
     private clickReceiveReward() {
+        mk.audio.playEffect("button");
         if (!gData.sign.sign_can) return;
         if (!gData.sign.haveSignDay()) return;
 

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

@@ -64,12 +64,12 @@ export default class Turnable extends cc.Component {
         this.audioId = await mk.audio.playEffect("turnableplay", true);
         this.btn_close.getComponent(BtnClosePanel).block_click = true;
 
-        this.perAdd = 10
-        this.node_turn.angle += 360 * 5
-        this.endAngle = index * -60
-        this.slowAngle = this.endAngle + this.slowDis
-        this.perMinus = this.perAdd / (this.slowDis / (this.perAdd * 0.5))
-        this.startDraw = true
+        this.perAdd = 10;
+        this.node_turn.angle += 360 * 5;
+        this.endAngle = index * -60;
+        this.slowAngle = this.endAngle + this.slowDis;
+        this.perMinus = this.perAdd / (this.slowDis / (this.perAdd * 0.5));
+        this.startDraw = true;
 
         // this.node_turn.angle = 1800;
         // let tar = index * 60;
@@ -101,19 +101,20 @@ export default class Turnable extends cc.Component {
         }
 
         if (this.startDraw) {
-            this.node_turn.angle -= this.perAdd
+            this.node_turn.angle -= this.perAdd;
             //开始减速
             if (this.node_turn.angle <= this.slowAngle) {
                 if (this.perAdd <= this.perMinus * 4) {
-                    this.perAdd -= this.perMinus * 0.01
+                    this.perAdd -= this.perMinus * 0.01;
                 }
                 else {
-                    this.perAdd -= this.perMinus
+                    this.perAdd -= this.perMinus;
                 }
             }
 
             if (this.node_turn.angle <= this.endAngle) {
-                this.startDraw = false
+                this.startDraw = false;
+                this.playOver();
             }
         }
     }

assets/script/mk/system/JsbSystem.ts

@@ -58,6 +58,7 @@ export default class JsbSystem {
      * @param info  info(Java返回)
      */
     public static updateDeviceInfo(info) {
+        mk.console.log("updateDeviceInfo" + cc.sys.os, info)
         if (cc.sys.os == cc.sys.OS_ANDROID) {
             gData.appData.updateDeviceInfo(info);
         }
@@ -71,12 +72,16 @@ export default class JsbSystem {
      * @description 自定义功能 CocosToJava
      */
     public static getDeviceInfo() {
+        mk.console.log("getDeviceInfo", cc.sys.os)
         if (cc.sys.os == cc.sys.OS_ANDROID) {
             this.callStaticMethod(this._JSB_ANDROID_PATH, "getDeviceInfo", "()V");
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {
             this.callStaticMethod(this._JSB_IOS_PATH, "getDeviceInfo", "");
         }
+        else {
+            gData.appData.getDeviceInfoCompelete = true;
+        }
     }
 
     /**