引导优化

富翁银行强制引导
点击率分层机制

assets/resources/data/guide_data.json

@@ -166,5 +166,33 @@
 		"clickRect": "event",
 		"finger": "0:0",
 		"lagNext": "1"
+	},
+	{
+		"id": "4_0",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "300,-400",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>点击富翁银行</color>",
+		"displayRect": "",
+		"clickRect": "界面层/game/功能按钮/左侧按钮/富翁银行",
+		"finger": "0:0",
+		"lagNext": "0"
+	},
+	{
+		"id": "5_0",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "0,0",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>点击提现</color>",
+		"displayRect": "0:310:500:120",
+		"clickRect": "界面层/SafeDepositBox/Par/saveNode/readyTixianLabel/tc_btn_1",
+		"finger": "0:0",
+		"lagNext": "0"
 	}
 ]

assets/resources/game/prefab/game.prefab

@@ -2788,8 +2788,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 120
+      "width": 115,
+      "height": 115
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2807,8 +2807,8 @@
         0,
         0,
         1,
-        1.15,
-        1.15,
+        1,
+        1,
         1.15
       ]
     },
@@ -6916,7 +6916,7 @@
     },
     "_enabled": true,
     "panel_name": "module/guideToWx/guideToWx",
-    "bool_Auth": true,
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 0,
     "onComplete": [

assets/resources/module/guide/guide.prefab

@@ -28,19 +28,22 @@
       },
       {
         "__id__": 17
+      },
+      {
+        "__id__": 35
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 41
       },
       {
-        "__id__": 36
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -1164,7 +1167,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "80Pou2FnNKnr67Y7RAlw1N",
+    "fileId": "386AhUAYBPD4ZRQCZgW3zo",
     "sync": false
   },
   {
@@ -1242,6 +1245,228 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "btnSkip",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 37
+      },
+      {
+        "__id__": 38
+      }
+    ],
+    "_prefab": {
+      "__id__": 40
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 177,
+      "height": 56
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        264.739,
+        607.507,
+        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__": 35
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "2ac12c40-721b-48c2-8303-e93769331699"
+    },
+    "_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.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 35
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 1,
+    "_left": 0,
+    "_right": 0,
+    "_top": 31.493000000000052,
+    "_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.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 35
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 39
+      }
+    ],
+    "_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": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "cc77atmGeBM4bPWFiQFl7H6",
+    "handler": "clickSkip",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
+    },
+    "fileId": "ecOI1cqP1ArpPE359zsRVZ",
+    "sync": false
+  },
+  {
     "__type__": "cc77atmGeBM4bPWFiQFl7H6",
     "_name": "",
     "_objFlags": 0,

assets/resources/module/guide/texture/btnSkip.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "5630d8dc-5cec-407b-be5e-dde31cb2f508",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 177,
+  "height": 56,
+  "platformSettings": {},
+  "subMetas": {
+    "btnSkip": {
+      "ver": "1.0.4",
+      "uuid": "2ac12c40-721b-48c2-8303-e93769331699",
+      "rawTextureUuid": "5630d8dc-5cec-407b-be5e-dde31cb2f508",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 177,
+      "height": 56,
+      "rawWidth": 177,
+      "rawHeight": 56,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/guideToWx/guideToWx.prefab

@@ -504,7 +504,7 @@
         "__id__": 31
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 34
@@ -1502,7 +1502,9 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": null,
+    "_spriteFrame": {
+      "__uuid__": "252fdc42-c2bf-4347-af5c-86bee119fd44"
+    },
     "_type": 0,
     "_sizeMode": 1,
     "_fillType": 0,

assets/resources/module/login/agreementTip.prefab

@@ -1640,7 +1640,7 @@
         1,
         1,
         1,
-        1
+        0
       ]
     },
     "_eulerAngles": {
@@ -1895,22 +1895,75 @@
     "sync": false
   },
   {
-    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
+    "__type__": "cc.Button",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 44
     },
     "_enabled": true,
-    "panel_name": "game/prefab/game",
-    "bool_Auth": false,
-    "open_type": 0,
-    "transition_type": 3,
-    "onComplete": [
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
       {
         "__id__": 53
       }
     ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
     "_id": ""
   },
   {

assets/resources/module/login/login.prefab

@@ -28,22 +28,28 @@
       },
       {
         "__id__": 13
+      },
+      {
+        "__id__": 31
+      },
+      {
+        "__id__": 36
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 51
       },
       {
-        "__id__": 47
+        "__id__": 52
       },
       {
-        "__id__": 48
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -489,7 +495,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Node",
+    "_name": "progressPart",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -500,19 +506,16 @@
       },
       {
         "__id__": 17
-      },
-      {
-        "__id__": 29
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -1080,34 +1083,264 @@
     "sync": false
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 13
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 4,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 75,
+    "_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__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
+    },
+    "fileId": "eaO0OvzchGqY/YK6jBmI7t",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "wechatButton",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 32
+      },
+      {
+        "__id__": 33
+      }
+    ],
+    "_prefab": {
+      "__id__": 35
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 343,
+      "height": 128
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -462.654,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        0
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 31
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "4d8c34a5-9de0-4de6-a4ea-12345b5cdf51"
+    },
+    "_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.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 31
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 34
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "6dba2tWf41JpYkegatfLoGC",
+    "handler": "clickLogin",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
+    },
+    "fileId": "c8fHUvtpZAlJfPnnljm7oJ",
+    "sync": false
+  },
+  {
     "__type__": "cc.Node",
     "_name": "New Layout",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 13
+      "__id__": 1
     },
     "_children": [
       {
-        "__id__": 30
+        "__id__": 37
       },
       {
-        "__id__": 33
+        "__id__": 40
       },
       {
-        "__id__": 36
+        "__id__": 43
       },
       {
-        "__id__": 39
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1132,7 +1365,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -592,
         0,
         0,
         0,
@@ -1161,17 +1394,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 39
     },
     "_opacity": 200,
     "_color": {
@@ -1225,7 +1458,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 37
     },
     "_enabled": true,
     "_materials": [
@@ -1261,7 +1494,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "2a2bHbGPxNzaBkOiZarCDH",
+    "fileId": "5dKQQteLBO54DGEAfe5N6i",
     "sync": false
   },
   {
@@ -1269,17 +1502,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 42
     },
     "_opacity": 200,
     "_color": {
@@ -1333,7 +1566,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 40
     },
     "_enabled": true,
     "_materials": [
@@ -1369,7 +1602,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "95GeoX59ZJp5spv7GVBgna",
+    "fileId": "cccSaT+RdDIZp9yMvh2vUM",
     "sync": false
   },
   {
@@ -1377,17 +1610,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 45
     },
     "_opacity": 200,
     "_color": {
@@ -1441,7 +1674,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 43
     },
     "_enabled": true,
     "_materials": [
@@ -1477,7 +1710,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "d0mRVEO1hIbr+7MG290nvm",
+    "fileId": "09its795xBgp7g4WWVqlsY",
     "sync": false
   },
   {
@@ -1485,17 +1718,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 40
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 48
     },
     "_opacity": 200,
     "_color": {
@@ -1549,7 +1782,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 46
     },
     "_enabled": true,
     "_materials": [
@@ -1585,7 +1818,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "achmLhzuBIo7UMLFoBN/Wg",
+    "fileId": "9fZGRqTXtJr5cqZELH13sF",
     "sync": false
   },
   {
@@ -1593,7 +1826,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 36
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1628,45 +1861,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "d8iZnhBxlN6Z+tevwjWta7",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 13
-    },
-    "_enabled": true,
-    "alignMode": 1,
-    "_target": null,
-    "_alignFlags": 4,
-    "_left": 0,
-    "_right": 0,
-    "_top": 0,
-    "_bottom": 75,
-    "_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__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
-    },
-    "fileId": "eaO0OvzchGqY/YK6jBmI7t",
+    "fileId": "bcFsbvXBZBGot+g2Mo0y74",
     "sync": false
   },
   {
@@ -1711,10 +1906,16 @@
       "__id__": 15
     },
     "lbl_server": {
-      "__id__": 34
+      "__id__": 41
     },
     "lbl_privacy": {
-      "__id__": 40
+      "__id__": 47
+    },
+    "node_loadPart": {
+      "__id__": 13
+    },
+    "node_btnLogin": {
+      "__id__": 31
     },
     "_id": ""
   },

assets/resources/module/login/texture/wechatButton.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "8d05df74-5a08-4855-b884-0621ed56dc9c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 343,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "wechatButton": {
+      "ver": "1.0.4",
+      "uuid": "4d8c34a5-9de0-4de6-a4ea-12345b5cdf51",
+      "rawTextureUuid": "8d05df74-5a08-4855-b884-0621ed56dc9c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 343,
+      "height": 128,
+      "rawWidth": 343,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/script/game/data/AdData.ts

@@ -141,7 +141,7 @@ export class AdData {
      * 8:插屏-全屏视频 完播、9:插屏-全屏视频 展示、10:插屏-全屏视频 加载失败、11:插屏加载失败、12:信息流加载失败、13:开屏加载失败、14:banner加载失败、
      * 51:激励视频点击、52:插屏点击、53:信息流点击、54:开屏点击、55:banner点击、56:插屏-全屏视频点击
      */
-    public updateADLog(type, placementId, data = null) {
+    public async updateADLog(type, placementId, data = null) {
         let sData = null
         if (!data) {
             sData = {
@@ -190,7 +190,14 @@ export class AdData {
             }
         }
 
-        mk.http.sendData('updateADLog', sData);
+        let response = await mk.http.sendData('updateADLog', sData);
+        if (response && response.errcode == 0) {
+            if (response.data) {
+                mk.console.logSingle('solution  ', response);
+                //0-无处理;1-警告;2-封广告30分钟;3-封广告12小时;4-用户拉黑
+                gData.warnTipData.setSolution(response.data.solution);
+            }
+        }
     }
 
     /** 设置关闭红包弹出全屏插屏序列 */

assets/script/game/data/GData.ts

@@ -26,6 +26,7 @@ import GuideWeakData from "./module/GuideWeakData";
 import SafeDepositBoxData from "./module/SafeDepositBoxData";
 import TipPanelDta from "./module/TipPanelData";
 import GuideToWxData from "./module/GuideToWxData";
+import WarnTipData from "./module/WarnTipData";
 
 /**
  * 数据集合全局类
@@ -75,6 +76,7 @@ class GData {
     public safeDepositBoxData: SafeDepositBoxData;
     public tipPanelData: TipPanelDta;
     public guideToWxData: GuideToWxData;
+    public warnTipData: WarnTipData;
 
     public moduleData: Map<number, Data>;
 
@@ -107,6 +109,7 @@ class GData {
         this.safeDepositBoxData = new SafeDepositBoxData();
         this.tipPanelData = new TipPanelDta();
         this.guideToWxData = new GuideToWxData();
+        this.warnTipData = new WarnTipData();
 
         this.moduleData = new Map<number, Data>();
         this.moduleData.set(Fun.moreGame, this.moreGame);

assets/script/game/data/GameData.ts

@@ -511,6 +511,8 @@ export enum EVENT_TYPE {
 export enum DataEventId {
     /** 点击 */
     guide = "guide",
+    /** 点击跳过 */
+    guideSkip = "guideSkip",
     /** 按钮点击 */
     button_click = "button_click",
     /** 看视频 */

assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 1;
+    public serverType: number = 0;
 
     public getServerUrl(): string {
         switch (this.serverType) {

assets/script/game/data/LoginData.ts

@@ -41,6 +41,8 @@ export class LoginData {
     /** 身份认证通过 */
     public passAnti = false;
 
+    public passPrivacy = false;
+
     /**
      * 初始化本地配置
      * @returns 
@@ -91,7 +93,7 @@ export class LoginData {
      */
     private async connect() {
         if (CC_DEBUG) {
-            gData.appData.mac = '12:02:e5:13:b3:55,f2:65:e2:1a:b7:27';
+            gData.appData.mac = '13:02:e5:13:b3:55,f3:65:e2:1a:b7:27';
         }
         //connect
         this.randomKey = mk.encrypt.randomString();
@@ -234,7 +236,7 @@ export class LoginData {
         let response = await mk.http.sendRequest('checklogin', 'POST', JSON.stringify(data));
         if (response.errcode != 0) {
             if (response.errcode == 403) {
-                mk.ui.openPanel('module/warnTip/WarnTipPanel');
+                gData.warnTipData.setSolution(4);
             }
             return;
         }

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

@@ -25,6 +25,7 @@ export class CashNormalData extends Data {
                 }
             });
             this.list_data = response.data;
+
             this.initReceipTotalRMB();
             this.update_list = true;
         }
@@ -32,7 +33,7 @@ export class CashNormalData extends Data {
     /** 数据列表 */
     public list_data: Array<TCashList> = [];
 
-    public update_list:boolean = false;
+    public update_list: boolean = false;
 
     /**
      * 标志位 - 是否刷新样式
@@ -97,6 +98,12 @@ export class CashNormalData extends Data {
         return new_list_data;
     }
 
+    public checkGuideBank() {
+        if (this.list_data.length >= 2) {
+            mk.guide.open(4);
+        }
+    }
+
     // public cash_type = ['', 'BOSS提现', '每日提现', '夺宝提现', '钱庄提现', '招募任务提现', '每日招募提现', '累计招募提现', '', '彩蛋提现', '福袋提现', '福袋提现'];
     /** 提现类型 */
     public cash_type = {

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

@@ -0,0 +1,23 @@
+
+const { ccclass } = cc._decorator;
+
+@ccclass
+export default class WarnTipData {
+    //当前状态 0-无处理;1-警告;2-封广告30分钟;3-封广告12小时;4-用户拉黑
+    curSolution = 0;
+    tipArr = ['',
+        '<b>您点击广告太频繁了，请降低点击广告频率以免被封！</b>',
+        '<b>您点击广告太频繁了，封禁广告30分钟！</b>',
+        '<b>您点击广告太频繁了，封禁广告12小时！</b>',
+        '<b>系统检测到您的账号存在异常，禁止登陆游戏！</b>']
+
+    setSolution(solution) {
+        if (this.curSolution != solution) {
+            this.curSolution = solution;
+            mk.storage.setStorage('solution', this.curSolution);
+            if (this.curSolution >= 1) {
+                mk.ui.openPanel('module/warnTip/WarnTipPanel');
+            }
+        }
+    }
+}

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

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "bfa40bf7-62af-433f-9c42-8bbb32cdde93",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/game/game/FunBtns.ts

@@ -70,8 +70,8 @@ export default class FunBtns extends cc.Component {
             this.btn11.active = (gData.guideToWxData.guideToWxSwith && show);
         }
 
-        // //test
-        // this.btn11.active = true;
+        //test
+        this.btn11.active = true;
     }
 
     update() {

assets/script/game/module/agreementTip/agreementTip.ts

@@ -27,6 +27,8 @@ export default class agreementTip extends cc.Component {
      * 关闭面板
      */
     private clickClose() {
+        mk.storage.setStorage("agreementTip", 1);
+        gData.loginData.passPrivacy = true;
         mk.ui.closePanel(this.node.name);
     }
     // update (dt) {}

assets/script/game/module/cashPro/CashPro.ts

@@ -136,6 +136,8 @@ export default class CashPro extends cc.Component {
             this.success = false;
             gData.safeDepositBoxData.creatPacketAnim(1);
             mk.ui.closeAllUI();
+
+            gData.cashNormal.checkGuideBank();
         }
     }
 }

assets/script/game/module/guide/Guide.ts

@@ -300,4 +300,12 @@ export default class Guide extends cc.Component {
         // super.onDestroy();
         this._eventManager.removeListener(this._touchListener, this.node_click);
     }
+
+    /** 点击跳过 */
+    clickSkip() {
+        mk.audio.playEffect('button');
+        mk.data.sendXYEvent("guide", `skip_${mk.guide.crtGuideID}`);
+        mk.data.sendDataEvent(DataEventId.guideSkip, `新手引导第${mk.guide.crtGuideID}步跳过`);
+        this.close();
+    }
 }

assets/script/game/module/guideToWx/GuideToWx.ts

@@ -39,42 +39,42 @@ export default class GuideToWx extends cc.Component {
     private lastTimeSpan = -1;
 
     async start() {
-        this.node_target.opacity = 0;
-        this.hand.active = false;
+        // this.node_target.opacity = 0;
+        // this.hand.active = false;
         this.moneyIndex = this.getIndexByMoney();
         let path = 'module/guideToWx/texture/money_' + this.moneyIndex;
         this.sp_money.spriteFrame = await mk.loader.load(path, cc.SpriteFrame);
 
-        let response = await mk.http.sendData('getAddServiceState', {});
-        mk.console.logSingle('GuideToWx getAddServiceState  ', response);
-        if (response.errcode != 0) {
-            return
-        }
-
-        console.log("state >>  ", response.data.state)
-        switch (response.data.state) {
-            case 0:
-                let state = mk.storage.getStorage('GuideState');
-                if (!state) {
-                    state = '0';
-                }
-                gData.guideToWxData.guideState = parseInt(state);
-                break;
-            case 1:
-                gData.guideToWxData.guideState = GuideState.canGetMoney;
-                let stateN = mk.storage.getStorage('canGetMoney');
-                if (!stateN) {
-                    mk.storage.setStorage('canGetMoney', 1);
-                    mk.data.sendDataEvent(DataEventId.guideToWx, "二维码");
-                }
-                break;
-            case 2:
-                gData.guideToWxData.guideState = GuideState.gotMoney;
-                break;
-        }
-
-        await mk.time.WaitForSeconds(0.3);
-        this.setState();
+        // let response = await mk.http.sendData('getAddServiceState', {});
+        // mk.console.logSingle('GuideToWx getAddServiceState  ', response);
+        // if (response.errcode != 0) {
+        //     return
+        // }
+
+        // console.log("state >>  ", response.data.state)
+        // switch (response.data.state) {
+        //     case 0:
+        //         let state = mk.storage.getStorage('GuideState');
+        //         if (!state) {
+        //             state = '0';
+        //         }
+        //         gData.guideToWxData.guideState = parseInt(state);
+        //         break;
+        //     case 1:
+        //         gData.guideToWxData.guideState = GuideState.canGetMoney;
+        //         let stateN = mk.storage.getStorage('canGetMoney');
+        //         if (!stateN) {
+        //             mk.storage.setStorage('canGetMoney', 1);
+        //             mk.data.sendDataEvent(DataEventId.guideToWx, "二维码");
+        //         }
+        //         break;
+        //     case 2:
+        //         gData.guideToWxData.guideState = GuideState.gotMoney;
+        //         break;
+        // }
+
+        // await mk.time.WaitForSeconds(0.3);
+        // this.setState();
 
         this.videoPlayer.node.on("completed", this.onCompleted, this);
 
@@ -100,16 +100,16 @@ export default class GuideToWx extends cc.Component {
             }
         }
 
-        if (this.lastTimeSpan != -1) {
-            let pass = Date.now() - this.lastTimeSpan;
-            mk.console.logSingle('GuideToWx pass  ', pass);
-            if (pass >= 10000) {
-                gData.guideToWxData.guideState = 3;
-                mk.storage.setStorage('GuideState', gData.guideToWxData.guideState);
-                this.setState();
-            }
-            this.lastTimeSpan = -1;
-        }
+        // if (this.lastTimeSpan != -1) {
+        //     let pass = Date.now() - this.lastTimeSpan;
+        //     mk.console.logSingle('GuideToWx pass  ', pass);
+        //     if (pass >= 10000) {
+        //         gData.guideToWxData.guideState = 3;
+        //         mk.storage.setStorage('GuideState', gData.guideToWxData.guideState);
+        //         this.setState();
+        //     }
+        //     this.lastTimeSpan = -1;
+        // }
     }
 
     async setState() {
@@ -194,6 +194,17 @@ export default class GuideToWx extends cc.Component {
 
     async clickService() {
         mk.audio.playEffect('button');
+
+        JsbSystem.WXLaunchMiniProgram(gData.guideToWxData.ghId, gData.guideToWxData.ghIdPath);
+
+        let value = mk.storage.getStorage('addServer')
+        if (!value) {
+            mk.storage.setStorage('addServer', 1);
+            mk.data.sendDataEvent(DataEventId.guideToWx, `添加客服`);
+            mk.data.sendXYEvent('addService', '添加客服');
+        }
+        return
+
         if (gData.guideToWxData.guideState == GuideState.none || gData.guideToWxData.guideState == GuideState.sendApply
             || gData.guideToWxData.guideState == GuideState.waitForPass) {
             this.lastTimeSpan = Date.now();

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

@@ -17,6 +17,11 @@ export default class Login extends cc.Component {
     private lbl_server: cc.Label = null;
     @property({ displayName: '隐私协议', type: cc.Label })
     private lbl_privacy: cc.Label = null;
+    @property({ displayName: '加载部分', type: cc.Node })
+    private node_loadPart: cc.Node = null;
+    @property({ displayName: '登录按钮', type: cc.Node })
+    private node_btnLogin: cc.Node = null;
+
     /** 加载进度 */
     private process: number = 0;
 
@@ -27,8 +32,16 @@ export default class Login extends cc.Component {
 
     private hasCheckAnti = false;
 
+    private loadSceneState = false;
+
+    private hasCheckPermission = false;
+
+    private hasCheckPrivacy = false;
+
     onLoad() {
         this.setProgress(0);
+        this.node_loadPart.active = true;
+        this.node_btnLogin.active = false;
     }
 
     start() {
@@ -43,20 +56,19 @@ export default class Login extends cc.Component {
         else {
             mk.aliRiskManager.init();
         }
-
-        this.init();
     }
 
     update() {
-        if (!gData.appData.getDeviceInfoCompelete) {
-            return
-        }
-
         if (!this.hasDeviceBackInit) {
             this.hasDeviceBackInit = true;
-            this.getDeviceInfoBack();
+            this.getAppVersion();
         }
 
+        // if (!this.hasDeviceBackInit) {
+        //     this.hasDeviceBackInit = true;
+        //     this.getDeviceInfoBack();
+        // }
+
         //如果更新没有结束,就不进入正常加载流程
         if (gData.appData.updateState == UpdateState.ForceUpdateFinish) {
             gData.appData.updateState = UpdateState.CheckHot;
@@ -73,6 +85,25 @@ export default class Login extends cc.Component {
             return;
         }
 
+        if (!this.hasCheckPrivacy) {
+            this.hasCheckPrivacy = true
+            this.checkPrivacy()
+        }
+
+        if (!gData.loginData.passPrivacy) {
+            return;
+        }
+
+        if (!this.hasCheckPermission) {
+            this.hasCheckPermission = true;
+            //获取手机授权
+            JsbSystem.checkPermission();
+        }
+
+        if (!gData.appData.getDeviceInfoCompelete) {
+            return
+        }
+
         if (!CC_DEBUG) {
             if (gData.loginData.popIdentifySwitch) {
                 if (!this.hasCheckAnti) {
@@ -99,16 +130,18 @@ export default class Login extends cc.Component {
                 this.login();
             }
             else if (gData.gameData.dataFinish) {//登录流程完毕
-                if (mk.storage.getStorage("agreementTip", false) != 1) {
-                    mk.ui.openPanel("module/login/agreementTip");
-                    mk.storage.setStorage("agreementTip", 1, false);
+                if (gData.loginData.isAuth || CC_DEBUG) {
+                    if (!this.loadSceneState) {
+                        this.loadSceneState = true;
+                        this.loadMain();
+                    }
                 }
                 else {
-                    mk.ui.openPanel("game/prefab/game");
-                    console.log("===[Jsbsystem 显示开屏广告================================")
-                    JsbSystem.showSplash();
+                    this.node_loadPart.active = false;
+                    this.node_btnLogin.active = true;
                 }
 
+
                 gData.gameData.dataFinish = false;
             }
         }
@@ -117,19 +150,34 @@ export default class Login extends cc.Component {
         }
     }
 
+    private async loadMain() {
+        mk.ui.openPanel("game/prefab/game");
+        console.log("===[Jsbsystem 显示开屏广告================================")
+        JsbSystem.showSplash();
+    }
+
+    private checkPrivacy() {
+        if (mk.storage.getStorage("agreementTip") != 1) {
+            mk.ui.openPanel("module/login/agreementTip");
+        }
+        else {
+            gData.loginData.passPrivacy = true;
+        }
+    }
+
     /** 设置进度 */
     private setProgress(current) {
         this.bar.setProgress(current);
         this.lbl_progress.string = "加载不消耗流量 " + current + "%";
     }
 
-    /** 初始化 */
-    public async init() {
-        //获取appid 和 配置version
-        JsbSystem.getWxAppId();
-        //获取手机授权
-        JsbSystem.checkPermission();
-    }
+    // /** 初始化 */
+    // public async init() {
+    //     //获取appid 和 配置version
+    //     JsbSystem.getWxAppId();
+    //     //获取手机授权
+    //     JsbSystem.checkPermission();
+    // }
 
     /** 获取设备信息后 */
     public async getDeviceInfoBack() {
@@ -140,6 +188,17 @@ export default class Login extends cc.Component {
         mk.audio.init();
     }
 
+    /** 获取appid 和 version */
+    public async getAppVersion() {
+        //获取appid 和 配置version
+        JsbSystem.getWxAppId();
+        //获取登录需要的sessionkey
+        gData.loginData.init();
+        await this.checkForceUpate();
+        this.checkRemoveLocalHot();
+        mk.audio.init();
+    }
+
     //整包更新和新流程--------------------------------------------------------
     /** 新包覆盖安装后清除热更版本,重启 */
     checkRemoveLocalHot() {
@@ -247,5 +306,21 @@ export default class Login extends cc.Component {
             mk.ui.openPanel('module/certification/CertificationNode');
         }
     }
+
+    private cool = false;
+    clickLogin() {
+        mk.audio.playEffect('button');
+        if (this.cool) {
+            return;
+        }
+
+        this.cool = true;
+
+        this.scheduleOnce(() => {
+            this.cool = false;
+        }, 3)
+
+        JsbSystem.WxAuth();
+    }
 }
 

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

@@ -135,6 +135,8 @@ export default class PigBank extends cc.Component {
         if (gData.pigbank.success) {
             gData.pigbank.success = false;
             gData.safeDepositBoxData.creatPacketAnim(2);
+
+            gData.cashNormal.checkGuideBank();
         }
     }
 }

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

@@ -91,6 +91,8 @@ export default class RedBagCash extends cc.Component {
             gData.redBagCash.success = false;
             gData.safeDepositBoxData.creatPacketAnim(2);
 
+            gData.cashNormal.checkGuideBank();
+
             let state = gData.gameData.getProp(GameProp.guideToWx);
             console.log('BBB   gData.gameData.gameData.cashIndex  ', gData.gameData.gameData.cashIndex);
             if (gData.gameData.gameData.cashIndex == 2 && !state) {

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

@@ -109,7 +109,16 @@ export default class MoneySaveItem extends cc.Component {
         }, delayTime)
     }
 
+    cool = false;
     clickAdd() {
+        if (this.cool) {
+            return
+        }
+        this.cool = true;
+        this.scheduleOnce(() => {
+            this.cool = false;
+        }, 2)
+
         this.unscheduleAllCallbacks()
         this.node.getChildByName("Hand").active = false
         if (this.callback) {

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

@@ -478,6 +478,8 @@ export default class SafeDepositBox extends cc.Component {
             this.readyTixianBtn.interactable = true
             outLine.color = cc.color(181, 140, 59)
             showMoney = Math.floor(minConfig.money / 100) > 0 ? (minConfig.money / 100) + "" : (minConfig.money / 100).toFixed(2)
+
+            mk.guide.open(5);
         } else {
             console.log("checkCurrentCanStartTask minConfig.index: money < minMoney")
             this.readyTixianBtn.node.getComponent(cc.Sprite).spriteFrame = this.spriteFrameList[1]

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

@@ -132,6 +132,8 @@ export default class Sign extends cc.Component {
         if (gData.sign.success) {
             gData.sign.success = false;
             gData.safeDepositBoxData.creatPacketAnim(2);
+
+            gData.cashNormal.checkGuideBank();
         }
 
         if (!showGuide) {

assets/script/game/module/warnTip/WarnTipPanel.ts

@@ -8,12 +8,17 @@ export default class WarnTipPanel extends cc.Component {
     @property(cc.RichText)
     labDes: cc.RichText = null;
 
-    onLoad() {
-
+    onEnable() {
+        this.labDes.string = gData.warnTipData.tipArr[gData.warnTipData.curSolution];
     }
 
     onClickSure() {
         mk.audio.playEffect('button');
-        cc.game.end();
+        if (gData.warnTipData.curSolution == 4) {
+            cc.game.end();
+        }
+        else {
+            mk.ui.closePanel(this.node.name);
+        }
     }
 }

assets/script/mk/system/AdSystem.ts

@@ -43,6 +43,17 @@ export default class AdSystem {
 
         //初始化Topon广告SDK
         this.adSdk.initSDK();
+
+
+        let value = mk.storage.getStorage('last_time_stamp');
+        if (value) {
+            this.last_time_stamp = parseInt(value);
+        }
+
+        value = mk.storage.getStorage('solution');
+        if (value) {
+            gData.warnTipData.curSolution = parseInt(value);
+        }
     }
 
     /**
@@ -110,6 +121,10 @@ export default class AdSystem {
             return;
         }
 
+        if (gData.warnTipData.curSolution >= 2) {
+            return;
+        }
+
         if (cc.sys.platform != cc.sys.WECHAT_GAME) {
             if (cc.sys.os == cc.sys.OS_ANDROID) {
                 this.adSdk.showNative(type);
@@ -148,6 +163,8 @@ export default class AdSystem {
     private initLastTimeStamp() {
         let new_date = new Date();
         this.last_time_stamp = new_date.getTime();
+
+        mk.storage.setStorage('last_time_stamp', this.last_time_stamp);
     }
 
     /**
@@ -158,9 +175,29 @@ export default class AdSystem {
         let new_date = new Date();
         let new_time_stamp = new_date.getTime();
         let gap_time_stamp = new_time_stamp - this.last_time_stamp;
-        if (gap_time_stamp <= 5000) {
-            const time = 6 - Math.ceil(gap_time_stamp / 1000);
-            mk.tip.pop('当前看视频太频繁了，请' + time + '秒后再试');
+
+        let needTime = 0;
+        switch (gData.warnTipData.curSolution) {
+            case 0:
+            case 1:
+                needTime = 5 * 1000;
+                break;
+            case 2:
+                needTime = 30 * 60 * 1000;
+                break;
+            case 3:
+                needTime = 12 * 60 * 60 * 1000;
+                break;
+            case 4:
+                mk.ui.openPanel('module/warnTip/WarnTipPanel');
+                return;
+        }
+
+        if (gap_time_stamp <= needTime) {
+            const time = Math.ceil((needTime - gap_time_stamp) / 1000);
+            const leftTime = mk.time.formatWithUnit(time);
+            mk.tip.pop('当前看视频太频繁了，请' + leftTime + '后再试');
+
             return true;
         }
         return false;
@@ -171,6 +208,10 @@ export default class AdSystem {
             return;
         }
 
+        if (gData.warnTipData.curSolution >= 2) {
+            return;
+        }
+
         if (!this.ifShowAd) {
             return;
         }
@@ -202,6 +243,10 @@ export default class AdSystem {
             return;
         }
 
+        if (gData.warnTipData.curSolution >= 2) {
+            return;
+        }
+
         if (!this.ifShowAd) {
             return;
         }

assets/script/mk/system/GuideSystem.ts

@@ -8,7 +8,7 @@ import { OpenActionType } from "./UISystem";
  */
 export default class GuideSystem {
 
-    private crtGuideID: number;
+    public crtGuideID: number;
     public ui: cc.Node;
 
     public open(id) {
@@ -64,7 +64,7 @@ export default class GuideSystem {
 
     /** 开启一个引导后直接默认已完成 */
     private setGuideID(id: number) {
-        if (id == 3) {
+        if (id == 5) {
             id = 9999;
             mk.data.sendXYEvent("guide_end", "新手引导结束");
         }

assets/script/mk/system/HttpSystem.ts

@@ -107,10 +107,10 @@ export default class HttpSystem {
 
         if (response.errcode != 0) {
             if (response.errcode == -10003 || response.errcode == -20003) {
-                mk.ui.openPanel('module/warnTip/WarnTipPanel');
+                gData.warnTipData.setSolution(4);
             }
         }
-        
+
         return response;
     }
 }

assets/script/mk/system/JsbSystem.ts

@@ -13,7 +13,7 @@ export default class JsbSystem {
     private static _JSB_IOS_PATH: string = "ThirdSdkMgr";
     /**代码桥在AS中的路径 */
     private static _JSB_ANDROID_PATH_JSDK: string = "org/cocos2dx/javascript/thirdSdk/ysdk/YSDKMgr";
-    
+
     /**
      * 是否文件存在
      * @param filePath 文件路径 
@@ -139,7 +139,7 @@ export default class JsbSystem {
 
         if (CC_DEBUG) {
             gData.appData.appId = "wxcf31f0e54f7fefda";
-            gData.appData.version = "1.5.1";
+            gData.appData.version = "1.6.1";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)
@@ -574,6 +574,18 @@ export default class JsbSystem {
     public static ysdkAuthSuccess() {
         gData.loginData.passAnti = true;
     }
+
+    /** 统计时长 */
+    public static updateActivateLog(sessionDuration) {
+        console.log('test>>>  updateActivateLog ', sessionDuration)
+
+        let data = {
+            'appId': gData.appData.appId,
+            'uin': gData.loginData.uin,
+            'sessionDuration': sessionDuration
+        }
+        mk.http.sendData('activateLog', data);
+    }
 }
 
 window['JsbMgr'] = JsbSystem

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = false;
+    public ifShowLog: boolean = true;
 
     /**
      * 标签符号

assets/script/mk/utils/TimeUtil.ts

@@ -101,28 +101,37 @@ export default class TimeUtil {
         let str = '';
 
         if (f.indexOf("天") != -1) {
-            str += d + "天";
+            if (d > 0) {
+                str += d + "天";
+            }
         }
         else {
             h += d * 24;
         }
 
         if (f.indexOf("时") != -1) {
-            str += parse_format(h, "时");
+            if (h > 0) {
+                // str += parse_format(h, "时");
+                str += h + "时";
+            }
         }
         else {
             m += h * 60;
         }
 
         if (f.indexOf("分") != -1) {
-            str += parse_format(m, "分");
+            if (m > 0) {
+                // str += parse_format(m, "分");
+                str += m + "分";
+            }
         }
         else {
             s += m * 60;
         }
 
         if (f.indexOf("秒") != -1) {
-            str += parse_format(s, "秒");
+            // str += parse_format(s, "秒");
+            str += s + "秒";
         }
         return str;
     }

build/jsb-link/assets/resources/import/2a/2ac12c40-721b-48c2-8303-e93769331699.json

@@ -0,0 +1 @@
+[1,["56MNjcXOxAe75e3eMcsvUI"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"btnSkip","rect":[0,0,177,56],"offset":[0,0],"originalSize":[177,56],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/4d/4d8c34a5-9de0-4de6-a4ea-12345b5cdf51.json

@@ -0,0 +1 @@
+[1,["8dBd90WghIVbiEBiHtVtyc"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"wechatButton","rect":[0,0,343,128],"offset":[0,0],"originalSize":[343,128],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/56/5630d8dc-5cec-407b-be5e-dde31cb2f508.json

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

build/jsb-link/assets/resources/import/8d/8d05df74-5a08-4855-b884-0621ed56dc9c.json

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

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/libcocos2dx.iml

@@ -33,16 +33,16 @@
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
     </content>
     <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml

@@ -187,16 +187,16 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />

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

@@ -51,10 +51,15 @@ import com.aries.qsllx.mz.BuildConfig;
 import com.tencent.ysdk.api.YSDKApi;
 
 import java.io.File;
+import java.util.Date;
 
 public class AppActivity extends Cocos2dxActivity {
     private static final int PERMISSIONS_REQUEST_STORAGE = 1;
 
+    //游戏时间
+    private int playTimeStart = 0;
+    private int playTimeEnd = 0;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -95,6 +100,9 @@ public class AppActivity extends Cocos2dxActivity {
         super.onResume();
         SDKWrapper.getInstance().onResume();
 
+        if(playTimeStart == 0){
+            playTimeStart = getSecondTimestampTwo(new Date());
+        }
     }
 
     @Override
@@ -141,6 +149,15 @@ public class AppActivity extends Cocos2dxActivity {
     protected void onStop() {
         super.onStop();
         SDKWrapper.getInstance().onStop();
+
+        playTimeEnd = getSecondTimestampTwo(new Date());
+        final int playTime = playTimeEnd - playTimeStart;
+        Log.d("test>>> ", "onStop: playTime  " + playTime);
+        playTimeStart = 0;
+
+        if(playTime > 0){
+            ThirdSdkMgr.updateActivateLog(playTime);
+        }
     }
 
     @Override
@@ -299,4 +316,18 @@ public class AppActivity extends Cocos2dxActivity {
         Log.d("vvvvvvvvv", "onRequestPermissionsResult  ");
         ThirdSdkMgr.updateDeviceInfo();
     }
+
+    /**
+     * 获取精确到秒的时间戳
+     *
+     * @param date
+     * @return
+     */
+    public static int getSecondTimestampTwo(Date date) {
+        if (null == date) {
+            return 0;
+        }
+        String timestamp = String.valueOf(date.getTime() / 1000);
+        return Integer.valueOf(timestamp);
+    }
 }

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

@@ -272,4 +272,13 @@ public class ThirdSdkMgr {
             }
         });
     }
+
+    public static void updateActivateLog(final int playTime){
+        ThirdSdkMgr.appActivity.runOnGLThread(new Runnable() {
+            @Override
+            public void run() {
+                Cocos2dxJavascriptJavaBridge.evalString(cocosJsbMgrName + "updateActivateLog("+ playTime + ");");
+            }
+        });
+    }
 }

packages-hot-update/cfg.json

@@ -18,7 +18,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote5/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote6/"
     ],
-    "buildTime": 1632482051093,
-    "genTime": 1632482051093,
+    "buildTime": 1633741157534,
+    "genTime": 1633741157534,
     "genVersion": null
 }

settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1632477070049,
+  "last-module-event-record-time": 1633674361428,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }