xujialiang 4 vuotta sitten
vanhempi
commit
837ac8eadd

+ 88 - 442
assets/resources/ui/FullScreenui.prefab

@@ -23,35 +23,32 @@
         "__id__": 7
       },
       {
-        "__id__": 18
+        "__id__": 16
       },
       {
-        "__id__": 27
+        "__id__": 25
       },
       {
         "__id__": 36
       },
       {
         "__id__": 47
-      },
-      {
-        "__id__": 58
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 54
       },
       {
-        "__id__": 66
+        "__id__": 55
       },
       {
-        "__id__": 67
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 57
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -234,7 +231,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "ExportItem",
+    "_name": "BackgroundUp",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -254,21 +251,15 @@
       },
       {
         "__id__": 14
-      },
-      {
-        "__id__": 15
-      },
-      {
-        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 15
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 391,
+      "y": 591,
       "z": 0
     },
     "_lrot": {
@@ -295,7 +286,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "IconDaochu",
+    "_name": "Label",
     "_objFlags": 0,
     "_parent": {
       "__id__": 7
@@ -313,351 +304,6 @@
     "_prefab": {
       "__id__": 11
     },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_layer": 1073741824,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransformComponent",
-    "_name": "IconDaochu<UITransformComponent>",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "_priority": 0,
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 750,
-      "height": 260
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.SpriteComponent",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 8
-    },
-    "_enabled": true,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_sharedMaterial": null,
-    "_spriteFrame": null,
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "57OCmntdFL5rwJxQVhWkvn",
-    "sync": false,
-    "_synced": {
-      "default": false,
-      "serializable": false
-    }
-  },
-  {
-    "__type__": "cc.UITransformComponent",
-    "_name": "ButtonDaochu1<UITransformComponent>",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 7
-    },
-    "_enabled": true,
-    "_priority": 0,
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 750,
-      "height": 260
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.SpriteComponent",
-    "_name": "ButtonDaochu1<SpriteComponent>",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 7
-    },
-    "_enabled": true,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_sharedMaterial": null,
-    "_spriteFrame": {
-      "__uuid__": "5cf7bdc6-ffa1-4fe5-91f5-cba0f411ffaf@f9941"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.ButtonComponent",
-    "_name": "ButtonDaochu1<ButtonComponent>",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 7
-    },
-    "_enabled": true,
-    "clickEvents": [],
-    "_interactable": true,
-    "_transition": 2,
-    "_normalColor": {
-      "__type__": "cc.Color",
-      "r": 214,
-      "g": 214,
-      "b": 214,
-      "a": 255
-    },
-    "_hoverColor": {
-      "__type__": "cc.Color",
-      "r": 211,
-      "g": 211,
-      "b": 211,
-      "a": 255
-    },
-    "_pressColor": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_disabledColor": {
-      "__type__": "cc.Color",
-      "r": 124,
-      "g": 124,
-      "b": 124,
-      "a": 255
-    },
-    "_normalSprite": {
-      "__uuid__": "5cf7bdc6-ffa1-4fe5-91f5-cba0f411ffaf@f9941"
-    },
-    "_hoverSprite": {
-      "__uuid__": "5cf7bdc6-ffa1-4fe5-91f5-cba0f411ffaf@f9941"
-    },
-    "_pressedSprite": {
-      "__uuid__": "5cf7bdc6-ffa1-4fe5-91f5-cba0f411ffaf@f9941"
-    },
-    "_disabledSprite": {
-      "__uuid__": "5cf7bdc6-ffa1-4fe5-91f5-cba0f411ffaf@f9941"
-    },
-    "_duration": 0.1,
-    "_zoomScale": 1.2,
-    "_target": {
-      "__id__": 7
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "89bf827dnVIrYRVh5P9587o",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 7
-    },
-    "_enabled": true,
-    "icon": {
-      "__id__": 10
-    },
-    "label": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.WidgetComponent",
-    "_name": "ExportItem<WidgetComponent>",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 7
-    },
-    "_enabled": true,
-    "_alignFlags": 17,
-    "_target": null,
-    "_left": 0,
-    "_right": 0,
-    "_top": 146,
-    "_bottom": 0,
-    "_horizontalCenter": 0,
-    "_verticalCenter": 0,
-    "_isAbsLeft": true,
-    "_isAbsRight": true,
-    "_isAbsTop": true,
-    "_isAbsBottom": true,
-    "_isAbsHorizontalCenter": true,
-    "_isAbsVerticalCenter": true,
-    "_originalWidth": 0,
-    "_originalHeight": 0,
-    "_alignMode": 2,
-    "_lockFlags": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "6aIR2E26VCYaMkSRKuebbZ",
-    "sync": false,
-    "_synced": {
-      "default": false,
-      "serializable": false
-    }
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "BackgroundUp",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [
-      {
-        "__id__": 19
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 23
-      },
-      {
-        "__id__": 24
-      },
-      {
-        "__id__": 25
-      }
-    ],
-    "_prefab": {
-      "__id__": 26
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 591,
-      "z": 0
-    },
-    "_lrot": {
-      "__type__": "cc.Quat",
-      "x": 0,
-      "y": 0,
-      "z": 0,
-      "w": 1
-    },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
-    },
-    "_layer": 33554432,
-    "_euler": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "Label",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 18
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 20
-      },
-      {
-        "__id__": 21
-      }
-    ],
-    "_prefab": {
-      "__id__": 22
-    },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
@@ -691,7 +337,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 8
     },
     "_enabled": true,
     "_priority": 0,
@@ -712,7 +358,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 8
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -763,7 +409,7 @@
     "_name": "BackgroundUp<UITransformComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 7
     },
     "_enabled": true,
     "_priority": 0,
@@ -784,7 +430,7 @@
     "_name": "BackgroundUp<SpriteComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 7
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -820,7 +466,7 @@
     "_name": "BackgroundUp<WidgetComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 7
     },
     "_enabled": true,
     "_alignFlags": 17,
@@ -867,28 +513,28 @@
     },
     "_children": [
       {
-        "__id__": 28
+        "__id__": 17
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 21
       },
       {
-        "__id__": 33
+        "__id__": 22
       },
       {
-        "__id__": 34
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 24
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 262,
+      "y": 522.8230000000001,
       "z": 0
     },
     "_lrot": {
@@ -918,20 +564,20 @@
     "_name": "Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 27
+      "__id__": 16
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 18
       },
       {
-        "__id__": 30
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 20
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -966,7 +612,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 17
     },
     "_enabled": true,
     "_priority": 0,
@@ -987,7 +633,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 17
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -1038,7 +684,7 @@
     "_name": "BackgroundUp<UITransformComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 16
     },
     "_enabled": true,
     "_priority": 0,
@@ -1059,7 +705,7 @@
     "_name": "BackgroundUp<SpriteComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 16
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -1095,14 +741,14 @@
     "_name": "BackgroundUp-001<WidgetComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 16
     },
     "_enabled": true,
     "_alignFlags": 17,
     "_target": null,
     "_left": 0,
     "_right": 0,
-    "_top": 405,
+    "_top": 144.1769999999999,
     "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -1142,34 +788,34 @@
     },
     "_children": [
       {
-        "__id__": 37
+        "__id__": 26
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 30
       },
       {
-        "__id__": 42
+        "__id__": 31
       },
       {
-        "__id__": 43
+        "__id__": 32
       },
       {
-        "__id__": 44
+        "__id__": 33
       },
       {
-        "__id__": 45
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 35
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -240,
+      "y": -117,
       "z": 0
     },
     "_lrot": {
@@ -1199,25 +845,25 @@
     "_name": "ListContent",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 36
+      "__id__": 25
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 27
       },
       {
-        "__id__": 39
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 29
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 436,
+      "y": 550,
       "z": 0
     },
     "_lrot": {
@@ -1247,14 +893,14 @@
     "_name": "ListContent<UITransformComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 26
     },
     "_enabled": true,
     "_priority": 0,
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 1105
+      "height": 1100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1268,7 +914,7 @@
     "_name": "ListContent<LayoutComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 37
+      "__id__": 26
     },
     "_enabled": true,
     "_resizeMode": 1,
@@ -1311,14 +957,14 @@
     "_name": "ExportList02<UITransformComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 25
     },
     "_enabled": true,
     "_priority": 0,
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 750,
-      "height": 854
+      "height": 1100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1332,7 +978,7 @@
     "_name": "ExportList02<ScrollViewComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 25
     },
     "_enabled": true,
     "bounceDuration": 1,
@@ -1344,7 +990,7 @@
     "cancelInnerEvents": true,
     "scrollEvents": [],
     "_content": {
-      "__id__": 37
+      "__id__": 26
     },
     "_horizontalScrollBar": null,
     "_verticalScrollBar": null,
@@ -1355,14 +1001,14 @@
     "_name": "ExportList02<ExportList>",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 25
     },
     "_enabled": true,
     "scrollView": {
-      "__id__": 42
+      "__id__": 31
     },
     "content": {
-      "__id__": 37
+      "__id__": 26
     },
     "itemPrefab": {
       "__uuid__": "a03c0b34-1e56-45ba-b992-8b9564cc4f10"
@@ -1378,14 +1024,14 @@
     "_name": "ExportList01<WidgetComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 25
     },
     "_enabled": true,
     "_alignFlags": 45,
     "_target": null,
     "_left": 0,
     "_right": 0,
-    "_top": 480,
+    "_top": 234,
     "_bottom": 0,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
@@ -1406,7 +1052,7 @@
     "_name": "ExportList02<MaskComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 25
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -1448,26 +1094,26 @@
     },
     "_children": [
       {
-        "__id__": 48
+        "__id__": 37
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 41
       },
       {
-        "__id__": 53
+        "__id__": 42
       },
       {
-        "__id__": 54
+        "__id__": 43
       },
       {
-        "__id__": 56
+        "__id__": 45
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 46
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1502,20 +1148,20 @@
     "_name": "Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 47
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 38
       },
       {
-        "__id__": 50
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 40
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1550,7 +1196,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 37
     },
     "_enabled": true,
     "_priority": 0,
@@ -1571,7 +1217,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 37
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -1622,7 +1268,7 @@
     "_name": "ButtonBackReal<UITransformComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 36
     },
     "_enabled": true,
     "_priority": 0,
@@ -1643,7 +1289,7 @@
     "_name": "ButtonBackReal<SpriteComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 36
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -1679,12 +1325,12 @@
     "_name": "ButtonBackReal<ButtonComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 36
     },
     "_enabled": true,
     "clickEvents": [
       {
-        "__id__": 55
+        "__id__": 44
       }
     ],
     "_interactable": true,
@@ -1732,7 +1378,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 47
+      "__id__": 36
     },
     "_id": ""
   },
@@ -1751,7 +1397,7 @@
     "_name": "ButtonBackReal<WidgetComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 36
     },
     "_enabled": true,
     "_alignFlags": 20,
@@ -1800,20 +1446,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 48
       },
       {
-        "__id__": 60
+        "__id__": 49
       },
       {
-        "__id__": 61
+        "__id__": 50
       },
       {
-        "__id__": 63
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 53
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1848,7 +1494,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 58
+      "__id__": 47
     },
     "_enabled": true,
     "_priority": 0,
@@ -1869,7 +1515,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 58
+      "__id__": 47
     },
     "_enabled": true,
     "_srcBlendFactor": 2,
@@ -1905,12 +1551,12 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 58
+      "__id__": 47
     },
     "_enabled": true,
     "clickEvents": [
       {
-        "__id__": 62
+        "__id__": 51
       }
     ],
     "_interactable": true,
@@ -1958,7 +1604,7 @@
     "_duration": 0.1,
     "_zoomScale": 1.2,
     "_target": {
-      "__id__": 58
+      "__id__": 47
     },
     "_id": ""
   },
@@ -1977,7 +1623,7 @@
     "_name": "ButtonDaochuBack<WidgetComponent>",
     "_objFlags": 0,
     "node": {
-      "__id__": 58
+      "__id__": 47
     },
     "_enabled": true,
     "_alignFlags": 9,
@@ -2073,10 +1719,10 @@
     },
     "_enabled": true,
     "ContinueButton": {
-      "__id__": 47
+      "__id__": 36
     },
     "ButtonDaochuBack": {
-      "__id__": 58
+      "__id__": 47
     },
     "_id": ""
   },

+ 1 - 1
assets/resources/ui/ads/AdvertisingUI.prefab

@@ -1476,7 +1476,7 @@
     "itemPrefab": {
       "__uuid__": "a5f7678b-ffd9-4c70-a9a7-35dc8fb9126b"
     },
-    "scrollType": 1,
+    "scrollType": 2,
     "autoScroll": true,
     "scrollSpeed": 70,
     "isShowFull": false,

+ 20 - 17
assets/scripts/games/ui/advertising/AdvertisingMediator.ts

@@ -36,38 +36,41 @@ export class AdvertisingMediator extends GUIMediator {
         this.BackButton.active = true;
     }
 
-    randomCpa():void{
-        if(this.wx!=null)
-        {
+    randomCpa(): void {
+        if (this.wx != null) {
             let adList: any[] = LiangLiangSDK.GetList();
-            let data = adList[Math.floor(Math.random()*adList.length)]
+            let data = adList[Math.floor(Math.random() * adList.length)]
             this.wx.navigateToMiniProgram({
                 appId: data.app_id,
                 path: data.app_path,
-                success: (res) => 
-                {
+                success: (res) => {
                     LiangLiangSDK.CpaReport(self.data);
                 },
                 fail: (res) => {
                     // GUIManager.single.Show(UIConst.FULL_OUTPUT_UI);
                     console.log("跳转失败!");
                 },
-                complete: (res) => {},
+                complete: (res) => { },
             });
         }
     }
 
     onClickBack(): void {
-        this.HideSelf();
-        if (LiangLiangSDK.CanWuChu() == true) {
-            this.randomCpa();
-            PlatformManager.showRewardedVideo(()=>{
-                PlatformManager.showBanner();
-                GUIManager.single.Show(UIConst.FULL_OUTPUT_UI);
-            }, ()=>{
-                PlatformManager.showBanner();
-                GUIManager.single.Show(UIConst.FULL_OUTPUT_UI);
-            })
+        let random: number = Math.random();
+        if (random < 0.5) {
+            this.HideSelf();
+            if (LiangLiangSDK.CanWuChu() == true) {
+                this.randomCpa();
+                PlatformManager.showRewardedVideo(() => {
+                    PlatformManager.showBanner();
+                    GUIManager.single.Show(UIConst.FULL_OUTPUT_UI);
+                }, () => {
+                    PlatformManager.showBanner();
+                    GUIManager.single.Show(UIConst.FULL_OUTPUT_UI);
+                })
+            }
+        } else {
+            this.HideSelf();
         }
     }
 

+ 5 - 14
assets/scripts/games/ui/prepares/PrepareMediator.ts

@@ -454,20 +454,11 @@ export class PrepareMediator extends GUIMediator {
             NoticeManager.ShowPrompt("请装配武器后再试!");
             return;
         }
-        // GUIManager.single.Show(UIConst.FREE_FENCE_UI);
-        GUIManager.single.Show(UIConst.FREE_USE_GUN_UI);
-        // if(GameConfigManager.GetNextFenceID(GameModel.single.currentFenceId)>0){
-            // GUIManager.single.Show(UIConst.FREE_FENCE_UI);
-            // return;
-        // }
-        // //隐藏
-        // this.HideSelf();
-        // PlatformManager.hideBanner();
-        // SceneManager.single.Swicth("FightingScene");
-        // let weChat = PlatformManager.impl as WeChatPlatform
-        // if(weChat instanceof WeChatPlatform){
-        //     weChat.startBranchAnalytics(String(GameModel.single.currentLevel));
-        // }
+        if(LiangLiangSDK.CanWuChu()){
+            GUIManager.single.Show(UIConst.FREE_USE_GUN_UI);
+        }else{
+            GUIManager.single.Show(UIConst.FREE_FENCE_UI);
+        }
     }
 
     /**