wuwangdong 4 years ago
parent
commit
0e78482fd7

+ 176 - 174
assets/resources/module/warnTip/WarnTipPanel.prefab

@@ -101,13 +101,13 @@
         "__id__": 6
       },
       {
-        "__id__": 9
+        "__id__": 15
       },
       {
-        "__id__": 18
+        "__id__": 21
       },
       {
-        "__id__": 24
+        "__id__": 30
       }
     ],
     "_active": true,
@@ -242,7 +242,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "5d5951b0-7033-4455-8c08-28285df66248"
+      "__uuid__": "452dd136-a70e-4541-91a9-a5108df1522f"
     },
     "_type": 1,
     "_sizeMode": 0,
@@ -271,113 +271,6 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "title",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 2
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 7
-      }
-    ],
-    "_prefab": {
-      "__id__": 8
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 229,
-      "b": 210,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 138,
-      "height": 53
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        221.376,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 6
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "2722f6f5-e260-46ca-8a91-e6aa86173d7d"
-    },
-    "_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__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
-    },
-    "fileId": "e0Yu3MIoNGX4nTVTtDRqYe",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
     "_name": "txt",
     "_objFlags": 0,
     "_parent": {
@@ -385,20 +278,20 @@
     },
     "_children": [
       {
-        "__id__": 10
+        "__id__": 7
       },
       {
-        "__id__": 13
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 14
     },
     "_opacity": 255,
     "_color": {
@@ -410,7 +303,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 580,
+      "width": 430,
       "height": 135.6
     },
     "_anchorPoint": {
@@ -452,17 +345,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 9
+      "__id__": 6
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 11
+        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 12
+      "__id__": 9
     },
     "_opacity": 255,
     "_color": {
@@ -474,7 +367,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 560,
+      "width": 420,
       "height": 75.6
     },
     "_anchorPoint": {
@@ -486,7 +379,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -280,
+        -210,
         -7.799999999999997,
         0,
         0,
@@ -517,7 +410,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 7
     },
     "_enabled": true,
     "_materials": [
@@ -529,14 +422,14 @@
     "_dstBlendFactor": 771,
     "_string": "系统检测到您的账号存在异常,",
     "_N$string": "系统检测到您的账号存在异常,",
-    "_fontSize": 40,
+    "_fontSize": 30,
     "_lineHeight": 60,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 0,
     "_N$verticalAlign": 1,
@@ -553,7 +446,7 @@
     "asset": {
       "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
     },
-    "fileId": "5ffP4hmhtPELq9q3TmEWF1",
+    "fileId": "c0xIb2bEFJnpKJ7012xIh8",
     "sync": false
   },
   {
@@ -561,17 +454,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 9
+      "__id__": 6
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 15
+      "__id__": 12
     },
     "_opacity": 255,
     "_color": {
@@ -583,7 +476,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 280,
+      "width": 210,
       "height": 75.6
     },
     "_anchorPoint": {
@@ -595,7 +488,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -140,
+        -105,
         -67.8,
         0,
         0,
@@ -626,7 +519,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 13
+      "__id__": 10
     },
     "_enabled": true,
     "_materials": [
@@ -638,14 +531,14 @@
     "_dstBlendFactor": 771,
     "_string": "禁止登陆游戏!",
     "_N$string": "禁止登陆游戏!",
-    "_fontSize": 40,
+    "_fontSize": 30,
     "_lineHeight": 60,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 0,
     "_N$verticalAlign": 1,
@@ -662,7 +555,7 @@
     "asset": {
       "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
     },
-    "fileId": "b1KQ/id/9FHrjogCSPxazW",
+    "fileId": "c7tc7yTD5HmaYKu+7lrrI1",
     "sync": false
   },
   {
@@ -670,17 +563,17 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 6
     },
     "_enabled": true,
     "_fontFamily": "Arial",
     "_isSystemFontUsed": true,
-    "_N$string": "<b>系统检测到您的账号存在异常,禁止登陆游戏!</b>",
+    "_N$string": "系统检测到您的账号存在异常,禁止登陆游戏!",
     "_N$horizontalAlign": 1,
-    "_N$fontSize": 40,
+    "_N$fontSize": 30,
     "_N$font": null,
     "_N$cacheMode": 0,
-    "_N$maxWidth": 580,
+    "_N$maxWidth": 430,
     "_N$lineHeight": 60,
     "_N$imageAtlas": null,
     "_N$handleTouchEvent": true,
@@ -708,17 +601,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 16
       },
       {
-        "__id__": 20
+        "__id__": 17
       },
       {
-        "__id__": 21
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -772,7 +665,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 15
     },
     "_enabled": true,
     "_materials": [
@@ -782,9 +675,7 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "a745272d-b658-4e0c-92b0-bf7b0eafa54a"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_sizeMode": 1,
     "_fillType": 0,
@@ -804,7 +695,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 15
     },
     "_enabled": true,
     "alignMode": 1,
@@ -831,7 +722,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 15
     },
     "_enabled": true,
     "node_panel": {
@@ -840,7 +731,7 @@
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 22
+        "__id__": 19
       }
     ],
     "_id": ""
@@ -875,20 +766,20 @@
     },
     "_children": [
       {
-        "__id__": 25
+        "__id__": 22
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 26
       },
       {
-        "__id__": 30
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -900,8 +791,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 328,
-      "height": 137
+      "width": 283,
+      "height": 112
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -913,14 +804,14 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -110.522,
+        -144.522,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        0.8,
+        0.8,
         0
       ]
     },
@@ -942,20 +833,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 24
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 23
       },
       {
-        "__id__": 27
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -967,8 +858,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 104,
-      "height": 67
+      "width": 106,
+      "height": 69
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1009,7 +900,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -1042,17 +933,17 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 22
     },
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 109,
-      "g": 209,
-      "b": 0,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {
@@ -1071,7 +962,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -1103,7 +994,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 21
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1112,7 +1003,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 31
+        "__id__": 28
       }
     ],
     "_N$interactable": true,
@@ -1192,6 +1083,114 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "title",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 31
+      }
+    ],
+    "_prefab": {
+      "__id__": 32
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 148,
+      "g": 82,
+      "b": 37,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        210,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 30
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "温馨提示",
+    "_N$string": "温馨提示",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "879eb3b1-6a64-47bd-a0ce-54cc4bc8044b"
+    },
+    "fileId": "3bTBetMQdBHYw1Jx2ZdElY",
+    "sync": false
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1241,8 +1240,11 @@
       "__id__": 2
     },
     "open_effect": 1,
+    "isOpenCloseEffect": true,
     "close_effect": 1,
     "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": false,
     "_id": ""
   },
   {
@@ -1276,7 +1278,7 @@
     },
     "_enabled": true,
     "labDes": {
-      "__id__": 16
+      "__id__": 13
     },
     "_id": ""
   },

BIN
assets/resources/module/warnTip/texture/button.png


+ 6 - 6
assets/resources/module/warnTip/texture/button.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 328,
-  "height": 137,
+  "width": 283,
+  "height": 112,
   "platformSettings": {},
   "subMetas": {
     "button": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 328,
-      "height": 137,
-      "rawWidth": 328,
-      "rawHeight": 137,
+      "width": 283,
+      "height": 112,
+      "rawWidth": 283,
+      "rawHeight": 112,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

+ 4 - 4
assets/script/game/data/module/WarnTipData.ts

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