From e0f42554cb5614690e925961af86e4217df9f04c Mon Sep 17 00:00:00 2001 From: Vladislav Date: Thu, 12 Jan 2023 22:23:57 +0400 Subject: [PATCH] Button mark + gold mainmenu animation --- .../Media/Animation/Game/TitleMenu/Open.anim | 172 ++++++- assets/Media/Images/Game/UI/ButtonMark.png | Bin 0 -> 197 bytes .../Media/Images/Game/UI/ButtonMark.png.meta | 134 +++++ assets/Scenes/Menu.scene | 456 +++++++++--------- 4 files changed, 520 insertions(+), 242 deletions(-) create mode 100644 assets/Media/Images/Game/UI/ButtonMark.png create mode 100644 assets/Media/Images/Game/UI/ButtonMark.png.meta diff --git a/assets/Media/Animation/Game/TitleMenu/Open.anim b/assets/Media/Animation/Game/TitleMenu/Open.anim index 1b7b25b..802ba74 100644 --- a/assets/Media/Animation/Game/TitleMenu/Open.anim +++ b/assets/Media/Animation/Game/TitleMenu/Open.anim @@ -37,6 +37,9 @@ }, { "__id__": 79 + }, + { + "__id__": 91 } ], "_exoticAnimation": null, @@ -204,9 +207,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.8333333134651184, - 1.6666666269302368, - 20.600000381469727 + 0.8333333333333334, + 1.6666666666666667, + 20.6 ], "_values": [ { @@ -268,7 +271,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 20.600000381469727 + 20.6 ], "_values": [ { @@ -345,9 +348,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.8333333134651184, - 1.6666666269302368, - 20.600000381469727 + 0.8333333333333334, + 1.6666666666666667, + 20.6 ], "_values": [ { @@ -485,8 +488,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.3166667222976685, - 16.183332443237305 + 1.3166666666666667, + 16.183333333333334 ], "_values": [ { @@ -498,10 +501,7 @@ "rightTangentWeight": 38.45438003540039, "leftTangent": -0.5, "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": { - "broken": true - } + "easingMethod": 0 }, { "__type__": "cc.RealKeyframeValue", @@ -512,8 +512,7 @@ "rightTangentWeight": 1, "leftTangent": 1.4227283000946045, "leftTangentWeight": 11.992213249206543, - "easingMethod": 0, - "__editorExtras__": null + "easingMethod": 0 } ], "preExtrapolation": 1, @@ -637,7 +636,7 @@ "__type__": "cc.RealCurve", "_times": [ 1.5, - 5.949999809265137 + 5.95 ], "_values": [ { @@ -725,8 +724,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.8333333134651184, - 1.6666666269302368 + 0.8333333333333334, + 1.6666666666666667 ], "_values": [ { @@ -827,7 +826,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.649999976158142 + 1.65 ], "_values": [ { @@ -854,8 +853,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.1666666269302368, - 1.8333333730697632 + 1.1666666666666667, + 1.8333333333333333 ], "_values": [ { @@ -893,7 +892,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.649999976158142 + 1.65 ], "_values": [ { @@ -977,7 +976,7 @@ "__type__": "cc.RealCurve", "_times": [ 1.5, - 3.7166666984558105 + 3.716666666666667 ], "_values": [ { @@ -1016,7 +1015,7 @@ "__type__": "cc.RealCurve", "_times": [ 1.5, - 3.7166666984558105 + 3.716666666666667 ], "_values": [ { @@ -1055,7 +1054,7 @@ "__type__": "cc.RealCurve", "_times": [ 1.5, - 3.7166666984558105 + 3.716666666666667 ], "_values": [ { @@ -1094,7 +1093,7 @@ "__type__": "cc.RealCurve", "_times": [ 1.5, - 3.7166666984558105 + 3.716666666666667 ], "_values": [ { @@ -1122,5 +1121,126 @@ ], "preExtrapolation": 1, "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 92 + } + }, + "_channels": [ + { + "__id__": 94 + }, + { + "__id__": 96 + }, + { + "__id__": 98 + }, + { + "__id__": 100 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 93 + }, + "position" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "GoldCounter" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 95 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 1.0666666666666667, + 1.9166666666666667 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 2, + "value": -487.884, + "rightTangent": 1099.2325224489798, + "rightTangentWeight": 224.42673286782053, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 1, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 54.309907235621544, + "leftTangentWeight": 24.39833486806918, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 97 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 99 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 101 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 } ] \ No newline at end of file diff --git a/assets/Media/Images/Game/UI/ButtonMark.png b/assets/Media/Images/Game/UI/ButtonMark.png new file mode 100644 index 0000000000000000000000000000000000000000..f5469589210893fa941a8c954b9b80e37e020ad8 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VJ)SO(Are!Q|NQ@N&&*+vW$h^8 z@!l(9 uZ?_GLjF0vxF!mH!z1=u}Vq;??BZKux+nEve^NfJ*V(@hJb6Mw<&;$T7-9DiJ literal 0 HcmV?d00001 diff --git a/assets/Media/Images/Game/UI/ButtonMark.png.meta b/assets/Media/Images/Game/UI/ButtonMark.png.meta new file mode 100644 index 0000000..148f292 --- /dev/null +++ b/assets/Media/Images/Game/UI/ButtonMark.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.25", + "importer": "image", + "imported": true, + "uuid": "a08a50b7-a28a-4cb6-a42f-2585fab5b6ae", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "a08a50b7-a28a-4cb6-a42f-2585fab5b6ae@6c48a", + "displayName": "ButtonMark", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "nearest", + "magfilter": "nearest", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "a08a50b7-a28a-4cb6-a42f-2585fab5b6ae", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "a08a50b7-a28a-4cb6-a42f-2585fab5b6ae@f9941", + "displayName": "ButtonMark", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 9, + "height": 9, + "rawWidth": 9, + "rawHeight": 9, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -4.5, + -4.5, + 0, + 4.5, + -4.5, + 0, + -4.5, + 4.5, + 0, + 4.5, + 4.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 9, + 9, + 9, + 0, + 0, + 9, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -4.5, + -4.5, + 0 + ], + "maxPos": [ + 4.5, + 4.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "a08a50b7-a28a-4cb6-a42f-2585fab5b6ae@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.11", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": true, + "hasAlpha": true, + "redirect": "a08a50b7-a28a-4cb6-a42f-2585fab5b6ae@f9941" + } +} diff --git a/assets/Scenes/Menu.scene b/assets/Scenes/Menu.scene index ef67449..92a974c 100644 --- a/assets/Scenes/Menu.scene +++ b/assets/Scenes/Menu.scene @@ -18,17 +18,17 @@ "__id__": 2 }, { - "__id__": 22 + "__id__": 24 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 102 + "__id__": 104 }, "autoReleaseAssets": false, "_globals": { - "__id__": 103 + "__id__": 105 }, "_id": "1a3bccb5-bbb7-4058-846c-ed41b52415b0" }, @@ -58,7 +58,7 @@ }, "targetOverrides": [ { - "__id__": 12 + "__id__": 14 } ] }, @@ -82,6 +82,9 @@ }, { "__id__": 10 + }, + { + "__id__": 12 } ], "removedComponents": [] @@ -168,6 +171,27 @@ "3cU8u+g/ZHqZh/QeLhRGlh" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 13 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f9c0nAyY1AEY+29CNy1WVz" + ] + }, { "__type__": "cc.TargetOverrideInfo", "source": null, @@ -176,10 +200,10 @@ "y8" ], "target": { - "__id__": 13 + "__id__": 15 }, "targetInfo": { - "__id__": 21 + "__id__": 23 } }, { @@ -189,14 +213,14 @@ "__id__": 2 }, "_prefab": { - "__id__": 14 + "__id__": 16 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 13 + "__id__": 15 }, "asset": { "__uuid__": "f668086a-2bff-40eb-a029-dd891718441d", @@ -204,7 +228,7 @@ }, "fileId": "5da9o8mwlJl5XD861jGbYx", "instance": { - "__id__": 15 + "__id__": 17 } }, { @@ -216,17 +240,17 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 16 - }, { "__id__": 18 }, { - "__id__": 19 + "__id__": 20 }, { - "__id__": 20 + "__id__": 21 + }, + { + "__id__": 22 } ], "removedComponents": [] @@ -234,7 +258,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 17 + "__id__": 19 }, "propertyPath": [ "_name" @@ -250,7 +274,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 17 + "__id__": 19 }, "propertyPath": [ "_lpos" @@ -265,7 +289,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 17 + "__id__": 19 }, "propertyPath": [ "_lrot" @@ -281,7 +305,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 17 + "__id__": 19 }, "propertyPath": [ "_euler" @@ -308,53 +332,47 @@ }, "_children": [ { - "__id__": 23 + "__id__": 25 }, { - "__id__": 26 + "__id__": 28 }, { - "__id__": 29 + "__id__": 31 }, { - "__id__": 35 + "__id__": 37 }, { - "__id__": 41 + "__id__": 43 }, { - "__id__": 44 + "__id__": 46 }, { - "__id__": 47 + "__id__": 49 }, { - "__id__": 53 + "__id__": 55 }, { - "__id__": 62 + "__id__": 64 }, { - "__id__": 74 + "__id__": 76 }, { - "__id__": 83 + "__id__": 85 }, { - "__id__": 86 + "__id__": 88 }, { - "__id__": 89 + "__id__": 91 } ], "_active": true, "_components": [ - { - "__id__": 97 - }, - { - "__id__": 98 - }, { "__id__": 99 }, @@ -363,13 +381,19 @@ }, { "__id__": 101 + }, + { + "__id__": 102 + }, + { + "__id__": 103 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": 320.00000000000006, - "y": 480.00000000000006, + "y": 479.99999999999994, "z": 0 }, "_lrot": { @@ -399,16 +423,16 @@ "_name": "Background", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 26 }, { - "__id__": 25 + "__id__": 27 } ], "_prefab": null, @@ -445,7 +469,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 23 + "__id__": 25 }, "_enabled": true, "__prefab": null, @@ -466,7 +490,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 23 + "__id__": 25 }, "_enabled": true, "__prefab": null, @@ -504,16 +528,16 @@ "_name": "BackgroundGradient", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [], "_active": true, "_components": [ { - "__id__": 27 + "__id__": 29 }, { - "__id__": 28 + "__id__": 30 } ], "_prefab": null, @@ -550,7 +574,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 26 + "__id__": 28 }, "_enabled": true, "__prefab": null, @@ -571,7 +595,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 26 + "__id__": 28 }, "_enabled": true, "__prefab": null, @@ -609,20 +633,20 @@ "_name": "TopGradient", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [ { - "__id__": 30 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 35 }, { - "__id__": 34 + "__id__": 36 } ], "_prefab": null, @@ -659,16 +683,16 @@ "_name": "RectAddon-001", "_objFlags": 0, "_parent": { - "__id__": 29 + "__id__": 31 }, "_children": [], "_active": true, "_components": [ { - "__id__": 31 + "__id__": 33 }, { - "__id__": 32 + "__id__": 34 } ], "_prefab": null, @@ -705,7 +729,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 30 + "__id__": 32 }, "_enabled": true, "__prefab": null, @@ -726,7 +750,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 30 + "__id__": 32 }, "_enabled": true, "__prefab": null, @@ -764,7 +788,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 31 }, "_enabled": true, "__prefab": null, @@ -785,7 +809,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 31 }, "_enabled": true, "__prefab": null, @@ -823,20 +847,20 @@ "_name": "BottomGradient", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [ { - "__id__": 36 + "__id__": 38 } ], "_active": true, "_components": [ { - "__id__": 39 + "__id__": 41 }, { - "__id__": 40 + "__id__": 42 } ], "_prefab": null, @@ -873,16 +897,16 @@ "_name": "RectAddon", "_objFlags": 0, "_parent": { - "__id__": 35 + "__id__": 37 }, "_children": [], "_active": true, "_components": [ { - "__id__": 37 + "__id__": 39 }, { - "__id__": 38 + "__id__": 40 } ], "_prefab": null, @@ -919,7 +943,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 36 + "__id__": 38 }, "_enabled": true, "__prefab": null, @@ -940,7 +964,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 36 + "__id__": 38 }, "_enabled": true, "__prefab": null, @@ -978,7 +1002,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 35 + "__id__": 37 }, "_enabled": true, "__prefab": null, @@ -999,7 +1023,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 35 + "__id__": 37 }, "_enabled": true, "__prefab": null, @@ -1037,16 +1061,16 @@ "_name": "LogoImage", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [], "_active": true, "_components": [ { - "__id__": 42 + "__id__": 44 }, { - "__id__": 43 + "__id__": 45 } ], "_prefab": null, @@ -1083,7 +1107,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 41 + "__id__": 43 }, "_enabled": true, "__prefab": null, @@ -1104,7 +1128,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 41 + "__id__": 43 }, "_enabled": true, "__prefab": null, @@ -1142,16 +1166,16 @@ "_name": "SunImage", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [], "_active": true, "_components": [ { - "__id__": 45 + "__id__": 47 }, { - "__id__": 46 + "__id__": 48 } ], "_prefab": null, @@ -1188,7 +1212,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 44 + "__id__": 46 }, "_enabled": true, "__prefab": null, @@ -1209,7 +1233,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 44 + "__id__": 46 }, "_enabled": true, "__prefab": null, @@ -1247,20 +1271,20 @@ "_name": "HordeImage", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [ { - "__id__": 48 + "__id__": 50 } ], "_active": true, "_components": [ { - "__id__": 51 + "__id__": 53 }, { - "__id__": 52 + "__id__": 54 } ], "_prefab": null, @@ -1297,16 +1321,16 @@ "_name": "RectAddon", "_objFlags": 0, "_parent": { - "__id__": 47 + "__id__": 49 }, "_children": [], "_active": true, "_components": [ { - "__id__": 49 + "__id__": 51 }, { - "__id__": 50 + "__id__": 52 } ], "_prefab": null, @@ -1343,7 +1367,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 48 + "__id__": 50 }, "_enabled": true, "__prefab": null, @@ -1364,7 +1388,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 48 + "__id__": 50 }, "_enabled": true, "__prefab": null, @@ -1402,7 +1426,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 47 + "__id__": 49 }, "_enabled": true, "__prefab": null, @@ -1423,7 +1447,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 47 + "__id__": 49 }, "_enabled": true, "__prefab": null, @@ -1461,21 +1485,15 @@ "_name": "PlayBtn", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [ { - "__id__": 54 + "__id__": 56 } ], "_active": true, "_components": [ - { - "__id__": 57 - }, - { - "__id__": 58 - }, { "__id__": 59 }, @@ -1484,6 +1502,12 @@ }, { "__id__": 61 + }, + { + "__id__": 62 + }, + { + "__id__": 63 } ], "_prefab": null, @@ -1520,16 +1544,16 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 53 + "__id__": 55 }, "_children": [], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 57 }, { - "__id__": 56 + "__id__": 58 } ], "_prefab": null, @@ -1566,7 +1590,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 54 + "__id__": 56 }, "_enabled": true, "__prefab": null, @@ -1587,7 +1611,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 54 + "__id__": 56 }, "_enabled": true, "__prefab": null, @@ -1628,7 +1652,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 55 }, "_enabled": true, "__prefab": null, @@ -1649,7 +1673,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 55 }, "_enabled": true, "__prefab": null, @@ -1687,7 +1711,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 55 }, "_enabled": true, "__prefab": null, @@ -1741,7 +1765,7 @@ "_duration": 0.1, "_zoomScale": 0.92, "_target": { - "__id__": 53 + "__id__": 55 }, "_id": "abjYBOPMJCK7GsAsqNfoj3" }, @@ -1750,7 +1774,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 55 }, "_enabled": true, "__prefab": null, @@ -1761,12 +1785,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 55 }, "_enabled": true, "__prefab": null, "button": { - "__id__": 60 + "__id__": 62 }, "_id": "3f/GLS2YxHJI360Fym4+Nl" }, @@ -1775,24 +1799,18 @@ "_name": "UpgradesBtn", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [ { - "__id__": 63 + "__id__": 65 }, { - "__id__": 66 + "__id__": 68 } ], "_active": true, "_components": [ - { - "__id__": 69 - }, - { - "__id__": 70 - }, { "__id__": 71 }, @@ -1801,6 +1819,12 @@ }, { "__id__": 73 + }, + { + "__id__": 74 + }, + { + "__id__": 75 } ], "_prefab": null, @@ -1837,16 +1861,16 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 62 + "__id__": 64 }, "_children": [], "_active": true, "_components": [ { - "__id__": 64 + "__id__": 66 }, { - "__id__": 65 + "__id__": 67 } ], "_prefab": null, @@ -1883,7 +1907,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 63 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -1904,7 +1928,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 63 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -1945,23 +1969,23 @@ "_name": "UpgradeAvailableIndicator", "_objFlags": 0, "_parent": { - "__id__": 62 + "__id__": 64 }, "_children": [], "_active": true, "_components": [ { - "__id__": 67 + "__id__": 69 }, { - "__id__": 68 + "__id__": 70 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 69.482, - "y": -13.615, + "x": 64, + "y": 18.5, "z": 0 }, "_lrot": { @@ -1991,14 +2015,14 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 66 + "__id__": 68 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 20, - "height": 20 + "width": 9, + "height": 9 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2012,7 +2036,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 66 + "__id__": 68 }, "_enabled": true, "__prefab": null, @@ -2022,17 +2046,17 @@ "_color": { "__type__": "cc.Color", "r": 255, - "g": 0, - "b": 0, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "0a917d5c-2810-46e1-8332-63f00395d63a@f9941", + "__uuid__": "a08a50b7-a28a-4cb6-a42f-2585fab5b6ae@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2053,7 +2077,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 64 }, "_enabled": true, "__prefab": null, @@ -2074,7 +2098,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 64 }, "_enabled": true, "__prefab": null, @@ -2112,7 +2136,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 64 }, "_enabled": true, "__prefab": null, @@ -2166,7 +2190,7 @@ "_duration": 0.1, "_zoomScale": 0.92, "_target": { - "__id__": 62 + "__id__": 64 }, "_id": "02km9/CjtM4LntV5ZcaVeR" }, @@ -2175,7 +2199,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 64 }, "_enabled": true, "__prefab": null, @@ -2186,12 +2210,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 62 + "__id__": 64 }, "_enabled": true, "__prefab": null, "button": { - "__id__": 72 + "__id__": 74 }, "_id": "adNyH1o7lEPoaiPeZSxUCn" }, @@ -2200,21 +2224,15 @@ "_name": "AudioSettingsBtn", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [ { - "__id__": 75 + "__id__": 77 } ], "_active": true, "_components": [ - { - "__id__": 78 - }, - { - "__id__": 79 - }, { "__id__": 80 }, @@ -2223,6 +2241,12 @@ }, { "__id__": 82 + }, + { + "__id__": 83 + }, + { + "__id__": 84 } ], "_prefab": null, @@ -2259,16 +2283,16 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 74 + "__id__": 76 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 78 }, { - "__id__": 77 + "__id__": 79 } ], "_prefab": null, @@ -2305,7 +2329,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 77 }, "_enabled": true, "__prefab": null, @@ -2326,7 +2350,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 77 }, "_enabled": true, "__prefab": null, @@ -2367,7 +2391,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -2388,7 +2412,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -2426,7 +2450,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -2480,7 +2504,7 @@ "_duration": 0.1, "_zoomScale": 0.92, "_target": { - "__id__": 74 + "__id__": 76 }, "_id": "83MUZ70BBPoqpCJzA3nVTN" }, @@ -2489,7 +2513,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -2500,12 +2524,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": null, "button": { - "__id__": 81 + "__id__": 83 }, "_id": "6bWmS+us9G55ZQR94w+B3i" }, @@ -2514,23 +2538,23 @@ "_name": "HighscoreLabel", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [], "_active": true, "_components": [ { - "__id__": 84 + "__id__": 86 }, { - "__id__": 85 + "__id__": 87 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -32.887, + "y": 231.847, "z": 0 }, "_lrot": { @@ -2560,7 +2584,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 83 + "__id__": 85 }, "_enabled": true, "__prefab": null, @@ -2581,7 +2605,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 83 + "__id__": 85 }, "_enabled": true, "__prefab": null, @@ -2622,16 +2646,16 @@ "_name": "Y8Logo", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [], "_active": true, "_components": [ { - "__id__": 87 + "__id__": 89 }, { - "__id__": 88 + "__id__": 90 } ], "_prefab": null, @@ -2668,7 +2692,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 86 + "__id__": 88 }, "_enabled": true, "__prefab": null, @@ -2689,7 +2713,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 86 + "__id__": 88 }, "_enabled": true, "__prefab": null, @@ -2727,27 +2751,27 @@ "_name": "GoldCounter", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 24 }, "_children": [ { - "__id__": 90 + "__id__": 92 }, { - "__id__": 93 + "__id__": 95 } ], "_active": true, "_components": [ { - "__id__": 96 + "__id__": 98 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -4.065, + "y": -25.446, "z": 0 }, "_lrot": { @@ -2777,16 +2801,16 @@ "_name": "GoldSprite", "_objFlags": 0, "_parent": { - "__id__": 89 + "__id__": 91 }, "_children": [], "_active": true, "_components": [ { - "__id__": 91 + "__id__": 93 }, { - "__id__": 92 + "__id__": 94 } ], "_prefab": null, @@ -2823,7 +2847,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 90 + "__id__": 92 }, "_enabled": true, "__prefab": null, @@ -2844,7 +2868,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 90 + "__id__": 92 }, "_enabled": true, "__prefab": null, @@ -2885,22 +2909,22 @@ "_name": "GoldLabel", "_objFlags": 0, "_parent": { - "__id__": 89 + "__id__": 91 }, "_children": [], "_active": true, "_components": [ { - "__id__": 94 + "__id__": 96 }, { - "__id__": 95 + "__id__": 97 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 1.185, + "x": 9.926, "y": 0, "z": 0 }, @@ -2931,7 +2955,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 93 + "__id__": 95 }, "_enabled": true, "__prefab": null, @@ -2952,7 +2976,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 93 + "__id__": 95 }, "_enabled": true, "__prefab": null, @@ -2993,7 +3017,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 89 + "__id__": 91 }, "_enabled": true, "__prefab": null, @@ -3014,7 +3038,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 24 }, "_enabled": true, "__prefab": null, @@ -3035,7 +3059,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 24 }, "_enabled": true, "__prefab": null, @@ -3048,7 +3072,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 24 }, "_enabled": true, "__prefab": null, @@ -3056,8 +3080,8 @@ "_target": null, "_left": 5.684341886080802e-14, "_right": 5.684341886080802e-14, - "_top": 5.684341886080802e-14, - "_bottom": 5.684341886080802e-14, + "_top": -5.684341886080802e-14, + "_bottom": -5.684341886080802e-14, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3077,33 +3101,33 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 24 }, "_enabled": true, "__prefab": null, "playBtn": { - "__id__": 60 + "__id__": 62 }, "upgradeBtn": { - "__id__": 72 + "__id__": 74 }, "upgradeAvailableIndicator": { - "__id__": 66 + "__id__": 68 }, "goldCounter": { - "__id__": 89 + "__id__": 91 }, "goldLabel": { - "__id__": 95 + "__id__": 97 }, "audioSettingsBtn": { - "__id__": 81 + "__id__": 83 }, "menuCanvas": { - "__id__": 98 + "__id__": 100 }, "highscoreLabel": { - "__id__": 85 + "__id__": 87 }, "_id": "4cQFnvx1xB65sFsTPGRrB7" }, @@ -3112,7 +3136,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 24 }, "_enabled": true, "__prefab": null, @@ -3141,19 +3165,19 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 104 - }, - "shadows": { - "__id__": 105 - }, - "_skybox": { "__id__": 106 }, - "fog": { + "shadows": { "__id__": 107 }, - "octree": { + "_skybox": { "__id__": 108 + }, + "fog": { + "__id__": 109 + }, + "octree": { + "__id__": 110 } }, {