增加星云点击去重埋点

升级topon广告sdk
增加ysdk实名认证&防沉迷

assets/resources/data/guide_data.json

@@ -1,112 +1,198 @@
 [
 	{
 		"id": "1_1",
-		"trigger": 1,
-		"tr_num": null,
-		"tr_form": 2,
-		"dialog": "欢迎来到轻松连连消",
-		"display_rect": "",
-		"click_rect": "all",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": ":20::::",
+		"dialogPos1": "",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>欢迎来到</color><color=2ed04c>轻松连连消</color>",
+		"displayRect": "",
+		"clickRect": "all",
 		"finger": "",
-		"lag_next": 0
+		"lagNext": "0"
 	},
 	{
 		"id": "1_2",
-		"trigger": 1,
-		"tr_num": null,
-		"tr_form": 2,
-		"dialog": "点击“开始游戏”，让我来介绍一下",
-		"display_rect": "",
-		"click_rect": "界面层/game/开始按钮",
-		"finger": "50:20",
-		"lag_next": 0
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": ":20::::",
+		"dialogPos1": "",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>点击</color><color=2ed04c>“开始游戏”</color>",
+		"displayRect": "",
+		"clickRect": "界面层/game/开始按钮",
+		"finger": "10:20",
+		"lagNext": "1"
 	},
 	{
 		"id": "1_3",
-		"trigger": 1,
-		"tr_num": null,
-		"tr_form": 1,
-		"dialog": "点击这两个动物即可消除哦",
-		"display_rect": "-300:100:100:500",
-		"click_rect": "event",
-		"finger": "50:20",
-		"lag_next": 1
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "295,-340",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>点击一下即可消除哦！</color>",
+		"displayRect": "-300:15:100:510",
+		"clickRect": "event",
+		"finger": "0:-50",
+		"lagNext": "1"
 	},
 	{
 		"id": "1_4",
-		"trigger": 1,
-		"tr_num": null,
-		"tr_form": 1,
-		"dialog": "消除可获得大量进度哦",
-		"display_rect": "300:100:100:500",
-		"click_rect": "event",
-		"finger": "50:20",
-		"lag_next": 2
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "0,-200",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>进度满即可</color><br/><color=ff4b4d>获得红包</color>",
+		"displayRect": "1:380:150:200",
+		"clickRect": "all",
+		"finger": "",
+		"lagNext": "0"
 	},
 	{
 		"id": "1_5",
-		"trigger": 1,
-		"tr_num": null,
-		"tr_form": 1,
-		"dialog": "进度攒满即可通关",
-		"display_rect": "100:100:100:500",
-		"click_rect": "event",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "-40,-520",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>加油，红包就在眼前</color>",
+		"displayRect": "45:-30:600:600",
+		"clickRect": "event",
 		"finger": "50:20",
-		"lag_next": 0
+		"lagNext": "2.5"
 	},
 	{
 		"id": "1_6",
-		"trigger": 1,
-		"tr_num": null,
-		"tr_form": 1,
-		"dialog": "继续点击消除吧",
-		"display_rect": "200:100:100:500",
-		"click_rect": "event",
+		"trigger": "1",
+		"trNum": "220",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "0,-400",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>打开红包奖励</color>",
+		"displayRect": "",
+		"clickRect": "界面层/rewardLuck/动画节点/红包节点/按钮_广告",
+		"finger": "50:0",
+		"lagNext": "1"
+	},
+	{
+		"id": "1_7",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "0,-450",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>点击领取！</color>",
+		"displayRect": "",
+		"clickRect": "界面层/rewardLuck/动画节点/红包节点/领取按钮",
+		"finger": "50:20",
+		"lagNext": "0.5"
+	},
+	{
+		"id": "1_8",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "100,-650",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>达到</color><color=ff4b4d>3000</color><color=476175>即可提现！</color>",
+		"displayRect": "",
+		"clickRect": "界面层/game/node_ui/顶部个人信息/红包币按钮",
 		"finger": "50:20",
-		"lag_next": 0
+		"lagNext": "0"
 	},
 	{
 		"id": "2_1",
-		"trigger": 1,
-		"tr_num": null,
-		"tr_form": 1,
-		"dialog": "点击领取红包币",
-		"display_rect": "300:100:100:500",
-		"click_rect": "event",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "85,-650",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>达到提现条件啦！</color>",
+		"displayRect": "",
+		"clickRect": "界面层/game/node_ui/顶部个人信息/红包币按钮",
 		"finger": "50:20",
-		"lag_next": 0
+		"lagNext": "1"
 	},
 	{
 		"id": "2_2",
-		"trigger": 1,
-		"tr_num": null,
-		"tr_form": 1,
-		"dialog": "红包币可用于提现",
-		"display_rect": "200:100:100:500",
-		"click_rect": "event",
-		"finger": "50:20",
-		"lag_next": 0
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "0,-400",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>点击即可提现！</color>",
+		"displayRect": "",
+		"clickRect": "界面层/redBagCash/动画节点/滚动视图/view/content/redBagCashItem/可领取",
+		"finger": "180:10",
+		"lagNext": "0"
+	},
+	{
+		"id": "3_0",
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "-300,-400",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>点击即可提现！</color>",
+		"displayRect": "",
+		"clickRect": "界面层/game/功能按钮/右侧按钮/引导到微信",
+		"finger": "0:0",
+		"lagNext": "1"
 	},
 	{
 		"id": "3_1",
-		"trigger": 1,
-		"tr_num": null,
-		"tr_form": 2,
-		"dialog": "达到提现条件啦！",
-		"display_rect": "100:100:100:500",
-		"click_rect": "event",
-		"finger": "50:20",
-		"lag_next": 0
+		"trigger": "1",
+		"trNum": "0",
+		"trForm": "2",
+		"dialogPos": "",
+		"dialogPos1": "0,-300",
+		"dialogAlignment": "1",
+		"dialog": "<color=476175>添加客服\n立领现金！</color>",
+		"displayRect": "0:310:500:120",
+		"clickRect": "event",
+		"finger": "0:0",
+		"lagNext": "1"
 	},
 	{
-		"id": "3_2",
-		"trigger": 1,
-		"tr_num": null,
-		"tr_form": 1,
-		"dialog": "点击即可提现",
-		"display_rect": "300:100:100:500",
-		"click_rect": "event",
-		"finger": "50:20",
-		"lag_next": 0
+		"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": ":20::::",
+		"dialogPos1": "",
+		"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/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

@@ -25,22 +25,31 @@
       },
       {
         "__id__": 10
+      },
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 31
+      },
+      {
+        "__id__": 36
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 51
       },
       {
-        "__id__": 44
+        "__id__": 52
       },
       {
-        "__id__": 45
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -379,30 +388,134 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Node",
+    "_name": "16+",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
-    "_children": [
+    "_children": [],
+    "_active": true,
+    "_components": [
       {
         "__id__": 11
-      },
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 810,
+      "height": 1038
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -313.802,
+        590.145,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.1,
+        0.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__": 10
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "3fac283c-bcb3-4a13-900b-f732f2cff5e7"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
+    },
+    "fileId": "dfjcalanVGc6vKC7Cczz1Y",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "progressPart",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
       {
         "__id__": 14
       },
       {
-        "__id__": 26
+        "__id__": 17
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -456,17 +569,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 13
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 16
     },
     "_opacity": 255,
     "_color": {
@@ -520,7 +633,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -564,24 +677,24 @@
     "_name": "progressbar",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 13
     },
     "_children": [
       {
-        "__id__": 15
+        "__id__": 18
       },
       {
-        "__id__": 18
+        "__id__": 21
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 24
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -635,17 +748,17 @@
     "_name": "jindu1",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 14
+      "__id__": 17
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -699,7 +812,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [
@@ -729,7 +842,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 14
+      "__id__": 17
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -742,21 +855,21 @@
     "_name": "jindu2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 14
+      "__id__": 17
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 22
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -810,17 +923,17 @@
     "_name": "jindu2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -874,7 +987,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -904,7 +1017,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 14
+      "__id__": 17
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -917,7 +1030,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -937,7 +1050,7 @@
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 14
+      "__id__": 17
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -950,18 +1063,18 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 17
     },
     "_enabled": true,
     "bar": {
-      "__id__": 20
+      "__id__": 23
     },
     "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
-      "__id__": 14
+      "__id__": 17
     },
     "asset": {
       "__uuid__": "484d8a70-97b2-4ddd-9794-87ef1c8b85d8"
@@ -970,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__": 10
+      "__id__": 1
     },
     "_children": [
       {
-        "__id__": 27
+        "__id__": 37
       },
       {
-        "__id__": 30
+        "__id__": 40
       },
       {
-        "__id__": 33
+        "__id__": 43
       },
       {
-        "__id__": 36
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1022,7 +1365,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -592,
         0,
         0,
         0,
@@ -1051,17 +1394,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 26
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 39
     },
     "_opacity": 200,
     "_color": {
@@ -1115,7 +1458,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 37
     },
     "_enabled": true,
     "_materials": [
@@ -1151,7 +1494,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "2a2bHbGPxNzaBkOiZarCDH",
+    "fileId": "5dKQQteLBO54DGEAfe5N6i",
     "sync": false
   },
   {
@@ -1159,17 +1502,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 26
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 42
     },
     "_opacity": 200,
     "_color": {
@@ -1223,7 +1566,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 40
     },
     "_enabled": true,
     "_materials": [
@@ -1259,7 +1602,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "95GeoX59ZJp5spv7GVBgna",
+    "fileId": "cccSaT+RdDIZp9yMvh2vUM",
     "sync": false
   },
   {
@@ -1267,17 +1610,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 26
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 45
     },
     "_opacity": 200,
     "_color": {
@@ -1331,7 +1674,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 43
     },
     "_enabled": true,
     "_materials": [
@@ -1367,7 +1710,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "d0mRVEO1hIbr+7MG290nvm",
+    "fileId": "09its795xBgp7g4WWVqlsY",
     "sync": false
   },
   {
@@ -1375,17 +1718,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 26
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 48
     },
     "_opacity": 200,
     "_color": {
@@ -1439,7 +1782,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 46
     },
     "_enabled": true,
     "_materials": [
@@ -1475,7 +1818,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "achmLhzuBIo7UMLFoBN/Wg",
+    "fileId": "9fZGRqTXtJr5cqZELH13sF",
     "sync": false
   },
   {
@@ -1483,7 +1826,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 36
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1518,45 +1861,7 @@
     "asset": {
       "__uuid__": "f7b563d2-2a35-4ed4-b0b0-05dd74c0033f"
     },
-    "fileId": "d8iZnhBxlN6Z+tevwjWta7",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Widget",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 10
-    },
-    "_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
   },
   {
@@ -1595,16 +1900,22 @@
     },
     "_enabled": true,
     "bar": {
-      "__id__": 24
+      "__id__": 27
     },
     "lbl_progress": {
-      "__id__": 12
+      "__id__": 15
     },
     "lbl_server": {
-      "__id__": 31
+      "__id__": 41
     },
     "lbl_privacy": {
-      "__id__": 37
+      "__id__": 47
+    },
+    "node_loadPart": {
+      "__id__": 13
+    },
+    "node_btnLogin": {
+      "__id__": 31
     },
     "_id": ""
   },

assets/resources/module/login/texture/16+.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "2c2897e9-570a-4d6d-b038-412a0b16d237",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 810,
+  "height": 1038,
+  "platformSettings": {},
+  "subMetas": {
+    "16+": {
+      "ver": "1.0.4",
+      "uuid": "3fac283c-bcb3-4a13-900b-f732f2cff5e7",
+      "rawTextureUuid": "2c2897e9-570a-4d6d-b038-412a0b16d237",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 810,
+      "height": 1038,
+      "rawWidth": 810,
+      "rawHeight": 1038,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

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/resources/module/warnTip/WarnTipPanel.prefab

@@ -553,7 +553,7 @@
     "asset": {
       "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
     },
-    "fileId": "5ffP4hmhtPELq9q3TmEWF1",
+    "fileId": "66ow+z1lFIxIzodLON3c+t",
     "sync": false
   },
   {
@@ -662,7 +662,7 @@
     "asset": {
       "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
     },
-    "fileId": "b1KQ/id/9FHrjogCSPxazW",
+    "fileId": "88FTM+gttCMZcADAU87x7M",
     "sync": false
   },
   {
@@ -827,22 +827,75 @@
     "_id": ""
   },
   {
-    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
+    "__type__": "cc.Button",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 18
     },
     "_enabled": true,
-    "node_panel": {
-      "__id__": 1
-    },
-    "transition_type": 3,
-    "onComplete": [
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
       {
         "__id__": 22
       }
     ],
+    "_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": ""
   },
   {
@@ -851,8 +904,8 @@
       "__id__": 1
     },
     "component": "",
-    "_componentId": "7626bHemEpG267E801XmW+W",
-    "handler": "onClickClose",
+    "_componentId": "d28f5FCuBxNc528DnLMDbW1",
+    "handler": "onClickSure",
     "customEventData": ""
   },
   {

assets/script/game/data/AdData.ts

@@ -140,8 +140,9 @@ export class AdData {
      * @param type 1:激励视频完播、2:插屏展示、3:信息流展示、 4:激励视频展⽰、5:激励视频加载失败、6:开屏展示、7:banner展示、
      * 8:插屏-全屏视频 完播、9:插屏-全屏视频 展示、10:插屏-全屏视频 加载失败、11:插屏加载失败、12:信息流加载失败、13:开屏加载失败、14:banner加载失败
      * 51:激励视频点击、52:插屏点击、53:信息流点击、54:开屏点击、55:banner点击、56:插屏-全屏视频点击
+     * 71:激励视频去重点击、72:插屏去重点击、73:信息流去重点击、74:开屏去重点击、75:banner去重点击、76:插屏-全屏视频去重点击
      */
-    public updateADLog(type, placementId, data = null) {
+    public async updateADLog(type, placementId, data = null) {
         let sData = null
         if (!data) {
             sData = {
@@ -190,7 +191,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

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

assets/script/game/data/LoginData.ts

@@ -41,6 +41,8 @@ export class LoginData {
     /** 身份认证通过 */
     public passAnti = false;
 
+    public passPrivacy = false;
+
     /**
      * 初始化本地配置
      * @returns 
@@ -236,7 +238,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

@@ -32,7 +32,7 @@ export class CashNormalData extends Data {
     /** 数据列表 */
     public list_data: Array<TCashList> = [];
 
-    public update_list:boolean = false;
+    public update_list: boolean = false;
 
     /**
      * 标志位 - 是否刷新样式
@@ -97,6 +97,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/RedBagCashData.ts

@@ -27,7 +27,7 @@ export class RedBagCashData extends Data {
             this.c_data = gData.gameData.configs.CashCfg;
             this.sortList();
             this.initState();
-            this.init_list = true;
+            // this.init_list = true;
         }
     }
     /** 标志位：初始化列表 */
@@ -43,7 +43,7 @@ export class RedBagCashData extends Data {
     /** 提现进度 */
     set cash_bar(value: number) {
         this._cash_bar = value;
-        this.init_list = true;
+        // this.init_list = true;
     }
     get cash_bar() {
         return this._cash_bar;

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

@@ -0,0 +1,27 @@
+
+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) {
+            //除了状态0，其他状态只有级别比当前状态高才会赋值，避免异步导致低级状态覆盖高级状态
+            if (solution == 0 || 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/Game.ts

@@ -187,7 +187,14 @@ export default class Game extends cc.Component {
 
         gData.gameData.init_red_point = false;
 
-        if ((!GamePlay.Inst || (GamePlay.Inst && !GamePlay.Inst.node.active)) && this.nodeRedPoint.node_redbagCash.active) {
+        // if ((!GamePlay.Inst || (GamePlay.Inst && !GamePlay.Inst.node.active)) && this.nodeRedPoint.node_redbagCash.active) {
+        //     let state = mk.guide.open(2);
+        //     if (state) {
+        //         mk.ui.closeAllUI();
+        //     }
+        // }
+
+        if (this.nodeRedPoint.node_redbagCash.active) {
             let state = mk.guide.open(2);
             if (state) {
                 mk.ui.closeAllUI();

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,11 +194,29 @@ 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();
             mk.console.logSingle('GuideToWx lastTimeSpan  ', this.lastTimeSpan);
             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', '添加客服');
+            }
         }
         else if (gData.guideToWxData.guideState == GuideState.canGetMoney) {
             let response = await mk.http.sendData('customerServiceCash', {});

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,14 +85,37 @@ export default class Login extends cc.Component {
             return;
         }
 
-        if (gData.loginData.popIdentifySwitch) {
-            if (!this.hasCheckAnti) {
-                this.hasCheckAnti = true
-                this.checkShowIdentification()
-            }
+        if (!this.hasCheckPrivacy) {
+            this.hasCheckPrivacy = true
+            this.checkPrivacy()
+        }
+
+        if (!gData.loginData.passPrivacy) {
+            return;
+        }
+
+        if (!this.hasCheckPermission) {
+            this.hasCheckPermission = true;
+            //获取手机授权
+            JsbSystem.checkPermission();
+        }
 
-            if (!gData.loginData.passAnti) {
-                return
+        if (!gData.appData.getDeviceInfoCompelete) {
+            return
+        }
+
+        if (!CC_DEBUG) {
+            if (gData.loginData.popIdentifySwitch) {
+                if (!this.hasCheckAnti) {
+                    this.hasCheckAnti = true
+                    // this.checkShowIdentification()
+                    JsbSystem.ysdkInit();
+                    JsbSystem.autologin();
+                }
+
+                if (!gData.loginData.passAnti) {
+                    return
+                }
             }
         }
 
@@ -95,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;
             }
         }
@@ -113,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() {
@@ -136,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() {
@@ -181,7 +244,7 @@ export default class Login extends cc.Component {
         if (CC_DEBUG) {
             //测试用配置版本号
             gData.appData.tfChannel = "1";
-            gData.appData.appVersion = "1.2.0";
+            gData.appData.appVersion = "1.5.1";
         }
         let data: any = {
             appId: gData.appData.appId,
@@ -243,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

@@ -90,6 +90,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);
             if (gData.gameData.gameData.cashIndex == 2 && !state) {
                 mk.guide.open(3);

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

@@ -35,9 +35,9 @@ export default class RedBagCashItem extends cc.Component {
      * 初始化数据
      */
     public async setItemData(item_data) {
-        if (this.item_data == null && item_data.index == 1) {
-            mk.event.register("event_guide", this.clickGuide.bind, this);
-        }
+        // if (this.item_data == null && item_data.index == 1) {
+        //     mk.event.register("event_guide", this.clickGuide.bind, this);
+        // }
         await this.initStyle(item_data);
     }
 

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

@@ -102,7 +102,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/sdk/ad/toppon/AnyThinkAds/ATJSSDK.js

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

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

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

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATBanner.ts

@@ -19,6 +19,7 @@ export default class ATBanner extends zgSingleton {
     /**是否观看完毕 */
     public ifWatchEnd: boolean = false;
 
+    private singleClick = false;
     init() {
 
         this.ATBannerJS = cc["ATBannerJS"];
@@ -120,6 +121,8 @@ export default class ATBanner extends zgSingleton {
         // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdShow(" + placementId + ", " + callbackInfo + ")");
         let data = JSON.parse(callbackInfo);
         gData.adData.updateADLog(7, placementId, data);
+
+        this.singleClick = true;
     }
 
     /**
@@ -133,6 +136,11 @@ export default class ATBanner extends zgSingleton {
         let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(55, placementId, data);
         mk.data.sendDataEvent(DataEventId.ad_click, 'banner点击');
+
+        if (this.singleClick) {
+            this.singleClick = false;
+            gData.adData.updateADLog(75, placementId, data);
+        }
     }
 
     /** banner自动刷新成功 */

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts

@@ -20,6 +20,9 @@ export default class ATInterstitial extends zgSingleton {
     /** 是否加载完显示 */
     private ifLoadShow: boolean = false;
 
+    private singleClick = false;
+    private singleClickFull = false;
+
     /** 初始化 */
     init() {
         this.ATInterstitialJS = cc["ATInterstitialJS"];
@@ -155,9 +158,11 @@ export default class ATInterstitial extends zgSingleton {
         let type = this.checkPlacementIDType(placementId);
         if (type == 0) {
             id = 2
+            this.singleClick = true;
         }
         else if (type == 1) {
             id = 9
+            this.singleClickFull = true;
         }
         gData.adData.updateADLog(id, placementId, data);
 
@@ -167,6 +172,8 @@ export default class ATInterstitial extends zgSingleton {
         //     let price = GameM.commonData.getAdPrice(data.adsource_id, data.adsource_price)
         //     AdM.sendUROIEvent(eventID, data.id, placementId, "ad_show", "interstitial", adAdn, price)
         // }
+
+
     }
 
     onInterstitialAdClick(placementId, callbackInfo) {
@@ -180,16 +187,29 @@ export default class ATInterstitial extends zgSingleton {
         // }
 
         let id = 52;
+        let singleId = 72;
         let type = this.checkPlacementIDType(placementId);
+        let data = JSON.parse(callbackInfo)
         if (type == 0) {
             id = 52;
+            singleId = 72;
             mk.data.sendDataEvent(DataEventId.ad_click, '插屏点击');
+
+            if (this.singleClick) {
+                this.singleClick = false;
+                gData.adData.updateADLog(singleId, placementId, data);
+            }
         }
         else if (type == 1) {
             id = 56;
+            singleId = 76;
             mk.data.sendDataEvent(DataEventId.ad_click, '全屏插屏点击');
+
+            if (this.singleClickFull) {
+                this.singleClickFull = false;
+                gData.adData.updateADLog(singleId, placementId, data);
+            }
         }
-        let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(id, placementId, data);
     }
 

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNative.ts

@@ -18,7 +18,7 @@ export class ATNative extends zgSingleton {
     /** 是否加载显示 */
     private ifLoadShow: boolean = false;
 
-
+    private singleClick = false;
     /** 初始化 */
     init() {
         this.ATNativeJS = cc["ATNativeJS"];
@@ -193,6 +193,8 @@ export class ATNative extends zgSingleton {
 
         let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(3, placementId, data);
+
+        this.singleClick = true;
     }
 
     /**
@@ -205,6 +207,11 @@ export class ATNative extends zgSingleton {
         let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(53, placementId, data);
         mk.data.sendDataEvent(DataEventId.ad_click, '信息流点击');
+
+        if (this.singleClick) {
+            this.singleClick = false;
+            gData.adData.updateADLog(73, placementId, data);
+        }
     }
 }
 

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -18,6 +18,8 @@ export class ATRewardVideo extends zgSingleton {
     public ifLoadShow: boolean = false;
     /**是否观看完毕 */
     public canGet: boolean = false;
+    /** 去重点击状态 */
+    private singleClick = false;
 
     init() {
         this.ATRewardVideoJS = cc["ATRewardVideoJS"];
@@ -111,8 +113,26 @@ export class ATRewardVideo extends zgSingleton {
         gData.adData.updateData(placementId, data);
         mk.data.sendDataEvent(DataEventId.video_init, mk.ad.videoAdType);
         this.reawardAdState = RewardAdState.Unload;
-        //点击关闭的时候重新加载（亲测，即使在start这边 加载 也是在点击关闭时候才返回成功）
-        //this.loadAd();
+
+        let times = mk.storage.getStorage('ad_videoEcpm');
+        if (!times) {
+            times = 1;
+        }
+        else {
+            times++;
+        }
+        mk.storage.setStorage('ad_videoEcpm', times);
+
+        if (times <= 300) {
+            if (times <= 50) {
+                mk.data.sendDataEventValue(DataEventId.ad_videoEcpm, `ad_video_ecpm${times}`, data.adsource_price);
+            }
+            else if (times % 10 == 0) {
+                mk.data.sendDataEventValue(DataEventId.ad_videoEcpm, `ad_video_ecpm${times}`, data.adsource_price);
+            }
+        }
+
+        this.singleClick = true;
     }
 
     /**
@@ -171,6 +191,11 @@ export class ATRewardVideo extends zgSingleton {
         let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(51, placementId, data);
         mk.data.sendDataEvent(DataEventId.ad_click, '激励视频点击');
+
+        if (this.singleClick) {
+            this.singleClick = false;
+            gData.adData.updateADLog(71, placementId, data);
+        }
     }
 
     /**

assets/script/mk/system/AdSystem.ts

@@ -43,6 +43,16 @@ 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 +120,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 +162,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,11 +174,33 @@ 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 true;
+        }
+
+        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;
         }
+
+        gData.warnTipData.setSolution(0);
         return false;
     }
 

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) {
@@ -62,7 +62,7 @@ export default class GuideSystem {
     /** 开启一个引导后直接默认已完成 */
     private setGuideID(id: number) {
         let guide = gData.guideData.getGuidesByID(id);
-        if (id == 3) {
+        if (id == 5) {
             id = 9999;
             mk.data.sendXYEvent("guide_end", "新手引导结束");
         }

assets/script/mk/system/HttpSystem.ts

@@ -107,7 +107,7 @@ 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);
             }
         }
 

assets/script/mk/system/JsbSystem.ts

@@ -11,6 +11,8 @@ export default class JsbSystem {
     private static _JSB_ANDROID_PATH: string = "org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr";
     /**代码桥在IOS中的路径 */
     private static _JSB_IOS_PATH: string = "ThirdSdkMgr";
+    /**代码桥在AS中的路径 */
+    private static _JSB_ANDROID_PATH_JSDK: string = "org/cocos2dx/javascript/thirdSdk/ysdk/YSDKMgr";
 
     /**
      * 是否文件存在
@@ -548,6 +550,42 @@ export default class JsbSystem {
         }
         return token;
     }
+
+    /** 统计时长 */
+    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);
+    }
+
+    /** 初始化ysdk */
+    public static ysdkInit() {
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            this.callStaticMethod(this._JSB_ANDROID_PATH_JSDK, "init", "()V");
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+            this.callStaticMethod("AppController", "init", "");
+        }
+    }
+
+    /** ysdk登录 */
+    public static autologin() {
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            this.callStaticMethod(this._JSB_ANDROID_PATH_JSDK, "autologin", "()V");
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+            this.callStaticMethod("AppController", "autologin", "");
+        }
+    }
+
+    public static ysdkAuthSuccess() {
+        gData.loginData.passAnti = true;
+    }
 }
 
 window['JsbMgr'] = JsbSystem

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/2c/2c2897e9-570a-4d6d-b038-412a0b16d237.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/3f/3fac283c-bcb3-4a13-900b-f732f2cff5e7.json

@@ -0,0 +1 @@
+[1,["2cKJfpVwpNbbA4QSoLFtI3"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"16+","rect":[0,0,810,1038],"offset":[0,0],"originalSize":[810,1038],"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/source/buildConfig/debug" 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/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/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/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/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" />
@@ -286,22 +286,38 @@
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_baidu.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_gdt.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_kuaishou.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_mintegral_china.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_pangle_china.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_network_sigmob.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_rewardvideo.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/anythink_splash.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/Baidu_MobAds_SDK-release_v9.1.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/GDTSDK.unionNormal.4.351.1221.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/kssdk-ad--3.3.9-publishRelease-4ea04e00c.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_3.5.0.8.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/Baidu_MobAds_SDK-release_v9.16.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/GDTSDK.unionNormal.4.410.1280.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/kssdk-ad--3.3.15-publishRelease-4533d8764.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_chinasame.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_interstitial.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_interstitialvideo.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbbanner.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbbid.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbjscommon.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbnative.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbnativeadvanced.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_mbsplash.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_nativeex.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_playercommon.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_reward.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_videocommon.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/mbridge_videojs.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/open_ad_sdk_4.0.0.6.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/tramini_sdk.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/windAd-2.25.2.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/topon/libs/windAd-3.3.4.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/oaid/oaid_sdk_1.0.25.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/thinkingdata/ThinkingSDK.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-abtest-v1.0.0.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-asms-armeabi-v1.2.3.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/aliRisk/Android-AliyunDevice-10017.aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.8.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/YSDK/ysdkshell.aar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/libs/YSDK/YSDK_Android_1.8.1_79033d3d.aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml

@@ -39,8 +39,7 @@
             android:configChanges="orientation|keyboardHidden|screenSize|screenLayout"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-            android:launchMode="singleTask"
-            android:taskAffinity="" >
+            android:taskAffinity="com.aries.qsllx.jsb" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -48,12 +47,22 @@
             </intent-filter>
         </activity>
 
+        <!-- TODO GAME SDK接入YSDK初始化配置 START -->
+        <!-- TODO android:value 要修改为游戏自身的MainActivity的完整路径，如YSDKDEMO的MainAcitiviy路径为com.tencent.tmgp.yybtestsdk.MainActivity -->
+        <!-- 如果AndroidManifest.xml配置MainActivity无效，可手动在LaunchActivity的onCreate()中调用YSDKApi.setMainActivity()接口设置游戏的MainActivity
+             示例：YSDKApi.setMainActivity("com.tencent.tmgp.yybtestsdk.MainActivity"); -->
+        <!-- TODO 此处涉及到游客模式弹窗、悬浮球、宝券等弹窗的实现，要修改为玩家玩游戏的activity -->
+        <meta-data
+            android:name="MAIN_ACTIVITY"
+            android:value="${applicationId}.AppActivity" />
+
+        <!-- TODO GAME SDK接入YSDK初始化配置 END -->
+
         <activity
             android:name="com.aries.qsllx.jsb.wxapi.WXEntryActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:exported="true"
-            android:taskAffinity="com.aries.qsllx.jsb"
             android:launchMode="singleTask">
         </activity>
 

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

@@ -165,7 +165,7 @@ dependencies {
     implementation project(':libcocos2dx')
 
     //微信SDK(自动集成)
-    api 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
+//    api 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
 
     //聚合SDK(手动导入SDK包)
     api 'androidx.appcompat:appcompat:1.0.0' //Gradle中要补充Support v7插件的引入，否则会集成失败
@@ -186,4 +186,7 @@ dependencies {
 
     //阿里风控
     api fileTree(include: ['*.jar','*.aar'], dir: 'libs/aliRisk')
+
+    //ysdk
+    api fileTree(include: ['*.jar','*.aar'], dir: 'libs/YSDK')
 }

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

@@ -1,4 +1,4 @@
-TF_CHANNEL="29";        //1 巨量 2 快手 3 广点通 5应用宝 22 oppo 29 羊毛党
+TF_CHANNEL="1";        //1 巨量 2 快手 3 广点通 5应用宝 22 oppo 29 羊毛党
 JL_AID="194376";       //巨量appid
 JL_CHANNEL="juliang";    //巨量渠道
 KS_AID="67132";        //快手appid
@@ -10,7 +10,7 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wx567b90447250bb4b"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u8f7b\u677e\u8fde\u8fde\u6d88
 PACKAGE_NAME=com.aries.qsllx.jsb
-VERSION_NAME=20.2.1
+VERSION_NAME=15.4.1
 VERSION_CODE=1000
 TOPON="a61122520bc85e,66b742dd0e502b64d783d9c66a9d30c4,b61122545c7f0a,b61122558edd77,b6112259a01d73,b611225775fc83,b61122587984dd,b611225685f436"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏
-APP_CONFIG_CODE="20.2.1"
+APP_CONFIG_CODE="15.4.1"