tang biao преди 5 години
родител
ревизия
8942175c2c

+ 524 - 25
assets/resources/prefabs/common/commonAlert.prefab

@@ -21,17 +21,20 @@
       },
       {
         "__id__": 6
+      },
+      {
+        "__id__": 48
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 57
     },
     "_opacity": 255,
     "_color": {
@@ -170,7 +173,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "60AbmD+IFF+LzanHKmdyDp"
+    "_id": ""
   },
   {
     "__type__": "cc.BlockInputEvents",
@@ -180,7 +183,7 @@
       "__id__": 2
     },
     "_enabled": true,
-    "_id": "02ntC3W/FAsqLzaIaOirSM"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -221,7 +224,7 @@
     "_level": 2,
     "_components": [],
     "_prefab": {
-      "__id__": 41
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -357,7 +360,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "bej2zaYU9DxbEeOltQYRGI"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -526,7 +529,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "02Pp2yPOBD+aDPr3uxiNyO"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -536,7 +539,7 @@
     "asset": {
       "__uuid__": "eb44a5ef-eed0-4aaf-ba0e-343445d5747f"
     },
-    "fileId": "195EhNEA1BCK3oh/RM6aRq",
+    "fileId": "1amInrpnRAeL1v+Uw7fJQy",
     "sync": false
   },
   {
@@ -625,7 +628,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "440z5vv6pNr4DqRjE8iwj9"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -635,7 +638,7 @@
     "asset": {
       "__uuid__": "eb44a5ef-eed0-4aaf-ba0e-343445d5747f"
     },
-    "fileId": "17AdoqTDhGjaIRBrn+cihe",
+    "fileId": "9fOlsVM8BOD6/VBNaeMLa8",
     "sync": false
   },
   {
@@ -654,7 +657,7 @@
     "_N$lineHeight": 32,
     "_N$imageAtlas": null,
     "_N$handleTouchEvent": true,
-    "_id": "e8NuwgwwtK65JvnrOhZChZ"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -756,7 +759,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "c3v23UeHVLQLn6cbNr2OK2"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -992,7 +995,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "c9zOoA6rRF3LfWlvy5l3wj"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1002,7 +1005,7 @@
     "asset": {
       "__uuid__": "eb44a5ef-eed0-4aaf-ba0e-343445d5747f"
     },
-    "fileId": "68lJlAWatO66C2Zo15DAK9",
+    "fileId": "e79KqOsipE163DKYkTP3V4",
     "sync": false
   },
   {
@@ -1091,7 +1094,7 @@
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
     "_N$overflow": 0,
-    "_id": "99Li/4bUJJz716h93lYN1q"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1101,7 +1104,7 @@
     "asset": {
       "__uuid__": "eb44a5ef-eed0-4aaf-ba0e-343445d5747f"
     },
-    "fileId": "e4y9f7QtNND4RQacX20IVo",
+    "fileId": "d44/ajbCxEgJJtXXnq2UTP",
     "sync": false
   },
   {
@@ -1122,7 +1125,7 @@
       "__uuid__": "9a199f9b-2e79-467b-85f6-b6ebe5f54f18"
     },
     "_N$handleTouchEvent": true,
-    "_id": "a77qcbr3pDM6HXCM4KET9k"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1161,7 +1164,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "44WkjiZu9DIZLC4MiAxBeu"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1184,17 +1187,20 @@
     "_children": [
       {
         "__id__": 35
+      },
+      {
+        "__id__": 38
       }
     ],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 46
     },
     "_opacity": 255,
     "_color": {
@@ -1315,7 +1321,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "e35abe3f-081b-4866-8d80-29108973488a"
+      "__uuid__": "6d87a9f4-6966-41ce-95e6-fbb66464eebe"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -1330,7 +1336,7 @@
     "_isTrimmedMode": true,
     "_state": 0,
     "_atlas": null,
-    "_id": "f15puD4btCp74gJ0sGMbnB"
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1344,6 +1350,201 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "richtext",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 34
+    },
+    "_children": [
+      {
+        "__id__": 39
+      }
+    ],
+    "_active": true,
+    "_level": 4,
+    "_components": [
+      {
+        "__id__": 42
+      }
+    ],
+    "_prefab": {
+      "__id__": 43
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 60,
+      "height": 32
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_zIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrivateNode",
+    "_name": "RICHTEXT_CHILD",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 38
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 5,
+    "_components": [
+      {
+        "__id__": 40
+      }
+    ],
+    "_prefab": {
+      "__id__": 41
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 60,
+      "height": 32
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -30,
+      "y": -16,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_zIndex": -32768,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 39
+    },
+    "_enabled": true,
+    "_srcBlendFactor": 1,
+    "_dstBlendFactor": 771,
+    "_useOriginalSize": true,
+    "_string": "确定",
+    "_N$string": "确定",
+    "_fontSize": 30,
+    "_lineHeight": 32,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eb44a5ef-eed0-4aaf-ba0e-343445d5747f"
+    },
+    "fileId": "1fgwbuNoJKoYfJE1SLwEwQ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.RichText",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 38
+    },
+    "_enabled": true,
+    "_N$string": "<b><color=#ffffff>确定</c></b>",
+    "_N$horizontalAlign": 1,
+    "_N$fontSize": 30,
+    "_N$font": null,
+    "_N$maxWidth": 0,
+    "_N$lineHeight": 32,
+    "_N$imageAtlas": null,
+    "_N$handleTouchEvent": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eb44a5ef-eed0-4aaf-ba0e-343445d5747f"
+    },
+    "fileId": "ef4mbGAHZANIBYE2HkwcBl",
+    "sync": false
+  },
+  {
     "__type__": "cc.Button",
     "_name": "",
     "_objFlags": 0,
@@ -1370,7 +1571,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 39
+        "__id__": 45
       }
     ],
     "_N$interactable": true,
@@ -1410,7 +1611,7 @@
     "_N$target": {
       "__id__": 35
     },
-    "_id": "ecIif7JbNE5K6nGQQ7Btet"
+    "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
@@ -1444,6 +1645,294 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "strore_close_btn",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 49
+      }
+    ],
+    "_active": false,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 52
+      },
+      {
+        "__id__": 54
+      }
+    ],
+    "_prefab": {
+      "__id__": 55
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 99,
+      "height": 114
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 180,
+      "y": 277,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_zIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "store_close",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 48
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 4,
+    "_components": [
+      {
+        "__id__": 50
+      }
+    ],
+    "_prefab": {
+      "__id__": 51
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 66,
+      "height": 71
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 18,
+      "y": -9,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_zIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 49
+    },
+    "_enabled": true,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "3b53aea6-e62a-4433-9e69-df03a3a718a7"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_state": 0,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eb44a5ef-eed0-4aaf-ba0e-343445d5747f"
+    },
+    "fileId": "f46VwGCpFLNqOi0Xmc8gwI",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 48
+    },
+    "_enabled": true,
+    "transition": 1,
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 120,
+      "g": 120,
+      "b": 120,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 53
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$normalSprite": {
+      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
+    },
+    "_N$pressedSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "pressedSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "_N$hoverSprite": {
+      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
+    },
+    "hoverSprite": {
+      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
+    },
+    "_N$disabledSprite": {
+      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
+    },
+    "_N$target": {
+      "__id__": 49
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "commAlert",
+    "handler": "closeAction",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 48
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 33,
+    "_left": 0,
+    "_right": 0.5,
+    "_top": -34,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "eb44a5ef-eed0-4aaf-ba0e-343445d5747f"
+    },
+    "fileId": "dfKMjOr4tE+b871G2hpSS/",
+    "sync": false
+  },
+  {
     "__type__": "deeaepjNkpLk6JgKTbJw1Jy",
     "_name": "",
     "_objFlags": 0,
@@ -1460,7 +1949,17 @@
     "descRichText": {
       "__id__": 30
     },
-    "_id": "bes2AK2lZGP5fqIRJYp12c"
+    "sureRichText": {
+      "__id__": 42
+    },
+    "sureButton": {
+      "__id__": 44
+    },
+    "closeButton": {
+      "__id__": 48
+    },
+    "diamond": 0,
+    "_id": ""
   },
   {
     "__type__": "cc.PrefabInfo",

+ 295 - 4
assets/resources/prefabs/draw/drawStarSuccss.prefab

@@ -21,17 +21,20 @@
       },
       {
         "__id__": 6
+      },
+      {
+        "__id__": 64
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 73
     },
     "_opacity": 255,
     "_color": {
@@ -946,7 +949,7 @@
     "asset": {
       "__uuid__": "f72cc06e-a339-494b-9401-6773a18c914f"
     },
-    "fileId": "386WgjP3lKN44BqKavp/gM",
+    "fileId": "1dlvui15FPPb6kNoVr5GqX",
     "sync": false
   },
   {
@@ -1045,7 +1048,7 @@
     "asset": {
       "__uuid__": "f72cc06e-a339-494b-9401-6773a18c914f"
     },
-    "fileId": "54VsD23B5OD5imC4du2fOH",
+    "fileId": "e5gVCM6iJF3oyV3rIHMPr9",
     "sync": false
   },
   {
@@ -2174,6 +2177,294 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "strore_close_btn",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 65
+      }
+    ],
+    "_active": true,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 68
+      },
+      {
+        "__id__": 70
+      }
+    ],
+    "_prefab": {
+      "__id__": 71
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 99,
+      "height": 114
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 225,
+      "y": 297,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_zIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "store_close",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 64
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 4,
+    "_components": [
+      {
+        "__id__": 66
+      }
+    ],
+    "_prefab": {
+      "__id__": 67
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 66,
+      "height": 71
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 18,
+      "y": -9,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_rotationX": 0,
+    "_rotationY": 0,
+    "_quat": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_zIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 65
+    },
+    "_enabled": true,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "3b53aea6-e62a-4433-9e69-df03a3a718a7"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_state": 0,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "f72cc06e-a339-494b-9401-6773a18c914f"
+    },
+    "fileId": "19C36ivEdAuqmpkQr4vRxm",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 64
+    },
+    "_enabled": true,
+    "transition": 1,
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 120,
+      "g": 120,
+      "b": 120,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 69
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$normalSprite": {
+      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
+    },
+    "_N$pressedSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "pressedSprite": {
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
+    },
+    "_N$hoverSprite": {
+      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
+    },
+    "hoverSprite": {
+      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
+    },
+    "_N$disabledSprite": {
+      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
+    },
+    "_N$target": {
+      "__id__": 65
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "DrawStarSuccss",
+    "handler": "closeAction",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 64
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 33,
+    "_left": 0,
+    "_right": 100.5,
+    "_top": 313,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "f72cc06e-a339-494b-9401-6773a18c914f"
+    },
+    "fileId": "75sc+cjeRPD6W1iFGPiHvq",
+    "sync": false
+  },
+  {
     "__type__": "aea30k9tM9N7pm6du2oM1Yi",
     "_name": "",
     "_objFlags": 0,

Файловите разлики са ограничени, защото са твърде много
+ 573 - 116
assets/resources/prefabs/store/storeAlbum.prefab


BIN
assets/resources/textures/star/star_longbtn_bg.png


+ 31 - 0
assets/resources/textures/star/star_longbtn_bg.png.meta

@@ -0,0 +1,31 @@
+{
+  "ver": "2.2.0",
+  "uuid": "92153e23-e43e-4208-b520-6275a86813a1",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "subMetas": {
+    "star_longbtn_bg": {
+      "ver": "1.0.3",
+      "uuid": "6d87a9f4-6966-41ce-95e6-fbb66464eebe",
+      "rawTextureUuid": "92153e23-e43e-4208-b520-6275a86813a1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 340,
+      "height": 80,
+      "rawWidth": 340,
+      "rawHeight": 80,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 37 - 4
assets/scripts/common/commAlert.js

@@ -1,6 +1,8 @@
 const DWTool = require("../utils/DWTool");
 const GameModule = require("../utils/GameModule");
 const ArtistManager = require('../utils/ArtistManager');
+const {GameNotificationKey, WechatShareType} = require('../utils/GameEnum');
+const WeChat = require('../net/WeChat');
 
 
 cc.Class({
@@ -10,6 +12,10 @@ cc.Class({
         iconSprite: cc.Sprite,
         titleRichText: cc.RichText,
         descRichText: cc.RichText,
+
+        sureRichText: cc.RichText,
+        sureButton: cc.Button,
+        closeButton: cc.Node,
         /// 增加钻石的
         diamond: 0,
     },
@@ -24,8 +30,9 @@ cc.Class({
         } else {
             this.descRichText.string = `<color=#540904>${desc}</color>`;
         }
+        this.closeButton.active = true;
         this.titleRichText.string = `<b><color=#540904>${title}</c></b>`;
-
+        this.sureRichText.string = `<b><color=#ffffff>炫耀</c></b>`;
         this._isBuyStar = true;
     },
 
@@ -55,14 +62,40 @@ cc.Class({
 
     },
 
+    //// 只有购买明星才有关闭按钮
+    closeAction() {
+        GameEvent.fire('commAlert_BuyStar_hidden');
+        this.node.destroy();   
+    },
+
     sureAction() {
         if (this.diamond > 0) {
             GameModule.userInfo.diamond += this.diamond;
         }
         GameModule.audioMng.playClickButton();
-        let notificationStr = this._isBuyStar ? 'commAlert_BuyStar_hidden' : 'commAlert_hidden';
-        GameEvent.fire(notificationStr);
-        this.node.destroy();
+        if (this._isBuyStar) {
+            this.sureButton.interactable = false;
+            GameEvent.on(GameNotificationKey.ShowShareAction, this, (type, isOk) => {
+                if (type != WechatShareType.buyStar) { return; }
+                if (isOk) {
+                    GameEvent.fire('commAlert_BuyStar_hidden');
+                    this.node.destroy();
+                } else {
+                    this.sureButton.interactable = true;
+                }
+                GameEvent.off(GameNotificationKey.ShowShareAction, this);
+            });
+            WeChat.shareAction(WechatShareType.buyStar, () => {
+    
+            }, () => {
+                this.sureButton.interactable = true;
+                console.log('分享失败或取消');
+            });
+        } else {
+            GameEvent.fire('commAlert_hidden');
+            this.node.destroy();
+        }
+        
     }
     // update (dt) {},
 });

+ 6 - 0
assets/scripts/draw/DrawStarSuccss.js

@@ -46,6 +46,7 @@ cc.Class({
         let nameString = '获得';
         let desc = '';
         let starId = -1;
+        this.subTitleLabel.string = '现在不需要';
         /// 抽奖获得金币数
         if (drawSuccessData.type == 1) {   
             let rate = TapTapTool.multiple(GameModule.skill.multiple, GameModule.userInfo.perpetualMt);
@@ -170,6 +171,11 @@ cc.Class({
         }
      },
 
+     closeAction()  {
+        this.node.destroy(); 
+        GameEvent.fire("draw_done_action");
+     },
+
     scrollAgainAction() {
         GameModule.audioMng.playClickButton();
         this.againButton.interactable = false;

+ 7 - 7
assets/scripts/store/StoreSubcript.js

@@ -8,9 +8,9 @@ cc.Class({
     properties: {
         btnArr: [cc.Button],
 
-        moneyLabels: [cc.Label],
+        moneyLabels: [cc.RichText],
 
-        titleLabels: [cc.Label],
+        titleLabels: [cc.RichText],
 
         recommendSprite: cc.Node,
     },
@@ -42,18 +42,18 @@ cc.Class({
                 if (hours == 0) {
                     this.moneyLabels[1].string = DWTool.calculateTime(shopDatas[0].cdTime / 1000);
                 } else {
-                    this.moneyLabels[1].string = '剩余' + hours + '小时';
+                    this.moneyLabels[1].string = `<b><color=#540904>${'剩余' + hours + '小时'}</color></b>`;
                 }
             } else {
-                this.moneyLabels[1].string = '剩余' + days + '天' + hours + '小时';
+                this.moneyLabels[1].string = `<b><color=#540904>${'剩余' + days + '天' + hours + '小时'}</color></b>`;
             }
             /// 不能点击
             this.btnArr[1].interactable = false;
             /// 更新价格信息
         } else {
-            this.moneyLabels[0].string = '¥' + this._shopDatas[1].price;
-            this.moneyLabels[1].string = '¥' + this._shopDatas[0].price;
-            this.moneyLabels[2].string = '¥' + this._shopDatas[2].price;
+            this.moneyLabels[0].string = `<b><color=#540904>¥${this._shopDatas[1].price}</color></b>`;
+            this.moneyLabels[1].string = `<b><color=#540904>¥${this._shopDatas[0].price}</color></b>`;
+            this.moneyLabels[2].string = `<b><color=#540904>¥${this._shopDatas[2].price}</color></b>`;
         }
     },
 

+ 1 - 0
assets/scripts/utils/GameEnum.js

@@ -69,6 +69,7 @@ var WechatShareType = cc.Enum({
     UpRoomLevel: 9,       ///升级楼层等级
     FriendHelp: 10,      //好友助力
     drawShare: 11,      //抽奖分享炫耀
+    buyStar: 12,        /// 购买明星炫耀
 });
 
 //视频广告的状态

Някои файлове не бяха показани, защото твърде много файлове са промени