diff --git a/assets/Media/Animation/Game/TitleMenu/Open.anim b/assets/Media/Animation/Game/TitleMenu/Open.anim index 802ba74..874a8f9 100644 --- a/assets/Media/Animation/Game/TitleMenu/Open.anim +++ b/assets/Media/Animation/Game/TitleMenu/Open.anim @@ -43,7 +43,13 @@ } ], "_exoticAnimation": null, - "_events": [], + "_events": [ + { + "frame": 16.183333333333334, + "func": "", + "params": [] + } + ], "_embeddedPlayers": [] }, { @@ -113,9 +119,9 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 2, "tangentWeightMode": 2, - "value": 630.9609985351562, - "rightTangent": -1515.6884765625, - "rightTangentWeight": 242.5102081298828, + "value": 472.093994140625, + "rightTangent": -443.2817687988281, + "rightTangentWeight": 110.82072448730469, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0 @@ -124,11 +130,11 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 2, "tangentWeightMode": 1, - "value": 342.2584228515625, + "value": 247.8719940185547, "rightTangent": 0, "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 0.5699999928474426, + "leftTangent": -21.901273727416992, + "leftTangentWeight": 12.058250427246094, "easingMethod": 0 } ], @@ -474,8 +480,22 @@ }, { "__type__": "cc.RealCurve", - "_times": [], - "_values": [], + "_times": [ + 16.183333333333334 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0 + } + ], "preExtrapolation": 1, "postExtrapolation": 1 }, @@ -507,7 +527,7 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 2, "tangentWeightMode": 1, - "value": -250.343994140625, + "value": -273, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 1.4227283000946045, @@ -526,8 +546,22 @@ }, { "__type__": "cc.RealCurve", - "_times": [], - "_values": [], + "_times": [ + 16.183333333333334 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0 + } + ], "preExtrapolation": 1, "postExtrapolation": 1 }, @@ -710,8 +744,22 @@ }, { "__type__": "cc.RealCurve", - "_times": [], - "_values": [], + "_times": [ + 1.6666666666666667 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0 + } + ], "preExtrapolation": 1, "postExtrapolation": 1 }, @@ -733,8 +781,8 @@ "interpolationMode": 2, "tangentWeightMode": 2, "value": -536.6669921875, - "rightTangent": 410.6460266113281, - "rightTangentWeight": 85.551513671875, + "rightTangent": 715.3125, + "rightTangentWeight": 149.02357482910156, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0 @@ -743,11 +791,11 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 2, "tangentWeightMode": 1, - "value": -350.6860046386719, + "value": -212.7030029296875, "rightTangent": 0, "rightTangentWeight": 1, - "leftTangent": 20.288835525512695, - "leftTangentWeight": 9.310338020324707, + "leftTangent": 35.34152603149414, + "leftTangentWeight": 16.204683303833008, "easingMethod": 0 } ], @@ -762,8 +810,22 @@ }, { "__type__": "cc.RealCurve", - "_times": [], - "_values": [], + "_times": [ + 1.6666666666666667 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0 + } + ], "preExtrapolation": 1, "postExtrapolation": 1 }, @@ -825,22 +887,8 @@ }, { "__type__": "cc.RealCurve", - "_times": [ - 1.65 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0 - } - ], + "_times": [], + "_values": [], "preExtrapolation": 1, "postExtrapolation": 1 }, @@ -861,7 +909,7 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 2, "tangentWeightMode": 2, - "value": -566.7440185546875, + "value": -476.947998046875, "rightTangent": 394.11419677734375, "rightTangentWeight": 65.6859130859375, "leftTangent": 0, @@ -872,7 +920,7 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 2, "tangentWeightMode": 1, - "value": -423.9490051269531, + "value": -290.1600036621094, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 19.4720458984375, @@ -891,22 +939,8 @@ }, { "__type__": "cc.RealCurve", - "_times": [ - 1.65 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0 - } - ], + "_times": [], + "_values": [], "preExtrapolation": 1, "postExtrapolation": 1 }, @@ -1176,15 +1210,12 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 2, "tangentWeightMode": 2, - "value": -487.884, - "rightTangent": 1099.2325224489798, - "rightTangentWeight": 224.42673286782053, + "value": -487.8840026855469, + "rightTangent": 1099.2325439453125, + "rightTangentWeight": 224.42672729492188, "leftTangent": 0, "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "easingMethod": 0 }, { "__type__": "cc.RealKeyframeValue", @@ -1193,12 +1224,9 @@ "value": 0, "rightTangent": 0, "rightTangentWeight": 1, - "leftTangent": 54.309907235621544, - "leftTangentWeight": 24.39833486806918, - "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "leftTangent": 54.309906005859375, + "leftTangentWeight": 24.398334503173828, + "easingMethod": 0 } ], "preExtrapolation": 1, diff --git a/assets/Media/Animation/Game/UI/GeneralModal/open.anim b/assets/Media/Animation/Game/UI/GeneralModal/open.anim index 4b8815c..0753d54 100644 --- a/assets/Media/Animation/Game/UI/GeneralModal/open.anim +++ b/assets/Media/Animation/Game/UI/GeneralModal/open.anim @@ -114,8 +114,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333432674408, - 0.5833333134651184 + 0.3333333333333333, + 0.5833333333333334 ], "_values": [ { @@ -165,8 +165,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333432674408, - 0.5833333134651184 + 0.3333333333333333, + 0.5833333333333334 ], "_values": [ { @@ -216,8 +216,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333432674408, - 0.5833333134651184 + 0.3333333333333333, + 0.5833333333333334 ], "_values": [ { @@ -267,8 +267,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333432674408, - 0.5833333134651184 + 0.3333333333333333, + 0.5833333333333334 ], "_values": [ { @@ -354,8 +354,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.3333333432674408, - 0.5833333134651184 + 0.3333333333333333, + 0.5833333333333334 ], "_values": [ { @@ -393,15 +393,15 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.3333333432674408, - 0.5833333134651184 + 0.3333333333333333, + 0.5833333333333334 ], "_values": [ { "__type__": "cc.RealKeyframeValue", "interpolationMode": 2, "tangentWeightMode": 2, - "value": -1000, + "value": -715.794, "rightTangent": 7360, "rightTangentWeight": 460, "leftTangent": 0, @@ -432,8 +432,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.3333333432674408, - 0.5833333134651184 + 0.3333333333333333, + 0.5833333333333334 ], "_values": [ { @@ -521,9 +521,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.699999988079071, - 0.9166666865348816, - 1.0833333730697632 + 0.7, + 0.9166666666666666, + 1.0833333333333333 ], "_values": [ { @@ -572,11 +572,11 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.550000011920929, - 0.699999988079071, - 0.7666666507720947, - 0.9166666865348816, - 1.0833333730697632 + 0.55, + 0.7, + 0.7666666666666667, + 0.9166666666666666, + 1.0833333333333333 ], "_values": [ { @@ -647,9 +647,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.699999988079071, - 0.9166666865348816, - 1.0833333730697632 + 0.7, + 0.9166666666666666, + 1.0833333333333333 ], "_values": [ { @@ -748,9 +748,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.550000011920929, - 0.699999988079071, - 0.7666666507720947 + 0.55, + 0.7, + 0.7666666666666667 ], "_values": [ { @@ -799,9 +799,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.550000011920929, - 0.699999988079071, - 0.7666666507720947 + 0.55, + 0.7, + 0.7666666666666667 ], "_values": [ { @@ -997,9 +997,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.7666666507720947, - 0.9166666865348816, - 1.0833333730697632 + 0.7666666666666667, + 0.9166666666666666, + 1.0833333333333333 ], "_values": [ { @@ -1048,9 +1048,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.7666666507720947, - 0.9166666865348816, - 1.0833333730697632 + 0.7666666666666667, + 0.9166666666666666, + 1.0833333333333333 ], "_values": [ { @@ -1099,8 +1099,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.9166666865348816, - 1.0833333730697632 + 0.9166666666666666, + 1.0833333333333333 ], "_values": [ { @@ -1201,8 +1201,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.8166666626930237, - 1.0499999523162842 + 0.8166666666666667, + 1.05 ], "_values": [ { @@ -1304,7 +1304,7 @@ "__type__": "cc.RealCurve", "_times": [ 1.25, - 1.5833333730697632 + 1.5833333333333333 ], "_values": [ { @@ -1342,9 +1342,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.0499999523162842, - 1.5666667222976685, - 1.7000000476837158 + 1.05, + 1.5666666666666667, + 1.7 ], "_values": [ { @@ -1394,7 +1394,7 @@ "__type__": "cc.RealCurve", "_times": [ 1.25, - 1.5833333730697632 + 1.5833333333333333 ], "_values": [ { @@ -1570,10 +1570,10 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.8833333253860474, - 1.0166666507720947, - 1.1166666746139526, - 1.8166667222976685 + 0.8833333333333333, + 1.0166666666666666, + 1.1166666666666667, + 1.8166666666666667 ], "_values": [ { @@ -1687,7 +1687,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.600000023841858 + 1.6 ], "_values": [ { @@ -1714,7 +1714,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.600000023841858 + 1.6 ], "_values": [ { @@ -1741,7 +1741,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.600000023841858 + 1.6 ], "_values": [ { @@ -1768,8 +1768,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.0666667222976685, - 1.5166666507720947 + 1.0666666666666667, + 1.5166666666666666 ], "_values": [ { @@ -1850,7 +1850,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.1666666269302368 + 1.1666666666666667 ], "_values": [ { @@ -1877,7 +1877,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.1666666269302368 + 1.1666666666666667 ], "_values": [ { @@ -1904,7 +1904,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.1666666269302368 + 1.1666666666666667 ], "_values": [ { @@ -1932,10 +1932,10 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 1.1666666269302368, - 1.7999999523162842, + 1.1666666666666667, + 1.8, 5, - 7.016666889190674 + 7.016666666666667 ], "_values": [ { @@ -2043,7 +2043,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.8166667222976685 + 1.8166666666666667 ], "_values": [ { @@ -2070,9 +2070,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.1166666746139526, - 1.600000023841858, - 1.8166667222976685 + 1.1166666666666667, + 1.6, + 1.8166666666666667 ], "_values": [ { @@ -2121,7 +2121,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.8166667222976685 + 1.8166666666666667 ], "_values": [ { @@ -2198,7 +2198,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 7.016666889190674 + 7.016666666666667 ], "_values": [ { @@ -2225,7 +2225,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 7.016666889190674 + 7.016666666666667 ], "_values": [ { @@ -2252,8 +2252,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.1666666269302368, - 7.016666889190674 + 1.1666666666666667, + 7.016666666666667 ], "_values": [ { diff --git a/assets/Media/Animation/Game/UpgAvailIndicator.anim b/assets/Media/Animation/Game/UpgAvailIndicator.anim new file mode 100644 index 0000000..3eb78b4 --- /dev/null +++ b/assets/Media/Animation/Game/UpgAvailIndicator.anim @@ -0,0 +1,183 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "UpgAvailIndicator", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 60, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.8333333333333334, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [] + }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + } + }, + "_channels": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 9 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + "scale" + ] + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 4 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.3333333333333333, + 0.8333333333333334 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 2, + "value": 0.92, + "rightTangent": 0.02500000037252903, + "rightTangentWeight": 0.16004998981952667, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0 + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 3, + "value": 1, + "rightTangent": -0.01666666753590107, + "rightTangentWeight": 0.2400333285331726, + "leftTangent": 0.02500000037252903, + "leftTangentWeight": 0.16004998981952667, + "easingMethod": 0 + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 1, + "value": 0.92, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": -0.01666666753590107, + "leftTangentWeight": 0.2400333285331726, + "easingMethod": 0 + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.3333333333333333, + 0.8333333333333334 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 2, + "value": 0.92, + "rightTangent": 0.02500000037252903, + "rightTangentWeight": 0.16004998981952667, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0 + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 3, + "value": 1, + "rightTangent": -0.01666666753590107, + "rightTangentWeight": 0.2400333285331726, + "leftTangent": 0.02500000037252903, + "leftTangentWeight": 0.16004998981952667, + "easingMethod": 0 + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 1, + "value": 0.92, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": -0.01666666753590107, + "leftTangentWeight": 0.2400333285331726, + "easingMethod": 0 + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 8 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 10 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + } +] \ No newline at end of file diff --git a/assets/Media/Animation/Game/UpgAvailIndicator.anim.meta b/assets/Media/Animation/Game/UpgAvailIndicator.anim.meta new file mode 100644 index 0000000..65cda7d --- /dev/null +++ b/assets/Media/Animation/Game/UpgAvailIndicator.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "bff9f8ad-6017-4ce9-9e0a-db0b30fc7b30", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "UpgAvailIndicator" + } +} diff --git a/assets/Media/Images/Game/UI/ButtonMark.png b/assets/Media/Images/Game/UI/ButtonMark.png index f546958..228b4b5 100644 Binary files a/assets/Media/Images/Game/UI/ButtonMark.png and b/assets/Media/Images/Game/UI/ButtonMark.png differ diff --git a/assets/Media/Images/Game/UI/ButtonMark.png.meta b/assets/Media/Images/Game/UI/ButtonMark.png.meta index 148f292..4a13647 100644 --- a/assets/Media/Images/Game/UI/ButtonMark.png.meta +++ b/assets/Media/Images/Game/UI/ButtonMark.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 9, - "height": 9, - "rawWidth": 9, - "rawHeight": 9, + "width": 10, + "height": 17, + "rawWidth": 10, + "rawHeight": 17, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -4.5, - -4.5, + -5, + -8.5, 0, - 4.5, - -4.5, + 5, + -8.5, 0, - -4.5, - 4.5, + -5, + 8.5, 0, - 4.5, - 4.5, + 5, + 8.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 9, - 9, - 9, + 17, + 10, + 17, 0, 0, - 9, + 10, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -4.5, - -4.5, + -5, + -8.5, 0 ], "maxPos": [ - 4.5, - 4.5, + 5, + 8.5, 0 ] }, diff --git a/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab index e932520..86b9bfd 100644 --- a/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab @@ -186,8 +186,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 600, + "height": 800 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -752,7 +752,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 120, + "x": 106, "y": -17, "z": 0 }, @@ -967,7 +967,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 280, + "width": 246, "height": 35 }, "_anchorPoint": { @@ -1078,7 +1078,7 @@ "__id__": 12 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 46 @@ -1207,7 +1207,7 @@ "__id__": 12 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 52 @@ -1599,7 +1599,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 280, + "width": 246, "height": 230 }, "_anchorPoint": { @@ -1983,7 +1983,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 228, + "width": 208, "height": 9 }, "_anchorPoint": { @@ -2076,7 +2076,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -100, + "x": -90, "y": 0, "z": 0 }, @@ -2256,7 +2256,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 200, + "width": 180, "height": 20 }, "_anchorPoint": { @@ -2656,7 +2656,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 228, + "width": 208, "height": 9 }, "_anchorPoint": { @@ -2749,7 +2749,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -100, + "x": -90, "y": 0, "z": 0 }, @@ -2929,7 +2929,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 200, + "width": 180, "height": 20 }, "_anchorPoint": { @@ -3414,8 +3414,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3451,8 +3451,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3520,8 +3520,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3590,15 +3590,15 @@ "backgroundCloseButton": { "__id__": 8 }, + "okButton": { + "__id__": 149 + }, "soundVolumeSlider": { "__id__": 102 }, "musicVolumeSlider": { "__id__": 132 }, - "okButton": { - "__id__": 149 - }, "_id": "" }, { diff --git a/assets/Media/Prefabs/ModalWindows/Chest/ChestModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/Chest/ChestModalWindow.prefab index d7a061b..cdf16d4 100644 --- a/assets/Media/Prefabs/ModalWindows/Chest/ChestModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/Chest/ChestModalWindow.prefab @@ -2983,8 +2983,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab index c2afcaf..2797288 100644 --- a/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab @@ -758,7 +758,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 120, + "x": 104, "y": -17, "z": 0 }, @@ -973,7 +973,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 280, + "width": 240, "height": 35 }, "_anchorPoint": { @@ -1084,7 +1084,7 @@ "__id__": 12 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 46 @@ -1213,7 +1213,7 @@ "__id__": 12 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 52 @@ -1605,7 +1605,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 280, + "width": 240, "height": 210 }, "_anchorPoint": { @@ -3147,8 +3147,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3184,8 +3184,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3253,8 +3253,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradeButton.prefab b/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradeButton.prefab index 1bc84be..460f9f7 100644 --- a/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradeButton.prefab +++ b/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradeButton.prefab @@ -63,8 +63,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -219.583, - "y": 172.6885, + "x": -160, + "y": -120, "z": 0 }, "_lrot": { @@ -153,8 +153,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 118.777 + "width": 75, + "height": 118 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -281,7 +281,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 83.097, + "y": 82.028, "z": 0 }, "_lrot": { @@ -319,7 +319,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 135.3, + "width": 129.1, "height": 40 }, "_anchorPoint": { @@ -361,7 +361,7 @@ "_fontSize": 20, "_fontFamily": "Century Gothic", "_lineHeight": 20, - "_overflow": 3, + "_overflow": 1, "_enableWrapText": true, "_font": { "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", @@ -413,7 +413,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -84.985, + "y": -85.523, "z": 0 }, "_lrot": { @@ -451,7 +451,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 130.6, + "width": 129.6, "height": 36 }, "_anchorPoint": { @@ -486,14 +486,14 @@ "b": 255, "a": 198 }, - "_string": "label\n123\n456", + "_string": "label\n123456\n88", "_horizontalAlign": 1, "_verticalAlign": 0, "_actualFontSize": 12, "_fontSize": 12, "_fontFamily": "Century Gothic", "_lineHeight": 12, - "_overflow": 3, + "_overflow": 1, "_enableWrapText": true, "_font": { "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", @@ -555,7 +555,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0.106, - "y": -46.442, + "y": -47.511, "z": 0 }, "_lrot": { @@ -782,7 +782,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": 0, + "x": -18, "y": 0, "z": 0 } @@ -906,7 +906,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": 0, + "x": 18, "y": 0, "z": 0 } @@ -1049,7 +1049,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -0.801, - "y": 27.087, + "y": 26.018, "z": 0 }, "_lrot": { @@ -1181,7 +1181,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -22.053, + "y": -23.122, "z": 0 }, "_lrot": { @@ -1316,8 +1316,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -6.766, - "y": -21.962, + "x": 1.288, + "y": -23.031, "z": 0 }, "_lrot": { @@ -1487,7 +1487,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 33.57, + "width": 22.14, "height": 18 }, "_anchorPoint": { @@ -1522,7 +1522,7 @@ "b": 59, "a": 255 }, - "_string": "300", + "_string": "30", "_horizontalAlign": 0, "_verticalAlign": 1, "_actualFontSize": 20, @@ -1571,8 +1571,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 160, - "height": 237.554 + "width": 150, + "height": 236 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab index 33a8442..43a0369 100644 --- a/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 154 + "__id__": 227 }, { - "__id__": 156 + "__id__": 229 }, { - "__id__": 158 + "__id__": 231 } ], "_prefab": { - "__id__": 160 + "__id__": 233 }, "_lpos": { "__type__": "cc.Vec3", @@ -84,14 +84,14 @@ "_active": true, "_components": [ { - "__id__": 149 + "__id__": 222 }, { - "__id__": 151 + "__id__": 224 } ], "_prefab": { - "__id__": 153 + "__id__": 226 }, "_lpos": { "__type__": "cc.Vec3", @@ -295,11 +295,11 @@ "_active": true, "_components": [ { - "__id__": 146 + "__id__": 219 } ], "_prefab": { - "__id__": 148 + "__id__": 221 }, "_lpos": { "__type__": "cc.Vec3", @@ -371,7 +371,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 430.178, + "y": 318, "z": 0 }, "_lrot": { @@ -752,7 +752,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 120, + "x": 108, "y": -17, "z": 0 }, @@ -967,7 +967,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 280, + "width": 250, "height": 35 }, "_anchorPoint": { @@ -1078,7 +1078,7 @@ "__id__": 12 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 46 @@ -1092,7 +1092,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -132, + "x": -102, "y": -4, "z": 0 }, @@ -1207,7 +1207,7 @@ "__id__": 12 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 52 @@ -1221,7 +1221,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 132, + "x": 102, "y": -4, "z": 0 }, @@ -1480,7 +1480,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -429, + "y": -313, "z": 0 }, "_lrot": { @@ -1599,8 +1599,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 280, - "height": 430 + "width": 250, + "height": 314 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1882,8 +1882,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -20.78800000000001, - "y": 333.972, + "x": -20.788, + "y": 226.72, "z": 0 }, "_lrot": { @@ -2142,22 +2142,22 @@ "_active": true, "_components": [ { - "__id__": 139 + "__id__": 212 }, { - "__id__": 141 + "__id__": 214 }, { - "__id__": 143 + "__id__": 216 } ], "_prefab": { - "__id__": 145 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -51.606, + "y": -51, "z": 0 }, "_lrot": { @@ -2568,33 +2568,36 @@ "_children": [ { "__id__": 120 + }, + { + "__id__": 185 } ], "_active": true, "_components": [ { - "__id__": 128 + "__id__": 203 }, { - "__id__": 130 + "__id__": 200 }, { - "__id__": 132 + "__id__": 205 }, { - "__id__": 134 + "__id__": 207 }, { - "__id__": 136 + "__id__": 209 } ], "_prefab": { - "__id__": 138 + "__id__": 211 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 6.266999999999996, "z": 0 }, "_lrot": { @@ -2626,26 +2629,39 @@ "_parent": { "__id__": 119 }, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 121 }, { - "__id__": 123 + "__id__": 133 }, { - "__id__": 125 + "__id__": 148 + }, + { + "__id__": 163 + } + ], + "_active": true, + "_components": [ + { + "__id__": 178 + }, + { + "__id__": 180 + }, + { + "__id__": 182 } ], "_prefab": { - "__id__": 127 + "__id__": 184 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 360, + "y": 243.9, "z": 0 }, "_lrot": { @@ -2670,6 +2686,649 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 120 + }, + "_prefab": { + "__id__": 122 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 121 + }, + "asset": { + "__uuid__": "211839e3-132d-429d-9e68-a96fcdfb0ff7", + "__expectedType__": "cc.Prefab" + }, + "fileId": "dchT3ooxlOOL9eH/XiAT2K", + "instance": { + "__id__": 123 + } + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "c9I09BdLpMiaGtQfNiQOR+", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 124 + }, + { + "__id__": 126 + }, + { + "__id__": 128 + }, + { + "__id__": 130 + }, + { + "__id__": 132 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 125 + }, + "propertyPath": [ + "_name" + ], + "value": "UpgradeButton" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 127 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -160, + "y": -120, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 129 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 131 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 131 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 120 + }, + "_prefab": { + "__id__": 134 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 133 + }, + "asset": { + "__uuid__": "211839e3-132d-429d-9e68-a96fcdfb0ff7", + "__expectedType__": "cc.Prefab" + }, + "fileId": "dchT3ooxlOOL9eH/XiAT2K", + "instance": { + "__id__": 135 + } + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "78GTuNPv9Hlqv/7vq6bKLV", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 136 + }, + { + "__id__": 138 + }, + { + "__id__": 140 + }, + { + "__id__": 142 + }, + { + "__id__": 144 + }, + { + "__id__": 146 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 137 + }, + "propertyPath": [ + "_name" + ], + "value": "UpgradeButton-001" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 139 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": -120, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 141 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 143 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 145 + }, + "propertyPath": [ + "_enabled" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3aMW06471HwpgHeF0r4+4M" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 147 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 120 + }, + "_prefab": { + "__id__": 149 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 148 + }, + "asset": { + "__uuid__": "211839e3-132d-429d-9e68-a96fcdfb0ff7", + "__expectedType__": "cc.Prefab" + }, + "fileId": "dchT3ooxlOOL9eH/XiAT2K", + "instance": { + "__id__": 150 + } + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "61h9yL5UZBsaVHD4mERGMg", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 151 + }, + { + "__id__": 153 + }, + { + "__id__": 155 + }, + { + "__id__": 157 + }, + { + "__id__": 159 + }, + { + "__id__": 161 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 152 + }, + "propertyPath": [ + "_name" + ], + "value": "UpgradeButton-002" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 154 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -160, + "y": -120, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 156 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 158 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 160 + }, + "propertyPath": [ + "_enabled" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3aMW06471HwpgHeF0r4+4M" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 162 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 120 + }, + "_prefab": { + "__id__": 164 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 163 + }, + "asset": { + "__uuid__": "211839e3-132d-429d-9e68-a96fcdfb0ff7", + "__expectedType__": "cc.Prefab" + }, + "fileId": "dchT3ooxlOOL9eH/XiAT2K", + "instance": { + "__id__": 165 + } + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "89DvT+24hGnpg3kZt4XZPM", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 166 + }, + { + "__id__": 168 + }, + { + "__id__": 170 + }, + { + "__id__": 172 + }, + { + "__id__": 174 + }, + { + "__id__": 176 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 167 + }, + "propertyPath": [ + "_name" + ], + "value": "UpgradeButton-003" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 169 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -160, + "y": -120, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 171 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 173 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 175 + }, + "propertyPath": [ + "_enabled" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "3aMW06471HwpgHeF0r4+4M" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 177 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "dchT3ooxlOOL9eH/XiAT2K" + ] + }, { "__type__": "cc.UITransform", "_name": "", @@ -2679,12 +3338,12 @@ }, "_enabled": false, "__prefab": { - "__id__": 122 + "__id__": 179 }, "_contentSize": { "__type__": "cc.Size", - "width": 524.4, - "height": 720 + "width": 490, + "height": 2.0000000000000284 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2706,7 +3365,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 181 }, "_resizeMode": 1, "_layoutType": 3, @@ -2718,10 +3377,10 @@ "_startAxis": 0, "_paddingLeft": 10, "_paddingRight": 10, - "_paddingTop": 10, + "_paddingTop": 2, "_paddingBottom": 0, - "_spacingX": 10.6, - "_spacingY": 14.3, + "_spacingX": 10, + "_spacingY": 14, "_verticalDirection": 1, "_horizontalDirection": 0, "_constraint": 2, @@ -2743,14 +3402,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 183 }, "_alignFlags": 45, "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, + "_left": -10, + "_right": -10, + "_top": 6.099999999999994, + "_bottom": 491.9, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2779,6 +3438,367 @@ }, "fileId": "8cdfKNiq1OsaOzNbcmcZcT" }, + { + "__type__": "cc.Node", + "_name": "scrollBar", + "_objFlags": 0, + "_parent": { + "__id__": 119 + }, + "_children": [ + { + "__id__": 186 + } + ], + "_active": false, + "_components": [ + { + "__id__": 192 + }, + { + "__id__": 194 + }, + { + "__id__": 196 + }, + { + "__id__": 198 + } + ], + "_prefab": { + "__id__": 202 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 235, + "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": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "bar", + "_objFlags": 0, + "_parent": { + "__id__": 185 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 187 + }, + { + "__id__": 189 + } + ], + "_prefab": { + "__id__": 191 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -11, + "y": -31.25, + "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.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 186 + }, + "_enabled": true, + "__prefab": { + "__id__": 188 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 10, + "height": 156.25 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "92agoOB3BOgJNzcOQFUEuP" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 186 + }, + "_enabled": true, + "__prefab": { + "__id__": 190 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "afc47931-f066-46b0-90be-9fe61f213428@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_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.CompPrefabInfo", + "fileId": "8b8jWbKXJJuKUJMLlp6RVY" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "bewsZvD9JNco7XSfOzlDjb" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 185 + }, + "_enabled": true, + "__prefab": { + "__id__": 193 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 12, + "height": 520 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 1, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a9ER6+S9JMlIyp6usd0CUX" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 185 + }, + "_enabled": true, + "__prefab": { + "__id__": 195 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "ffb88a8f-af62-48f4-8f1d-3cb606443a43@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_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.CompPrefabInfo", + "fileId": "23E8VA9vJNnbVY2ayfxm1c" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 185 + }, + "_enabled": true, + "__prefab": { + "__id__": 197 + }, + "_alignFlags": 37, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 250, + "_alignMode": 1, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "61720TmHdMt41airWs6Ryw" + }, + { + "__type__": "cc.ScrollBar", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 185 + }, + "_enabled": true, + "__prefab": { + "__id__": 199 + }, + "_scrollView": { + "__id__": 200 + }, + "_handle": { + "__id__": 189 + }, + "_direction": 1, + "_enableAutoHide": false, + "_autoHideTime": 1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d7cV7qk8BGLKcf75X0i/0v" + }, + { + "__type__": "cc.ScrollView", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 119 + }, + "_enabled": true, + "__prefab": { + "__id__": 201 + }, + "bounceDuration": 1, + "brake": 0.5, + "elastic": true, + "inertia": true, + "horizontal": false, + "vertical": true, + "cancelInnerEvents": true, + "scrollEvents": [], + "_content": { + "__id__": 120 + }, + "_horizontalScrollBar": null, + "_verticalScrollBar": { + "__id__": 198 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2bsyZpQvBB4qNv7okVnNae" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f2UDZPa45ARaR4AlO9Lotd" + }, { "__type__": "cc.UITransform", "_name": "", @@ -2788,12 +3808,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 204 }, "_contentSize": { "__type__": "cc.Size", - "width": 524.4, - "height": 720 + "width": 470, + "height": 500 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2806,36 +3826,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "5bTtmQTHxLTYzTENu22bnY" }, - { - "__type__": "cc.ScrollView", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 119 - }, - "_enabled": true, - "__prefab": { - "__id__": 131 - }, - "bounceDuration": 1, - "brake": 0.5, - "elastic": true, - "inertia": true, - "horizontal": false, - "vertical": true, - "cancelInnerEvents": false, - "scrollEvents": [], - "_content": { - "__id__": 120 - }, - "_horizontalScrollBar": null, - "_verticalScrollBar": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "2bsyZpQvBB4qNv7okVnNae" - }, { "__type__": "cc.Mask", "_name": "", @@ -2845,7 +3835,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 206 }, "_type": 0, "_inverted": false, @@ -2866,7 +3856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 135 + "__id__": 208 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2911,14 +3901,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 210 }, "_alignFlags": 45, "_target": null, - "_left": 17.80000000000001, - "_right": 17.80000000000001, - "_top": -10, - "_bottom": -10, + "_left": 5, + "_right": 5, + "_top": -11.266999999999996, + "_bottom": 1.266999999999996, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2956,12 +3946,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 140 + "__id__": 213 }, "_contentSize": { "__type__": "cc.Size", - "width": 560, - "height": 700 + "width": 480, + "height": 490 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2983,7 +3973,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 142 + "__id__": 215 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3027,7 +4017,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 217 }, "_id": "" }, @@ -3054,12 +4044,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 220 }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3091,12 +4081,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 223 }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3118,7 +4108,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 225 }, "playOnLoad": false, "_clips": [ @@ -3160,12 +4150,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 228 }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3188,7 +4178,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 230 }, "_alignFlags": 45, "_target": null, @@ -3223,10 +4213,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 232 }, "animation": { - "__id__": 151 + "__id__": 224 }, "closeButton": { "__id__": 31 @@ -3263,6 +4253,20 @@ "__id__": 0 }, "fileId": "32U/bJCUBDlaQxxGFNXZTu", - "targetOverrides": [] + "targetOverrides": [], + "nestedPrefabInstanceRoots": [ + { + "__id__": 163 + }, + { + "__id__": 148 + }, + { + "__id__": 133 + }, + { + "__id__": 121 + } + ] } ] \ No newline at end of file diff --git a/assets/Scenes/Game.scene b/assets/Scenes/Game.scene index 4270e8e..34b2076 100644 --- a/assets/Scenes/Game.scene +++ b/assets/Scenes/Game.scene @@ -18,20 +18,20 @@ "__id__": 2 }, { - "__id__": 26 + "__id__": 28 }, { - "__id__": 28 + "__id__": 30 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 134 + "__id__": 139 }, "autoReleaseAssets": false, "_globals": { - "__id__": 139 + "__id__": 144 }, "_id": "cffa5b19-2043-4cef-8221-1a10ab7a2c1f" }, @@ -61,7 +61,7 @@ }, "targetOverrides": [ { - "__id__": 16 + "__id__": 18 } ] }, @@ -91,6 +91,9 @@ }, { "__id__": 14 + }, + { + "__id__": 16 } ], "removedComponents": [] @@ -167,8 +170,8 @@ ], "value": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 } }, { @@ -209,6 +212,27 @@ "71qF2ggGpMcLF94AUlql0u" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 17 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 255.00000000000003, + "y": 340.00000000000006, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f6cwwQmx9G2qaYOpNATP9o" + ] + }, { "__type__": "cc.TargetOverrideInfo", "source": null, @@ -217,10 +241,10 @@ "y8" ], "target": { - "__id__": 17 + "__id__": 19 }, "targetInfo": { - "__id__": 25 + "__id__": 27 } }, { @@ -230,14 +254,14 @@ "__id__": 2 }, "_prefab": { - "__id__": 18 + "__id__": 20 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 17 + "__id__": 19 }, "asset": { "__uuid__": "f668086a-2bff-40eb-a029-dd891718441d", @@ -245,7 +269,7 @@ }, "fileId": "5da9o8mwlJl5XD861jGbYx", "instance": { - "__id__": 19 + "__id__": 21 } }, { @@ -257,17 +281,17 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 20 - }, { "__id__": 22 }, { - "__id__": 23 + "__id__": 24 }, { - "__id__": 24 + "__id__": 25 + }, + { + "__id__": 26 } ], "removedComponents": [] @@ -275,7 +299,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 21 + "__id__": 23 }, "propertyPath": [ "_name" @@ -291,7 +315,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 21 + "__id__": 23 }, "propertyPath": [ "_lpos" @@ -306,7 +330,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 21 + "__id__": 23 }, "propertyPath": [ "_lrot" @@ -322,7 +346,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 21 + "__id__": 23 }, "propertyPath": [ "_euler" @@ -351,7 +375,7 @@ "_active": true, "_components": [ { - "__id__": 27 + "__id__": 29 } ], "_prefab": null, @@ -388,7 +412,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 26 + "__id__": 28 }, "_enabled": true, "__prefab": null, @@ -411,13 +435,10 @@ }, "_children": [ { - "__id__": 29 + "__id__": 31 }, { - "__id__": 37 - }, - { - "__id__": 40 + "__id__": 39 }, { "__id__": 42 @@ -435,41 +456,44 @@ "__id__": 50 }, { - "__id__": 60 + "__id__": 52 }, { - "__id__": 74 + "__id__": 62 }, { - "__id__": 78 + "__id__": 76 }, { - "__id__": 81 + "__id__": 80 }, { - "__id__": 127 + "__id__": 83 + }, + { + "__id__": 132 } ], "_active": true, "_components": [ { - "__id__": 130 + "__id__": 135 }, { - "__id__": 131 + "__id__": 136 }, { - "__id__": 132 + "__id__": 137 }, { - "__id__": 133 + "__id__": 138 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 319.99999999999994, - "y": 480.00000000000006, + "x": 254.99999999999997, + "y": 339.99999999999994, "z": 0 }, "_lrot": { @@ -498,17 +522,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_prefab": { - "__id__": 30 + "__id__": 32 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 29 + "__id__": 31 }, "asset": { "__uuid__": "8a193591-d71d-493f-8010-f7c8c13b6ec8", @@ -516,7 +540,7 @@ }, "fileId": "62B+OqAzROoon1s4L/Ur4W", "instance": { - "__id__": 31 + "__id__": 33 } }, { @@ -525,17 +549,17 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 32 - }, { "__id__": 34 }, { - "__id__": 35 + "__id__": 36 }, { - "__id__": 36 + "__id__": 37 + }, + { + "__id__": 38 } ], "removedComponents": [] @@ -543,7 +567,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_name" @@ -559,7 +583,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -574,7 +598,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lrot" @@ -590,7 +614,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_euler" @@ -607,16 +631,16 @@ "_name": "Background", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [], "_active": true, "_components": [ { - "__id__": 38 + "__id__": 40 }, { - "__id__": 39 + "__id__": 41 } ], "_prefab": null, @@ -653,7 +677,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 39 }, "_enabled": true, "__prefab": null, @@ -674,7 +698,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 39 }, "_enabled": true, "__prefab": null, @@ -707,13 +731,13 @@ "_name": "HaloProjectileLauncher", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 43 } ], "_prefab": null, @@ -750,7 +774,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 40 + "__id__": 42 }, "_enabled": true, "__prefab": null, @@ -765,13 +789,13 @@ "_name": "HorizontalProjectileLauncher", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 45 } ], "_prefab": null, @@ -808,7 +832,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 42 + "__id__": 44 }, "_enabled": true, "__prefab": null, @@ -823,13 +847,13 @@ "_name": "DiagonalProjectileLauncher", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [], "_active": true, "_components": [ { - "__id__": 45 + "__id__": 47 } ], "_prefab": null, @@ -866,7 +890,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 44 + "__id__": 46 }, "_enabled": true, "__prefab": null, @@ -881,13 +905,13 @@ "_name": "EnemyAxeProjectileLauncher", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [], "_active": true, "_components": [ { - "__id__": 47 + "__id__": 49 } ], "_prefab": null, @@ -924,7 +948,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 46 + "__id__": 48 }, "_enabled": true, "__prefab": null, @@ -939,13 +963,13 @@ "_name": "EnemyMagicOrbProjectileLauncher", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [], "_active": true, "_components": [ { - "__id__": 49 + "__id__": 51 } ], "_prefab": null, @@ -982,7 +1006,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 48 + "__id__": 50 }, "_enabled": true, "__prefab": null, @@ -996,17 +1020,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_prefab": { - "__id__": 51 + "__id__": 53 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 50 + "__id__": 52 }, "asset": { "__uuid__": "27c97ec7-9bb8-4e4e-a264-ce49f2ae9843", @@ -1014,7 +1038,7 @@ }, "fileId": "fbcM/H31RNxK0HvQrwpElL", "instance": { - "__id__": 52 + "__id__": 54 } }, { @@ -1023,20 +1047,20 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 53 - }, { "__id__": 55 }, - { - "__id__": 56 - }, { "__id__": 57 }, { "__id__": 58 + }, + { + "__id__": 59 + }, + { + "__id__": 60 } ], "removedComponents": [] @@ -1044,7 +1068,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 56 }, "propertyPath": [ "_name" @@ -1060,7 +1084,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 56 }, "propertyPath": [ "_lpos" @@ -1075,7 +1099,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 56 }, "propertyPath": [ "_lrot" @@ -1091,7 +1115,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 56 }, "propertyPath": [ "_euler" @@ -1106,7 +1130,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 59 + "__id__": 61 }, "propertyPath": [ "_defaultClip" @@ -1127,12 +1151,9 @@ "_name": "ItemManager", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [ - { - "__id__": 61 - }, { "__id__": 63 }, @@ -1147,12 +1168,15 @@ }, { "__id__": 71 + }, + { + "__id__": 73 } ], "_active": true, "_components": [ { - "__id__": 73 + "__id__": 75 } ], "_prefab": null, @@ -1189,13 +1213,13 @@ "_name": "XPSpawner", "_objFlags": 0, "_parent": { - "__id__": 60 + "__id__": 62 }, "_children": [], "_active": true, "_components": [ { - "__id__": 62 + "__id__": 64 } ], "_prefab": null, @@ -1232,7 +1256,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 61 + "__id__": 63 }, "_enabled": true, "__prefab": null, @@ -1247,13 +1271,13 @@ "_name": "GoldSpawner", "_objFlags": 0, "_parent": { - "__id__": 60 + "__id__": 62 }, "_children": [], "_active": true, "_components": [ { - "__id__": 64 + "__id__": 66 } ], "_prefab": null, @@ -1290,7 +1314,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 63 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -1305,13 +1329,13 @@ "_name": "HealthPotionSpawner", "_objFlags": 0, "_parent": { - "__id__": 60 + "__id__": 62 }, "_children": [], "_active": true, "_components": [ { - "__id__": 66 + "__id__": 68 } ], "_prefab": null, @@ -1348,7 +1372,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 65 + "__id__": 67 }, "_enabled": true, "__prefab": null, @@ -1363,13 +1387,13 @@ "_name": "MagnetSpawner", "_objFlags": 0, "_parent": { - "__id__": 60 + "__id__": 62 }, "_children": [], "_active": true, "_components": [ { - "__id__": 68 + "__id__": 70 } ], "_prefab": null, @@ -1406,7 +1430,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 67 + "__id__": 69 }, "_enabled": true, "__prefab": null, @@ -1421,13 +1445,13 @@ "_name": "ChestSpawner", "_objFlags": 0, "_parent": { - "__id__": 60 + "__id__": 62 }, "_children": [], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 72 } ], "_prefab": null, @@ -1464,7 +1488,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 69 + "__id__": 71 }, "_enabled": true, "__prefab": null, @@ -1479,13 +1503,13 @@ "_name": "PickupEffectManager", "_objFlags": 0, "_parent": { - "__id__": 60 + "__id__": 62 }, "_children": [], "_active": true, "_components": [ { - "__id__": 72 + "__id__": 74 } ], "_prefab": null, @@ -1522,7 +1546,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 71 + "__id__": 73 }, "_enabled": true, "__prefab": null, @@ -1537,28 +1561,28 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 60 + "__id__": 62 }, "_enabled": true, "__prefab": null, "xpSpawner": { - "__id__": 62 - }, - "goldSpawner": { "__id__": 64 }, - "healthPotionSpawner": { + "goldSpawner": { "__id__": 66 }, - "magnetSpawner": { + "healthPotionSpawner": { "__id__": 68 }, - "chestSpawner": { + "magnetSpawner": { "__id__": 70 }, - "pickupEffectManager": { + "chestSpawner": { "__id__": 72 }, + "pickupEffectManager": { + "__id__": 74 + }, "_id": "98EDpSoeBKp7eDmPXKNFJ0" }, { @@ -1566,17 +1590,17 @@ "_name": "EnemyManager", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [ { - "__id__": 75 + "__id__": 77 } ], "_active": true, "_components": [ { - "__id__": 77 + "__id__": 79 } ], "_prefab": null, @@ -1613,13 +1637,13 @@ "_name": "EnemySpawner", "_objFlags": 0, "_parent": { - "__id__": 74 + "__id__": 76 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 78 } ], "_prefab": null, @@ -1656,7 +1680,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 77 }, "_enabled": true, "__prefab": null, @@ -1709,12 +1733,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 74 + "__id__": 76 }, "_enabled": true, "__prefab": null, "enemySpawner": { - "__id__": 76 + "__id__": 78 }, "_id": "1ffjazmm5IkZwKInsSIULY" }, @@ -1723,16 +1747,16 @@ "_name": "EnemyDeathEffectManager", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [], "_active": true, "_components": [ { - "__id__": 79 + "__id__": 81 }, { - "__id__": 80 + "__id__": 82 } ], "_prefab": null, @@ -1769,7 +1793,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 78 + "__id__": 80 }, "_enabled": true, "__prefab": null, @@ -1790,7 +1814,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 78 + "__id__": 80 }, "_enabled": true, "__prefab": null, @@ -1805,20 +1829,23 @@ "_name": "GameUI", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [ { - "__id__": 82 + "__id__": 84 }, { - "__id__": 117 + "__id__": 121 } ], "_active": true, "_components": [ { - "__id__": 126 + "__id__": 130 + }, + { + "__id__": 131 } ], "_prefab": null, @@ -1855,36 +1882,36 @@ "_name": "TopUI", "_objFlags": 0, "_parent": { - "__id__": 81 + "__id__": 83 }, "_children": [ { - "__id__": 83 + "__id__": 85 }, { - "__id__": 95 + "__id__": 99 }, { - "__id__": 98 + "__id__": 102 }, { - "__id__": 107 + "__id__": 111 } ], "_active": true, "_components": [ { - "__id__": 115 + "__id__": 119 }, { - "__id__": 116 + "__id__": 120 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": -320, - "y": 480.0000000000001, + "x": -255, + "y": 340, "z": -1000 }, "_lrot": { @@ -1914,33 +1941,36 @@ "_name": "XpBar", "_objFlags": 0, "_parent": { - "__id__": 82 + "__id__": 84 }, "_children": [ { - "__id__": 84 + "__id__": 86 }, { - "__id__": 87 + "__id__": 89 }, { - "__id__": 90 + "__id__": 93 } ], "_active": true, "_components": [ { - "__id__": 93 + "__id__": 96 }, { - "__id__": 94 + "__id__": 97 + }, + { + "__id__": 98 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 320, - "y": -14, + "x": 255, + "y": 2.299999999999997, "z": 0 }, "_lrot": { @@ -1970,22 +2000,22 @@ "_name": "Background", "_objFlags": 0, "_parent": { - "__id__": 83 + "__id__": 85 }, "_children": [], "_active": false, "_components": [ { - "__id__": 85 + "__id__": 87 }, { - "__id__": 86 + "__id__": 88 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": -300, + "x": -238.787, "y": -13.496, "z": 0 }, @@ -2016,7 +2046,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 84 + "__id__": 86 }, "_enabled": true, "__prefab": null, @@ -2037,7 +2067,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 84 + "__id__": 86 }, "_enabled": true, "__prefab": null, @@ -2075,23 +2105,26 @@ "_name": "Background-001", "_objFlags": 0, "_parent": { - "__id__": 83 + "__id__": 85 }, "_children": [], "_active": true, "_components": [ { - "__id__": 88 + "__id__": 90 }, { - "__id__": 89 + "__id__": 91 + }, + { + "__id__": 92 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": -300, - "y": 0, + "x": 0, + "y": -20, "z": 0 }, "_lrot": { @@ -2121,18 +2154,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 87 + "__id__": 89 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 300, + "width": 239, "height": 12 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0, + "x": 0.5, "y": 1 }, "_id": "e36kPPILxNhrk6FRIW0gdc" @@ -2142,7 +2175,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 87 + "__id__": 89 }, "_enabled": true, "__prefab": null, @@ -2175,28 +2208,57 @@ "_atlas": null, "_id": "edz3gVlFVFwY1B8kGGGPfm" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 89 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 42, + "_target": null, + "_left": 16, + "_right": 16, + "_top": 0, + "_bottom": 8, + "_horizontalCenter": 0, + "_verticalCenter": -16, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 255, + "_originalHeight": 12, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "a4bRf3TDlJq4VskjJGVPp3" + }, { "__type__": "cc.Node", "_name": "MovableBar", "_objFlags": 0, "_parent": { - "__id__": 83 + "__id__": 85 }, "_children": [], "_active": true, "_components": [ { - "__id__": 91 + "__id__": 94 }, { - "__id__": 92 + "__id__": 95 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": -296, - "y": -12, + "x": -235, + "y": -32, "z": 0 }, "_lrot": { @@ -2226,13 +2288,13 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 90 + "__id__": 93 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 296, + "width": 235, "height": 8 }, "_anchorPoint": { @@ -2247,7 +2309,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 90 + "__id__": 93 }, "_enabled": true, "__prefab": null, @@ -2285,19 +2347,19 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 83 + "__id__": 85 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 600, - "height": 16 + "width": 510, + "height": 32 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, - "y": 0.5 + "y": 1 }, "_id": "63JWN+EuhGUYNXaXZyVBrw" }, @@ -2306,12 +2368,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 83 + "__id__": 85 }, "_enabled": true, "__prefab": null, "_barSprite": { - "__id__": 92 + "__id__": 95 }, "_mode": 0, "_totalLength": 284, @@ -2319,36 +2381,65 @@ "_reverse": false, "_id": "5a1CWtS5hFdK4pcdIQ6qWC" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 85 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 41, + "_target": null, + "_left": 0, + "_right": 0, + "_top": -2.299999999999997, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 510, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "21PDA+ANlMs6V6TLVVkLSH" + }, { "__type__": "cc.Node", "_name": "TimeAliveText", "_objFlags": 0, "_parent": { - "__id__": 82 + "__id__": 84 }, "_children": [], "_active": true, "_components": [ { - "__id__": 96 + "__id__": 100 }, { - "__id__": 97 + "__id__": 101 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 320, - "y": -66, + "x": 255, + "y": -72, "z": 1000 }, "_lrot": { "__type__": "cc.Quat", "x": 0, "y": 0, - "z": 0, - "w": 1 + "z": -0.0008726645152351496, + "w": 0.9999996192282494 }, "_lscale": { "__type__": "cc.Vec3", @@ -2361,7 +2452,7 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": 0 + "z": -0.1 }, "_id": "c4XsoErxpCwoh0Ud7l6xNv" }, @@ -2370,7 +2461,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 95 + "__id__": 99 }, "_enabled": true, "__prefab": null, @@ -2391,7 +2482,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 95 + "__id__": 99 }, "_enabled": true, "__prefab": null, @@ -2432,44 +2523,44 @@ "_name": "PauseBtn", "_objFlags": 0, "_parent": { - "__id__": 82 + "__id__": 84 }, "_children": [ { - "__id__": 99 + "__id__": 103 } ], "_active": true, "_components": [ - { - "__id__": 102 - }, - { - "__id__": 103 - }, - { - "__id__": 104 - }, - { - "__id__": 105 - }, { "__id__": 106 + }, + { + "__id__": 107 + }, + { + "__id__": 108 + }, + { + "__id__": 109 + }, + { + "__id__": 110 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 588, - "y": -66, + "x": 463, + "y": -72, "z": 0 }, "_lrot": { "__type__": "cc.Quat", "x": 0, "y": 0, - "z": 0, - "w": 1 + "z": -0.0008726645152351496, + "w": 0.9999996192282494 }, "_lscale": { "__type__": "cc.Vec3", @@ -2482,7 +2573,7 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": 0 + "z": -0.1 }, "_id": "7a8ey4eQ5ACb/mhdDxPxpd" }, @@ -2491,16 +2582,16 @@ "_name": "Square", "_objFlags": 0, "_parent": { - "__id__": 98 + "__id__": 102 }, "_children": [], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 104 }, { - "__id__": 101 + "__id__": 105 } ], "_prefab": null, @@ -2537,7 +2628,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 99 + "__id__": 103 }, "_enabled": true, "__prefab": null, @@ -2558,7 +2649,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 99 + "__id__": 103 }, "_enabled": true, "__prefab": null, @@ -2599,7 +2690,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 98 + "__id__": 102 }, "_enabled": true, "__prefab": null, @@ -2620,7 +2711,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 98 + "__id__": 102 }, "_enabled": true, "__prefab": null, @@ -2658,7 +2749,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 98 + "__id__": 102 }, "_enabled": true, "__prefab": null, @@ -2712,7 +2803,7 @@ "_duration": 0.1, "_zoomScale": 0.92, "_target": { - "__id__": 98 + "__id__": 102 }, "_id": "44V8O8mzZKQZv5NNhU9U2X" }, @@ -2721,7 +2812,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 98 + "__id__": 102 }, "_enabled": true, "__prefab": null, @@ -2732,12 +2823,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 98 + "__id__": 102 }, "_enabled": true, "__prefab": null, "button": { - "__id__": 105 + "__id__": 109 }, "_id": "19CfluWQpOB4qddmLDK5n9" }, @@ -2746,18 +2837,64 @@ "_name": "GoldCount", "_objFlags": 0, "_parent": { - "__id__": 82 + "__id__": 84 }, "_children": [ { - "__id__": 108 + "__id__": 112 }, { - "__id__": 111 + "__id__": 115 } ], "_active": true, "_components": [ + { + "__id__": 118 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 16.229000000000028, + "y": -72, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": -0.0008726645152351496, + "w": 0.9999996192282494 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": -0.1 + }, + "_id": "7fPczruidECKoUXrdBlLxC" + }, + { + "__type__": "cc.Node", + "_name": "GoldSprite", + "_objFlags": 0, + "_parent": { + "__id__": 111 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 113 + }, { "__id__": 114 } @@ -2789,52 +2926,6 @@ "y": 0, "z": 0 }, - "_id": "7fPczruidECKoUXrdBlLxC" - }, - { - "__type__": "cc.Node", - "_name": "GoldSprite", - "_objFlags": 0, - "_parent": { - "__id__": 107 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 109 - }, - { - "__id__": 110 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 36.425, - "y": -62.549, - "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": "40TlCcxUNBhrbKQh2tiN9z" }, { @@ -2842,7 +2933,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 108 + "__id__": 112 }, "_enabled": true, "__prefab": null, @@ -2853,7 +2944,7 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "84UMKZyxhE57eUncF5RU+C" @@ -2863,7 +2954,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 108 + "__id__": 112 }, "_enabled": true, "__prefab": null, @@ -2904,23 +2995,23 @@ "_name": "GoldLabel", "_objFlags": 0, "_parent": { - "__id__": 107 + "__id__": 111 }, "_children": [], "_active": true, "_components": [ { - "__id__": 112 + "__id__": 116 }, { - "__id__": 113 + "__id__": 117 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 54.488, - "y": -62.347, + "x": 38.288, + "y": 0, "z": 0 }, "_lrot": { @@ -2950,7 +3041,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 111 + "__id__": 115 }, "_enabled": true, "__prefab": null, @@ -2971,7 +3062,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 111 + "__id__": 115 }, "_enabled": true, "__prefab": null, @@ -3012,18 +3103,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 107 + "__id__": 111 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", "width": 100, - "height": 100 + "height": 40.882 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "15WWn9leJBuYJ0PzNnEUzt" @@ -3033,14 +3124,14 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 82 + "__id__": 84 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3054,16 +3145,16 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 82 + "__id__": 84 }, "_enabled": true, "__prefab": null, - "_alignFlags": 41, + "_alignFlags": 45, "_target": null, - "_left": -320, - "_right": 320, - "_top": 480, - "_bottom": -320.1, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3073,7 +3164,7 @@ "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, "_originalWidth": 960, - "_originalHeight": 640, + "_originalHeight": 960, "_alignMode": 2, "_lockFlags": 0, "_id": "8e0CbTwKlKs4y+iGPQLoIp" @@ -3083,17 +3174,17 @@ "_name": "UI", "_objFlags": 0, "_parent": { - "__id__": 81 + "__id__": 83 }, "_children": [ { - "__id__": 118 + "__id__": 122 } ], "_active": true, "_components": [ { - "__id__": 125 + "__id__": 129 } ], "_prefab": null, @@ -3130,23 +3221,23 @@ "_name": "VirtualJoystic", "_objFlags": 0, "_parent": { - "__id__": 117 + "__id__": 121 }, "_children": [ { - "__id__": 119 + "__id__": 123 } ], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 126 }, { - "__id__": 123 + "__id__": 127 }, { - "__id__": 124 + "__id__": 128 } ], "_prefab": null, @@ -3183,16 +3274,16 @@ "_name": "Knob", "_objFlags": 0, "_parent": { - "__id__": 118 + "__id__": 122 }, "_children": [], "_active": true, "_components": [ { - "__id__": 120 + "__id__": 124 }, { - "__id__": 121 + "__id__": 125 } ], "_prefab": null, @@ -3229,7 +3320,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 119 + "__id__": 123 }, "_enabled": true, "__prefab": null, @@ -3250,7 +3341,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 119 + "__id__": 123 }, "_enabled": true, "__prefab": null, @@ -3288,7 +3379,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 118 + "__id__": 122 }, "_enabled": true, "__prefab": null, @@ -3309,7 +3400,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 118 + "__id__": 122 }, "_enabled": true, "__prefab": null, @@ -3350,13 +3441,13 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 118 + "__id__": 122 }, "_enabled": true, "__prefab": null, "maxDistance": 46, "knob": { - "__id__": 119 + "__id__": 123 }, "_id": "50ceZG62tGlYXvZWEvSDKl" }, @@ -3365,7 +3456,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 117 + "__id__": 121 }, "_enabled": true, "__prefab": null, @@ -3386,39 +3477,60 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 81 + "__id__": 83 }, "_enabled": true, "__prefab": null, "xpBar": { - "__id__": 94 - }, - "timeAliveText": { "__id__": 97 }, + "timeAliveText": { + "__id__": 101 + }, "goldLabel": { - "__id__": 113 + "__id__": 117 }, "pauseBtn": { - "__id__": 105 + "__id__": 109 }, "_id": "bau/7eItRFrKKoAZZb/uYL" }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 83 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 510, + "height": 680 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "c9rueW4jND9JmNSEqhmk36" + }, { "__type__": "cc.Node", "_name": "BlackScreen", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [], "_active": false, "_components": [ { - "__id__": 128 + "__id__": 133 }, { - "__id__": 129 + "__id__": 134 } ], "_prefab": null, @@ -3455,7 +3567,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 127 + "__id__": 132 }, "_enabled": true, "__prefab": null, @@ -3476,7 +3588,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 127 + "__id__": 132 }, "_enabled": true, "__prefab": null, @@ -3514,14 +3626,14 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3535,7 +3647,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": null, @@ -3548,16 +3660,16 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": null, "_alignFlags": 45, "_target": null, - "_left": -5.684341886080802e-14, - "_right": 0, - "_top": 1.1368683772161603e-13, - "_bottom": 5.684341886080802e-14, + "_left": -2.842170943040401e-14, + "_right": 2.842170943040401e-14, + "_top": 0, + "_bottom": -5.684341886080802e-14, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3577,50 +3689,50 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": null, "virtualJoystic": { - "__id__": 124 + "__id__": 128 }, "player": null, "haloProjectileLauncherComponent": { - "__id__": 41 - }, - "horizontalProjectileLauncherComponent": { "__id__": 43 }, - "diagonalProjectileLauncherComponent": { + "horizontalProjectileLauncherComponent": { "__id__": 45 }, - "enemyAxeProjectileLauncherComponent": { + "diagonalProjectileLauncherComponent": { "__id__": 47 }, - "enemyMagicOrbProjectileLauncherComponent": { + "enemyAxeProjectileLauncherComponent": { "__id__": 49 }, + "enemyMagicOrbProjectileLauncherComponent": { + "__id__": 51 + }, "enemyManager": { - "__id__": 77 + "__id__": 79 }, "deathEffectSpawner": { - "__id__": 80 + "__id__": 82 }, "itemManager": { - "__id__": 73 + "__id__": 75 }, "gameUI": { - "__id__": 126 + "__id__": 130 }, "gameCanvas": { - "__id__": 131 + "__id__": 136 }, "background": { - "__id__": 39 + "__id__": 41 }, "gameAudioAdapter": null, "blackScreen": { - "__id__": 127 + "__id__": 132 }, "_id": "3a9z1bqlFCGL4/WyDwU4L5" }, @@ -3629,10 +3741,10 @@ "fileId": "cffa5b19-2043-4cef-8221-1a10ab7a2c1f", "targetOverrides": [ { - "__id__": 135 + "__id__": 140 }, { - "__id__": 137 + "__id__": 142 } ], "nestedPrefabInstanceRoots": [ @@ -3640,27 +3752,27 @@ "__id__": 2 }, { - "__id__": 29 + "__id__": 31 }, { - "__id__": 50 + "__id__": 52 } ] }, { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 133 + "__id__": 138 }, "sourceInfo": null, "propertyPath": [ "player" ], "target": { - "__id__": 50 + "__id__": 52 }, "targetInfo": { - "__id__": 136 + "__id__": 141 } }, { @@ -3672,17 +3784,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 133 + "__id__": 138 }, "sourceInfo": null, "propertyPath": [ "gameAudioAdapter" ], "target": { - "__id__": 29 + "__id__": 31 }, "targetInfo": { - "__id__": 138 + "__id__": 143 } }, { @@ -3694,19 +3806,19 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 140 + "__id__": 145 }, "shadows": { - "__id__": 141 + "__id__": 146 }, "_skybox": { - "__id__": 142 + "__id__": 147 }, "fog": { - "__id__": 143 + "__id__": 148 }, "octree": { - "__id__": 144 + "__id__": 149 } }, { diff --git a/assets/Scenes/Menu.scene b/assets/Scenes/Menu.scene index 92a974c..0e877fc 100644 --- a/assets/Scenes/Menu.scene +++ b/assets/Scenes/Menu.scene @@ -18,17 +18,17 @@ "__id__": 2 }, { - "__id__": 24 + "__id__": 26 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 104 + "__id__": 107 }, "autoReleaseAssets": false, "_globals": { - "__id__": 105 + "__id__": 108 }, "_id": "1a3bccb5-bbb7-4058-846c-ed41b52415b0" }, @@ -58,7 +58,7 @@ }, "targetOverrides": [ { - "__id__": 14 + "__id__": 16 } ] }, @@ -85,6 +85,9 @@ }, { "__id__": 12 + }, + { + "__id__": 14 } ], "removedComponents": [] @@ -161,8 +164,8 @@ ], "value": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 } }, { @@ -192,6 +195,27 @@ "f9c0nAyY1AEY+29CNy1WVz" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 15 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 254.99999999999997, + "y": 339.99999999999994, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f6cwwQmx9G2qaYOpNATP9o" + ] + }, { "__type__": "cc.TargetOverrideInfo", "source": null, @@ -200,10 +224,10 @@ "y8" ], "target": { - "__id__": 15 + "__id__": 17 }, "targetInfo": { - "__id__": 23 + "__id__": 25 } }, { @@ -213,14 +237,14 @@ "__id__": 2 }, "_prefab": { - "__id__": 16 + "__id__": 18 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 15 + "__id__": 17 }, "asset": { "__uuid__": "f668086a-2bff-40eb-a029-dd891718441d", @@ -228,7 +252,7 @@ }, "fileId": "5da9o8mwlJl5XD861jGbYx", "instance": { - "__id__": 17 + "__id__": 19 } }, { @@ -240,17 +264,17 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 18 - }, { "__id__": 20 }, { - "__id__": 21 + "__id__": 22 }, { - "__id__": 22 + "__id__": 23 + }, + { + "__id__": 24 } ], "removedComponents": [] @@ -258,7 +282,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 19 + "__id__": 21 }, "propertyPath": [ "_name" @@ -274,7 +298,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 19 + "__id__": 21 }, "propertyPath": [ "_lpos" @@ -289,7 +313,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 19 + "__id__": 21 }, "propertyPath": [ "_lrot" @@ -305,7 +329,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 19 + "__id__": 21 }, "propertyPath": [ "_euler" @@ -332,68 +356,68 @@ }, "_children": [ { - "__id__": 25 + "__id__": 27 }, { - "__id__": 28 + "__id__": 30 }, { - "__id__": 31 + "__id__": 33 }, { - "__id__": 37 + "__id__": 39 }, { - "__id__": 43 + "__id__": 45 }, { - "__id__": 46 + "__id__": 48 }, { - "__id__": 49 + "__id__": 54 }, { - "__id__": 55 + "__id__": 57 }, { - "__id__": 64 + "__id__": 60 }, { - "__id__": 76 + "__id__": 69 }, { - "__id__": 85 + "__id__": 82 }, { - "__id__": 88 + "__id__": 90 }, { - "__id__": 91 + "__id__": 99 } ], "_active": true, "_components": [ - { - "__id__": 99 - }, - { - "__id__": 100 - }, - { - "__id__": 101 - }, { "__id__": 102 }, { "__id__": 103 + }, + { + "__id__": 104 + }, + { + "__id__": 105 + }, + { + "__id__": 106 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 320.00000000000006, - "y": 479.99999999999994, + "x": 254.99999999999997, + "y": 339.99999999999994, "z": 0 }, "_lrot": { @@ -423,16 +447,16 @@ "_name": "Background", "_objFlags": 0, "_parent": { - "__id__": 24 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 26 + "__id__": 28 }, { - "__id__": 27 + "__id__": 29 } ], "_prefab": null, @@ -469,7 +493,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 25 + "__id__": 27 }, "_enabled": true, "__prefab": null, @@ -490,7 +514,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 25 + "__id__": 27 }, "_enabled": true, "__prefab": null, @@ -528,16 +552,16 @@ "_name": "BackgroundGradient", "_objFlags": 0, "_parent": { - "__id__": 24 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 31 }, { - "__id__": 30 + "__id__": 32 } ], "_prefab": null, @@ -574,7 +598,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": null, @@ -595,7 +619,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": null, @@ -633,20 +657,20 @@ "_name": "TopGradient", "_objFlags": 0, "_parent": { - "__id__": 24 + "__id__": 26 }, "_children": [ { - "__id__": 32 + "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 35 + "__id__": 37 }, { - "__id__": 36 + "__id__": 38 } ], "_prefab": null, @@ -683,16 +707,16 @@ "_name": "RectAddon-001", "_objFlags": 0, "_parent": { - "__id__": 31 + "__id__": 33 }, "_children": [], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 35 }, { - "__id__": 34 + "__id__": 36 } ], "_prefab": null, @@ -729,7 +753,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": null, @@ -750,7 +774,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 32 + "__id__": 34 }, "_enabled": true, "__prefab": null, @@ -788,7 +812,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 31 + "__id__": 33 }, "_enabled": true, "__prefab": null, @@ -809,7 +833,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 31 + "__id__": 33 }, "_enabled": true, "__prefab": null, @@ -847,20 +871,20 @@ "_name": "BottomGradient", "_objFlags": 0, "_parent": { - "__id__": 24 + "__id__": 26 }, "_children": [ { - "__id__": 38 + "__id__": 40 } ], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 43 }, { - "__id__": 42 + "__id__": 44 } ], "_prefab": null, @@ -897,16 +921,16 @@ "_name": "RectAddon", "_objFlags": 0, "_parent": { - "__id__": 37 + "__id__": 39 }, "_children": [], "_active": true, "_components": [ { - "__id__": 39 + "__id__": 41 }, { - "__id__": 40 + "__id__": 42 } ], "_prefab": null, @@ -943,7 +967,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 38 + "__id__": 40 }, "_enabled": true, "__prefab": null, @@ -964,7 +988,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 38 + "__id__": 40 }, "_enabled": true, "__prefab": null, @@ -1002,7 +1026,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 39 }, "_enabled": true, "__prefab": null, @@ -1023,7 +1047,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 39 }, "_enabled": true, "__prefab": null, @@ -1056,133 +1080,28 @@ "_atlas": null, "_id": "0a5iaspnxMT5oj9RhrL8JL" }, - { - "__type__": "cc.Node", - "_name": "LogoImage", - "_objFlags": 0, - "_parent": { - "__id__": 24 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 44 - }, - { - "__id__": 45 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 341.6, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 2, - "y": 2, - "z": 1 - }, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "e3SGBVIhRO1IJl+rU0J4ah" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 43 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 218, - "height": 82 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "94WOOj+6NGYJGNGlWnCpEe" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 43 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "3e2102a8-8c41-4066-b953-dfdcd265ae17@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "eaCd/4b3JMgL23qGiod/r/" - }, { "__type__": "cc.Node", "_name": "SunImage", "_objFlags": 0, "_parent": { - "__id__": 24 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 47 + "__id__": 46 }, { - "__id__": 48 + "__id__": 47 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -252.78, + "y": -270, "z": 0 }, "_lrot": { @@ -1212,7 +1131,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 46 + "__id__": 45 }, "_enabled": true, "__prefab": null, @@ -1233,7 +1152,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 46 + "__id__": 45 }, "_enabled": true, "__prefab": null, @@ -1271,27 +1190,27 @@ "_name": "HordeImage", "_objFlags": 0, "_parent": { - "__id__": 24 + "__id__": 26 }, "_children": [ { - "__id__": 50 + "__id__": 49 } ], "_active": true, "_components": [ { - "__id__": 53 + "__id__": 52 }, { - "__id__": 54 + "__id__": 53 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -257.694, + "y": -239.115, "z": 0 }, "_lrot": { @@ -1303,8 +1222,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 2, - "y": 2, + "x": 1.6, + "y": 1.6, "z": 1 }, "_layer": 33554432, @@ -1321,16 +1240,16 @@ "_name": "RectAddon", "_objFlags": 0, "_parent": { - "__id__": 49 + "__id__": 48 }, "_children": [], "_active": true, "_components": [ { - "__id__": 51 + "__id__": 50 }, { - "__id__": 52 + "__id__": 51 } ], "_prefab": null, @@ -1367,7 +1286,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 50 + "__id__": 49 }, "_enabled": true, "__prefab": null, @@ -1388,7 +1307,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 50 + "__id__": 49 }, "_enabled": true, "__prefab": null, @@ -1426,7 +1345,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 49 + "__id__": 48 }, "_enabled": true, "__prefab": null, @@ -1447,7 +1366,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 49 + "__id__": 48 }, "_enabled": true, "__prefab": null, @@ -1482,39 +1401,252 @@ }, { "__type__": "cc.Node", - "_name": "PlayBtn", + "_name": "LogoImage", "_objFlags": 0, "_parent": { - "__id__": 24 + "__id__": 26 }, - "_children": [ - { - "__id__": 56 - } - ], + "_children": [], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 55 }, { - "__id__": 60 - }, - { - "__id__": 61 - }, - { - "__id__": 62 - }, - { - "__id__": 63 + "__id__": 56 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 154.508, + "y": 247, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.5, + "y": 1.5, + "z": 1 + }, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "e3SGBVIhRO1IJl+rU0J4ah" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 54 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 218, + "height": 82 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "94WOOj+6NGYJGNGlWnCpEe" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 54 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "3e2102a8-8c41-4066-b953-dfdcd265ae17@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "eaCd/4b3JMgL23qGiod/r/" + }, + { + "__type__": "cc.Node", + "_name": "HighscoreLabel", + "_objFlags": 0, + "_parent": { + "__id__": 26 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 58 + }, + { + "__id__": 59 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 157.337, + "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": "2bG95VhbNDN6iiv88LPyjH" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 57 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 150.43, + "height": 26 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "65/u2Ii8lF6ZE+x4Bk14JD" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 57 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "Highscore: 0", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 26, + "_fontSize": 26, + "_fontFamily": "Arial", + "_lineHeight": 26, + "_overflow": 0, + "_enableWrapText": true, + "_font": { + "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "3fd6mbQOZH9ZnXu+ryqYhj" + }, + { + "__type__": "cc.Node", + "_name": "PlayBtn", + "_objFlags": 0, + "_parent": { + "__id__": 26 + }, + "_children": [ + { + "__id__": 61 + } + ], + "_active": true, + "_components": [ + { + "__id__": 64 + }, + { + "__id__": 65 + }, + { + "__id__": 66 + }, + { + "__id__": 67 + }, + { + "__id__": 68 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 93.842, "z": 0 }, "_lrot": { @@ -1544,16 +1676,16 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 55 + "__id__": 60 }, "_children": [], "_active": true, "_components": [ { - "__id__": 57 + "__id__": 62 }, { - "__id__": 58 + "__id__": 63 } ], "_prefab": null, @@ -1590,7 +1722,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 56 + "__id__": 61 }, "_enabled": true, "__prefab": null, @@ -1611,7 +1743,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 56 + "__id__": 61 }, "_enabled": true, "__prefab": null, @@ -1652,14 +1784,14 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 55 + "__id__": 60 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 160, - "height": 40 + "width": 130, + "height": 32 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1673,7 +1805,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 55 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -1711,7 +1843,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 55 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -1765,7 +1897,7 @@ "_duration": 0.1, "_zoomScale": 0.92, "_target": { - "__id__": 55 + "__id__": 60 }, "_id": "abjYBOPMJCK7GsAsqNfoj3" }, @@ -1774,7 +1906,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 55 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -1785,12 +1917,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 55 + "__id__": 60 }, "_enabled": true, "__prefab": null, "button": { - "__id__": 62 + "__id__": 67 }, "_id": "3f/GLS2YxHJI360Fym4+Nl" }, @@ -1799,39 +1931,39 @@ "_name": "UpgradesBtn", "_objFlags": 0, "_parent": { - "__id__": 24 + "__id__": 26 }, "_children": [ { - "__id__": 65 + "__id__": 70 }, { - "__id__": 68 + "__id__": 73 } ], "_active": true, "_components": [ { - "__id__": 71 + "__id__": 77 }, { - "__id__": 72 + "__id__": 78 }, { - "__id__": 73 + "__id__": 79 }, { - "__id__": 74 + "__id__": 80 }, { - "__id__": 75 + "__id__": 81 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 48.037, + "y": 8.459, "z": 0 }, "_lrot": { @@ -1861,16 +1993,16 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 64 + "__id__": 69 }, "_children": [], "_active": true, "_components": [ { - "__id__": 66 + "__id__": 71 }, { - "__id__": 67 + "__id__": 72 } ], "_prefab": null, @@ -1907,7 +2039,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 65 + "__id__": 70 }, "_enabled": true, "__prefab": null, @@ -1928,7 +2060,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 65 + "__id__": 70 }, "_enabled": true, "__prefab": null, @@ -1969,23 +2101,26 @@ "_name": "UpgradeAvailableIndicator", "_objFlags": 0, "_parent": { - "__id__": 64 + "__id__": 69 }, "_children": [], "_active": true, "_components": [ { - "__id__": 69 + "__id__": 74 }, { - "__id__": 70 + "__id__": 75 + }, + { + "__id__": 76 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 64, - "y": 18.5, + "x": 52.419, + "y": 14.499, "z": 0 }, "_lrot": { @@ -2015,14 +2150,14 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 68 + "__id__": 73 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 9, - "height": 9 + "width": 10, + "height": 17 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2036,7 +2171,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 68 + "__id__": 73 }, "_enabled": true, "__prefab": null, @@ -2072,19 +2207,41 @@ }, "_id": "3bWZb/wFFM7r06bUvHUkcc" }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 73 + }, + "_enabled": true, + "__prefab": null, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "bff9f8ad-6017-4ce9-9e0a-db0b30fc7b30", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "bff9f8ad-6017-4ce9-9e0a-db0b30fc7b30", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "5dVmzNooJNxJdTCQ8K+Prg" + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "node": { - "__id__": 64 + "__id__": 69 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 160, - "height": 40 + "width": 130, + "height": 32 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2098,7 +2255,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 64 + "__id__": 69 }, "_enabled": true, "__prefab": null, @@ -2136,7 +2293,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 64 + "__id__": 69 }, "_enabled": true, "__prefab": null, @@ -2190,7 +2347,7 @@ "_duration": 0.1, "_zoomScale": 0.92, "_target": { - "__id__": 64 + "__id__": 69 }, "_id": "02km9/CjtM4LntV5ZcaVeR" }, @@ -2199,7 +2356,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 64 + "__id__": 69 }, "_enabled": true, "__prefab": null, @@ -2210,568 +2367,41 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 64 + "__id__": 69 }, "_enabled": true, "__prefab": null, "button": { - "__id__": 74 + "__id__": 80 }, "_id": "adNyH1o7lEPoaiPeZSxUCn" }, - { - "__type__": "cc.Node", - "_name": "AudioSettingsBtn", - "_objFlags": 0, - "_parent": { - "__id__": 24 - }, - "_children": [ - { - "__id__": 77 - } - ], - "_active": true, - "_components": [ - { - "__id__": 80 - }, - { - "__id__": 81 - }, - { - "__id__": 82 - }, - { - "__id__": 83 - }, - { - "__id__": 84 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -348.205, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 2, - "y": 2, - "z": 1 - }, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "0c5QLzfeJIPogjKOYmZj7M" - }, - { - "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 512, - "_parent": { - "__id__": 76 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 78 - }, - { - "__id__": 79 - } - ], - "_prefab": null, - "_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": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "06dRHYuFFP/a/o39V6kbbw" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 77 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 130, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "d1d/N7z/tJe6M98lBL8FK6" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 77 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "Audio Settings", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 12, - "_fontSize": 12, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 1, - "_enableWrapText": false, - "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", - "__expectedType__": "cc.BitmapFont" - }, - "_isSystemFontUsed": false, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_id": "0foNkZgxJJWKhv+kjV9A9W" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 76 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 130, - "height": 24 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "7bkG6d1QxEc70rQblThaFd" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 76 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "5a4486c7-4d66-464c-ad81-6627c758eca2@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "adjFoug+ZHY7G2QNG0o7tk" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 76 - }, - "_enabled": true, - "__prefab": null, - "clickEvents": [], - "_interactable": true, - "_transition": 3, - "_normalColor": { - "__type__": "cc.Color", - "r": 214, - "g": 214, - "b": 214, - "a": 255 - }, - "_hoverColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_pressedColor": { - "__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__": "5a4486c7-4d66-464c-ad81-6627c758eca2@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_duration": 0.1, - "_zoomScale": 0.92, - "_target": { - "__id__": 76 - }, - "_id": "83MUZ70BBPoqpCJzA3nVTN" - }, - { - "__type__": "55e5f5nQ8dHiL5fPWjgdXbH", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 76 - }, - "_enabled": true, - "__prefab": null, - "_id": "32FMfxdN1Auo3dMG2+/Ftl" - }, - { - "__type__": "146cdU9Cw9I+otUVSgpwCCT", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 76 - }, - "_enabled": true, - "__prefab": null, - "button": { - "__id__": 83 - }, - "_id": "6bWmS+us9G55ZQR94w+B3i" - }, - { - "__type__": "cc.Node", - "_name": "HighscoreLabel", - "_objFlags": 0, - "_parent": { - "__id__": 24 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 86 - }, - { - "__id__": 87 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 231.847, - "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": "2bG95VhbNDN6iiv88LPyjH" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 85 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 150.43, - "height": 26 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "65/u2Ii8lF6ZE+x4Bk14JD" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 85 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "Highscore: 0", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 26, - "_fontSize": 26, - "_fontFamily": "Arial", - "_lineHeight": 26, - "_overflow": 0, - "_enableWrapText": true, - "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", - "__expectedType__": "cc.BitmapFont" - }, - "_isSystemFontUsed": false, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_id": "3fd6mbQOZH9ZnXu+ryqYhj" - }, - { - "__type__": "cc.Node", - "_name": "Y8Logo", - "_objFlags": 0, - "_parent": { - "__id__": 24 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 89 - }, - { - "__id__": 90 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -423.949, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 2, - "y": 2, - "z": 1 - }, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "13+S9W+VlG86BbwamhNUF8" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 88 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 51, - "height": 24 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "98rzeIs6hGorO565C3aibT" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 88 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "3e324d01-0072-417d-b0fc-b8bbdb9d909d@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "5aB7OXEtBOBa7DA9DZexHe" - }, { "__type__": "cc.Node", "_name": "GoldCounter", "_objFlags": 0, "_parent": { - "__id__": 24 + "__id__": 26 }, "_children": [ { - "__id__": 92 + "__id__": 83 }, { - "__id__": 95 + "__id__": 86 } ], "_active": true, "_components": [ { - "__id__": 98 + "__id__": 89 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -25.446, + "y": -54.851, "z": 0 }, "_lrot": { @@ -2801,16 +2431,16 @@ "_name": "GoldSprite", "_objFlags": 0, "_parent": { - "__id__": 91 + "__id__": 82 }, "_children": [], "_active": true, "_components": [ { - "__id__": 93 + "__id__": 84 }, { - "__id__": 94 + "__id__": 85 } ], "_prefab": null, @@ -2847,7 +2477,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 92 + "__id__": 83 }, "_enabled": true, "__prefab": null, @@ -2868,7 +2498,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 92 + "__id__": 83 }, "_enabled": true, "__prefab": null, @@ -2909,16 +2539,16 @@ "_name": "GoldLabel", "_objFlags": 0, "_parent": { - "__id__": 91 + "__id__": 82 }, "_children": [], "_active": true, "_components": [ { - "__id__": 96 + "__id__": 87 }, { - "__id__": 97 + "__id__": 88 } ], "_prefab": null, @@ -2955,7 +2585,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 95 + "__id__": 86 }, "_enabled": true, "__prefab": null, @@ -2976,7 +2606,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 95 + "__id__": 86 }, "_enabled": true, "__prefab": null, @@ -3017,7 +2647,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 91 + "__id__": 82 }, "_enabled": true, "__prefab": null, @@ -3033,19 +2663,438 @@ }, "_id": "3ccBq+Y69GZ4xwb93799iO" }, + { + "__type__": "cc.Node", + "_name": "AudioSettingsBtn", + "_objFlags": 0, + "_parent": { + "__id__": 26 + }, + "_children": [ + { + "__id__": 91 + } + ], + "_active": true, + "_components": [ + { + "__id__": 94 + }, + { + "__id__": 95 + }, + { + "__id__": 96 + }, + { + "__id__": 97 + }, + { + "__id__": 98 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -212.288, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 2, + "y": 2, + "z": 1 + }, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "0c5QLzfeJIPogjKOYmZj7M" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 512, + "_parent": { + "__id__": 90 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 92 + }, + { + "__id__": 93 + } + ], + "_prefab": null, + "_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": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "06dRHYuFFP/a/o39V6kbbw" + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "node": { - "__id__": 24 + "__id__": 91 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 130, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "d1d/N7z/tJe6M98lBL8FK6" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 91 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "Audio Settings", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 12, + "_fontSize": 12, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 1, + "_enableWrapText": false, + "_font": { + "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__expectedType__": "cc.BitmapFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "0foNkZgxJJWKhv+kjV9A9W" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 90 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 130, + "height": 24 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "7bkG6d1QxEc70rQblThaFd" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 90 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "5a4486c7-4d66-464c-ad81-6627c758eca2@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "adjFoug+ZHY7G2QNG0o7tk" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 90 + }, + "_enabled": true, + "__prefab": null, + "clickEvents": [], + "_interactable": true, + "_transition": 3, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__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__": "5a4486c7-4d66-464c-ad81-6627c758eca2@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_hoverSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_pressedSprite": { + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_disabledSprite": { + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_duration": 0.1, + "_zoomScale": 0.92, + "_target": { + "__id__": 90 + }, + "_id": "83MUZ70BBPoqpCJzA3nVTN" + }, + { + "__type__": "55e5f5nQ8dHiL5fPWjgdXbH", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 90 + }, + "_enabled": true, + "__prefab": null, + "_id": "32FMfxdN1Auo3dMG2+/Ftl" + }, + { + "__type__": "146cdU9Cw9I+otUVSgpwCCT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 90 + }, + "_enabled": true, + "__prefab": null, + "button": { + "__id__": 97 + }, + "_id": "6bWmS+us9G55ZQR94w+B3i" + }, + { + "__type__": "cc.Node", + "_name": "Y8Logo", + "_objFlags": 0, + "_parent": { + "__id__": 26 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 100 + }, + { + "__id__": 101 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -288.032, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 2, + "y": 2, + "z": 1 + }, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "13+S9W+VlG86BbwamhNUF8" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 99 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 51, + "height": 24 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "98rzeIs6hGorO565C3aibT" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 99 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "3e324d01-0072-417d-b0fc-b8bbdb9d909d@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "5aB7OXEtBOBa7DA9DZexHe" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3059,7 +3108,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 24 + "__id__": 26 }, "_enabled": true, "__prefab": null, @@ -3072,14 +3121,14 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 24 + "__id__": 26 }, "_enabled": true, "__prefab": null, "_alignFlags": 45, "_target": null, - "_left": 5.684341886080802e-14, - "_right": 5.684341886080802e-14, + "_left": -2.842170943040401e-14, + "_right": -2.842170943040401e-14, "_top": -5.684341886080802e-14, "_bottom": -5.684341886080802e-14, "_horizontalCenter": 0, @@ -3101,33 +3150,33 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 24 + "__id__": 26 }, "_enabled": true, "__prefab": null, "playBtn": { - "__id__": 62 + "__id__": 67 }, "upgradeBtn": { - "__id__": 74 + "__id__": 80 }, "upgradeAvailableIndicator": { - "__id__": 68 + "__id__": 73 }, "goldCounter": { - "__id__": 91 + "__id__": 82 }, "goldLabel": { - "__id__": 97 + "__id__": 88 }, "audioSettingsBtn": { - "__id__": 83 + "__id__": 97 }, "menuCanvas": { - "__id__": 100 + "__id__": 103 }, "highscoreLabel": { - "__id__": 87 + "__id__": 59 }, "_id": "4cQFnvx1xB65sFsTPGRrB7" }, @@ -3136,7 +3185,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 24 + "__id__": 26 }, "_enabled": true, "__prefab": null, @@ -3165,19 +3214,19 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 106 - }, - "shadows": { - "__id__": 107 - }, - "_skybox": { - "__id__": 108 - }, - "fog": { "__id__": 109 }, - "octree": { + "shadows": { "__id__": 110 + }, + "_skybox": { + "__id__": 111 + }, + "fog": { + "__id__": 112 + }, + "octree": { + "__id__": 113 } }, { diff --git a/assets/Scripts/Game/Data/GameConstants.ts b/assets/Scripts/Game/Data/GameConstants.ts index 3fbafc7..04c5d24 100644 --- a/assets/Scripts/Game/Data/GameConstants.ts +++ b/assets/Scripts/Game/Data/GameConstants.ts @@ -1,5 +1,5 @@ -export const SCREEN_WIDTH = 640; -export const SCREEN_HEIGHT = 960; +export const SCREEN_WIDTH = 510; +export const SCREEN_HEIGHT = 680; export const SCREEN_HALF_WIDTH = SCREEN_WIDTH / 2; export const SCREEN_HALF_HEIGHT = SCREEN_HEIGHT / 2; diff --git a/settings/v2/packages/project.json b/settings/v2/packages/project.json index 6dbb217..2f046e6 100644 --- a/settings/v2/packages/project.json +++ b/settings/v2/packages/project.json @@ -45,8 +45,8 @@ }, "general": { "designResolution": { - "width": 640, - "height": 960, + "width": 510, + "height": 680, "fitHeight": true } }