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

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,

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

@@ -24,17 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 83
-      },
-      {
         "__id__": 84
       },
       {
         "__id__": 85
+      },
+      {
+        "__id__": 86
+      },
+      {
+        "__id__": 87
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 88
     },
     "_opacity": 255,
     "_color": {
@@ -46,8 +49,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -58,8 +61,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        375,
+        667,
         0,
         0,
         0,
@@ -119,46 +122,47 @@
         "__id__": 32
       },
       {
-        "__id__": 36
+        "__id__": 38
       },
       {
-        "__id__": 39
+        "__id__": 41
       },
       {
-        "__id__": 42
-      },
-      {
-        "__id__": 47
+        "__id__": 44
       },
       {
-        "__id__": 52
+        "__id__": 49
       },
       {
-        "__id__": 57
+        "__id__": 54
       },
       {
-        "__id__": 61
+        "__id__": 59
       },
       {
-        "__id__": 66
+        "__id__": 63
       },
       {
-        "__id__": 69
+        "__id__": 68
       },
       {
-        "__id__": 74
+        "__id__": 71
       },
       {
-        "__id__": 77
+        "__id__": 76
       },
       {
-        "__id__": 80
+        "__id__": 79
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 82
+      }
+    ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 83
     },
     "_opacity": 255,
     "_color": {
@@ -170,8 +174,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
+      "width": 750,
+      "height": 1334
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1264,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
       }
@@ -1299,8 +1368,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        305.291,
-        280.976,
+        0,
+        0,
         0,
         0,
         0,
@@ -1329,7 +1398,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 33
     },
     "_enabled": true,
     "_materials": [
@@ -1357,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,
@@ -1367,7 +1447,7 @@
     "node_panel": {
       "__id__": 1
     },
-    "transition_type": 0,
+    "transition_type": 3,
     "onComplete": [],
     "_id": ""
   },
@@ -1393,11 +1473,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1451,7 +1531,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 38
     },
     "_enabled": true,
     "_materials": [
@@ -1500,11 +1580,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -1558,7 +1638,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 41
     },
     "_enabled": true,
     "_materials": [
@@ -1607,14 +1687,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 45
       },
       {
-        "__id__": 44
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -1668,7 +1748,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1700,7 +1780,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 44
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1709,7 +1789,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 45
+        "__id__": 47
       }
     ],
     "_N$interactable": true,
@@ -1765,7 +1845,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 42
+      "__id__": 44
     },
     "_id": ""
   },
@@ -1801,14 +1881,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 50
       },
       {
-        "__id__": 49
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -1862,7 +1942,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 49
     },
     "_enabled": true,
     "_materials": [
@@ -1894,7 +1974,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 49
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1903,7 +1983,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 50
+        "__id__": 52
       }
     ],
     "_N$interactable": true,
@@ -1959,7 +2039,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 47
+      "__id__": 49
     },
     "_id": ""
   },
@@ -1995,14 +2075,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 55
       },
       {
-        "__id__": 54
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 58
     },
     "_opacity": 255,
     "_color": {
@@ -2056,7 +2136,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 54
     },
     "_enabled": true,
     "_materials": [
@@ -2088,7 +2168,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 54
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2097,7 +2177,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 55
+        "__id__": 57
       }
     ],
     "_N$interactable": true,
@@ -2153,7 +2233,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 52
+      "__id__": 54
     },
     "_id": ""
   },
@@ -2189,14 +2269,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 60
       },
       {
-        "__id__": 59
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -2250,7 +2330,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "_materials": [
@@ -2283,7 +2363,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 59
     },
     "_enabled": true,
     "_color": {
@@ -2318,14 +2398,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 64
       },
       {
-        "__id__": 63
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 67
     },
     "_opacity": 255,
     "_color": {
@@ -2379,7 +2459,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 61
+      "__id__": 63
     },
     "_enabled": true,
     "_materials": [
@@ -2408,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": ""
   },
   {
@@ -2513,11 +2537,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 70
     },
     "_opacity": 255,
     "_color": {
@@ -2571,7 +2595,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 68
     },
     "_enabled": true,
     "_materials": [
@@ -2620,14 +2644,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 72
       },
       {
-        "__id__": 71
+        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 73
+      "__id__": 75
     },
     "_opacity": 255,
     "_color": {
@@ -2681,7 +2705,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 69
+      "__id__": 71
     },
     "_enabled": true,
     "_materials": [
@@ -2710,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": ""
   },
   {
@@ -2815,11 +2783,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 75
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2873,7 +2841,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 74
+      "__id__": 76
     },
     "_enabled": true,
     "_materials": [
@@ -2922,11 +2890,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 79
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -2980,7 +2948,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 77
+      "__id__": 79
     },
     "_enabled": true,
     "_materials": [
@@ -3020,54 +2988,37 @@
     "sync": false
   },
   {
-    "__type__": "cc.Node",
+    "__type__": "cc.Widget",
+    "_name": "",
     "_objFlags": 0,
-    "_parent": {
+    "node": {
       "__id__": 2
     },
-    "_prefab": {
-      "__id__": 81
-    },
-    "_name": "rule",
-    "_active": false,
-    "_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
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": {
+      "__id__": 1
     },
+    "_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__": 80
-    },
-    "asset": {
-      "__uuid__": "7e4d3969-92a1-47cb-a7f0-d6b362601c86"
-    },
-    "fileId": "eeOUTd16xITJkri2+FSKra",
-    "sync": true
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
       "__id__": 1
     },
     "asset": {
@@ -3094,15 +3045,12 @@
       "__id__": 25
     },
     "img_music": {
-      "__id__": 43
+      "__id__": 45
     },
     "img_effect": {
-      "__id__": 48
+      "__id__": 50
     },
     "lbl_version": {
-      "__id__": 78
-    },
-    "node_rule": {
       "__id__": 80
     },
     "_id": ""
@@ -3143,6 +3091,33 @@
     "_id": ""
   },
   {
+    "__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__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/script/game/component/BtnOpenPanel.ts

@@ -31,11 +31,12 @@ export default class BtnOpenPanel extends cc.Component {
     private async openPanel() {
         mk.audio.playEffect("button");
         if (!this.panel_name) return;
-        await mk.ui.openPanel(this.panel_name, this.open_type);        
+        await mk.ui.openPanel(this.panel_name, this.open_type);
         const c_count = this.onComplete.length;
         for (let i = 0; i < c_count; i++) {
             if (this.onComplete[i].handler) this.onComplete[i].emit([])
         }
+        mk.console.log('open->' + this.panel_name)
     }
     // update (dt) {}
 }

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/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/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

@@ -22,7 +22,7 @@ export default class Setting extends cc.Component {
     img_effect: cc.Sprite = null;
     @property({ type: cc.Label, displayName: "版本号" })
     lbl_version: cc.Label = null;
-    @property({ type: cc.Node, displayName: "协议内容" })
+    // @property({ type: cc.Node, displayName: "协议内容" })
     node_rule: cc.Node = null;
 
     onLoad() {
@@ -66,10 +66,8 @@ export default class Setting extends cc.Component {
 
     }
 
-    clickRule(e,data) {
-        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() {

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/.externalNativeBuild/ndkBuild/release/armeabi-v7a/android_gradle_build_cocos2djs_armeabi-v7a.stdout.txt

@@ -1,2 +1,4 @@
 Android NDK: WARNING: Unsupported source file extensions in D:\Develop\CocosDashboard_1.0.9\resources\.editors\Creator\2.4.5\resources\cocos2d-x/cocos/Android.mk for module cocos2dx_static    
 Android NDK:   ../external/sources/edtaa3func/edtaa3func.h renderer/memop/RecyclePool.hpp    
+[armeabi-v7a] Compile++ arm  : cocos2djs <= AppDelegate.cpp
+[armeabi-v7a] SharedLibrary  : libcocos2djs.so

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

@@ -9,7 +9,7 @@ UM_CHANNEL="ttaxx_juliang"; //友盟渠道
 UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wxcf31f0e54f7fefda"; //微信appid
 MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88
-PACKAGE_NAME=com.aries.ttaxx
+PACKAGE_NAME=com.aries.qsllx.mz
 VERSION_NAME=1.1.4
 VERSION_CODE=9
 TOPON="a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，全屏开屏

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -73,4 +73,15 @@ public class ThirdSdkMgr {
             }
         });
     }
+
+    /**获取广告配置*/
+    public static String getAdvertisingChannel(){
+        //Log.d("adadasdsad",BuildConfig.WX_APP_ID);
+        //Log.d("adadasdsad",BuildConfig.TF_CHANNEL);
+        //Log.d("adadasdsad","asdadsadsa"+BuildConfig.TOPON);
+        String str = BuildConfig.TF_CHANNEL +","+BuildConfig.TOPON;
+        return str;
+    }
+
+    //埋点相关
 }