Ver Fonte

[FC]:对应广告变现点添加逻辑

fengcong há 5 anos atrás
pai
commit
f83c17b4ef
27 ficheiros alterados com 1186 adições e 596 exclusões
  1. 165 151
      assets/resources/module/blessingBag/blessingBag.prefab
  2. 21 7
      assets/resources/module/help/help.prefab
  3. 86 72
      assets/resources/module/moreGame/moreGame.prefab
  4. 20 6
      assets/resources/module/pigBank/pigBank.prefab
  5. 21 7
      assets/resources/module/redCode/redCode.prefab
  6. 22 8
      assets/resources/module/reward/rewardLuck.prefab
  7. 91 77
      assets/resources/module/setting/setting.prefab
  8. 22 8
      assets/resources/module/sign/sign.prefab
  9. 160 146
      assets/resources/module/turnable/turnable.prefab
  10. 18 1
      assets/script/before/GamePlay.ts
  11. 11 10
      assets/script/before/view/GetPropUI.ts
  12. 7 2
      assets/script/before/view/PauseUI.ts
  13. 1 0
      assets/script/before/view/uiItem/CellItem.ts
  14. 5 0
      assets/script/game/module/blessingBag/BlessingBag.ts
  15. 6 1
      assets/script/game/module/help/Help.ts
  16. 4 0
      assets/script/game/module/moreGame/MoreGame.ts
  17. 4 1
      assets/script/game/module/pigBank/PigBank.ts
  18. 6 0
      assets/script/game/module/redCode/RedCode.ts
  19. 7 0
      assets/script/game/module/reward/Reward.ts
  20. 7 2
      assets/script/game/module/setting/Setting.ts
  21. 6 0
      assets/script/game/module/sign/Sign.ts
  22. 6 2
      assets/script/game/module/turntable/Turnable.ts
  23. 2 0
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts
  24. 3 3
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNative.ts
  25. 11 1
      assets/script/mk/system/AdSystem.ts
  26. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk
  27. 474 91
      build/jsb-link/js backups (useful for debugging)/main.index.js

Diff do ficheiro suprimidas por serem muito extensas
+ 165 - 151
assets/resources/module/blessingBag/blessingBag.prefab


+ 21 - 7
assets/resources/module/help/help.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 18
-      },
-      {
         "__id__": 19
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 21
+      },
+      {
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -110,7 +110,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 17
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -502,7 +502,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -622,10 +622,24 @@
       "__id__": 1
     },
     "transition_type": 3,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 16
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "7626bHemEpG267E801XmW+W",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

+ 86 - 72
assets/resources/module/moreGame/moreGame.prefab

@@ -27,14 +27,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 54
       },
       {
-        "__id__": 54
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -215,20 +215,20 @@
         "__id__": 7
       },
       {
-        "__id__": 18
+        "__id__": 19
       },
       {
-        "__id__": 43
+        "__id__": 44
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 51
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -289,20 +289,20 @@
         "__id__": 8
       },
       {
-        "__id__": 12
+        "__id__": 13
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 16
       },
       {
-        "__id__": 16
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -369,7 +369,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 12
     },
     "_opacity": 255,
     "_color": {
@@ -462,10 +462,24 @@
       "__id__": 1
     },
     "transition_type": 0,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 11
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "a6705qKu8tPpoRd4ECt6v+E",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -487,11 +501,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 15
     },
     "_opacity": 255,
     "_color": {
@@ -545,7 +559,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 13
     },
     "_enabled": true,
     "_materials": [
@@ -662,20 +676,20 @@
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 20
       },
       {
-        "__id__": 28
+        "__id__": 29
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -729,24 +743,24 @@
     "_name": "moreGame_bg_item",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [
       {
-        "__id__": 20
+        "__id__": 21
       },
       {
-        "__id__": 23
+        "__id__": 24
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -800,17 +814,17 @@
     "_name": "moreGame_icon_begin",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 23
     },
     "_opacity": 255,
     "_color": {
@@ -864,7 +878,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -907,17 +921,17 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 19
+      "__id__": 20
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 24
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -971,7 +985,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 23
+      "__id__": 24
     },
     "_enabled": true,
     "_materials": [
@@ -1015,7 +1029,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 20
     },
     "_enabled": true,
     "_materials": [
@@ -1058,27 +1072,27 @@
     "_name": "New ScrollView",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
-      },
-      {
         "__id__": 38
       },
       {
         "__id__": 39
+      },
+      {
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1132,24 +1146,24 @@
     "_name": "view",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 28
+      "__id__": 29
     },
     "_children": [
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 35
       },
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1203,20 +1217,20 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 30
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 32
       },
       {
-        "__id__": 32
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -1270,7 +1284,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 31
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1297,7 +1311,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 31
     },
     "_enabled": true,
     "_layoutSize": {
@@ -1340,7 +1354,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "_materials": [
@@ -1360,7 +1374,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1398,7 +1412,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "horizontal": false,
@@ -1410,10 +1424,10 @@
     "scrollEvents": [],
     "cancelInnerEvents": false,
     "_N$content": {
-      "__id__": 30
+      "__id__": 31
     },
     "content": {
-      "__id__": 30
+      "__id__": 31
     },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
@@ -1424,7 +1438,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "pre_item": [
@@ -1447,7 +1461,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 29
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1485,7 +1499,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1527,20 +1541,20 @@
     },
     "_children": [
       {
-        "__id__": 44
+        "__id__": 45
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 49
       },
       {
-        "__id__": 49
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 51
     },
     "_opacity": 255,
     "_color": {
@@ -1594,20 +1608,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 43
+      "__id__": 44
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 46
       },
       {
-        "__id__": 46
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -1661,7 +1675,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 45
     },
     "_enabled": true,
     "_materials": [
@@ -1694,7 +1708,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 45
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1732,7 +1746,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1764,7 +1778,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 44
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1854,7 +1868,7 @@
     },
     "_enabled": true,
     "node_sv": {
-      "__id__": 28
+      "__id__": 29
     },
     "moreGameNormalNode": {
       "__uuid__": "0acc5eb1-6666-4231-8d4e-796b2a1c57e9"

+ 20 - 6
assets/resources/module/pigBank/pigBank.prefab

@@ -27,9 +27,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 63
-      },
-      {
         "__id__": 64
       },
       {
@@ -37,10 +34,13 @@
       },
       {
         "__id__": 66
+      },
+      {
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -2053,7 +2053,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 63
     },
     "_opacity": 255,
     "_color": {
@@ -2221,10 +2221,24 @@
       "__id__": 1
     },
     "transition_type": 3,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 62
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "b7b79eT6/VPr5yd7mCH4hR7",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

+ 21 - 7
assets/resources/module/redCode/redCode.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 113
-      },
-      {
         "__id__": 114
       },
       {
         "__id__": 115
+      },
+      {
+        "__id__": 116
       }
     ],
     "_prefab": {
-      "__id__": 116
+      "__id__": 117
     },
     "_opacity": 255,
     "_color": {
@@ -107,7 +107,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 112
+      "__id__": 113
     },
     "_opacity": 255,
     "_color": {
@@ -3776,7 +3776,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 111
+      "__id__": 112
     },
     "_opacity": 255,
     "_color": {
@@ -4086,10 +4086,24 @@
       "__id__": 1
     },
     "transition_type": 0,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 111
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "c41b5+3RSVEG7N5eu3qKlqZ",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

+ 22 - 8
assets/resources/module/reward/rewardLuck.prefab

@@ -27,9 +27,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 124
-      },
-      {
         "__id__": 125
       },
       {
@@ -37,10 +34,13 @@
       },
       {
         "__id__": 127
+      },
+      {
+        "__id__": 128
       }
     ],
     "_prefab": {
-      "__id__": 128
+      "__id__": 129
     },
     "_opacity": 255,
     "_color": {
@@ -2447,7 +2447,7 @@
     "_animationName": "animation",
     "_animationQueue": [],
     "_headAniInfo": null,
-    "_playTimes": 0,
+    "_playTimes": 1,
     "_isAniComplete": true,
     "_N$skeletonData": {
       "__uuid__": "4ff19fc9-047e-44b1-aac9-98904d537eb9"
@@ -4316,11 +4316,11 @@
         "__id__": 121
       },
       {
-        "__id__": 122
+        "__id__": 123
       }
     ],
     "_prefab": {
-      "__id__": 123
+      "__id__": 124
     },
     "_opacity": 255,
     "_color": {
@@ -4413,10 +4413,24 @@
       "__id__": 1
     },
     "transition_type": 3,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 122
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "43f3akkA71HA76UhTj/R19X",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.Animation",
     "_name": "",
     "_objFlags": 0,

+ 91 - 77
assets/resources/module/setting/setting.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 89
-      },
-      {
         "__id__": 90
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 92
+      },
+      {
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 94
     },
     "_opacity": 255,
     "_color": {
@@ -125,47 +125,47 @@
         "__id__": 37
       },
       {
-        "__id__": 43
+        "__id__": 44
       },
       {
-        "__id__": 46
+        "__id__": 47
       },
       {
-        "__id__": 49
+        "__id__": 50
       },
       {
-        "__id__": 54
+        "__id__": 55
       },
       {
-        "__id__": 59
+        "__id__": 60
       },
       {
-        "__id__": 64
+        "__id__": 65
       },
       {
-        "__id__": 68
+        "__id__": 69
       },
       {
-        "__id__": 73
+        "__id__": 74
       },
       {
-        "__id__": 76
+        "__id__": 77
       },
       {
-        "__id__": 81
+        "__id__": 82
       },
       {
-        "__id__": 84
+        "__id__": 85
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 88
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 89
     },
     "_opacity": 255,
     "_color": {
@@ -737,8 +737,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 106,
-      "height": 106
+      "width": 117,
+      "height": 117
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1475,7 +1475,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -1643,10 +1643,24 @@
       "__id__": 1
     },
     "transition_type": 3,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 42
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "6cec48K3X9GK6QSjqp7IWnc",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1668,11 +1682,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 46
     },
     "_opacity": 255,
     "_color": {
@@ -1726,7 +1740,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 44
     },
     "_enabled": true,
     "_materials": [
@@ -1775,11 +1789,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -1833,7 +1847,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 46
+      "__id__": 47
     },
     "_enabled": true,
     "_materials": [
@@ -1882,14 +1896,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 51
       },
       {
-        "__id__": 51
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -1943,7 +1957,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 50
     },
     "_enabled": true,
     "_materials": [
@@ -1975,7 +1989,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 50
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1984,7 +1998,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 52
+        "__id__": 53
       }
     ],
     "_N$interactable": true,
@@ -2040,7 +2054,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 49
+      "__id__": 50
     },
     "_id": ""
   },
@@ -2076,14 +2090,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 56
       },
       {
-        "__id__": 56
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -2137,7 +2151,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 54
+      "__id__": 55
     },
     "_enabled": true,
     "_materials": [
@@ -2169,7 +2183,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 54
+      "__id__": 55
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2178,7 +2192,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 57
+        "__id__": 58
       }
     ],
     "_N$interactable": true,
@@ -2234,7 +2248,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 54
+      "__id__": 55
     },
     "_id": ""
   },
@@ -2270,14 +2284,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 61
       },
       {
-        "__id__": 61
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 64
     },
     "_opacity": 255,
     "_color": {
@@ -2331,7 +2345,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 59
+      "__id__": 60
     },
     "_enabled": true,
     "_materials": [
@@ -2363,7 +2377,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 59
+      "__id__": 60
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2372,7 +2386,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 62
+        "__id__": 63
       }
     ],
     "_N$interactable": true,
@@ -2428,7 +2442,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 59
+      "__id__": 60
     },
     "_id": ""
   },
@@ -2464,14 +2478,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 66
       },
       {
-        "__id__": 66
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 67
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -2525,7 +2539,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 64
+      "__id__": 65
     },
     "_enabled": true,
     "_materials": [
@@ -2558,7 +2572,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 64
+      "__id__": 65
     },
     "_enabled": true,
     "_color": {
@@ -2593,14 +2607,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 70
       },
       {
-        "__id__": 70
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 73
     },
     "_opacity": 255,
     "_color": {
@@ -2654,7 +2668,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 68
+      "__id__": 69
     },
     "_enabled": true,
     "_materials": [
@@ -2687,7 +2701,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 68
+      "__id__": 69
     },
     "_enabled": true,
     "panel_name": "module/setting/rule",
@@ -2695,7 +2709,7 @@
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 71
+        "__id__": 72
       }
     ],
     "_id": ""
@@ -2732,11 +2746,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 75
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 76
     },
     "_opacity": 255,
     "_color": {
@@ -2790,7 +2804,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 73
+      "__id__": 74
     },
     "_enabled": true,
     "_materials": [
@@ -2839,14 +2853,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 77
+        "__id__": 78
       },
       {
-        "__id__": 78
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -2900,7 +2914,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 77
     },
     "_enabled": true,
     "_materials": [
@@ -2933,7 +2947,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 77
     },
     "_enabled": true,
     "panel_name": "module/setting/rule",
@@ -2941,7 +2955,7 @@
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 79
+        "__id__": 80
       }
     ],
     "_id": ""
@@ -2978,11 +2992,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 84
     },
     "_opacity": 255,
     "_color": {
@@ -3036,7 +3050,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 81
+      "__id__": 82
     },
     "_enabled": true,
     "_materials": [
@@ -3085,11 +3099,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 85
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 87
     },
     "_opacity": 255,
     "_color": {
@@ -3143,7 +3157,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 84
+      "__id__": 85
     },
     "_enabled": true,
     "_materials": [
@@ -3240,13 +3254,13 @@
       "__id__": 25
     },
     "img_music": {
-      "__id__": 50
+      "__id__": 51
     },
     "img_effect": {
-      "__id__": 55
+      "__id__": 56
     },
     "lbl_version": {
-      "__id__": 85
+      "__id__": 86
     },
     "_id": ""
   },

+ 22 - 8
assets/resources/module/sign/sign.prefab

@@ -27,9 +27,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 48
-      },
-      {
         "__id__": 49
       },
       {
@@ -37,10 +34,13 @@
       },
       {
         "__id__": 51
+      },
+      {
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 53
     },
     "_opacity": 255,
     "_color": {
@@ -1562,7 +1562,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -1574,8 +1574,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 53,
-      "height": 49
+      "width": 88,
+      "height": 88
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1723,10 +1723,24 @@
       "__id__": 1
     },
     "transition_type": 0,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 47
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "92c1epESLhJSLrId9Dkn6Wd",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

Diff do ficheiro suprimidas por serem muito extensas
+ 160 - 146
assets/resources/module/turnable/turnable.prefab


+ 18 - 1
assets/script/before/GamePlay.ts

@@ -186,7 +186,8 @@ export default class GamePlay extends cc.Component {
             this.initEvent();
 
             this.intervalShowGuide();
-          
+            this.intervalShowInter();
+
             cc.tween(this.btn_gameGetRed1).delay(0.2).to(1, { y: 60 }, { easing: "" }).to(1, { y: 0 }, { easing: "" }).union().repeatForever().start();
             cc.tween(this.btn_gameGetRed2).delay(0.4).to(1, { y: 60 }, { easing: "" }).to(1, { y: 0 }, { easing: "" }).union().repeatForever().start();
             cc.tween(this.btn_gameGetRed3).delay(0.2).to(1, { y: 60 }, { easing: "" }).to(1, { y: 0 }, { easing: "" }).union().repeatForever().start();
@@ -412,6 +413,7 @@ export default class GamePlay extends cc.Component {
     onClickBtn(event: cc.Event.EventTouch) {
 
         this.intervalShowGuide();
+        this.intervalShowInter();
 
         //是否已经通关
         if (this.ifPass) {
@@ -1109,4 +1111,19 @@ export default class GamePlay extends cc.Component {
             this.couldCleanVecArr = [];
         }
     }
+
+    public interval_ShowInter: number = null;
+    //间隔显示
+    intervalShowInter() {
+        this.cancelShowInter();
+        this.interval_ShowGuide = setInterval(() => {
+            mk.ad.showInterAd(0);
+        }, 15000);
+    }
+
+    cancelShowInter() {
+        if (this.interval_ShowGuide) {
+            clearInterval(this.interval_ShowGuide);
+        }
+    }
 }

+ 11 - 10
assets/script/before/view/GetPropUI.ts

@@ -32,23 +32,20 @@ export default class GetPropUI extends cc.Component {
     start() {
         this.adapt();
         this.initEvent();
-        // mk.ad.showBannerAd();
-        //mk.ad.showNativeAd();
-        mk.ad.showInterAd(0);
+        //mk.ad.showBannerAd();
+        // mk.ad.showNativeAd(4);
+        // mk.ad.showInterAd(0);
     }
 
     // update (dt) {}
 
     onEnable() {
         GameMgr.Inst.sendEvent(UI_NAME.GetPropUI, `进入获取道具界面`);
-        // //显示广告
-        // AdMgr.Inst.showNativeAd(4, true);
         this.init();
     }
 
     onDisable() {
         GamePlay.Inst.curPropType = PROPTYPE.Null;
-        // AdMgr.Inst.destroyNativeAd();
     }
 
     /**适配 */
@@ -91,12 +88,13 @@ export default class GetPropUI extends cc.Component {
     onClickClose() {
         GameMgr.Inst.sendEvent(UI_NAME.GetPropUI, "点击关闭按钮");
         mk.ui.closePanel("GetPropUI");
+
     }
 
     /**点击获取 */
     onClickGet() {
         GameMgr.Inst.sendEvent(UI_NAME.GetPropUI, `点击${GamePlay.Inst.curPropType}按钮`);
-
+        GamePlay.Inst.cancelShowInter();
         mk.ad.watchAd((ifsuccess: boolean) => {
             this.watchCallBack(ifsuccess)
         });
@@ -105,14 +103,17 @@ export default class GetPropUI extends cc.Component {
     /**观看回调 */
     watchCallBack(ifSuccess: boolean = false) {
 
-        mk.tip.pop("观看失败,无法领取奖励哦")
         if (ifSuccess) {
+            this.scheduleOnce(() => {
+                mk.tip.pop("观看成功,获取奖励")
+            }, 0)
             this.watchSuccess();
-            mk.tip.pop("观看成功,获取奖励")
         }
         else {
+            this.scheduleOnce(() => {
+                mk.tip.pop("观看失败,无法领取奖励哦")
+            }, 0)
             this.watchFailed();
-            mk.tip.pop("观看失败,无法领取奖励哦")
         }
     }
 

+ 7 - 2
assets/script/before/view/PauseUI.ts

@@ -42,12 +42,14 @@ export default class PauseUI extends cc.Component {
 
     // LIFE-CYCLE CALLBACKS:
 
-    // onLoad () {}
+    onLoad() {
+     
+    }
 
     start() {
+        mk.ad.showNativeAd(4);
 
         this.node_bg.setContentSize(cc.winSize.width, cc.winSize.height);
-
         this.initEvent();
     }
 
@@ -116,6 +118,7 @@ export default class PauseUI extends cc.Component {
 
         console.log("点击关闭按钮", this.node.name);
         mk.ui.closePanel(this.node.name);
+        mk.ad.destroyNativeAd();
     }
 
     onClickMusicSwitch() {
@@ -144,5 +147,7 @@ export default class PauseUI extends cc.Component {
         //     Main.Inst.node_start.active = true;
         //     Main.Inst.node_game.active = false;
         // },2000)
+
+        mk.ad.destroyNativeAd();
     }
 }

+ 1 - 0
assets/script/before/view/uiItem/CellItem.ts

@@ -142,6 +142,7 @@ export default class CellItem extends cc.Component {
 
         //重置提示
         GamePlay.Inst.intervalShowGuide();
+        GamePlay.Inst.intervalShowInter();
 
         if (GamePlay.Inst.node_changeCellItemUI.active) {
             GamePlay.Inst.node_changeCellItemUI.active = false;

+ 5 - 0
assets/script/game/module/blessingBag/BlessingBag.ts

@@ -343,4 +343,9 @@ export default class BlessingBag extends cc.Component {
         gData.blessingBag.adsource_id_value = this.inputBox.string;
     }
 
+
+    /** 点击关闭 */
+    onClickClose() {
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 6 - 1
assets/script/game/module/help/Help.ts

@@ -11,7 +11,8 @@ export default class Help extends cc.Component {
     @property({ type: cc.Label, displayName: '文字说明' })
     lbl_desc: cc.Label = null;
 
-    start(){
+    start() {
+        mk.ad.showNativeAd(4);
     }
 
     update() {
@@ -23,4 +24,8 @@ export default class Help extends cc.Component {
     lateUpdate() {
         gData.help.init_desc_name = false;
     }
+
+    onClickClose() {
+        mk.ad.destroyNativeAd();
+    }
 }

+ 4 - 0
assets/script/game/module/moreGame/MoreGame.ts

@@ -54,4 +54,8 @@ export default class MoreGame extends cc.Component {
         }
         this.node_sv.emit('srollview-init', data)
     }
+    
+    onClickClose() {
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 4 - 1
assets/script/game/module/pigBank/PigBank.ts

@@ -105,5 +105,8 @@ export default class PigBank extends cc.Component {
         gData.help.des = des;
     }
 
-
+    /** 点击关闭 */
+    onClickClose() {
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 6 - 0
assets/script/game/module/redCode/RedCode.ts

@@ -36,6 +36,8 @@ export default class RedCode extends cc.Component {
     coolTime = false
 
     start() {
+        mk.ad.showNativeAd(4);
+
         this.coolTime = false
         this.labOfficial.string = `“${this.officialStr}”`
         this.labRed.string = `“${this.redCodeStr}”`
@@ -97,4 +99,8 @@ export default class RedCode extends cc.Component {
         mk.audio.playEffect("button");
         mk.audio.setResumeMusic();
     }
+
+    onClickClose() {
+        mk.ad.destroyNativeAd();
+    }
 }

+ 7 - 0
assets/script/game/module/reward/Reward.ts

@@ -62,6 +62,9 @@ export default class Reward extends cc.Component {
     }
 
     start() {
+        mk.ad.showBannerAd();
+        mk.ad.checkShowInterByChance();
+
         /** 盖子 */
         this.initLid();
         // gData.gameData.gameData.redMoney = 1500;// 测试数据
@@ -237,4 +240,8 @@ export default class Reward extends cc.Component {
         }
     }
 
+    onClickClose() {
+        mk.ad.destroyNativeAd();
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 7 - 2
assets/script/game/module/setting/Setting.ts

@@ -30,7 +30,7 @@ export default class Setting extends cc.Component {
     }
 
     start() {
-
+        mk.ad.showNativeAd(4);
     }
 
     private async initData() {
@@ -44,7 +44,7 @@ export default class Setting extends cc.Component {
         this.img_effect.spriteFrame = await mk.loader.load(effect, cc.SpriteFrame);
 
         console.log("=== gData.wechatData.avatar", gData.wechatData.avatar);
-        let result = await mk.loader.loadRemote(gData.wechatData.avatar+"?aaa=aa.jpg", null);
+        let result = await mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null);
         this.img_head.spriteFrame = new cc.SpriteFrame(result);
         console.log("=== loadHead:", result);
         // this.img_head.spriteFrame = result;
@@ -95,4 +95,9 @@ export default class Setting extends cc.Component {
     onDestroy() {
 
     }
+
+    onClickClose() {
+       mk.ad.destroyNativeAd();
+       mk.ad.checkShowInterByChance();
+    }
 }

+ 6 - 0
assets/script/game/module/sign/Sign.ts

@@ -27,6 +27,7 @@ export default class Sign extends cc.Component {
     }
 
     start() {
+        mk.ad.showNativeAd(4);
         // gData.sign.sign_can = gData.gameData.getProp(GameProp.sign_can);
         gData.sign.initListData();
         gData.sign.init_data = true;
@@ -114,4 +115,9 @@ export default class Sign extends cc.Component {
             this.anim_btn.getComponent('SetGray').setGray(true);
         }
     }
+
+    onClickClose() {
+        mk.ad.destroyNativeAd();
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 6 - 2
assets/script/game/module/turntable/Turnable.ts

@@ -80,11 +80,11 @@ export default class Turnable extends cc.Component {
         let index = 0;
         let i = 0;
         while (i < this.rewardWeights.length - 1) {
-            if(i < type - 1){
+            if (i < type - 1) {
                 index += this.rewardWeights[i];
                 i++;
             }
-            else{
+            else {
                 index += Math.floor(Math.random() * this.rewardWeights[i]);
                 break;
             }
@@ -156,4 +156,8 @@ export default class Turnable extends cc.Component {
     onDestroy() {
 
     }
+
+    onClickClose() {
+        mk.ad.checkShowInterByChance();
+    }
 }

+ 2 - 0
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts

@@ -16,6 +16,7 @@ export default class ATInterstitial extends zgSingleton {
         this.ATInterstitialJS.proxy = this;;
         this.ATInterstitialJS.init();
         // this.loadNative();
+        this.loadInter(0);
     }
 
     /** 广告位id */
@@ -64,6 +65,7 @@ export default class ATInterstitial extends zgSingleton {
         //     // console.log('99999999   showInter fail')
         //     this.loadInter(type)
         // }
+        this.ATInterstitialJS.showInter(0);
     }
 
     //广告回调部分------------------------------------------------------------------------

+ 3 - 3
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNative.ts

@@ -31,7 +31,7 @@ export class ATNative extends zgSingleton {
      * @param type 类型对应不同位置
      * @param show 是否加载完显示显示
      */
-    loadNative(type = 0, show = false) {
+    loadNative(type = 4, show = false) {
         this.ATNativeJS.loadNative(type, show);
     }
 
@@ -58,11 +58,11 @@ export class ATNative extends zgSingleton {
 
     /** 销毁baaner */
     destroyNative() {
-        cc["ATNativeJS"].destroyNative();
+        this.ATNativeJS.destroyNative();
     }
 
     /** 当前是否有banner显示 */
     getIsNativeShow() {
-        return cc["ATNativeJS"].nativeShow
+        return this.ATNativeJS.nativeShow
     }
 }

+ 11 - 1
assets/script/mk/system/AdSystem.ts

@@ -17,7 +17,7 @@ export default class AdSystem {
     }
 
     /** 广告sdk */
-    public adSdk: IADSDKMgr = null;
+    private adSdk: IADSDKMgr = null;
 
     /** 是否显示广告 */
     public ifShowAd: boolean = true;
@@ -162,4 +162,14 @@ export default class AdSystem {
         }
         this.adSdk.showInter();
     }
+
+    /**
+     * 根据几率检测弹出插屏
+     */
+    public checkShowInterByChance() {
+        let random = Math.random();
+        if (random < 0.5) {
+            this.showInterAd(0);
+        }
+    }
 }

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk


Diff do ficheiro suprimidas por serem muito extensas
+ 474 - 91
build/jsb-link/js backups (useful for debugging)/main.index.js


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff