diff --git a/assets/_Game/Prefabs/Ball.prefab b/assets/_Game/Prefabs/Ball.prefab index cfa3a5b..39d8da7 100644 --- a/assets/_Game/Prefabs/Ball.prefab +++ b/assets/_Game/Prefabs/Ball.prefab @@ -941,11 +941,11 @@ "__id__": 47 }, "_hitSound": { - "__uuid__": "6a432293-3852-4267-be19-c671f36fe9f0", + "__uuid__": "b122d38e-ecf1-42e2-8b26-c09d306d90d9", "__expectedType__": "cc.AudioClip" }, - "_ballThrowSound": { - "__uuid__": "97c8a166-c717-41bd-837f-bd1733e2ee1c", + "_hitFlipperSound": { + "__uuid__": "a76cc94a-6331-47e7-b8aa-0caeea6a79eb", "__expectedType__": "cc.AudioClip" }, "_jumpCurve": { diff --git a/assets/_Game/Prefabs/Booster/CumulativeBooster.prefab b/assets/_Game/Prefabs/Booster/CumulativeBooster.prefab index 8c2fd05..89e28fb 100644 --- a/assets/_Game/Prefabs/Booster/CumulativeBooster.prefab +++ b/assets/_Game/Prefabs/Booster/CumulativeBooster.prefab @@ -1119,6 +1119,10 @@ "_animation": { "__id__": 82 }, + "_collectSound": { + "__uuid__": "1ac12acc-dde3-4d31-9106-dfc30c030d40", + "__expectedType__": "cc.AudioClip" + }, "time": 10, "_id": "" }, diff --git a/assets/_Game/Prefabs/Clock.prefab b/assets/_Game/Prefabs/Clock.prefab index c1c37ce..970fd0b 100644 --- a/assets/_Game/Prefabs/Clock.prefab +++ b/assets/_Game/Prefabs/Clock.prefab @@ -318,7 +318,7 @@ "__id__": 16 }, "_hitSound": { - "__uuid__": "1f602e14-2769-4903-b4d2-b0977eeaf36b", + "__uuid__": "65a023cb-b98f-4470-ba2d-4eba9fe184fe", "__expectedType__": "cc.AudioClip" }, "_score": 0, diff --git a/assets/_Game/Prefabs/box.prefab b/assets/_Game/Prefabs/box.prefab index 0ef2068..432c28a 100644 --- a/assets/_Game/Prefabs/box.prefab +++ b/assets/_Game/Prefabs/box.prefab @@ -318,7 +318,7 @@ "__id__": 16 }, "_hitSound": { - "__uuid__": "1f602e14-2769-4903-b4d2-b0977eeaf36b", + "__uuid__": "65a023cb-b98f-4470-ba2d-4eba9fe184fe", "__expectedType__": "cc.AudioClip" }, "_score": 5, diff --git a/assets/_Game/Scenes/EndLessScene.scene b/assets/_Game/Scenes/EndLessScene.scene index 2fa5c5d..b2976bc 100644 --- a/assets/_Game/Scenes/EndLessScene.scene +++ b/assets/_Game/Scenes/EndLessScene.scene @@ -25,7 +25,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 1071 + "__id__": 1091 }, "_lpos": { "__type__": "cc.Vec3", @@ -56,7 +56,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 1082 + "__id__": 1102 }, "_id": "82e6ef2e-3f9c-4d4e-ab02-dc963e925b88" }, @@ -79,19 +79,19 @@ "__id__": 9 }, { - "__id__": 1066 + "__id__": 1086 } ], "_active": true, "_components": [ { - "__id__": 1068 + "__id__": 1088 }, { - "__id__": 1069 + "__id__": 1089 }, { - "__id__": 1070 + "__id__": 1090 } ], "_prefab": null, @@ -367,34 +367,34 @@ "__id__": 113 }, { - "__id__": 440 + "__id__": 460 }, { - "__id__": 515 + "__id__": 535 }, { - "__id__": 581 + "__id__": 601 }, { - "__id__": 585 + "__id__": 605 }, { - "__id__": 789 + "__id__": 809 }, { - "__id__": 792 + "__id__": 812 }, { - "__id__": 794 + "__id__": 814 } ], "_active": true, "_components": [ { - "__id__": 1064 + "__id__": 1084 }, { - "__id__": 1065 + "__id__": 1085 } ], "_prefab": null, @@ -1407,6 +1407,10 @@ "_collider": { "__id__": 32 }, + "_soundFx": { + "__uuid__": "87e078a9-1082-4700-bd78-e6d0a06a150d", + "__expectedType__": "cc.AudioClip" + }, "_id": "f5BnEgCcxCQbIwzLn52V5G" }, { @@ -1687,6 +1691,10 @@ "_collider": { "__id__": 39 }, + "_soundFx": { + "__uuid__": "87e078a9-1082-4700-bd78-e6d0a06a150d", + "__expectedType__": "cc.AudioClip" + }, "_id": "11muFRUMdJ8b+tiu5yigmX" }, { @@ -2165,6 +2173,10 @@ "_collider": { "__id__": 51 }, + "_soundFx": { + "__uuid__": "8602f38f-d976-4e2b-baa2-621a62f20261", + "__expectedType__": "cc.AudioClip" + }, "_id": "aaFVCScoxJ5a270n4ihc6t" }, { @@ -2643,6 +2655,10 @@ "_collider": { "__id__": 63 }, + "_soundFx": { + "__uuid__": "8602f38f-d976-4e2b-baa2-621a62f20261", + "__expectedType__": "cc.AudioClip" + }, "_id": "56W5XkecxF9qFPiuwUcOye" }, { @@ -2950,6 +2966,10 @@ "_collider": { "__id__": 71 }, + "_soundFx": { + "__uuid__": "8602f38f-d976-4e2b-baa2-621a62f20261", + "__expectedType__": "cc.AudioClip" + }, "_id": "612I3eg0hBvYz0ANzjKOZn" }, { @@ -3257,6 +3277,10 @@ "_collider": { "__id__": 79 }, + "_soundFx": { + "__uuid__": "8602f38f-d976-4e2b-baa2-621a62f20261", + "__expectedType__": "cc.AudioClip" + }, "_id": "45MoczJ4FBhbf67lIqZ4nF" }, { @@ -6037,28 +6061,38 @@ "_points": [ { "__type__": "cc.Vec2", - "x": -108.3, + "x": -115, "y": -157.2 }, { "__type__": "cc.Vec2", - "x": -109.2, + "x": -115, "y": -113.6 }, { "__type__": "cc.Vec2", - "x": 119.4, + "x": 125, "y": -114.6 }, { "__type__": "cc.Vec2", - "x": 116.8, + "x": 125, "y": -162.9 }, { "__type__": "cc.Vec2", - "x": 1.1, - "y": -183.6 + "x": 68.7, + "y": -182.3 + }, + { + "__type__": "cc.Vec2", + "x": 4.1, + "y": -190.3 + }, + { + "__type__": "cc.Vec2", + "x": -65.9, + "y": -181.5 } ], "_id": "66yKMgTD5HXZ2YEmqy93qQ" @@ -6081,7 +6115,7 @@ "__expectedType__": "cc.Prefab" }, "_goalSound": { - "__uuid__": "b8e26fea-3d75-4254-8fe6-4a57c40d6121", + "__uuid__": "4ce9d2c6-98c5-4d05-94af-70193bb795fe", "__expectedType__": "cc.AudioClip" }, "_id": "depU8qmkxCaJIJsMIq3jv4" @@ -6714,6 +6748,10 @@ "__uuid__": "7afbc379-62e2-4721-b6d4-be47b00b6db2", "__expectedType__": "cc.Prefab" }, + "_soundFX": { + "__uuid__": "d3b9a148-5c8e-41f4-9e87-c09175e20b2d", + "__expectedType__": "cc.AudioClip" + }, "_id": "cf4OeeWmpFIouLcLflIG+0" }, { @@ -7015,7 +7053,7 @@ "_fillBar": { "__id__": 195 }, - "_maxValue": 500, + "_maxValue": 1000, "_scoreUI": { "__id__": 201 }, @@ -7023,6 +7061,10 @@ "__uuid__": "35274179-f40e-4de9-a5d5-43fba9c12669", "__expectedType__": "cc.Prefab" }, + "_soundFx": { + "__uuid__": "65a023cb-b98f-4470-ba2d-4eba9fe184fe", + "__expectedType__": "cc.AudioClip" + }, "_id": "e5qVdeXFZOu6/MatkdDEG6" }, { @@ -7036,10 +7078,10 @@ "_active": true, "_components": [ { - "__id__": 438 + "__id__": 458 }, { - "__id__": 439 + "__id__": 459 } ], "_prefab": null, @@ -7090,16 +7132,16 @@ "_active": true, "_components": [ { - "__id__": 434 + "__id__": 454 }, { - "__id__": 435 + "__id__": 455 }, { - "__id__": 436 + "__id__": 456 }, { - "__id__": 437 + "__id__": 457 } ], "_prefab": null, @@ -7141,7 +7183,10 @@ }, "_children": [ { - "__id__": 427 + "__id__": 443 + }, + { + "__id__": 447 }, { "__id__": 202 @@ -7150,13 +7195,13 @@ "_active": true, "_components": [ { - "__id__": 431 + "__id__": 451 }, { - "__id__": 432 + "__id__": 452 }, { - "__id__": 433 + "__id__": 453 } ], "_prefab": null, @@ -7201,19 +7246,22 @@ "__id__": 203 }, { - "__id__": 413 + "__id__": 416 }, { - "__id__": 402 + "__id__": 405 + }, + { + "__id__": 428 } ], "_active": true, "_components": [ { - "__id__": 425 + "__id__": 441 }, { - "__id__": 426 + "__id__": 442 } ], "_prefab": null, @@ -7270,13 +7318,13 @@ "_active": true, "_components": [ { - "__id__": 397 + "__id__": 400 }, { - "__id__": 398 + "__id__": 401 }, { - "__id__": 399 + "__id__": 402 } ], "_prefab": null, @@ -11690,6 +11738,10 @@ "__uuid__": "35274179-f40e-4de9-a5d5-43fba9c12669", "__expectedType__": "cc.Prefab" }, + "_soundCollectCoinFx": { + "__uuid__": "65a023cb-b98f-4470-ba2d-4eba9fe184fe", + "__expectedType__": "cc.AudioClip" + }, "_id": "bbcyvzebBDsJfOOH9VNeON" }, { @@ -11816,13 +11868,13 @@ "_active": false, "_components": [ { - "__id__": 394 + "__id__": 397 }, { - "__id__": 395 + "__id__": 398 }, { - "__id__": 396 + "__id__": 399 } ], "_prefab": null, @@ -11862,12 +11914,63 @@ "_parent": { "__id__": 388 }, - "_children": [], + "_children": [ + { + "__id__": 390 + } + ], "_active": true, "_components": [ { - "__id__": 390 + "__id__": 393 }, + { + "__id__": 394 + }, + { + "__id__": 395 + } + ], + "_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 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "e8XiYaBZFP9JAI3TvQoyfu" + }, + { + "__type__": "cc.Node", + "_name": "Start", + "_objFlags": 0, + "_parent": { + "__id__": 389 + }, + "_children": [], + "_active": true, + "_components": [ { "__id__": 391 }, @@ -11903,7 +12006,69 @@ "y": 0, "z": 0 }, - "_id": "e8XiYaBZFP9JAI3TvQoyfu" + "_id": "3bOtFnH29LK5ScC0Aza7yh" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 390 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 302.17, + "height": 151.2 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "40QEIsSfhN6av7fIdYFAaZ" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 390 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "Start", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 120, + "_fontSize": 120, + "_fontFamily": "Arial", + "_lineHeight": 120, + "_overflow": 0, + "_enableWrapText": true, + "_font": { + "__uuid__": "4eb60b5b-72b8-497c-b499-d7921c9b84db", + "__expectedType__": "cc.TTFFont" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "96iMKuFvZMqoG07zYljajd" }, { "__type__": "cc.UITransform", @@ -11916,8 +12081,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 478, - "height": 194 + "width": 500, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -11946,12 +12111,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ff046972-01bd-4d20-b27d-92120e050ca3@f9941", + "__uuid__": "7025496d-1937-4fca-9210-a5afc2f4b66c@f9941", "__expectedType__": "cc.SpriteFrame" }, - "_type": 1, + "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -11975,7 +12140,7 @@ "__prefab": null, "clickEvents": [ { - "__id__": 393 + "__id__": 396 } ], "_interactable": true, @@ -12008,22 +12173,10 @@ "b": 124, "a": 255 }, - "_normalSprite": { - "__uuid__": "ff046972-01bd-4d20-b27d-92120e050ca3@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" - }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 1.2, "_target": { @@ -12192,10 +12345,10 @@ "__id__": 387 }, "_ticketLabel": { - "__id__": 400 + "__id__": 403 }, "_timeLabel": { - "__id__": 411 + "__id__": 414 }, "_eventLabel": { "__id__": 304 @@ -12217,7 +12370,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 401 + "__id__": 404 }, "_enabled": true, "__prefab": null, @@ -12258,16 +12411,16 @@ "_name": "ticket", "_objFlags": 0, "_parent": { - "__id__": 402 + "__id__": 405 }, "_children": [], "_active": true, "_components": [ { - "__id__": 410 + "__id__": 413 }, { - "__id__": 400 + "__id__": 403 } ], "_prefab": null, @@ -12309,25 +12462,25 @@ }, "_children": [ { - "__id__": 403 + "__id__": 406 }, { - "__id__": 401 + "__id__": 404 } ], "_active": true, "_components": [ - { - "__id__": 406 - }, - { - "__id__": 407 - }, - { - "__id__": 408 - }, { "__id__": 409 + }, + { + "__id__": 410 + }, + { + "__id__": 411 + }, + { + "__id__": 412 } ], "_prefab": null, @@ -12365,16 +12518,16 @@ "_name": "icon", "_objFlags": 0, "_parent": { - "__id__": 402 + "__id__": 405 }, "_children": [], "_active": true, "_components": [ { - "__id__": 404 + "__id__": 407 }, { - "__id__": 405 + "__id__": 408 } ], "_prefab": null, @@ -12412,7 +12565,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 403 + "__id__": 406 }, "_enabled": true, "__prefab": null, @@ -12433,7 +12586,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 403 + "__id__": 406 }, "_enabled": true, "__prefab": null, @@ -12471,7 +12624,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 402 + "__id__": 405 }, "_enabled": true, "__prefab": null, @@ -12492,7 +12645,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 402 + "__id__": 405 }, "_enabled": true, "__prefab": null, @@ -12530,7 +12683,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 402 + "__id__": 405 }, "_enabled": true, "__prefab": null, @@ -12559,7 +12712,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 402 + "__id__": 405 }, "_enabled": true, "__prefab": null, @@ -12590,7 +12743,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 401 + "__id__": 404 }, "_enabled": true, "__prefab": null, @@ -12611,7 +12764,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 412 + "__id__": 415 }, "_enabled": true, "__prefab": null, @@ -12652,16 +12805,16 @@ "_name": "Timer", "_objFlags": 0, "_parent": { - "__id__": 413 + "__id__": 416 }, "_children": [], "_active": true, "_components": [ { - "__id__": 424 + "__id__": 427 }, { - "__id__": 411 + "__id__": 414 } ], "_prefab": null, @@ -12703,25 +12856,25 @@ }, "_children": [ { - "__id__": 414 + "__id__": 417 }, { - "__id__": 412 + "__id__": 415 } ], "_active": true, "_components": [ - { - "__id__": 420 - }, - { - "__id__": 421 - }, - { - "__id__": 422 - }, { "__id__": 423 + }, + { + "__id__": 424 + }, + { + "__id__": 425 + }, + { + "__id__": 426 } ], "_prefab": null, @@ -12759,20 +12912,20 @@ "_name": "icon", "_objFlags": 0, "_parent": { - "__id__": 413 + "__id__": 416 }, "_children": [ { - "__id__": 415 + "__id__": 418 } ], "_active": true, "_components": [ { - "__id__": 418 + "__id__": 421 }, { - "__id__": 419 + "__id__": 422 } ], "_prefab": null, @@ -12810,16 +12963,16 @@ "_name": "Clock", "_objFlags": 0, "_parent": { - "__id__": 414 + "__id__": 417 }, "_children": [], "_active": true, "_components": [ { - "__id__": 416 + "__id__": 419 }, { - "__id__": 417 + "__id__": 420 } ], "_prefab": null, @@ -12857,7 +13010,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 415 + "__id__": 418 }, "_enabled": true, "__prefab": null, @@ -12878,7 +13031,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 415 + "__id__": 418 }, "_enabled": true, "__prefab": null, @@ -12916,7 +13069,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 414 + "__id__": 417 }, "_enabled": true, "__prefab": null, @@ -12937,7 +13090,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 414 + "__id__": 417 }, "_enabled": true, "__prefab": null, @@ -12975,7 +13128,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 413 + "__id__": 416 }, "_enabled": true, "__prefab": null, @@ -12996,7 +13149,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 413 + "__id__": 416 }, "_enabled": true, "__prefab": null, @@ -13034,7 +13187,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 413 + "__id__": 416 }, "_enabled": true, "__prefab": null, @@ -13063,7 +13216,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 413 + "__id__": 416 }, "_enabled": true, "__prefab": null, @@ -13094,7 +13247,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 412 + "__id__": 415 }, "_enabled": true, "__prefab": null, @@ -13110,6 +13263,451 @@ }, "_id": "aaOHbgUfNOOLyY/i3dpKo3" }, + { + "__type__": "cc.Node", + "_name": "Button", + "_objFlags": 0, + "_parent": { + "__id__": 204 + }, + "_children": [ + { + "__id__": 429 + }, + { + "__id__": 432 + } + ], + "_active": true, + "_components": [ + { + "__id__": 435 + }, + { + "__id__": 436 + }, + { + "__id__": 437 + }, + { + "__id__": 439 + }, + { + "__id__": 440 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 430, + "y": -190, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "4arGArpuBN344olHjyQwFX" + }, + { + "__type__": "cc.Node", + "_name": "Sound", + "_objFlags": 0, + "_parent": { + "__id__": 428 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 430 + }, + { + "__id__": 431 + } + ], + "_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": 0.4, + "y": 0.4, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "d7QlavJEtOjJ5Em31N4CBm" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 429 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 209, + "height": 159 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "0dxGMIrLpKFafnoWpOZplC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 429 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "834b7b1a-0bf9-437a-b2ee-627c08bc87cc@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": "30vAqkVSdNvpDzVpOOhL+C" + }, + { + "__type__": "cc.Node", + "_name": "No_Sound", + "_objFlags": 0, + "_parent": { + "__id__": 428 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 433 + }, + { + "__id__": 434 + } + ], + "_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": 0.4, + "y": 0.4, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "f0h1cL96xEN6nRv1Eioao6" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 432 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 203, + "height": 159 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "1e/QpLOXZOPKI36CXGB0vk" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 432 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "4bcfb3c4-ecab-48a0-8bd6-c2916fd3acb3@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": "8dYNTDvl5ILpJWl1HUxlA5" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 428 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 160, + "height": 120 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "92XJXO6xRKPIZ5M29MX5yf" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 428 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7025496d-1937-4fca-9210-a5afc2f4b66c@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": "62du5TLmRDhrcegMRkZdNu" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 428 + }, + "_enabled": true, + "__prefab": null, + "clickEvents": [ + { + "__id__": 438 + } + ], + "_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": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": { + "__id__": 428 + }, + "_id": "1cDmuMEIFEs5ImBNG5Gm0F" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 428 + }, + "component": "", + "_componentId": "fe619HtEX1OQq7oeACKrANd", + "handler": "clickBtn", + "customEventData": "" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 428 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 33, + "_target": null, + "_left": 0, + "_right": 30, + "_top": 180, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "d3hx2/bNhFsL+ZHSJvmbCo" + }, + { + "__type__": "fe619HtEX1OQq7oeACKrANd", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 428 + }, + "_enabled": true, + "__prefab": null, + "_unMute": { + "__id__": 429 + }, + "_mute": { + "__id__": 432 + }, + "_id": "adeG5FRP1GpLzDXol2pxU+" + }, { "__type__": "cc.UITransform", "_name": "", @@ -13160,6 +13758,144 @@ "_lockFlags": 0, "_id": "3ezOJfp3FPLY6+4J33WrXu" }, + { + "__type__": "cc.Node", + "_name": "avt sprite", + "_objFlags": 0, + "_parent": { + "__id__": 203 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 444 + }, + { + "__id__": 445 + }, + { + "__id__": 446 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 83.4765, + "y": -88.9409395465995, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "79pCDBIjlAGZ7xHX4I8Sap" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 443 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 96.953, + "height": 113.27182178217822 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "44PFWTHt5CHqBtjsTiuqWS" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 443 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "c60afd72-3284-4d02-a2fa-f70904bfd53a@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "3aqIF1XNpCEpB8NqEWbbTK" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 443 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 10, + "_target": null, + "_left": 35, + "_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": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "57abtVPmhGsLAImokKOYfi" + }, { "__type__": "cc.Node", "_name": "username", @@ -13171,13 +13907,13 @@ "_active": true, "_components": [ { - "__id__": 428 + "__id__": 448 }, { - "__id__": 429 + "__id__": 449 }, { - "__id__": 430 + "__id__": 450 } ], "_prefab": null, @@ -13215,7 +13951,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 427 + "__id__": 447 }, "_enabled": true, "__prefab": null, @@ -13236,7 +13972,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 427 + "__id__": 447 }, "_enabled": true, "__prefab": null, @@ -13250,10 +13986,10 @@ "b": 255, "a": 255 }, - "_string": "Username", + "_string": "Player", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 39, + "_actualFontSize": 51, "_fontSize": 50, "_fontFamily": "Arial", "_lineHeight": 40, @@ -13277,7 +14013,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 427 + "__id__": 447 }, "_enabled": true, "__prefab": null, @@ -13576,22 +14312,22 @@ }, "_children": [ { - "__id__": 441 + "__id__": 461 }, { - "__id__": 457 + "__id__": 477 }, { - "__id__": 476 + "__id__": 496 }, { - "__id__": 495 + "__id__": 515 } ], "_active": true, "_components": [ { - "__id__": 514 + "__id__": 534 } ], "_prefab": null, @@ -13629,26 +14365,26 @@ "_name": "Enemy", "_objFlags": 0, "_parent": { - "__id__": 440 + "__id__": 460 }, "_children": [ { - "__id__": 442 + "__id__": 462 }, { - "__id__": 449 + "__id__": 469 }, { - "__id__": 451 + "__id__": 471 } ], "_active": true, "_components": [ { - "__id__": 453 + "__id__": 473 }, { - "__id__": 454 + "__id__": 474 } ], "_prefab": null, @@ -13686,23 +14422,23 @@ "_name": "Collider", "_objFlags": 0, "_parent": { - "__id__": 441 + "__id__": 461 }, "_children": [ { - "__id__": 443 + "__id__": 463 } ], "_active": true, "_components": [ { - "__id__": 446 + "__id__": 466 }, { - "__id__": 447 + "__id__": 467 }, { - "__id__": 448 + "__id__": 468 } ], "_prefab": null, @@ -13740,16 +14476,16 @@ "_name": "Sprite", "_objFlags": 0, "_parent": { - "__id__": 442 + "__id__": 462 }, "_children": [], "_active": true, "_components": [ { - "__id__": 444 + "__id__": 464 }, { - "__id__": 445 + "__id__": 465 } ], "_prefab": null, @@ -13787,7 +14523,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 443 + "__id__": 463 }, "_enabled": true, "__prefab": null, @@ -13808,7 +14544,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 443 + "__id__": 463 }, "_enabled": true, "__prefab": null, @@ -13846,7 +14582,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 442 + "__id__": 462 }, "_enabled": true, "__prefab": null, @@ -13867,7 +14603,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 442 + "__id__": 462 }, "_enabled": true, "__prefab": null, @@ -13894,7 +14630,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 442 + "__id__": 462 }, "_enabled": true, "__prefab": null, @@ -13921,13 +14657,13 @@ "_name": "P1", "_objFlags": 0, "_parent": { - "__id__": 441 + "__id__": 461 }, "_children": [], "_active": true, "_components": [ { - "__id__": 450 + "__id__": 470 } ], "_prefab": null, @@ -13965,7 +14701,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 449 + "__id__": 469 }, "_enabled": true, "__prefab": null, @@ -13986,13 +14722,13 @@ "_name": "P2", "_objFlags": 0, "_parent": { - "__id__": 441 + "__id__": 461 }, "_children": [], "_active": true, "_components": [ { - "__id__": 452 + "__id__": 472 } ], "_prefab": null, @@ -14030,7 +14766,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 451 + "__id__": 471 }, "_enabled": true, "__prefab": null, @@ -14051,7 +14787,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 441 + "__id__": 461 }, "_enabled": true, "__prefab": null, @@ -14072,35 +14808,39 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 441 + "__id__": 461 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 447 + "__id__": 467 }, "_sprite": { - "__id__": 445 + "__id__": 465 }, "_patrolPoint1": { - "__id__": 449 + "__id__": 469 }, "_patrolPoint2": { - "__id__": 451 + "__id__": 471 }, "_speed": 50, "_requireGoal": 1, "_curveY": true, "_patrolCurve": { - "__id__": 455 + "__id__": 475 }, "_multiplierCurve": 120, + "_hitSound": { + "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__expectedType__": "cc.AudioClip" + }, "_id": "9cJaywMb9Fr4Z0zlx1Pdcb" }, { "__type__": "cc.AnimationCurve", "_curve": { - "__id__": 456 + "__id__": 476 } }, { @@ -14143,29 +14883,29 @@ "_name": "Enemy-001", "_objFlags": 0, "_parent": { - "__id__": 440 + "__id__": 460 }, "_children": [ { - "__id__": 458 + "__id__": 478 }, { - "__id__": 461 + "__id__": 481 }, { - "__id__": 468 + "__id__": 488 }, { - "__id__": 470 + "__id__": 490 } ], "_active": true, "_components": [ { - "__id__": 472 + "__id__": 492 }, { - "__id__": 473 + "__id__": 493 } ], "_prefab": null, @@ -14203,16 +14943,16 @@ "_name": "track", "_objFlags": 0, "_parent": { - "__id__": 457 + "__id__": 477 }, "_children": [], "_active": true, "_components": [ { - "__id__": 459 + "__id__": 479 }, { - "__id__": 460 + "__id__": 480 } ], "_prefab": null, @@ -14250,7 +14990,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 458 + "__id__": 478 }, "_enabled": true, "__prefab": null, @@ -14271,7 +15011,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 458 + "__id__": 478 }, "_enabled": true, "__prefab": null, @@ -14309,23 +15049,23 @@ "_name": "Collider", "_objFlags": 0, "_parent": { - "__id__": 457 + "__id__": 477 }, "_children": [ { - "__id__": 462 + "__id__": 482 } ], "_active": true, "_components": [ { - "__id__": 465 + "__id__": 485 }, { - "__id__": 466 + "__id__": 486 }, { - "__id__": 467 + "__id__": 487 } ], "_prefab": null, @@ -14363,16 +15103,16 @@ "_name": "Sprite", "_objFlags": 0, "_parent": { - "__id__": 461 + "__id__": 481 }, "_children": [], "_active": true, "_components": [ { - "__id__": 463 + "__id__": 483 }, { - "__id__": 464 + "__id__": 484 } ], "_prefab": null, @@ -14410,7 +15150,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 462 + "__id__": 482 }, "_enabled": true, "__prefab": null, @@ -14431,7 +15171,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 462 + "__id__": 482 }, "_enabled": true, "__prefab": null, @@ -14469,7 +15209,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 461 + "__id__": 481 }, "_enabled": true, "__prefab": null, @@ -14490,7 +15230,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 461 + "__id__": 481 }, "_enabled": true, "__prefab": null, @@ -14517,7 +15257,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 461 + "__id__": 481 }, "_enabled": true, "__prefab": null, @@ -14544,13 +15284,13 @@ "_name": "P1", "_objFlags": 0, "_parent": { - "__id__": 457 + "__id__": 477 }, "_children": [], "_active": true, "_components": [ { - "__id__": 469 + "__id__": 489 } ], "_prefab": null, @@ -14588,7 +15328,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 468 + "__id__": 488 }, "_enabled": true, "__prefab": null, @@ -14609,13 +15349,13 @@ "_name": "P2", "_objFlags": 0, "_parent": { - "__id__": 457 + "__id__": 477 }, "_children": [], "_active": true, "_components": [ { - "__id__": 471 + "__id__": 491 } ], "_prefab": null, @@ -14653,7 +15393,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 470 + "__id__": 490 }, "_enabled": true, "__prefab": null, @@ -14674,7 +15414,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 457 + "__id__": 477 }, "_enabled": true, "__prefab": null, @@ -14695,35 +15435,39 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 457 + "__id__": 477 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 466 + "__id__": 486 }, "_sprite": { - "__id__": 464 + "__id__": 484 }, "_patrolPoint1": { - "__id__": 468 + "__id__": 488 }, "_patrolPoint2": { - "__id__": 470 + "__id__": 490 }, "_speed": 50, "_requireGoal": 3, "_curveY": false, "_patrolCurve": { - "__id__": 474 + "__id__": 494 }, "_multiplierCurve": 100, + "_hitSound": { + "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__expectedType__": "cc.AudioClip" + }, "_id": "f2+Qohf8JAhZ3Xqi9g9xV1" }, { "__type__": "cc.AnimationCurve", "_curve": { - "__id__": 475 + "__id__": 495 } }, { @@ -14766,29 +15510,29 @@ "_name": "Enemy-002", "_objFlags": 0, "_parent": { - "__id__": 440 + "__id__": 460 }, "_children": [ { - "__id__": 477 + "__id__": 497 }, { - "__id__": 480 + "__id__": 500 }, { - "__id__": 487 + "__id__": 507 }, { - "__id__": 489 + "__id__": 509 } ], "_active": true, "_components": [ { - "__id__": 491 + "__id__": 511 }, { - "__id__": 492 + "__id__": 512 } ], "_prefab": null, @@ -14826,16 +15570,16 @@ "_name": "track", "_objFlags": 0, "_parent": { - "__id__": 476 + "__id__": 496 }, "_children": [], "_active": true, "_components": [ { - "__id__": 478 + "__id__": 498 }, { - "__id__": 479 + "__id__": 499 } ], "_prefab": null, @@ -14873,7 +15617,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 477 + "__id__": 497 }, "_enabled": true, "__prefab": null, @@ -14894,7 +15638,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 477 + "__id__": 497 }, "_enabled": true, "__prefab": null, @@ -14932,23 +15676,23 @@ "_name": "Collider", "_objFlags": 0, "_parent": { - "__id__": 476 + "__id__": 496 }, "_children": [ { - "__id__": 481 + "__id__": 501 } ], "_active": true, "_components": [ { - "__id__": 484 + "__id__": 504 }, { - "__id__": 485 + "__id__": 505 }, { - "__id__": 486 + "__id__": 506 } ], "_prefab": null, @@ -14986,16 +15730,16 @@ "_name": "Sprite", "_objFlags": 0, "_parent": { - "__id__": 480 + "__id__": 500 }, "_children": [], "_active": true, "_components": [ { - "__id__": 482 + "__id__": 502 }, { - "__id__": 483 + "__id__": 503 } ], "_prefab": null, @@ -15033,7 +15777,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 481 + "__id__": 501 }, "_enabled": true, "__prefab": null, @@ -15054,7 +15798,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 481 + "__id__": 501 }, "_enabled": true, "__prefab": null, @@ -15092,7 +15836,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 480 + "__id__": 500 }, "_enabled": true, "__prefab": null, @@ -15113,7 +15857,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 480 + "__id__": 500 }, "_enabled": true, "__prefab": null, @@ -15140,7 +15884,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 480 + "__id__": 500 }, "_enabled": true, "__prefab": null, @@ -15167,13 +15911,13 @@ "_name": "P1", "_objFlags": 0, "_parent": { - "__id__": 476 + "__id__": 496 }, "_children": [], "_active": true, "_components": [ { - "__id__": 488 + "__id__": 508 } ], "_prefab": null, @@ -15211,7 +15955,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 487 + "__id__": 507 }, "_enabled": true, "__prefab": null, @@ -15232,13 +15976,13 @@ "_name": "P2", "_objFlags": 0, "_parent": { - "__id__": 476 + "__id__": 496 }, "_children": [], "_active": true, "_components": [ { - "__id__": 490 + "__id__": 510 } ], "_prefab": null, @@ -15276,7 +16020,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 489 + "__id__": 509 }, "_enabled": true, "__prefab": null, @@ -15297,7 +16041,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 476 + "__id__": 496 }, "_enabled": true, "__prefab": null, @@ -15318,35 +16062,39 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 476 + "__id__": 496 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 485 + "__id__": 505 }, "_sprite": { - "__id__": 483 + "__id__": 503 }, "_patrolPoint1": { - "__id__": 487 + "__id__": 507 }, "_patrolPoint2": { - "__id__": 489 + "__id__": 509 }, "_speed": 50, "_requireGoal": 6, "_curveY": false, "_patrolCurve": { - "__id__": 493 + "__id__": 513 }, "_multiplierCurve": 100, + "_hitSound": { + "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__expectedType__": "cc.AudioClip" + }, "_id": "99Yu77Ej9N4JRBZjD+OE2I" }, { "__type__": "cc.AnimationCurve", "_curve": { - "__id__": 494 + "__id__": 514 } }, { @@ -15389,29 +16137,29 @@ "_name": "Enemy-003", "_objFlags": 0, "_parent": { - "__id__": 440 + "__id__": 460 }, "_children": [ { - "__id__": 496 + "__id__": 516 }, { - "__id__": 499 + "__id__": 519 }, { - "__id__": 506 + "__id__": 526 }, { - "__id__": 508 + "__id__": 528 } ], "_active": true, "_components": [ { - "__id__": 510 + "__id__": 530 }, { - "__id__": 511 + "__id__": 531 } ], "_prefab": null, @@ -15449,16 +16197,16 @@ "_name": "track", "_objFlags": 0, "_parent": { - "__id__": 495 + "__id__": 515 }, "_children": [], "_active": true, "_components": [ { - "__id__": 497 + "__id__": 517 }, { - "__id__": 498 + "__id__": 518 } ], "_prefab": null, @@ -15496,7 +16244,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 496 + "__id__": 516 }, "_enabled": true, "__prefab": null, @@ -15517,7 +16265,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 496 + "__id__": 516 }, "_enabled": true, "__prefab": null, @@ -15555,23 +16303,23 @@ "_name": "Collider", "_objFlags": 0, "_parent": { - "__id__": 495 + "__id__": 515 }, "_children": [ { - "__id__": 500 + "__id__": 520 } ], "_active": true, "_components": [ { - "__id__": 503 + "__id__": 523 }, { - "__id__": 504 + "__id__": 524 }, { - "__id__": 505 + "__id__": 525 } ], "_prefab": null, @@ -15609,16 +16357,16 @@ "_name": "Sprite", "_objFlags": 0, "_parent": { - "__id__": 499 + "__id__": 519 }, "_children": [], "_active": true, "_components": [ { - "__id__": 501 + "__id__": 521 }, { - "__id__": 502 + "__id__": 522 } ], "_prefab": null, @@ -15656,7 +16404,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 500 + "__id__": 520 }, "_enabled": true, "__prefab": null, @@ -15677,7 +16425,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 500 + "__id__": 520 }, "_enabled": true, "__prefab": null, @@ -15715,7 +16463,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 499 + "__id__": 519 }, "_enabled": true, "__prefab": null, @@ -15736,7 +16484,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 499 + "__id__": 519 }, "_enabled": true, "__prefab": null, @@ -15763,7 +16511,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 499 + "__id__": 519 }, "_enabled": true, "__prefab": null, @@ -15790,13 +16538,13 @@ "_name": "P1", "_objFlags": 0, "_parent": { - "__id__": 495 + "__id__": 515 }, "_children": [], "_active": true, "_components": [ { - "__id__": 507 + "__id__": 527 } ], "_prefab": null, @@ -15834,7 +16582,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 506 + "__id__": 526 }, "_enabled": true, "__prefab": null, @@ -15855,13 +16603,13 @@ "_name": "P2", "_objFlags": 0, "_parent": { - "__id__": 495 + "__id__": 515 }, "_children": [], "_active": true, "_components": [ { - "__id__": 509 + "__id__": 529 } ], "_prefab": null, @@ -15899,7 +16647,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 508 + "__id__": 528 }, "_enabled": true, "__prefab": null, @@ -15920,7 +16668,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 495 + "__id__": 515 }, "_enabled": true, "__prefab": null, @@ -15941,35 +16689,39 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 495 + "__id__": 515 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 504 + "__id__": 524 }, "_sprite": { - "__id__": 502 + "__id__": 522 }, "_patrolPoint1": { - "__id__": 506 + "__id__": 526 }, "_patrolPoint2": { - "__id__": 508 + "__id__": 528 }, "_speed": 50, "_requireGoal": 9, "_curveY": false, "_patrolCurve": { - "__id__": 512 + "__id__": 532 }, "_multiplierCurve": 100, + "_hitSound": { + "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__expectedType__": "cc.AudioClip" + }, "_id": "2bedVMe25Ou4KcU4DmnB4q" }, { "__type__": "cc.AnimationCurve", "_curve": { - "__id__": 513 + "__id__": 533 } }, { @@ -16012,7 +16764,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 440 + "__id__": 460 }, "_enabled": true, "__prefab": null, @@ -16037,22 +16789,22 @@ }, "_children": [ { - "__id__": 516 + "__id__": 536 }, { - "__id__": 532 + "__id__": 552 }, { - "__id__": 548 + "__id__": 568 }, { - "__id__": 564 + "__id__": 584 } ], "_active": true, "_components": [ { - "__id__": 580 + "__id__": 600 } ], "_prefab": null, @@ -16091,23 +16843,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 515 + "__id__": 535 }, "_children": [ { - "__id__": 517 + "__id__": 537 } ], "_active": true, "_components": [ { - "__id__": 526 + "__id__": 546 }, { - "__id__": 530 + "__id__": 550 }, { - "__id__": 531 + "__id__": 551 } ], "_prefab": null, @@ -16146,32 +16898,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 516 + "__id__": 536 }, "_children": [ { - "__id__": 518 + "__id__": 538 }, { - "__id__": 521 + "__id__": 541 } ], "_active": true, "_components": [ { - "__id__": 524 + "__id__": 544 }, { - "__id__": 525 + "__id__": 545 }, { - "__id__": 527 + "__id__": 547 }, { - "__id__": 528 + "__id__": 548 }, { - "__id__": 529 + "__id__": 549 } ], "_prefab": null, @@ -16209,16 +16961,16 @@ "_name": "Glow", "_objFlags": 0, "_parent": { - "__id__": 517 + "__id__": 537 }, "_children": [], "_active": true, "_components": [ { - "__id__": 519 + "__id__": 539 }, { - "__id__": 520 + "__id__": 540 } ], "_prefab": null, @@ -16256,7 +17008,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 518 + "__id__": 538 }, "_enabled": true, "__prefab": null, @@ -16277,7 +17029,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 518 + "__id__": 538 }, "_enabled": true, "__prefab": null, @@ -16315,16 +17067,16 @@ "_name": "Sprite", "_objFlags": 0, "_parent": { - "__id__": 517 + "__id__": 537 }, "_children": [], "_active": true, "_components": [ { - "__id__": 522 + "__id__": 542 }, { - "__id__": 523 + "__id__": 543 } ], "_prefab": null, @@ -16362,7 +17114,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 521 + "__id__": 541 }, "_enabled": true, "__prefab": null, @@ -16383,7 +17135,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 521 + "__id__": 541 }, "_enabled": true, "__prefab": null, @@ -16422,7 +17174,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 517 + "__id__": 537 }, "_enabled": true, "__prefab": null, @@ -16450,7 +17202,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 517 + "__id__": 537 }, "_enabled": true, "__prefab": null, @@ -16466,7 +17218,7 @@ }, "collideConnected": false, "connectedBody": { - "__id__": 526 + "__id__": 546 }, "_enableLimit": true, "_lowerAngle": -60, @@ -16482,7 +17234,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 516 + "__id__": 536 }, "_enabled": true, "__prefab": null, @@ -16510,7 +17262,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 517 + "__id__": 537 }, "_enabled": true, "__prefab": null, @@ -16589,7 +17341,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 517 + "__id__": 537 }, "_enabled": true, "__prefab": null, @@ -16610,7 +17362,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 517 + "__id__": 537 }, "_enabled": true, "__prefab": null, @@ -16648,19 +17400,23 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 516 + "__id__": 536 }, "_enabled": true, "__prefab": null, "_animation": { - "__id__": 531 + "__id__": 551 }, "_hingeJoint": { - "__id__": 525 + "__id__": 545 }, "_motorSpeedActive": -10000, "_motorSpeedDeActive": 10000, "side": 0, + "_activeSound": { + "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__expectedType__": "cc.AudioClip" + }, "_id": "dbyGJf4ZlNuqnbz9gSPD7E" }, { @@ -16668,7 +17424,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 516 + "__id__": 536 }, "_enabled": true, "__prefab": null, @@ -16691,23 +17447,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 515 + "__id__": 535 }, "_children": [ { - "__id__": 533 + "__id__": 553 } ], "_active": true, "_components": [ { - "__id__": 542 + "__id__": 562 }, { - "__id__": 546 + "__id__": 566 }, { - "__id__": 547 + "__id__": 567 } ], "_prefab": null, @@ -16746,32 +17502,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 532 + "__id__": 552 }, "_children": [ { - "__id__": 534 + "__id__": 554 }, { - "__id__": 537 + "__id__": 557 } ], "_active": true, "_components": [ { - "__id__": 540 + "__id__": 560 }, { - "__id__": 541 + "__id__": 561 }, { - "__id__": 543 + "__id__": 563 }, { - "__id__": 544 + "__id__": 564 }, { - "__id__": 545 + "__id__": 565 } ], "_prefab": null, @@ -16809,16 +17565,16 @@ "_name": "Glow", "_objFlags": 0, "_parent": { - "__id__": 533 + "__id__": 553 }, "_children": [], "_active": true, "_components": [ { - "__id__": 535 + "__id__": 555 }, { - "__id__": 536 + "__id__": 556 } ], "_prefab": null, @@ -16856,7 +17612,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 534 + "__id__": 554 }, "_enabled": true, "__prefab": null, @@ -16877,7 +17633,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 534 + "__id__": 554 }, "_enabled": true, "__prefab": null, @@ -16915,16 +17671,16 @@ "_name": "Sprite", "_objFlags": 0, "_parent": { - "__id__": 533 + "__id__": 553 }, "_children": [], "_active": true, "_components": [ { - "__id__": 538 + "__id__": 558 }, { - "__id__": 539 + "__id__": 559 } ], "_prefab": null, @@ -16962,7 +17718,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 537 + "__id__": 557 }, "_enabled": true, "__prefab": null, @@ -16983,7 +17739,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 537 + "__id__": 557 }, "_enabled": true, "__prefab": null, @@ -17022,7 +17778,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 533 + "__id__": 553 }, "_enabled": true, "__prefab": null, @@ -17050,7 +17806,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 533 + "__id__": 553 }, "_enabled": true, "__prefab": null, @@ -17066,7 +17822,7 @@ }, "collideConnected": false, "connectedBody": { - "__id__": 542 + "__id__": 562 }, "_enableLimit": true, "_lowerAngle": 0, @@ -17082,7 +17838,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 532 + "__id__": 552 }, "_enabled": true, "__prefab": null, @@ -17110,7 +17866,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 533 + "__id__": 553 }, "_enabled": true, "__prefab": null, @@ -17204,7 +17960,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 533 + "__id__": 553 }, "_enabled": true, "__prefab": null, @@ -17225,7 +17981,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 533 + "__id__": 553 }, "_enabled": true, "__prefab": null, @@ -17263,19 +18019,23 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 532 + "__id__": 552 }, "_enabled": true, "__prefab": null, "_animation": { - "__id__": 547 + "__id__": 567 }, "_hingeJoint": { - "__id__": 541 + "__id__": 561 }, "_motorSpeedActive": 10000, "_motorSpeedDeActive": -10000, "side": 1, + "_activeSound": { + "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__expectedType__": "cc.AudioClip" + }, "_id": "c2LBQkbqpMS7ebeAdAWNd2" }, { @@ -17283,7 +18043,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 532 + "__id__": 552 }, "_enabled": true, "__prefab": null, @@ -17306,23 +18066,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 515 + "__id__": 535 }, "_children": [ { - "__id__": 549 + "__id__": 569 } ], "_active": true, "_components": [ { - "__id__": 558 + "__id__": 578 }, { - "__id__": 562 + "__id__": 582 }, { - "__id__": 563 + "__id__": 583 } ], "_prefab": null, @@ -17361,32 +18121,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 548 + "__id__": 568 }, "_children": [ { - "__id__": 550 + "__id__": 570 }, { - "__id__": 553 + "__id__": 573 } ], "_active": true, "_components": [ { - "__id__": 556 + "__id__": 576 }, { - "__id__": 557 + "__id__": 577 }, { - "__id__": 559 + "__id__": 579 }, { - "__id__": 560 + "__id__": 580 }, { - "__id__": 561 + "__id__": 581 } ], "_prefab": null, @@ -17424,16 +18184,16 @@ "_name": "Glow", "_objFlags": 0, "_parent": { - "__id__": 549 + "__id__": 569 }, "_children": [], "_active": true, "_components": [ { - "__id__": 551 + "__id__": 571 }, { - "__id__": 552 + "__id__": 572 } ], "_prefab": null, @@ -17471,7 +18231,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 550 + "__id__": 570 }, "_enabled": true, "__prefab": null, @@ -17492,7 +18252,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 550 + "__id__": 570 }, "_enabled": true, "__prefab": null, @@ -17530,16 +18290,16 @@ "_name": "Sprite", "_objFlags": 0, "_parent": { - "__id__": 549 + "__id__": 569 }, "_children": [], "_active": true, "_components": [ { - "__id__": 554 + "__id__": 574 }, { - "__id__": 555 + "__id__": 575 } ], "_prefab": null, @@ -17577,7 +18337,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 553 + "__id__": 573 }, "_enabled": true, "__prefab": null, @@ -17598,7 +18358,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 553 + "__id__": 573 }, "_enabled": true, "__prefab": null, @@ -17637,7 +18397,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 549 + "__id__": 569 }, "_enabled": true, "__prefab": null, @@ -17665,7 +18425,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 549 + "__id__": 569 }, "_enabled": true, "__prefab": null, @@ -17681,7 +18441,7 @@ }, "collideConnected": false, "connectedBody": { - "__id__": 558 + "__id__": 578 }, "_enableLimit": true, "_lowerAngle": 0, @@ -17697,7 +18457,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 548 + "__id__": 568 }, "_enabled": true, "__prefab": null, @@ -17725,7 +18485,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 549 + "__id__": 569 }, "_enabled": true, "__prefab": null, @@ -17819,7 +18579,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 549 + "__id__": 569 }, "_enabled": true, "__prefab": null, @@ -17840,7 +18600,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 549 + "__id__": 569 }, "_enabled": true, "__prefab": null, @@ -17878,19 +18638,23 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 548 + "__id__": 568 }, "_enabled": true, "__prefab": null, "_animation": { - "__id__": 563 + "__id__": 583 }, "_hingeJoint": { - "__id__": 557 + "__id__": 577 }, "_motorSpeedActive": 10000, "_motorSpeedDeActive": -10000, "side": 1, + "_activeSound": { + "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__expectedType__": "cc.AudioClip" + }, "_id": "14hqKrgTVA0r/f0mOYZ/aP" }, { @@ -17898,7 +18662,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 548 + "__id__": 568 }, "_enabled": true, "__prefab": null, @@ -17921,23 +18685,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 515 + "__id__": 535 }, "_children": [ { - "__id__": 565 + "__id__": 585 } ], "_active": true, "_components": [ { - "__id__": 574 + "__id__": 594 }, { - "__id__": 578 + "__id__": 598 }, { - "__id__": 579 + "__id__": 599 } ], "_prefab": null, @@ -17976,32 +18740,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 564 + "__id__": 584 }, "_children": [ { - "__id__": 566 + "__id__": 586 }, { - "__id__": 569 + "__id__": 589 } ], "_active": true, "_components": [ { - "__id__": 572 + "__id__": 592 }, { - "__id__": 573 + "__id__": 593 }, { - "__id__": 575 + "__id__": 595 }, { - "__id__": 576 + "__id__": 596 }, { - "__id__": 577 + "__id__": 597 } ], "_prefab": null, @@ -18039,16 +18803,16 @@ "_name": "Glow", "_objFlags": 0, "_parent": { - "__id__": 565 + "__id__": 585 }, "_children": [], "_active": true, "_components": [ { - "__id__": 567 + "__id__": 587 }, { - "__id__": 568 + "__id__": 588 } ], "_prefab": null, @@ -18086,7 +18850,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 566 + "__id__": 586 }, "_enabled": true, "__prefab": null, @@ -18107,7 +18871,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 566 + "__id__": 586 }, "_enabled": true, "__prefab": null, @@ -18145,16 +18909,16 @@ "_name": "Sprite", "_objFlags": 0, "_parent": { - "__id__": 565 + "__id__": 585 }, "_children": [], "_active": true, "_components": [ { - "__id__": 570 + "__id__": 590 }, { - "__id__": 571 + "__id__": 591 } ], "_prefab": null, @@ -18192,7 +18956,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 569 + "__id__": 589 }, "_enabled": true, "__prefab": null, @@ -18213,7 +18977,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 569 + "__id__": 589 }, "_enabled": true, "__prefab": null, @@ -18252,7 +19016,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 565 + "__id__": 585 }, "_enabled": true, "__prefab": null, @@ -18280,7 +19044,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 565 + "__id__": 585 }, "_enabled": true, "__prefab": null, @@ -18296,7 +19060,7 @@ }, "collideConnected": false, "connectedBody": { - "__id__": 574 + "__id__": 594 }, "_enableLimit": true, "_lowerAngle": -60, @@ -18312,7 +19076,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 564 + "__id__": 584 }, "_enabled": true, "__prefab": null, @@ -18340,7 +19104,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 565 + "__id__": 585 }, "_enabled": true, "__prefab": null, @@ -18419,7 +19183,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 565 + "__id__": 585 }, "_enabled": true, "__prefab": null, @@ -18440,7 +19204,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 565 + "__id__": 585 }, "_enabled": true, "__prefab": null, @@ -18478,19 +19242,23 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 564 + "__id__": 584 }, "_enabled": true, "__prefab": null, "_animation": { - "__id__": 579 + "__id__": 599 }, "_hingeJoint": { - "__id__": 573 + "__id__": 593 }, "_motorSpeedActive": -10000, "_motorSpeedDeActive": 10000, "side": 0, + "_activeSound": { + "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__expectedType__": "cc.AudioClip" + }, "_id": "a3/6ZctnhAFb+E8W1w8jJR" }, { @@ -18498,7 +19266,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 564 + "__id__": 584 }, "_enabled": true, "__prefab": null, @@ -18520,7 +19288,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 515 + "__id__": 535 }, "_enabled": true, "__prefab": null, @@ -18547,13 +19315,13 @@ "_active": true, "_components": [ { - "__id__": 582 + "__id__": 602 }, { - "__id__": 583 + "__id__": 603 }, { - "__id__": 584 + "__id__": 604 } ], "_prefab": null, @@ -18591,7 +19359,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 581 + "__id__": 601 }, "_enabled": true, "__prefab": null, @@ -18612,7 +19380,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 581 + "__id__": 601 }, "_enabled": true, "__prefab": null, @@ -18639,12 +19407,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 581 + "__id__": 601 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 583 + "__id__": 603 }, "_id": "63rfzsm3REkprs+s68PCRK" }, @@ -18657,211 +19425,211 @@ }, "_children": [ { - "__id__": 586 + "__id__": 606 }, { - "__id__": 589 + "__id__": 609 }, { - "__id__": 592 + "__id__": 612 }, { - "__id__": 595 + "__id__": 615 }, { - "__id__": 598 + "__id__": 618 }, { - "__id__": 601 + "__id__": 621 }, { - "__id__": 604 + "__id__": 624 }, { - "__id__": 607 + "__id__": 627 }, { - "__id__": 610 + "__id__": 630 }, { - "__id__": 613 + "__id__": 633 }, { - "__id__": 616 + "__id__": 636 }, { - "__id__": 619 + "__id__": 639 }, { - "__id__": 622 + "__id__": 642 }, { - "__id__": 625 + "__id__": 645 }, { - "__id__": 628 + "__id__": 648 }, { - "__id__": 631 + "__id__": 651 }, { - "__id__": 634 + "__id__": 654 }, { - "__id__": 637 + "__id__": 657 }, { - "__id__": 640 + "__id__": 660 }, { - "__id__": 643 + "__id__": 663 }, { - "__id__": 646 + "__id__": 666 }, { - "__id__": 649 + "__id__": 669 }, { - "__id__": 652 + "__id__": 672 }, { - "__id__": 655 + "__id__": 675 }, { - "__id__": 658 + "__id__": 678 }, { - "__id__": 661 + "__id__": 681 }, { - "__id__": 664 + "__id__": 684 }, { - "__id__": 667 + "__id__": 687 }, { - "__id__": 670 + "__id__": 690 }, { - "__id__": 673 + "__id__": 693 }, { - "__id__": 676 + "__id__": 696 }, { - "__id__": 679 + "__id__": 699 }, { - "__id__": 682 + "__id__": 702 }, { - "__id__": 685 + "__id__": 705 }, { - "__id__": 688 + "__id__": 708 }, { - "__id__": 691 + "__id__": 711 }, { - "__id__": 694 + "__id__": 714 }, { - "__id__": 697 + "__id__": 717 }, { - "__id__": 700 + "__id__": 720 }, { - "__id__": 703 + "__id__": 723 }, { - "__id__": 706 + "__id__": 726 }, { - "__id__": 709 + "__id__": 729 }, { - "__id__": 712 + "__id__": 732 }, { - "__id__": 715 + "__id__": 735 }, { - "__id__": 718 + "__id__": 738 }, { - "__id__": 721 + "__id__": 741 }, { - "__id__": 724 + "__id__": 744 }, { - "__id__": 727 + "__id__": 747 }, { - "__id__": 730 + "__id__": 750 }, { - "__id__": 733 + "__id__": 753 }, { - "__id__": 736 + "__id__": 756 }, { - "__id__": 739 + "__id__": 759 }, { - "__id__": 742 + "__id__": 762 }, { - "__id__": 745 + "__id__": 765 }, { - "__id__": 748 + "__id__": 768 }, { - "__id__": 751 + "__id__": 771 }, { - "__id__": 754 + "__id__": 774 }, { - "__id__": 757 + "__id__": 777 }, { - "__id__": 760 + "__id__": 780 }, { - "__id__": 763 + "__id__": 783 }, { - "__id__": 766 + "__id__": 786 }, { - "__id__": 769 + "__id__": 789 }, { - "__id__": 772 + "__id__": 792 }, { - "__id__": 775 + "__id__": 795 }, { - "__id__": 778 + "__id__": 798 }, { - "__id__": 781 + "__id__": 801 } ], "_active": true, "_components": [ { - "__id__": 784 + "__id__": 804 }, { - "__id__": 785 + "__id__": 805 } ], "_prefab": null, @@ -18899,16 +19667,16 @@ "_name": "spawn point", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 587 + "__id__": 607 }, { - "__id__": 588 + "__id__": 608 } ], "_prefab": null, @@ -18946,7 +19714,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 586 + "__id__": 606 }, "_enabled": true, "__prefab": null, @@ -18967,7 +19735,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 586 + "__id__": 606 }, "_enabled": true, "__prefab": null, @@ -19005,16 +19773,16 @@ "_name": "spawn point-001", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 590 + "__id__": 610 }, { - "__id__": 591 + "__id__": 611 } ], "_prefab": null, @@ -19052,7 +19820,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 589 + "__id__": 609 }, "_enabled": true, "__prefab": null, @@ -19073,7 +19841,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 589 + "__id__": 609 }, "_enabled": true, "__prefab": null, @@ -19111,16 +19879,16 @@ "_name": "spawn point-002", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 593 + "__id__": 613 }, { - "__id__": 594 + "__id__": 614 } ], "_prefab": null, @@ -19158,7 +19926,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 592 + "__id__": 612 }, "_enabled": true, "__prefab": null, @@ -19179,7 +19947,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 592 + "__id__": 612 }, "_enabled": true, "__prefab": null, @@ -19217,16 +19985,16 @@ "_name": "spawn point-003", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 596 + "__id__": 616 }, { - "__id__": 597 + "__id__": 617 } ], "_prefab": null, @@ -19264,7 +20032,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 595 + "__id__": 615 }, "_enabled": true, "__prefab": null, @@ -19285,7 +20053,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 595 + "__id__": 615 }, "_enabled": true, "__prefab": null, @@ -19323,16 +20091,16 @@ "_name": "spawn point-004", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 599 + "__id__": 619 }, { - "__id__": 600 + "__id__": 620 } ], "_prefab": null, @@ -19370,7 +20138,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 598 + "__id__": 618 }, "_enabled": true, "__prefab": null, @@ -19391,7 +20159,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 598 + "__id__": 618 }, "_enabled": true, "__prefab": null, @@ -19429,16 +20197,16 @@ "_name": "spawn point-005", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 602 + "__id__": 622 }, { - "__id__": 603 + "__id__": 623 } ], "_prefab": null, @@ -19476,7 +20244,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 601 + "__id__": 621 }, "_enabled": true, "__prefab": null, @@ -19497,7 +20265,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 601 + "__id__": 621 }, "_enabled": true, "__prefab": null, @@ -19535,16 +20303,16 @@ "_name": "spawn point-006", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 605 + "__id__": 625 }, { - "__id__": 606 + "__id__": 626 } ], "_prefab": null, @@ -19582,7 +20350,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 604 + "__id__": 624 }, "_enabled": true, "__prefab": null, @@ -19603,7 +20371,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 604 + "__id__": 624 }, "_enabled": true, "__prefab": null, @@ -19641,16 +20409,16 @@ "_name": "spawn point-007", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 608 + "__id__": 628 }, { - "__id__": 609 + "__id__": 629 } ], "_prefab": null, @@ -19688,7 +20456,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 607 + "__id__": 627 }, "_enabled": true, "__prefab": null, @@ -19709,7 +20477,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 607 + "__id__": 627 }, "_enabled": true, "__prefab": null, @@ -19747,16 +20515,16 @@ "_name": "spawn point-008", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 611 + "__id__": 631 }, { - "__id__": 612 + "__id__": 632 } ], "_prefab": null, @@ -19794,7 +20562,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 610 + "__id__": 630 }, "_enabled": true, "__prefab": null, @@ -19815,7 +20583,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 610 + "__id__": 630 }, "_enabled": true, "__prefab": null, @@ -19853,16 +20621,16 @@ "_name": "spawn point-009", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 614 + "__id__": 634 }, { - "__id__": 615 + "__id__": 635 } ], "_prefab": null, @@ -19900,7 +20668,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 613 + "__id__": 633 }, "_enabled": true, "__prefab": null, @@ -19921,7 +20689,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 613 + "__id__": 633 }, "_enabled": true, "__prefab": null, @@ -19959,16 +20727,16 @@ "_name": "spawn point-010", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 617 + "__id__": 637 }, { - "__id__": 618 + "__id__": 638 } ], "_prefab": null, @@ -20006,7 +20774,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 616 + "__id__": 636 }, "_enabled": true, "__prefab": null, @@ -20027,7 +20795,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 616 + "__id__": 636 }, "_enabled": true, "__prefab": null, @@ -20065,16 +20833,16 @@ "_name": "spawn point-011", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 620 + "__id__": 640 }, { - "__id__": 621 + "__id__": 641 } ], "_prefab": null, @@ -20112,7 +20880,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 619 + "__id__": 639 }, "_enabled": true, "__prefab": null, @@ -20133,7 +20901,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 619 + "__id__": 639 }, "_enabled": true, "__prefab": null, @@ -20171,16 +20939,16 @@ "_name": "spawn point-014", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 623 + "__id__": 643 }, { - "__id__": 624 + "__id__": 644 } ], "_prefab": null, @@ -20218,7 +20986,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 622 + "__id__": 642 }, "_enabled": true, "__prefab": null, @@ -20239,7 +21007,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 622 + "__id__": 642 }, "_enabled": true, "__prefab": null, @@ -20277,16 +21045,16 @@ "_name": "spawn point-015", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 626 + "__id__": 646 }, { - "__id__": 627 + "__id__": 647 } ], "_prefab": null, @@ -20324,7 +21092,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 625 + "__id__": 645 }, "_enabled": true, "__prefab": null, @@ -20345,7 +21113,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 625 + "__id__": 645 }, "_enabled": true, "__prefab": null, @@ -20383,16 +21151,16 @@ "_name": "spawn point-016", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 629 + "__id__": 649 }, { - "__id__": 630 + "__id__": 650 } ], "_prefab": null, @@ -20430,7 +21198,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 628 + "__id__": 648 }, "_enabled": true, "__prefab": null, @@ -20451,7 +21219,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 628 + "__id__": 648 }, "_enabled": true, "__prefab": null, @@ -20489,16 +21257,16 @@ "_name": "spawn point-017", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 632 + "__id__": 652 }, { - "__id__": 633 + "__id__": 653 } ], "_prefab": null, @@ -20536,7 +21304,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 631 + "__id__": 651 }, "_enabled": true, "__prefab": null, @@ -20557,7 +21325,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 631 + "__id__": 651 }, "_enabled": true, "__prefab": null, @@ -20595,16 +21363,16 @@ "_name": "spawn point-020", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 635 + "__id__": 655 }, { - "__id__": 636 + "__id__": 656 } ], "_prefab": null, @@ -20642,7 +21410,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 634 + "__id__": 654 }, "_enabled": true, "__prefab": null, @@ -20663,7 +21431,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 634 + "__id__": 654 }, "_enabled": true, "__prefab": null, @@ -20701,16 +21469,16 @@ "_name": "spawn point-021", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 638 + "__id__": 658 }, { - "__id__": 639 + "__id__": 659 } ], "_prefab": null, @@ -20748,7 +21516,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 637 + "__id__": 657 }, "_enabled": true, "__prefab": null, @@ -20769,7 +21537,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 637 + "__id__": 657 }, "_enabled": true, "__prefab": null, @@ -20807,16 +21575,16 @@ "_name": "spawn point-022", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 641 + "__id__": 661 }, { - "__id__": 642 + "__id__": 662 } ], "_prefab": null, @@ -20854,7 +21622,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 640 + "__id__": 660 }, "_enabled": true, "__prefab": null, @@ -20875,7 +21643,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 640 + "__id__": 660 }, "_enabled": true, "__prefab": null, @@ -20913,16 +21681,16 @@ "_name": "spawn point-023", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 644 + "__id__": 664 }, { - "__id__": 645 + "__id__": 665 } ], "_prefab": null, @@ -20960,7 +21728,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 643 + "__id__": 663 }, "_enabled": true, "__prefab": null, @@ -20981,7 +21749,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 643 + "__id__": 663 }, "_enabled": true, "__prefab": null, @@ -21019,16 +21787,16 @@ "_name": "spawn point-024", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 647 + "__id__": 667 }, { - "__id__": 648 + "__id__": 668 } ], "_prefab": null, @@ -21066,7 +21834,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 646 + "__id__": 666 }, "_enabled": true, "__prefab": null, @@ -21087,7 +21855,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 646 + "__id__": 666 }, "_enabled": true, "__prefab": null, @@ -21125,16 +21893,16 @@ "_name": "spawn point-025", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 650 + "__id__": 670 }, { - "__id__": 651 + "__id__": 671 } ], "_prefab": null, @@ -21172,7 +21940,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 649 + "__id__": 669 }, "_enabled": true, "__prefab": null, @@ -21193,7 +21961,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 649 + "__id__": 669 }, "_enabled": true, "__prefab": null, @@ -21231,16 +21999,16 @@ "_name": "spawn point-026", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 653 + "__id__": 673 }, { - "__id__": 654 + "__id__": 674 } ], "_prefab": null, @@ -21278,7 +22046,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 652 + "__id__": 672 }, "_enabled": true, "__prefab": null, @@ -21299,7 +22067,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 652 + "__id__": 672 }, "_enabled": true, "__prefab": null, @@ -21337,16 +22105,16 @@ "_name": "spawn point-027", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 656 + "__id__": 676 }, { - "__id__": 657 + "__id__": 677 } ], "_prefab": null, @@ -21384,7 +22152,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 655 + "__id__": 675 }, "_enabled": true, "__prefab": null, @@ -21405,7 +22173,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 655 + "__id__": 675 }, "_enabled": true, "__prefab": null, @@ -21443,16 +22211,16 @@ "_name": "spawn point-028", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 659 + "__id__": 679 }, { - "__id__": 660 + "__id__": 680 } ], "_prefab": null, @@ -21490,7 +22258,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 658 + "__id__": 678 }, "_enabled": true, "__prefab": null, @@ -21511,7 +22279,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 658 + "__id__": 678 }, "_enabled": true, "__prefab": null, @@ -21549,16 +22317,16 @@ "_name": "spawn point-029", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 662 + "__id__": 682 }, { - "__id__": 663 + "__id__": 683 } ], "_prefab": null, @@ -21596,7 +22364,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 661 + "__id__": 681 }, "_enabled": true, "__prefab": null, @@ -21617,7 +22385,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 661 + "__id__": 681 }, "_enabled": true, "__prefab": null, @@ -21655,16 +22423,16 @@ "_name": "spawn point-030", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 665 + "__id__": 685 }, { - "__id__": 666 + "__id__": 686 } ], "_prefab": null, @@ -21702,7 +22470,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 664 + "__id__": 684 }, "_enabled": true, "__prefab": null, @@ -21723,7 +22491,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 664 + "__id__": 684 }, "_enabled": true, "__prefab": null, @@ -21761,16 +22529,16 @@ "_name": "spawn point-031", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 668 + "__id__": 688 }, { - "__id__": 669 + "__id__": 689 } ], "_prefab": null, @@ -21808,7 +22576,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 667 + "__id__": 687 }, "_enabled": true, "__prefab": null, @@ -21829,7 +22597,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 667 + "__id__": 687 }, "_enabled": true, "__prefab": null, @@ -21867,16 +22635,16 @@ "_name": "spawn point-032", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 671 + "__id__": 691 }, { - "__id__": 672 + "__id__": 692 } ], "_prefab": null, @@ -21914,7 +22682,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 670 + "__id__": 690 }, "_enabled": true, "__prefab": null, @@ -21935,7 +22703,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 670 + "__id__": 690 }, "_enabled": true, "__prefab": null, @@ -21973,16 +22741,16 @@ "_name": "spawn point-033", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 674 + "__id__": 694 }, { - "__id__": 675 + "__id__": 695 } ], "_prefab": null, @@ -22020,7 +22788,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 673 + "__id__": 693 }, "_enabled": true, "__prefab": null, @@ -22041,7 +22809,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 673 + "__id__": 693 }, "_enabled": true, "__prefab": null, @@ -22079,16 +22847,16 @@ "_name": "spawn point-034", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 677 + "__id__": 697 }, { - "__id__": 678 + "__id__": 698 } ], "_prefab": null, @@ -22126,7 +22894,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 676 + "__id__": 696 }, "_enabled": true, "__prefab": null, @@ -22147,7 +22915,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 676 + "__id__": 696 }, "_enabled": true, "__prefab": null, @@ -22185,16 +22953,16 @@ "_name": "spawn point-035", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 680 + "__id__": 700 }, { - "__id__": 681 + "__id__": 701 } ], "_prefab": null, @@ -22232,7 +23000,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 679 + "__id__": 699 }, "_enabled": true, "__prefab": null, @@ -22253,7 +23021,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 679 + "__id__": 699 }, "_enabled": true, "__prefab": null, @@ -22291,16 +23059,16 @@ "_name": "spawn point-036", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 683 + "__id__": 703 }, { - "__id__": 684 + "__id__": 704 } ], "_prefab": null, @@ -22338,7 +23106,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 682 + "__id__": 702 }, "_enabled": true, "__prefab": null, @@ -22359,7 +23127,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 682 + "__id__": 702 }, "_enabled": true, "__prefab": null, @@ -22397,16 +23165,16 @@ "_name": "spawn point-037", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 686 + "__id__": 706 }, { - "__id__": 687 + "__id__": 707 } ], "_prefab": null, @@ -22444,7 +23212,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 685 + "__id__": 705 }, "_enabled": true, "__prefab": null, @@ -22465,7 +23233,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 685 + "__id__": 705 }, "_enabled": true, "__prefab": null, @@ -22503,16 +23271,16 @@ "_name": "spawn point-038", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 689 + "__id__": 709 }, { - "__id__": 690 + "__id__": 710 } ], "_prefab": null, @@ -22550,7 +23318,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 688 + "__id__": 708 }, "_enabled": true, "__prefab": null, @@ -22571,7 +23339,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 688 + "__id__": 708 }, "_enabled": true, "__prefab": null, @@ -22609,16 +23377,16 @@ "_name": "spawn point-039", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 692 + "__id__": 712 }, { - "__id__": 693 + "__id__": 713 } ], "_prefab": null, @@ -22656,7 +23424,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 691 + "__id__": 711 }, "_enabled": true, "__prefab": null, @@ -22677,7 +23445,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 691 + "__id__": 711 }, "_enabled": true, "__prefab": null, @@ -22715,16 +23483,16 @@ "_name": "spawn point-040", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 695 + "__id__": 715 }, { - "__id__": 696 + "__id__": 716 } ], "_prefab": null, @@ -22762,7 +23530,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 694 + "__id__": 714 }, "_enabled": true, "__prefab": null, @@ -22783,7 +23551,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 694 + "__id__": 714 }, "_enabled": true, "__prefab": null, @@ -22821,16 +23589,16 @@ "_name": "spawn point-041", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 698 + "__id__": 718 }, { - "__id__": 699 + "__id__": 719 } ], "_prefab": null, @@ -22868,7 +23636,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 697 + "__id__": 717 }, "_enabled": true, "__prefab": null, @@ -22889,7 +23657,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 697 + "__id__": 717 }, "_enabled": true, "__prefab": null, @@ -22927,16 +23695,16 @@ "_name": "spawn point-043", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 701 + "__id__": 721 }, { - "__id__": 702 + "__id__": 722 } ], "_prefab": null, @@ -22974,7 +23742,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 700 + "__id__": 720 }, "_enabled": true, "__prefab": null, @@ -22995,7 +23763,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 700 + "__id__": 720 }, "_enabled": true, "__prefab": null, @@ -23033,16 +23801,16 @@ "_name": "spawn point-044", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 704 + "__id__": 724 }, { - "__id__": 705 + "__id__": 725 } ], "_prefab": null, @@ -23080,7 +23848,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 703 + "__id__": 723 }, "_enabled": true, "__prefab": null, @@ -23101,7 +23869,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 703 + "__id__": 723 }, "_enabled": true, "__prefab": null, @@ -23139,16 +23907,16 @@ "_name": "spawn point-045", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 707 + "__id__": 727 }, { - "__id__": 708 + "__id__": 728 } ], "_prefab": null, @@ -23186,7 +23954,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 706 + "__id__": 726 }, "_enabled": true, "__prefab": null, @@ -23207,7 +23975,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 706 + "__id__": 726 }, "_enabled": true, "__prefab": null, @@ -23245,16 +24013,16 @@ "_name": "spawn point-047", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 710 + "__id__": 730 }, { - "__id__": 711 + "__id__": 731 } ], "_prefab": null, @@ -23292,7 +24060,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 709 + "__id__": 729 }, "_enabled": true, "__prefab": null, @@ -23313,7 +24081,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 709 + "__id__": 729 }, "_enabled": true, "__prefab": null, @@ -23351,16 +24119,16 @@ "_name": "spawn point-048", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 713 + "__id__": 733 }, { - "__id__": 714 + "__id__": 734 } ], "_prefab": null, @@ -23398,7 +24166,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 712 + "__id__": 732 }, "_enabled": true, "__prefab": null, @@ -23419,7 +24187,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 712 + "__id__": 732 }, "_enabled": true, "__prefab": null, @@ -23457,16 +24225,16 @@ "_name": "spawn point-049", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 716 + "__id__": 736 }, { - "__id__": 717 + "__id__": 737 } ], "_prefab": null, @@ -23504,7 +24272,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 715 + "__id__": 735 }, "_enabled": true, "__prefab": null, @@ -23525,7 +24293,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 715 + "__id__": 735 }, "_enabled": true, "__prefab": null, @@ -23563,16 +24331,16 @@ "_name": "spawn point-050", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 719 + "__id__": 739 }, { - "__id__": 720 + "__id__": 740 } ], "_prefab": null, @@ -23610,7 +24378,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 718 + "__id__": 738 }, "_enabled": true, "__prefab": null, @@ -23631,7 +24399,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 718 + "__id__": 738 }, "_enabled": true, "__prefab": null, @@ -23669,16 +24437,16 @@ "_name": "spawn point-051", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 722 + "__id__": 742 }, { - "__id__": 723 + "__id__": 743 } ], "_prefab": null, @@ -23716,7 +24484,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 721 + "__id__": 741 }, "_enabled": true, "__prefab": null, @@ -23737,7 +24505,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 721 + "__id__": 741 }, "_enabled": true, "__prefab": null, @@ -23775,16 +24543,16 @@ "_name": "spawn point-052", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 725 + "__id__": 745 }, { - "__id__": 726 + "__id__": 746 } ], "_prefab": null, @@ -23822,7 +24590,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 724 + "__id__": 744 }, "_enabled": true, "__prefab": null, @@ -23843,7 +24611,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 724 + "__id__": 744 }, "_enabled": true, "__prefab": null, @@ -23881,16 +24649,16 @@ "_name": "spawn point-053", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 728 + "__id__": 748 }, { - "__id__": 729 + "__id__": 749 } ], "_prefab": null, @@ -23928,7 +24696,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 727 + "__id__": 747 }, "_enabled": true, "__prefab": null, @@ -23949,7 +24717,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 727 + "__id__": 747 }, "_enabled": true, "__prefab": null, @@ -23987,16 +24755,16 @@ "_name": "spawn point-018", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 731 + "__id__": 751 }, { - "__id__": 732 + "__id__": 752 } ], "_prefab": null, @@ -24034,7 +24802,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 730 + "__id__": 750 }, "_enabled": true, "__prefab": null, @@ -24055,7 +24823,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 730 + "__id__": 750 }, "_enabled": true, "__prefab": null, @@ -24093,16 +24861,16 @@ "_name": "spawn point-019", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 734 + "__id__": 754 }, { - "__id__": 735 + "__id__": 755 } ], "_prefab": null, @@ -24140,7 +24908,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 733 + "__id__": 753 }, "_enabled": true, "__prefab": null, @@ -24161,7 +24929,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 733 + "__id__": 753 }, "_enabled": true, "__prefab": null, @@ -24199,16 +24967,16 @@ "_name": "spawn point-042", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 737 + "__id__": 757 }, { - "__id__": 738 + "__id__": 758 } ], "_prefab": null, @@ -24246,7 +25014,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 736 + "__id__": 756 }, "_enabled": true, "__prefab": null, @@ -24267,7 +25035,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 736 + "__id__": 756 }, "_enabled": true, "__prefab": null, @@ -24305,16 +25073,16 @@ "_name": "spawn point-046", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 740 + "__id__": 760 }, { - "__id__": 741 + "__id__": 761 } ], "_prefab": null, @@ -24352,7 +25120,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 739 + "__id__": 759 }, "_enabled": true, "__prefab": null, @@ -24373,7 +25141,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 739 + "__id__": 759 }, "_enabled": true, "__prefab": null, @@ -24411,16 +25179,16 @@ "_name": "spawn point-054", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 743 + "__id__": 763 }, { - "__id__": 744 + "__id__": 764 } ], "_prefab": null, @@ -24458,7 +25226,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 742 + "__id__": 762 }, "_enabled": true, "__prefab": null, @@ -24479,7 +25247,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 742 + "__id__": 762 }, "_enabled": true, "__prefab": null, @@ -24517,16 +25285,16 @@ "_name": "spawn point-055", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 746 + "__id__": 766 }, { - "__id__": 747 + "__id__": 767 } ], "_prefab": null, @@ -24564,7 +25332,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 745 + "__id__": 765 }, "_enabled": true, "__prefab": null, @@ -24585,7 +25353,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 745 + "__id__": 765 }, "_enabled": true, "__prefab": null, @@ -24623,16 +25391,16 @@ "_name": "spawn point-012", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 749 + "__id__": 769 }, { - "__id__": 750 + "__id__": 770 } ], "_prefab": null, @@ -24670,7 +25438,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 748 + "__id__": 768 }, "_enabled": true, "__prefab": null, @@ -24691,7 +25459,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 748 + "__id__": 768 }, "_enabled": true, "__prefab": null, @@ -24729,16 +25497,16 @@ "_name": "spawn point-013", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 752 + "__id__": 772 }, { - "__id__": 753 + "__id__": 773 } ], "_prefab": null, @@ -24776,7 +25544,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 751 + "__id__": 771 }, "_enabled": true, "__prefab": null, @@ -24797,7 +25565,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 751 + "__id__": 771 }, "_enabled": true, "__prefab": null, @@ -24835,16 +25603,16 @@ "_name": "spawn point-058", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 755 + "__id__": 775 }, { - "__id__": 756 + "__id__": 776 } ], "_prefab": null, @@ -24882,7 +25650,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 754 + "__id__": 774 }, "_enabled": true, "__prefab": null, @@ -24903,7 +25671,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 754 + "__id__": 774 }, "_enabled": true, "__prefab": null, @@ -24941,16 +25709,16 @@ "_name": "spawn point-059", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 758 + "__id__": 778 }, { - "__id__": 759 + "__id__": 779 } ], "_prefab": null, @@ -24988,7 +25756,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 757 + "__id__": 777 }, "_enabled": true, "__prefab": null, @@ -25009,7 +25777,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 757 + "__id__": 777 }, "_enabled": true, "__prefab": null, @@ -25047,16 +25815,16 @@ "_name": "spawn point-056", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 761 + "__id__": 781 }, { - "__id__": 762 + "__id__": 782 } ], "_prefab": null, @@ -25094,7 +25862,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 760 + "__id__": 780 }, "_enabled": true, "__prefab": null, @@ -25115,7 +25883,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 760 + "__id__": 780 }, "_enabled": true, "__prefab": null, @@ -25153,16 +25921,16 @@ "_name": "spawn point-057", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 764 + "__id__": 784 }, { - "__id__": 765 + "__id__": 785 } ], "_prefab": null, @@ -25200,7 +25968,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 763 + "__id__": 783 }, "_enabled": true, "__prefab": null, @@ -25221,7 +25989,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 763 + "__id__": 783 }, "_enabled": true, "__prefab": null, @@ -25259,16 +26027,16 @@ "_name": "spawn point-060", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 767 + "__id__": 787 }, { - "__id__": 768 + "__id__": 788 } ], "_prefab": null, @@ -25306,7 +26074,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 766 + "__id__": 786 }, "_enabled": true, "__prefab": null, @@ -25327,7 +26095,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 766 + "__id__": 786 }, "_enabled": true, "__prefab": null, @@ -25365,16 +26133,16 @@ "_name": "spawn point-061", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 770 + "__id__": 790 }, { - "__id__": 771 + "__id__": 791 } ], "_prefab": null, @@ -25412,7 +26180,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 769 + "__id__": 789 }, "_enabled": true, "__prefab": null, @@ -25433,7 +26201,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 769 + "__id__": 789 }, "_enabled": true, "__prefab": null, @@ -25471,16 +26239,16 @@ "_name": "spawn point-062", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 773 + "__id__": 793 }, { - "__id__": 774 + "__id__": 794 } ], "_prefab": null, @@ -25518,7 +26286,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 772 + "__id__": 792 }, "_enabled": true, "__prefab": null, @@ -25539,7 +26307,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 772 + "__id__": 792 }, "_enabled": true, "__prefab": null, @@ -25577,16 +26345,16 @@ "_name": "spawn point-065", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 776 + "__id__": 796 }, { - "__id__": 777 + "__id__": 797 } ], "_prefab": null, @@ -25624,7 +26392,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 775 + "__id__": 795 }, "_enabled": true, "__prefab": null, @@ -25645,7 +26413,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 775 + "__id__": 795 }, "_enabled": true, "__prefab": null, @@ -25683,16 +26451,16 @@ "_name": "spawn point-063", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 779 + "__id__": 799 }, { - "__id__": 780 + "__id__": 800 } ], "_prefab": null, @@ -25730,7 +26498,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 778 + "__id__": 798 }, "_enabled": true, "__prefab": null, @@ -25751,7 +26519,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 778 + "__id__": 798 }, "_enabled": true, "__prefab": null, @@ -25789,16 +26557,16 @@ "_name": "spawn point-064", "_objFlags": 0, "_parent": { - "__id__": 585 + "__id__": 605 }, "_children": [], "_active": true, "_components": [ { - "__id__": 782 + "__id__": 802 }, { - "__id__": 783 + "__id__": 803 } ], "_prefab": null, @@ -25836,7 +26604,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 781 + "__id__": 801 }, "_enabled": true, "__prefab": null, @@ -25857,7 +26625,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 781 + "__id__": 801 }, "_enabled": true, "__prefab": null, @@ -25895,7 +26663,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 585 + "__id__": 605 }, "_enabled": true, "__prefab": null, @@ -25916,221 +26684,221 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 585 + "__id__": 605 }, "_enabled": true, "__prefab": null, "_objects": [ { - "__id__": 786 + "__id__": 806 }, { - "__id__": 787 + "__id__": 807 } ], "_boosters": [ { - "__id__": 788 + "__id__": 808 } ], "_spawnPoints": [ { - "__id__": 586 + "__id__": 606 }, { - "__id__": 589 + "__id__": 609 }, { - "__id__": 592 + "__id__": 612 }, { - "__id__": 595 + "__id__": 615 }, { - "__id__": 598 + "__id__": 618 }, { - "__id__": 601 + "__id__": 621 }, { - "__id__": 604 + "__id__": 624 }, { - "__id__": 607 + "__id__": 627 }, { - "__id__": 610 + "__id__": 630 }, { - "__id__": 613 + "__id__": 633 }, { - "__id__": 616 + "__id__": 636 }, { - "__id__": 619 + "__id__": 639 }, { - "__id__": 622 + "__id__": 642 }, { - "__id__": 625 + "__id__": 645 }, { - "__id__": 628 + "__id__": 648 }, { - "__id__": 631 + "__id__": 651 }, { - "__id__": 634 + "__id__": 654 }, { - "__id__": 637 + "__id__": 657 }, { - "__id__": 640 + "__id__": 660 }, { - "__id__": 643 + "__id__": 663 }, { - "__id__": 646 + "__id__": 666 }, { - "__id__": 649 + "__id__": 669 }, { - "__id__": 652 + "__id__": 672 }, { - "__id__": 655 + "__id__": 675 }, { - "__id__": 658 + "__id__": 678 }, { - "__id__": 661 + "__id__": 681 }, { - "__id__": 664 + "__id__": 684 }, { - "__id__": 667 + "__id__": 687 }, { - "__id__": 670 + "__id__": 690 }, { - "__id__": 673 + "__id__": 693 }, { - "__id__": 676 + "__id__": 696 }, { - "__id__": 679 + "__id__": 699 }, { - "__id__": 682 + "__id__": 702 }, { - "__id__": 685 + "__id__": 705 }, { - "__id__": 688 + "__id__": 708 }, { - "__id__": 691 + "__id__": 711 }, { - "__id__": 694 + "__id__": 714 }, { - "__id__": 697 + "__id__": 717 }, { - "__id__": 700 + "__id__": 720 }, { - "__id__": 703 + "__id__": 723 }, { - "__id__": 706 + "__id__": 726 }, { - "__id__": 709 + "__id__": 729 }, { - "__id__": 712 + "__id__": 732 }, { - "__id__": 715 + "__id__": 735 }, { - "__id__": 718 + "__id__": 738 }, { - "__id__": 721 + "__id__": 741 }, { - "__id__": 724 + "__id__": 744 }, { - "__id__": 727 + "__id__": 747 }, { - "__id__": 730 + "__id__": 750 }, { - "__id__": 733 + "__id__": 753 }, { - "__id__": 736 + "__id__": 756 }, { - "__id__": 739 + "__id__": 759 }, { - "__id__": 742 + "__id__": 762 }, { - "__id__": 745 + "__id__": 765 }, { - "__id__": 748 + "__id__": 768 }, { - "__id__": 751 + "__id__": 771 }, { - "__id__": 754 + "__id__": 774 }, { - "__id__": 757 + "__id__": 777 }, { - "__id__": 760 + "__id__": 780 }, { - "__id__": 763 + "__id__": 783 }, { - "__id__": 766 + "__id__": 786 }, { - "__id__": 769 + "__id__": 789 }, { - "__id__": 772 + "__id__": 792 }, { - "__id__": 775 + "__id__": 795 }, { - "__id__": 778 + "__id__": 798 }, { - "__id__": 781 + "__id__": 801 } ], "_spawnTime": 1.5, @@ -26182,10 +26950,10 @@ "_active": true, "_components": [ { - "__id__": 790 + "__id__": 810 }, { - "__id__": 791 + "__id__": 811 } ], "_prefab": null, @@ -26223,7 +26991,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 789 + "__id__": 809 }, "_enabled": true, "__prefab": null, @@ -26244,7 +27012,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 789 + "__id__": 809 }, "_enabled": true, "__prefab": null, @@ -26288,7 +27056,7 @@ "_active": true, "_components": [ { - "__id__": 793 + "__id__": 813 } ], "_prefab": null, @@ -26326,7 +27094,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 792 + "__id__": 812 }, "_enabled": true, "__prefab": null, @@ -26351,16 +27119,16 @@ }, "_children": [ { - "__id__": 795 + "__id__": 815 }, { - "__id__": 929 + "__id__": 949 } ], "_active": true, "_components": [ { - "__id__": 1063 + "__id__": 1083 } ], "_prefab": null, @@ -26398,26 +27166,26 @@ "_name": "Cannon", "_objFlags": 0, "_parent": { - "__id__": 794 + "__id__": 814 }, "_children": [ { - "__id__": 796 + "__id__": 816 }, { - "__id__": 800 + "__id__": 820 } ], "_active": true, "_components": [ { - "__id__": 926 + "__id__": 946 }, { - "__id__": 927 + "__id__": 947 }, { - "__id__": 928 + "__id__": 948 } ], "_prefab": null, @@ -26455,19 +27223,19 @@ "_name": "Collider", "_objFlags": 0, "_parent": { - "__id__": 795 + "__id__": 815 }, "_children": [], "_active": true, "_components": [ { - "__id__": 797 + "__id__": 817 }, { - "__id__": 798 + "__id__": 818 }, { - "__id__": 799 + "__id__": 819 } ], "_prefab": null, @@ -26505,7 +27273,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 796 + "__id__": 816 }, "_enabled": true, "__prefab": null, @@ -26526,7 +27294,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 796 + "__id__": 816 }, "_enabled": true, "__prefab": null, @@ -26564,7 +27332,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 796 + "__id__": 816 }, "_enabled": true, "__prefab": null, @@ -26591,20 +27359,20 @@ "_name": "Fx", "_objFlags": 0, "_parent": { - "__id__": 795 + "__id__": 815 }, "_children": [ { - "__id__": 801 + "__id__": 821 }, { - "__id__": 860 + "__id__": 880 } ], "_active": false, "_components": [ { - "__id__": 925 + "__id__": 945 } ], "_prefab": null, @@ -26642,19 +27410,19 @@ "_name": "Particle", "_objFlags": 0, "_parent": { - "__id__": 800 + "__id__": 820 }, "_children": [], "_active": true, "_components": [ { - "__id__": 802 + "__id__": 822 }, { - "__id__": 858 + "__id__": 878 }, { - "__id__": 859 + "__id__": 879 } ], "_prefab": null, @@ -26692,7 +27460,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 801 + "__id__": 821 }, "_enabled": true, "__prefab": null, @@ -26705,60 +27473,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 803 + "__id__": 823 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 804 + "__id__": 824 }, "startSize": { - "__id__": 804 + "__id__": 824 }, "startSizeY": { - "__id__": 805 + "__id__": 825 }, "startSizeZ": { - "__id__": 806 + "__id__": 826 }, "startSpeed": { - "__id__": 807 + "__id__": 827 }, "startRotation3D": false, "startRotationX": { - "__id__": 808 + "__id__": 828 }, "startRotationY": { - "__id__": 809 + "__id__": 829 }, "startRotationZ": { - "__id__": 810 + "__id__": 830 }, "startRotation": { - "__id__": 810 + "__id__": 830 }, "startDelay": { - "__id__": 811 + "__id__": 831 }, "startLifetime": { - "__id__": 812 + "__id__": 832 }, "duration": 0.5, "loop": false, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 813 + "__id__": 833 }, "rateOverTime": { - "__id__": 814 + "__id__": 834 }, "rateOverDistance": { - "__id__": 815 + "__id__": 835 }, "bursts": [ { - "__id__": 816 + "__id__": 836 } ], "_renderCulling": false, @@ -26769,37 +27537,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 818 - }, - "_shapeModule": { - "__id__": 820 - }, - "_sizeOvertimeModule": { - "__id__": 822 - }, - "_velocityOvertimeModule": { - "__id__": 828 - }, - "_forceOvertimeModule": { - "__id__": 834 - }, - "_limitVelocityOvertimeModule": { "__id__": 838 }, + "_shapeModule": { + "__id__": 840 + }, + "_sizeOvertimeModule": { + "__id__": 842 + }, + "_velocityOvertimeModule": { + "__id__": 848 + }, + "_forceOvertimeModule": { + "__id__": 854 + }, + "_limitVelocityOvertimeModule": { + "__id__": 858 + }, "_rotationOvertimeModule": { - "__id__": 843 + "__id__": 863 }, "_textureAnimationModule": { - "__id__": 847 + "__id__": 867 }, "_noiseModule": { - "__id__": 851 + "__id__": 871 }, "_trailModule": { - "__id__": 852 + "__id__": 872 }, "renderer": { - "__id__": 857 + "__id__": 877 }, "_prewarm": false, "_capacity": 8, @@ -26899,7 +27667,7 @@ "_repeatCount": 1, "repeatInterval": 0, "count": { - "__id__": 817 + "__id__": 837 } }, { @@ -26912,7 +27680,7 @@ "__type__": "cc.ColorOvertimeModule", "_enable": false, "color": { - "__id__": 819 + "__id__": 839 } }, { @@ -26941,7 +27709,7 @@ "arcMode": 0, "arcSpread": 11.4, "arcSpeed": { - "__id__": 821 + "__id__": 841 }, "length": 5, "boxThickness": { @@ -26982,23 +27750,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 823 + "__id__": 843 }, "x": { - "__id__": 825 + "__id__": 845 }, "y": { - "__id__": 826 + "__id__": 846 }, "z": { - "__id__": 827 + "__id__": 847 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 824 + "__id__": 844 }, "multiplier": 1 }, @@ -27059,16 +27827,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": true, "x": { - "__id__": 829 + "__id__": 849 }, "y": { - "__id__": 830 + "__id__": 850 }, "z": { - "__id__": 832 + "__id__": 852 }, "speedModifier": { - "__id__": 833 + "__id__": 853 }, "space": 1 }, @@ -27082,7 +27850,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 831 + "__id__": 851 }, "multiplier": 1 }, @@ -27137,13 +27905,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 835 + "__id__": 855 }, "y": { - "__id__": 836 + "__id__": 856 }, "z": { - "__id__": 837 + "__id__": 857 }, "space": 1 }, @@ -27169,16 +27937,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 839 + "__id__": 859 }, "limitY": { - "__id__": 840 + "__id__": 860 }, "limitZ": { - "__id__": 841 + "__id__": 861 }, "limit": { - "__id__": 842 + "__id__": 862 }, "dampen": 3, "separateAxes": false, @@ -27213,13 +27981,13 @@ "_enable": true, "_separateAxes": false, "x": { - "__id__": 844 + "__id__": 864 }, "y": { - "__id__": 845 + "__id__": 865 }, "z": { - "__id__": 846 + "__id__": 866 } }, { @@ -27253,10 +28021,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 848 + "__id__": 868 }, "startFrame": { - "__id__": 850 + "__id__": 870 }, "cycleCount": 0, "_flipU": 0, @@ -27269,7 +28037,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 849 + "__id__": 869 }, "multiplier": 1 }, @@ -27336,25 +28104,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 853 + "__id__": 873 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 854 + "__id__": 874 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 855 + "__id__": 875 }, "colorOvertime": { - "__id__": 856 + "__id__": 876 }, "_space": 0, "_particleSystem": { - "__id__": 802 + "__id__": 822 } }, { @@ -27414,7 +28182,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 801 + "__id__": 821 }, "_enabled": true, "__prefab": null, @@ -27425,7 +28193,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 801 + "__id__": 821 }, "_enabled": true, "__prefab": null, @@ -27447,19 +28215,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 800 + "__id__": 820 }, "_children": [], "_active": true, "_components": [ { - "__id__": 861 + "__id__": 881 }, { - "__id__": 923 + "__id__": 943 }, { - "__id__": 924 + "__id__": 944 } ], "_prefab": null, @@ -27498,7 +28266,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 860 + "__id__": 880 }, "_enabled": true, "__prefab": null, @@ -27511,60 +28279,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 862 + "__id__": 882 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 863 + "__id__": 883 }, "startSize": { - "__id__": 863 + "__id__": 883 }, "startSizeY": { - "__id__": 864 + "__id__": 884 }, "startSizeZ": { - "__id__": 865 + "__id__": 885 }, "startSpeed": { - "__id__": 866 + "__id__": 886 }, "startRotation3D": false, "startRotationX": { - "__id__": 867 + "__id__": 887 }, "startRotationY": { - "__id__": 868 + "__id__": 888 }, "startRotationZ": { - "__id__": 869 + "__id__": 889 }, "startRotation": { - "__id__": 869 + "__id__": 889 }, "startDelay": { - "__id__": 870 + "__id__": 890 }, "startLifetime": { - "__id__": 871 + "__id__": 891 }, "duration": 0.5, "loop": false, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 872 + "__id__": 892 }, "rateOverTime": { - "__id__": 873 + "__id__": 893 }, "rateOverDistance": { - "__id__": 874 + "__id__": 894 }, "bursts": [ { - "__id__": 875 + "__id__": 895 } ], "_renderCulling": false, @@ -27575,37 +28343,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 877 + "__id__": 897 }, "_shapeModule": { - "__id__": 886 + "__id__": 906 }, "_sizeOvertimeModule": { - "__id__": 888 - }, - "_velocityOvertimeModule": { - "__id__": 894 - }, - "_forceOvertimeModule": { - "__id__": 899 - }, - "_limitVelocityOvertimeModule": { - "__id__": 903 - }, - "_rotationOvertimeModule": { "__id__": 908 }, + "_velocityOvertimeModule": { + "__id__": 914 + }, + "_forceOvertimeModule": { + "__id__": 919 + }, + "_limitVelocityOvertimeModule": { + "__id__": 923 + }, + "_rotationOvertimeModule": { + "__id__": 928 + }, "_textureAnimationModule": { - "__id__": 912 + "__id__": 932 }, "_noiseModule": { - "__id__": 916 + "__id__": 936 }, "_trailModule": { - "__id__": 917 + "__id__": 937 }, "renderer": { - "__id__": 922 + "__id__": 942 }, "_prewarm": false, "_capacity": 100, @@ -27703,7 +28471,7 @@ "_repeatCount": 1, "repeatInterval": 1, "count": { - "__id__": 876 + "__id__": 896 } }, { @@ -27716,38 +28484,38 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 878 + "__id__": 898 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 879 + "__id__": 899 } }, { "__type__": "cc.Gradient", "colorKeys": [ { - "__id__": 880 + "__id__": 900 }, { - "__id__": 881 + "__id__": 901 }, { - "__id__": 882 + "__id__": 902 } ], "alphaKeys": [ { - "__id__": 883 + "__id__": 903 }, { - "__id__": 884 + "__id__": 904 }, { - "__id__": 885 + "__id__": 905 } ], "mode": 0 @@ -27815,7 +28583,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 887 + "__id__": 907 }, "length": 5, "boxThickness": { @@ -27856,23 +28624,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 889 + "__id__": 909 }, "x": { - "__id__": 891 + "__id__": 911 }, "y": { - "__id__": 892 + "__id__": 912 }, "z": { - "__id__": 893 + "__id__": 913 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 890 + "__id__": 910 }, "multiplier": 1 }, @@ -27933,16 +28701,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 895 + "__id__": 915 }, "y": { - "__id__": 896 + "__id__": 916 }, "z": { - "__id__": 897 + "__id__": 917 }, "speedModifier": { - "__id__": 898 + "__id__": 918 }, "space": 1 }, @@ -27974,13 +28742,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 900 + "__id__": 920 }, "y": { - "__id__": 901 + "__id__": 921 }, "z": { - "__id__": 902 + "__id__": 922 }, "space": 1 }, @@ -28006,16 +28774,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": true, "limitX": { - "__id__": 904 + "__id__": 924 }, "limitY": { - "__id__": 905 + "__id__": 925 }, "limitZ": { - "__id__": 906 + "__id__": 926 }, "limit": { - "__id__": 907 + "__id__": 927 }, "dampen": 0.05, "separateAxes": false, @@ -28050,13 +28818,13 @@ "_enable": true, "_separateAxes": false, "x": { - "__id__": 909 + "__id__": 929 }, "y": { - "__id__": 910 + "__id__": 930 }, "z": { - "__id__": 911 + "__id__": 931 } }, { @@ -28088,10 +28856,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 913 + "__id__": 933 }, "startFrame": { - "__id__": 915 + "__id__": 935 }, "cycleCount": 1, "_flipU": 0, @@ -28104,7 +28872,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 914 + "__id__": 934 }, "multiplier": 1 }, @@ -28172,25 +28940,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 918 + "__id__": 938 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 919 + "__id__": 939 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 920 + "__id__": 940 }, "colorOvertime": { - "__id__": 921 + "__id__": 941 }, "_space": 0, "_particleSystem": { - "__id__": 861 + "__id__": 881 } }, { @@ -28250,7 +29018,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 860 + "__id__": 880 }, "_enabled": true, "__prefab": null, @@ -28261,7 +29029,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 860 + "__id__": 880 }, "_enabled": true, "__prefab": null, @@ -28282,7 +29050,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 800 + "__id__": 820 }, "_enabled": true, "__prefab": null, @@ -28303,7 +29071,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 795 + "__id__": 815 }, "_enabled": true, "__prefab": null, @@ -28324,17 +29092,21 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 795 + "__id__": 815 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 799 + "__id__": 819 }, "_animation": { - "__id__": 928 + "__id__": 948 }, "_force": 40, + "_soundFx": { + "__uuid__": "c4a1c16a-96e4-4e8a-9188-cf42b4f35f73", + "__expectedType__": "cc.AudioClip" + }, "onDone": [], "_id": "dddTNOdPZBp5+GzdCqTj+4" }, @@ -28343,7 +29115,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 795 + "__id__": 815 }, "_enabled": true, "__prefab": null, @@ -28365,26 +29137,26 @@ "_name": "Cannon-001", "_objFlags": 0, "_parent": { - "__id__": 794 + "__id__": 814 }, "_children": [ { - "__id__": 930 + "__id__": 950 }, { - "__id__": 934 + "__id__": 954 } ], "_active": true, "_components": [ { - "__id__": 1060 + "__id__": 1080 }, { - "__id__": 1061 + "__id__": 1081 }, { - "__id__": 1062 + "__id__": 1082 } ], "_prefab": null, @@ -28422,19 +29194,19 @@ "_name": "Collider", "_objFlags": 0, "_parent": { - "__id__": 929 + "__id__": 949 }, "_children": [], "_active": true, "_components": [ { - "__id__": 931 + "__id__": 951 }, { - "__id__": 932 + "__id__": 952 }, { - "__id__": 933 + "__id__": 953 } ], "_prefab": null, @@ -28472,7 +29244,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 930 + "__id__": 950 }, "_enabled": true, "__prefab": null, @@ -28493,7 +29265,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 930 + "__id__": 950 }, "_enabled": true, "__prefab": null, @@ -28531,7 +29303,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 930 + "__id__": 950 }, "_enabled": true, "__prefab": null, @@ -28558,20 +29330,20 @@ "_name": "Fx", "_objFlags": 0, "_parent": { - "__id__": 929 + "__id__": 949 }, "_children": [ { - "__id__": 935 + "__id__": 955 }, { - "__id__": 994 + "__id__": 1014 } ], "_active": false, "_components": [ { - "__id__": 1059 + "__id__": 1079 } ], "_prefab": null, @@ -28609,19 +29381,19 @@ "_name": "Particle", "_objFlags": 0, "_parent": { - "__id__": 934 + "__id__": 954 }, "_children": [], "_active": true, "_components": [ { - "__id__": 936 + "__id__": 956 }, { - "__id__": 992 + "__id__": 1012 }, { - "__id__": 993 + "__id__": 1013 } ], "_prefab": null, @@ -28659,7 +29431,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 935 + "__id__": 955 }, "_enabled": true, "__prefab": null, @@ -28672,60 +29444,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 937 + "__id__": 957 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 938 + "__id__": 958 }, "startSize": { - "__id__": 938 + "__id__": 958 }, "startSizeY": { - "__id__": 939 + "__id__": 959 }, "startSizeZ": { - "__id__": 940 + "__id__": 960 }, "startSpeed": { - "__id__": 941 + "__id__": 961 }, "startRotation3D": false, "startRotationX": { - "__id__": 942 + "__id__": 962 }, "startRotationY": { - "__id__": 943 + "__id__": 963 }, "startRotationZ": { - "__id__": 944 + "__id__": 964 }, "startRotation": { - "__id__": 944 + "__id__": 964 }, "startDelay": { - "__id__": 945 + "__id__": 965 }, "startLifetime": { - "__id__": 946 + "__id__": 966 }, "duration": 0.5, "loop": false, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 947 + "__id__": 967 }, "rateOverTime": { - "__id__": 948 + "__id__": 968 }, "rateOverDistance": { - "__id__": 949 + "__id__": 969 }, "bursts": [ { - "__id__": 950 + "__id__": 970 } ], "_renderCulling": false, @@ -28736,37 +29508,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 952 - }, - "_shapeModule": { - "__id__": 954 - }, - "_sizeOvertimeModule": { - "__id__": 956 - }, - "_velocityOvertimeModule": { - "__id__": 962 - }, - "_forceOvertimeModule": { - "__id__": 968 - }, - "_limitVelocityOvertimeModule": { "__id__": 972 }, + "_shapeModule": { + "__id__": 974 + }, + "_sizeOvertimeModule": { + "__id__": 976 + }, + "_velocityOvertimeModule": { + "__id__": 982 + }, + "_forceOvertimeModule": { + "__id__": 988 + }, + "_limitVelocityOvertimeModule": { + "__id__": 992 + }, "_rotationOvertimeModule": { - "__id__": 977 + "__id__": 997 }, "_textureAnimationModule": { - "__id__": 981 + "__id__": 1001 }, "_noiseModule": { - "__id__": 985 + "__id__": 1005 }, "_trailModule": { - "__id__": 986 + "__id__": 1006 }, "renderer": { - "__id__": 991 + "__id__": 1011 }, "_prewarm": false, "_capacity": 8, @@ -28866,7 +29638,7 @@ "_repeatCount": 1, "repeatInterval": 0, "count": { - "__id__": 951 + "__id__": 971 } }, { @@ -28879,7 +29651,7 @@ "__type__": "cc.ColorOvertimeModule", "_enable": false, "color": { - "__id__": 953 + "__id__": 973 } }, { @@ -28908,7 +29680,7 @@ "arcMode": 0, "arcSpread": 11.4, "arcSpeed": { - "__id__": 955 + "__id__": 975 }, "length": 5, "boxThickness": { @@ -28949,23 +29721,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 957 + "__id__": 977 }, "x": { - "__id__": 959 + "__id__": 979 }, "y": { - "__id__": 960 + "__id__": 980 }, "z": { - "__id__": 961 + "__id__": 981 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 958 + "__id__": 978 }, "multiplier": 1 }, @@ -29026,16 +29798,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": true, "x": { - "__id__": 963 + "__id__": 983 }, "y": { - "__id__": 964 + "__id__": 984 }, "z": { - "__id__": 966 + "__id__": 986 }, "speedModifier": { - "__id__": 967 + "__id__": 987 }, "space": 1 }, @@ -29049,7 +29821,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 965 + "__id__": 985 }, "multiplier": 1 }, @@ -29104,13 +29876,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 969 + "__id__": 989 }, "y": { - "__id__": 970 + "__id__": 990 }, "z": { - "__id__": 971 + "__id__": 991 }, "space": 1 }, @@ -29136,16 +29908,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": false, "limitX": { - "__id__": 973 + "__id__": 993 }, "limitY": { - "__id__": 974 + "__id__": 994 }, "limitZ": { - "__id__": 975 + "__id__": 995 }, "limit": { - "__id__": 976 + "__id__": 996 }, "dampen": 3, "separateAxes": false, @@ -29180,13 +29952,13 @@ "_enable": true, "_separateAxes": false, "x": { - "__id__": 978 + "__id__": 998 }, "y": { - "__id__": 979 + "__id__": 999 }, "z": { - "__id__": 980 + "__id__": 1000 } }, { @@ -29220,10 +29992,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 982 + "__id__": 1002 }, "startFrame": { - "__id__": 984 + "__id__": 1004 }, "cycleCount": 0, "_flipU": 0, @@ -29236,7 +30008,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 983 + "__id__": 1003 }, "multiplier": 1 }, @@ -29303,25 +30075,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 987 + "__id__": 1007 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 988 + "__id__": 1008 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 989 + "__id__": 1009 }, "colorOvertime": { - "__id__": 990 + "__id__": 1010 }, "_space": 0, "_particleSystem": { - "__id__": 936 + "__id__": 956 } }, { @@ -29381,7 +30153,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 935 + "__id__": 955 }, "_enabled": true, "__prefab": null, @@ -29392,7 +30164,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 935 + "__id__": 955 }, "_enabled": true, "__prefab": null, @@ -29414,19 +30186,19 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 934 + "__id__": 954 }, "_children": [], "_active": true, "_components": [ { - "__id__": 995 + "__id__": 1015 }, { - "__id__": 1057 + "__id__": 1077 }, { - "__id__": 1058 + "__id__": 1078 } ], "_prefab": null, @@ -29465,7 +30237,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 994 + "__id__": 1014 }, "_enabled": true, "__prefab": null, @@ -29478,60 +30250,60 @@ ], "_visFlags": 0, "startColor": { - "__id__": 996 + "__id__": 1016 }, "scaleSpace": 1, "startSize3D": false, "startSizeX": { - "__id__": 997 + "__id__": 1017 }, "startSize": { - "__id__": 997 + "__id__": 1017 }, "startSizeY": { - "__id__": 998 + "__id__": 1018 }, "startSizeZ": { - "__id__": 999 + "__id__": 1019 }, "startSpeed": { - "__id__": 1000 + "__id__": 1020 }, "startRotation3D": false, "startRotationX": { - "__id__": 1001 + "__id__": 1021 }, "startRotationY": { - "__id__": 1002 + "__id__": 1022 }, "startRotationZ": { - "__id__": 1003 + "__id__": 1023 }, "startRotation": { - "__id__": 1003 + "__id__": 1023 }, "startDelay": { - "__id__": 1004 + "__id__": 1024 }, "startLifetime": { - "__id__": 1005 + "__id__": 1025 }, "duration": 0.5, "loop": false, "simulationSpeed": 1, "playOnAwake": true, "gravityModifier": { - "__id__": 1006 + "__id__": 1026 }, "rateOverTime": { - "__id__": 1007 + "__id__": 1027 }, "rateOverDistance": { - "__id__": 1008 + "__id__": 1028 }, "bursts": [ { - "__id__": 1009 + "__id__": 1029 } ], "_renderCulling": false, @@ -29542,37 +30314,37 @@ "_dataCulling": false, "enableCulling": false, "_colorOverLifetimeModule": { - "__id__": 1011 + "__id__": 1031 }, "_shapeModule": { - "__id__": 1020 + "__id__": 1040 }, "_sizeOvertimeModule": { - "__id__": 1022 - }, - "_velocityOvertimeModule": { - "__id__": 1028 - }, - "_forceOvertimeModule": { - "__id__": 1033 - }, - "_limitVelocityOvertimeModule": { - "__id__": 1037 - }, - "_rotationOvertimeModule": { "__id__": 1042 }, + "_velocityOvertimeModule": { + "__id__": 1048 + }, + "_forceOvertimeModule": { + "__id__": 1053 + }, + "_limitVelocityOvertimeModule": { + "__id__": 1057 + }, + "_rotationOvertimeModule": { + "__id__": 1062 + }, "_textureAnimationModule": { - "__id__": 1046 + "__id__": 1066 }, "_noiseModule": { - "__id__": 1050 + "__id__": 1070 }, "_trailModule": { - "__id__": 1051 + "__id__": 1071 }, "renderer": { - "__id__": 1056 + "__id__": 1076 }, "_prewarm": false, "_capacity": 100, @@ -29670,7 +30442,7 @@ "_repeatCount": 1, "repeatInterval": 1, "count": { - "__id__": 1010 + "__id__": 1030 } }, { @@ -29683,38 +30455,38 @@ "__type__": "cc.ColorOvertimeModule", "_enable": true, "color": { - "__id__": 1012 + "__id__": 1032 } }, { "__type__": "cc.GradientRange", "_mode": 1, "gradient": { - "__id__": 1013 + "__id__": 1033 } }, { "__type__": "cc.Gradient", "colorKeys": [ { - "__id__": 1014 + "__id__": 1034 }, { - "__id__": 1015 + "__id__": 1035 }, { - "__id__": 1016 + "__id__": 1036 } ], "alphaKeys": [ { - "__id__": 1017 + "__id__": 1037 }, { - "__id__": 1018 + "__id__": 1038 }, { - "__id__": 1019 + "__id__": 1039 } ], "mode": 0 @@ -29782,7 +30554,7 @@ "arcMode": 0, "arcSpread": 0, "arcSpeed": { - "__id__": 1021 + "__id__": 1041 }, "length": 5, "boxThickness": { @@ -29823,23 +30595,23 @@ "_enable": true, "separateAxes": false, "size": { - "__id__": 1023 + "__id__": 1043 }, "x": { - "__id__": 1025 + "__id__": 1045 }, "y": { - "__id__": 1026 + "__id__": 1046 }, "z": { - "__id__": 1027 + "__id__": 1047 } }, { "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1024 + "__id__": 1044 }, "multiplier": 1 }, @@ -29900,16 +30672,16 @@ "__type__": "cc.VelocityOvertimeModule", "_enable": false, "x": { - "__id__": 1029 + "__id__": 1049 }, "y": { - "__id__": 1030 + "__id__": 1050 }, "z": { - "__id__": 1031 + "__id__": 1051 }, "speedModifier": { - "__id__": 1032 + "__id__": 1052 }, "space": 1 }, @@ -29941,13 +30713,13 @@ "__type__": "cc.ForceOvertimeModule", "_enable": false, "x": { - "__id__": 1034 + "__id__": 1054 }, "y": { - "__id__": 1035 + "__id__": 1055 }, "z": { - "__id__": 1036 + "__id__": 1056 }, "space": 1 }, @@ -29973,16 +30745,16 @@ "__type__": "cc.LimitVelocityOvertimeModule", "_enable": true, "limitX": { - "__id__": 1038 + "__id__": 1058 }, "limitY": { - "__id__": 1039 + "__id__": 1059 }, "limitZ": { - "__id__": 1040 + "__id__": 1060 }, "limit": { - "__id__": 1041 + "__id__": 1061 }, "dampen": 0.05, "separateAxes": false, @@ -30017,13 +30789,13 @@ "_enable": true, "_separateAxes": false, "x": { - "__id__": 1043 + "__id__": 1063 }, "y": { - "__id__": 1044 + "__id__": 1064 }, "z": { - "__id__": 1045 + "__id__": 1065 } }, { @@ -30055,10 +30827,10 @@ "_mode": 0, "animation": 0, "frameOverTime": { - "__id__": 1047 + "__id__": 1067 }, "startFrame": { - "__id__": 1049 + "__id__": 1069 }, "cycleCount": 1, "_flipU": 0, @@ -30071,7 +30843,7 @@ "__type__": "cc.CurveRange", "mode": 1, "spline": { - "__id__": 1048 + "__id__": 1068 }, "multiplier": 1 }, @@ -30139,25 +30911,25 @@ "_enable": false, "mode": 0, "lifeTime": { - "__id__": 1052 + "__id__": 1072 }, "_minParticleDistance": 0.1, "existWithParticles": true, "textureMode": 0, "widthFromParticle": true, "widthRatio": { - "__id__": 1053 + "__id__": 1073 }, "colorFromParticle": false, "colorOverTrail": { - "__id__": 1054 + "__id__": 1074 }, "colorOvertime": { - "__id__": 1055 + "__id__": 1075 }, "_space": 0, "_particleSystem": { - "__id__": 995 + "__id__": 1015 } }, { @@ -30217,7 +30989,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 994 + "__id__": 1014 }, "_enabled": true, "__prefab": null, @@ -30228,7 +31000,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 994 + "__id__": 1014 }, "_enabled": true, "__prefab": null, @@ -30249,7 +31021,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 934 + "__id__": 954 }, "_enabled": true, "__prefab": null, @@ -30270,7 +31042,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 929 + "__id__": 949 }, "_enabled": true, "__prefab": null, @@ -30291,17 +31063,21 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 929 + "__id__": 949 }, "_enabled": true, "__prefab": null, "_collider": { - "__id__": 933 + "__id__": 953 }, "_animation": { - "__id__": 1062 + "__id__": 1082 }, "_force": 40, + "_soundFx": { + "__uuid__": "c4a1c16a-96e4-4e8a-9188-cf42b4f35f73", + "__expectedType__": "cc.AudioClip" + }, "onDone": [], "_id": "6dRMRMEmNLnoxDfiks3Kr9" }, @@ -30310,7 +31086,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 929 + "__id__": 949 }, "_enabled": true, "__prefab": null, @@ -30332,7 +31108,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 794 + "__id__": 814 }, "_enabled": true, "__prefab": null, @@ -30389,10 +31165,10 @@ "__expectedType__": "cc.Prefab" }, "_floatingTextContainer": { - "__id__": 1066 + "__id__": 1086 }, "_ballHolder": { - "__id__": 792 + "__id__": 812 }, "_ballSpawnPosition": { "__type__": "cc.Vec3", @@ -30401,12 +31177,24 @@ "z": 0 }, "_timePlay": 120, + "_boosterActiveSound": { + "__uuid__": "4dba398c-e777-4670-8b1b-76b3fbfb4625", + "__expectedType__": "cc.AudioClip" + }, "_startSound": { - "__uuid__": "6452248b-259c-4844-b0e1-70f47d69955e", + "__uuid__": "015d5eb5-b790-46d8-a580-b35ecb94caf3", + "__expectedType__": "cc.AudioClip" + }, + "_ballOutSound": { + "__uuid__": "90fc5275-7ce7-4e86-a757-0674c4fe8f18", "__expectedType__": "cc.AudioClip" }, "_backgroundMusic": { - "__uuid__": "fc66df28-6c8c-4915-adbd-5a3da652cfc6", + "__uuid__": "40b027bb-9e2f-40e5-85a7-cd32e2ad51af", + "__expectedType__": "cc.AudioClip" + }, + "_gameOverMusic": { + "__uuid__": "bab45dd0-83c3-45fe-958c-5a21a4c4a5bb", "__expectedType__": "cc.AudioClip" }, "_id": "94qg9r7nVDkbO1S3Aid8/t" @@ -30422,7 +31210,7 @@ "_active": true, "_components": [ { - "__id__": 1067 + "__id__": 1087 } ], "_prefab": null, @@ -30460,7 +31248,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1066 + "__id__": 1086 }, "_enabled": true, "__prefab": null, @@ -30552,16 +31340,16 @@ "instance": null, "targetOverrides": [ { - "__id__": 1072 + "__id__": 1092 }, { - "__id__": 1075 + "__id__": 1095 }, { - "__id__": 1077 + "__id__": 1097 }, { - "__id__": 1079 + "__id__": 1099 } ], "nestedPrefabInstanceRoots": [ @@ -30585,7 +31373,7 @@ "__id__": 153 }, "sourceInfo": { - "__id__": 1073 + "__id__": 1093 }, "propertyPath": [ "_trailModule", @@ -30595,7 +31383,7 @@ "__id__": 153 }, "targetInfo": { - "__id__": 1074 + "__id__": 1094 } }, { @@ -30613,7 +31401,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 399 + "__id__": 402 }, "sourceInfo": null, "propertyPath": [ @@ -30623,7 +31411,7 @@ "__id__": 207 }, "targetInfo": { - "__id__": 1076 + "__id__": 1096 } }, { @@ -30645,7 +31433,7 @@ "__id__": 319 }, "targetInfo": { - "__id__": 1078 + "__id__": 1098 } }, { @@ -30660,7 +31448,7 @@ "__id__": 134 }, "sourceInfo": { - "__id__": 1080 + "__id__": 1100 }, "propertyPath": [ "_trailModule", @@ -30670,7 +31458,7 @@ "__id__": 134 }, "targetInfo": { - "__id__": 1081 + "__id__": 1101 } }, { @@ -30688,22 +31476,22 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 1083 + "__id__": 1103 }, "shadows": { - "__id__": 1084 + "__id__": 1104 }, "_skybox": { - "__id__": 1085 + "__id__": 1105 }, "fog": { - "__id__": 1086 + "__id__": 1106 }, "octree": { - "__id__": 1087 + "__id__": 1107 }, "lightProbeInfo": { - "__id__": 1088 + "__id__": 1108 }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false diff --git a/assets/_Game/Scripts/Booster/BoosterBase.ts b/assets/_Game/Scripts/Booster/BoosterBase.ts index cef80b7..759148a 100644 --- a/assets/_Game/Scripts/Booster/BoosterBase.ts +++ b/assets/_Game/Scripts/Booster/BoosterBase.ts @@ -1,9 +1,10 @@ -import { _decorator, CCFloat, Collider2D, Component, Contact2DType, Animation } from 'cc'; +import { _decorator, CCFloat, Collider2D, Component, Contact2DType, Animation, AudioClip } from 'cc'; import ObjectPool from '../Pool/ObjectPool'; import { EventManger } from '../Manager/EventManger'; import GameEvent from '../Events/GameEvent'; import IPoolable from '../Pool/IPoolable'; import Utilities from '../Utilities'; +import { SoundManager } from '../Manager/SoundManager'; const { ccclass, property } = _decorator; @ccclass('BoosterBase') @@ -12,6 +13,9 @@ export class BoosterBase extends Component implements IPoolable { protected _collider: Collider2D; @property({ type: Animation, visible: true }) private _animation: Animation; + @property({ type: AudioClip, visible: true }) + private _collectSound: AudioClip; + @property(CCFloat) protected time: number = 10; @@ -22,6 +26,7 @@ export class BoosterBase extends Component implements IPoolable { private onContactBegin(self: Collider2D, other: Collider2D) { this.boosterActive(); EventManger.instance.emit(GameEvent.ObjectRelease, this.node); + SoundManager.instance.playSfx(this._collectSound); ObjectPool.release(this.node); } diff --git a/assets/_Game/Scripts/Enum/GameState.ts b/assets/_Game/Scripts/Enum/GameState.ts index 0b59a5d..b0276aa 100644 --- a/assets/_Game/Scripts/Enum/GameState.ts +++ b/assets/_Game/Scripts/Enum/GameState.ts @@ -1,5 +1,6 @@ enum GameState { Init = 'Init', + Ready = 'Ready', Playing = 'Playing', GameOver = 'GameOver', End = 'End', diff --git a/assets/_Game/Scripts/Enum/PhysicGroup.ts b/assets/_Game/Scripts/Enum/PhysicGroup.ts index f6cea38..7b32d67 100644 --- a/assets/_Game/Scripts/Enum/PhysicGroup.ts +++ b/assets/_Game/Scripts/Enum/PhysicGroup.ts @@ -5,7 +5,9 @@ enum PhysicsGroup { TRIGGER = 1 << 1, BALL = 1 << 2, BALL_THROWING = 1 << 3, - ENEMY = 1 << 4, + BORDER = 1 << 4, + ENEMY = 1 << 5, + FLIPPER = 1 << 6, } export default Enum(PhysicsGroup); diff --git a/assets/_Game/Scripts/Environments/CumulativeBar.ts b/assets/_Game/Scripts/Environments/CumulativeBar.ts index 3cd7814..105e2ff 100644 --- a/assets/_Game/Scripts/Environments/CumulativeBar.ts +++ b/assets/_Game/Scripts/Environments/CumulativeBar.ts @@ -1,4 +1,18 @@ -import { _decorator, CCInteger, clamp, Component, lerp, Sprite, Node, tween, Prefab, Tween, Vec3, Label } from 'cc'; +import { + _decorator, + CCInteger, + clamp, + Component, + lerp, + Sprite, + Node, + tween, + Prefab, + Tween, + Vec3, + Label, + AudioClip, +} from 'cc'; import { EventManger } from '../Manager/EventManger'; import GameEvent from '../Events/GameEvent'; import ScoreType from '../Enum/ScoreType'; @@ -6,6 +20,7 @@ import Utilities from '../Utilities'; import { GameManager } from '../Manager/GameManager'; import BoosterType from '../Enum/BoosterType'; import ObjectPool from '../Pool/ObjectPool'; +import { SoundManager } from '../Manager/SoundManager'; const { ccclass, property } = _decorator; @ccclass('CumulativeBar') @@ -19,16 +34,20 @@ export class CumulativeBar extends Component { @property({ type: Prefab, visible: true }) private _scoreObjectPrefab: Prefab; + @property({ type: AudioClip, visible: true }) + private _soundFx; + private _pool: ObjectPool; private _currentValue = 0; private _fillValue = 0; private _active = false; private _goal = false; private _timer = 0; + private _multiplier = 1; protected onLoad(): void { this._fillBar.fillRange = 0; - this._pool = new ObjectPool(this._scoreObjectPrefab, 100, true); + this._pool = new ObjectPool(this._scoreObjectPrefab, 50, true); EventManger.instance.on(GameEvent.Score, this.onScore, this); EventManger.instance.on(GameEvent.BoosterActive, this.onBoosterActive, this); EventManger.instance.on(GameEvent.BoosterDisable, this.onBoosterDisable, this); @@ -39,7 +58,7 @@ export class CumulativeBar extends Component { this._timer += dt; if (this._timer >= 0.1) { this._timer = 0; - this._currentValue -= 0.5; + this._currentValue -= 2; if (this._currentValue < 0) { this._currentValue = 0; @@ -57,14 +76,16 @@ export class CumulativeBar extends Component { switch (type) { case ScoreType.DestroyObject: if (!this._active) return; - this._currentValue += points; + this._multiplier++; + this._currentValue += points * this._multiplier; + if (this._currentValue > this._maxValue) this._currentValue = this._maxValue; break; case ScoreType.Goal: if (this._currentValue == 0) return; + this._multiplier = 0; this._goal = true; await Utilities.delay(1); - let items = Math.round(this._currentValue / 5); GameManager.instance.addScore( Math.round(this._currentValue), ScoreType.Combo, @@ -75,16 +96,17 @@ export class CumulativeBar extends Component { duration: 1, }, ); - this._currentValue = 0; - this._goal = false; + let items = Math.ceil(this._currentValue / 10); this.playCollectEffect(items); + this._goal = false; + this._currentValue = 0; break; } this._fillValue = -clamp(this._currentValue / 2 / this._maxValue, 0, 0.5); } private async playCollectEffect(items: number) { - const time = items < 10 ? 0.05 : 1.5 / items; + const time = 0.04; while (items > 0) { const obj = this._pool.get(this._scoreUI); obj.setWorldPosition(this.node.worldPosition); @@ -101,6 +123,7 @@ export class CumulativeBar extends Component { .call(() => ObjectPool.release(obj)) .start(); items--; + SoundManager.instance.playSfx(this._soundFx); await Utilities.delay(time); } } @@ -109,6 +132,9 @@ export class CumulativeBar extends Component { if (type == BoosterType.CumulativeBar) this._active = true; } private onBoosterDisable(type: BoosterType) { - if (type == BoosterType.CumulativeBar) this._active = false; + if (type == BoosterType.CumulativeBar) { + this._multiplier = 0; + this._active = false; + } } } diff --git a/assets/_Game/Scripts/Environments/SlingShot.ts b/assets/_Game/Scripts/Environments/SlingShot.ts index 9ce2bf1..f3035f2 100644 --- a/assets/_Game/Scripts/Environments/SlingShot.ts +++ b/assets/_Game/Scripts/Environments/SlingShot.ts @@ -1,5 +1,6 @@ -import { _decorator, Collider2D, Component, Contact2DType, Node, Animation, RigidBody2D } from 'cc'; +import { _decorator, Collider2D, Component, Contact2DType, Node, Animation, RigidBody2D, AudioClip } from 'cc'; import { CameraController } from './CameraController'; +import { SoundManager } from '../Manager/SoundManager'; const { ccclass, property } = _decorator; @ccclass('SlingShot') @@ -9,6 +10,9 @@ export default class SlingShot extends Component { @property({ type: Collider2D, visible: true }) private _collider: Collider2D; + @property({ type: AudioClip, visible: true }) + private _soundFx: AudioClip; + protected onLoad(): void { this._collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this); } @@ -16,6 +20,9 @@ export default class SlingShot extends Component { onBeginContact(self: Collider2D, other: Collider2D) { this._animation.play(); const velocity = other.getComponent(RigidBody2D).linearVelocity.length(); - if (velocity >= 40) CameraController.instance.shake(0.08); + SoundManager.instance.playSfx(this._soundFx); + if (velocity >= 40) { + CameraController.instance.shake(0.08); + } } } diff --git a/assets/_Game/Scripts/GamePlay/Cannon.ts b/assets/_Game/Scripts/GamePlay/Cannon.ts index af3331f..4d3ec79 100644 --- a/assets/_Game/Scripts/GamePlay/Cannon.ts +++ b/assets/_Game/Scripts/GamePlay/Cannon.ts @@ -9,6 +9,7 @@ import { Vec2, Animation, Vec3, + AudioClip, } from 'cc'; import Utilities from '../Utilities'; import { Ball } from './Ball'; @@ -16,6 +17,7 @@ import TimeConfig from '../Enum/TimeConfig'; import { EventManger } from '../Manager/EventManger'; import GameEvent from '../Events/GameEvent'; import { CameraController } from '../Environments/CameraController'; +import { SoundManager } from '../Manager/SoundManager'; const { ccclass, property } = _decorator; @ccclass('Cannon') @@ -26,6 +28,10 @@ export class Cannon extends Component { private _animation: Animation; @property({ type: CCInteger, visible: true }) private _force = 30; + + @property({ type: AudioClip, visible: true }) + private _soundFx: AudioClip; + @property({ type: EventHandler, visible: true }) private onDone: EventHandler[] = []; @@ -45,6 +51,7 @@ export class Cannon extends Component { this._animation.play(); ball.setActiveRigi(true); ball.throwBall(new Vec2(0, this._force)); + SoundManager.instance.playSfx(this._soundFx); await Utilities.delay(TimeConfig.DelayCannonDone); tween(this._collider.node).to(0.5, { scale: Vec3.ZERO }, { easing: 'backIn' }).start(); EventHandler.emitEvents(this.onDone, ball); diff --git a/assets/_Game/Scripts/GamePlay/Enemy.ts b/assets/_Game/Scripts/GamePlay/Enemy.ts index 1e9d958..a8bd56d 100644 --- a/assets/_Game/Scripts/GamePlay/Enemy.ts +++ b/assets/_Game/Scripts/GamePlay/Enemy.ts @@ -11,11 +11,14 @@ import { Collider2D, Sprite, Contact2DType, + AudioClip, + Tween, } from 'cc'; import { EventManger } from '../Manager/EventManger'; import GameEvent from '../Events/GameEvent'; import ScoreType from '../Enum/ScoreType'; import GameState from '../Enum/GameState'; +import { SoundManager } from '../Manager/SoundManager'; const { ccclass, property } = _decorator; @ccclass('Enemy') @@ -38,6 +41,10 @@ export class Enemy extends Component { private _patrolCurve: geometry.AnimationCurve = new geometry.AnimationCurve(); @property({ type: CCFloat, visible: true }) private _multiplierCurve = 100; + + @property({ type: AudioClip, visible: true }) + private _hitSound: AudioClip; + private x: number; private y: number; private _distance: number; @@ -100,8 +107,10 @@ export class Enemy extends Component { } private onBeginContact(self: Collider2D, other: Collider2D) { - this._sprite.node.setScale(Vec3.ONE); + SoundManager.instance.playSfx(this._hitSound); + Tween.stopAllByTarget(this._sprite.node.scale); tween(this._sprite.node.scale) + .set(Vec3.ONE) .to(0.1, new Vec3(1.2, 1.2), { easing: 'backInOut' }) .to(0.5, Vec3.ONE, { easing: 'backOut' }) .start(); @@ -130,11 +139,17 @@ export class Enemy extends Component { switch (state) { case GameState.Init: break; + case GameState.Ready: + break; case GameState.Playing: this.init(); break; case GameState.GameOver: break; + case GameState.Relive: + break; + case GameState.End: + break; } } } diff --git a/assets/_Game/Scripts/GamePlay/Goal.ts b/assets/_Game/Scripts/GamePlay/Goal.ts index 9b7d8bb..23250ef 100644 --- a/assets/_Game/Scripts/GamePlay/Goal.ts +++ b/assets/_Game/Scripts/GamePlay/Goal.ts @@ -14,7 +14,6 @@ import Utilities from '../Utilities'; import ObjectPool from '../Pool/ObjectPool'; import { Ball } from './Ball'; import { SoundManager } from '../Manager/SoundManager'; -import TimeConfig from '../Enum/TimeConfig'; import { CameraController } from '../Environments/CameraController'; const { ccclass, property } = _decorator; @@ -41,7 +40,7 @@ export class Goal extends Component { if (ball) { GameManager.instance.goal(this._score, ball.node.getWorldPosition()); ball.setActiveRigi(false); - const fx = this._goalFxPool.get(this.node, ParticleSystem); + const fx = this._goalFxPool.get(ParticleSystem, this.node); const pos = ball.node.getWorldPosition(); pos.z = 10; fx.node.setWorldPosition(pos); @@ -50,7 +49,7 @@ export class Goal extends Component { ObjectPool.release(ball.node); CameraController.instance.shake(0.5); await Utilities.waitUntil(() => fx.isStopped); - this._goalFxPool.release(fx.node); + this._goalFxPool.release(fx); } } } diff --git a/assets/_Game/Scripts/GamePlay/MutilBall.ts b/assets/_Game/Scripts/GamePlay/MutilBall.ts index 5e5da47..f38679f 100644 --- a/assets/_Game/Scripts/GamePlay/MutilBall.ts +++ b/assets/_Game/Scripts/GamePlay/MutilBall.ts @@ -1,10 +1,11 @@ -import { _decorator, Collider2D, Component, Contact2DType, Vec2, Node, ParticleSystem, Prefab } from 'cc'; +import { _decorator, Collider2D, Component, Contact2DType, Vec2, Node, ParticleSystem, Prefab, AudioClip } from 'cc'; import { GameManager } from '../Manager/GameManager'; import Utilities from '../Utilities'; import { Ball } from './Ball'; import TimeConfig from '../Enum/TimeConfig'; import ObjectPool from '../Pool/ObjectPool'; import { CameraController } from '../Environments/CameraController'; +import { SoundManager } from '../Manager/SoundManager'; const { ccclass, property } = _decorator; @ccclass('MultiBall') @@ -18,6 +19,9 @@ export class MultiBall extends Component { @property({ type: Prefab, visible: true }) private _fx: Prefab; + @property({ type: AudioClip, visible: true }) + private _soundFX: AudioClip; + private _originBall: Ball; private _trigged = false; private _fxPool: ObjectPool; @@ -32,7 +36,7 @@ export class MultiBall extends Component { CameraController.instance.shake(0.2); this._originBall.setActiveRigi(true); const ball1 = this._originBall; - const ball2 = GameManager.instance.spawnBall(false); + const ball2 = GameManager.instance.spawnBall(false, false); ball1.node.setWorldPosition(this._portRight.worldPosition); ball1.addForce(new Vec2(20, 0)); @@ -49,11 +53,12 @@ export class MultiBall extends Component { this._originBall = otherCollider.getComponent(Ball); this._originBall.setActiveRigi(false); this._trigged = true; - const fx = this._fxPool.get(this.node, ParticleSystem); + const fx = this._fxPool.get(ParticleSystem, this.node); fx.node.setWorldPosition(this.node.worldPosition); + SoundManager.instance.playSfx(this._soundFX); await Utilities.delay(TimeConfig.DelayMultiBall); this._collider.enabled = true; await Utilities.waitUntil(() => fx.isStopped); - this._fxPool.release(fx.node); + this._fxPool.release(fx); } } diff --git a/assets/_Game/Scripts/Gameplay/Ball.ts b/assets/_Game/Scripts/Gameplay/Ball.ts index 4b11d9f..d5ef9c9 100644 --- a/assets/_Game/Scripts/Gameplay/Ball.ts +++ b/assets/_Game/Scripts/Gameplay/Ball.ts @@ -37,10 +37,12 @@ export class Ball extends Component implements IPoolable { private _maxSpeed: number; @property({ type: RigidBody2D, visible: true }) private _rigidBody: RigidBody2D; + @property({ type: Sprite, visible: true }) private _sprite: Sprite; @property({ type: Sprite, visible: true }) private _spriteShadow: Sprite; + @property({ type: Animation, visible: true }) private _animation: Animation; @property({ type: ParticleSystem, visible: true }) @@ -51,10 +53,12 @@ export class Ball extends Component implements IPoolable { private _boosterParticle: ParticleSystem; @property({ type: CircleCollider2D, visible: true }) private _collider: CircleCollider2D; + @property({ type: AudioClip, visible: true }) private _hitSound: AudioClip; @property({ type: AudioClip, visible: true }) - private _ballThrowSound: AudioClip; + private _hitFlipperSound: AudioClip; + @property({ type: geometry.AnimationCurve, visible: true }) private _jumpCurve: geometry.AnimationCurve = new geometry.AnimationCurve(); @@ -131,11 +135,13 @@ export class Ball extends Component implements IPoolable { const point = selfCollider.node.getWorldPosition().add(dir); hitPoint = new Vec2(point.x, point.y); } - const hitFx = this._impactPool.get(this.node.parent, ParticleSystem); + const hitFx = this._impactPool.get(ParticleSystem, this.node.parent); hitFx.node.setWorldPosition(new Vec3(hitPoint.x, hitPoint.y, 10)); - SoundManager.instance.playSfx(this._hitSound); + SoundManager.instance.playSfx( + otherCollider.group == PhysicsGroup.FLIPPER ? this._hitFlipperSound : this._hitSound, + ); await Utilities.waitUntil(() => hitFx.isStopped, 0.1); - this._impactPool.release(hitFx.node); + this._impactPool.release(hitFx); } } @@ -162,7 +168,6 @@ export class Ball extends Component implements IPoolable { } public throwBall(force: Vec2) { - SoundManager.instance.playSfx(this._ballThrowSound); this._collider.group = PhysicsGroup.BALL_THROWING; this._rigidBody.group = PhysicsGroup.BALL_THROWING; this._rigidBody.applyAngularImpulse(-5 * force.x || 2, true); diff --git a/assets/_Game/Scripts/Gameplay/Flipper.ts b/assets/_Game/Scripts/Gameplay/Flipper.ts index bfe147e..fd5663f 100644 --- a/assets/_Game/Scripts/Gameplay/Flipper.ts +++ b/assets/_Game/Scripts/Gameplay/Flipper.ts @@ -11,10 +11,12 @@ import { Animation, Vec3, AnimationState, + AudioClip, } from 'cc'; import { EventManger } from '../Manager/EventManger'; import GameEvent from '../Events/GameEvent'; import TimeConfig from '../Enum/TimeConfig'; +import { SoundManager } from '../Manager/SoundManager'; const { ccclass, property } = _decorator; export enum ControllerSide { @@ -37,6 +39,9 @@ export class Flipper extends Component { @property({ visible: true, type: ControllerSide }) private side = ControllerSide.Left; + @property({ type: AudioClip, visible: true }) + private _activeSound: AudioClip; + private _timer = 0; private _isAnimationPlaying; @@ -119,6 +124,7 @@ export class Flipper extends Component { //#endregion private activeFlipper(): void { + SoundManager.instance.playSfx(this._activeSound, 0.5); this._hingeJoint.motorSpeed = this._motorSpeedActive; } private deActiveFlipper(): void { diff --git a/assets/_Game/Scripts/Manager/GameManager.ts b/assets/_Game/Scripts/Manager/GameManager.ts index 53dcf0a..526dd02 100644 --- a/assets/_Game/Scripts/Manager/GameManager.ts +++ b/assets/_Game/Scripts/Manager/GameManager.ts @@ -66,10 +66,17 @@ export class GameManager extends Singleton() { private _ballSpawnPosition: Vec3; @property({ type: CCInteger, visible: true }) private readonly _timePlay = 120; + + @property({ type: AudioClip, visible: true }) + private _boosterActiveSound: AudioClip; @property({ type: AudioClip, visible: true }) private _startSound: AudioClip; @property({ type: AudioClip, visible: true }) + private _ballOutSound: AudioClip; + @property({ type: AudioClip, visible: true }) private _backgroundMusic: AudioClip; + @property({ type: AudioClip, visible: true }) + private _gameOverMusic: AudioClip; private _ballPool: ObjectPool; private _FloatingScorePool: ObjectPool; @@ -127,6 +134,8 @@ export class GameManager extends Singleton() { case GameState.Init: BEConnector.instance.authenticate(); break; + case GameState.Ready: + break; case GameState.Playing: this.countTime(); BEConnector.instance.ticketMinus('auth'); @@ -134,8 +143,6 @@ export class GameManager extends Singleton() { case GameState.GameOver: break; case GameState.End: - await Utilities.delay(2.5); - BEConnector.instance.postScoreToServer(this.score); break; case GameState.Relive: BEConnector.instance.ticketMinus('revive'); @@ -152,7 +159,7 @@ export class GameManager extends Singleton() { opts: { scaleMin: number; scaleMax: number; duration: number }, ) { this._score += score; - const floatingScore = this._FloatingScorePool.get(this._floatingTextContainer, FloatingText); + const floatingScore = this._FloatingScorePool.get(FloatingText, this._floatingTextContainer); floatingScore.show(`+${score}`, position, score >= 100 ? opts.scaleMax : opts.scaleMin, opts.duration); EventManger.instance.emit(GameEvent.Score, [this._score, score, type]); } @@ -186,11 +193,11 @@ export class GameManager extends Singleton() { } } - public spawnBall(throwBall: boolean): Ball { + public spawnBall(throwBall: boolean, playStartSound: boolean = true): Ball { if (this._gameState != GameState.Playing) return; - SoundManager.instance.playSfx(this._startSound); + if (playStartSound) SoundManager.instance.playSfx(this._startSound); this.setCurrentBallInGame(1); - const ball = this._ballPool.get(this._ballHolder, Ball); + const ball = this._ballPool.get(Ball, this._ballHolder); ball.init(this._boostersActive.length > 0); ball.node.setRotation(Quat.IDENTITY); ball.node.setPosition(this._ballSpawnPosition); @@ -208,6 +215,7 @@ export class GameManager extends Singleton() { this.setCurrentBallInGame(-1); if (this._currentBallInGame <= 0) { EventManger.instance.emit(GameEvent.BallOut, null); + SoundManager.instance.playSfx(this._ballOutSound); for (let i = 0; i < this._boostersActive.length; i++) { const booster = this._boostersActive[i]; EventManger.instance.emit(GameEvent.BoosterDisable, booster.type); @@ -243,7 +251,7 @@ export class GameManager extends Singleton() { } if (bonusTime) { this.addTime(bonusTime); - const floatingScore = this._FloatingScorePool.get(this._floatingTextContainer, FloatingText); + const floatingScore = this._FloatingScorePool.get(FloatingText, this._floatingTextContainer); floatingScore.show(`+${bonusTime}⏰`, position, 1.5); } } @@ -260,7 +268,7 @@ export class GameManager extends Singleton() { EventManger.instance.emit(GameEvent.BoosterDisable, booster.type); } this._boostersActive = []; - + SoundManager.instance.playBGM(this._gameOverMusic); if (this.isReplayed) { this.changeGameState(GameState.End); return; @@ -270,12 +278,16 @@ export class GameManager extends Singleton() { this.changeGameState(GameState.GameOver); } + public Ready() { + SoundManager.instance.playBGM(this._backgroundMusic, 1); + this.changeGameState(GameState.Ready); + } + public async play() { this._timer = this._timePlay + TimeConfig.DelayPLay; this._score = 0; this._currentBallInGame = 0; this._isMultiBall = false; - SoundManager.instance.playBGM(this._backgroundMusic, 0.5); this.changeGameState(GameState.Playing); await Utilities.delay(TimeConfig.DelayPLay); this.spawnBall(true); @@ -286,13 +298,13 @@ export class GameManager extends Singleton() { this._timer = this._timePlay + TimeConfig.DelayPLay; this._currentBallInGame = 0; this._isMultiBall = false; - SoundManager.instance.playBGM(this._backgroundMusic, 0.5); + SoundManager.instance.playBGM(this._backgroundMusic, 1); this.changeGameState(GameState.Playing); await Utilities.delay(TimeConfig.DelayPLay); this.spawnBall(true); } - public ActiveBooster(type: BoosterType, time: number) { + public async ActiveBooster(type: BoosterType, time: number) { //check booster already active for (let i = 0; i < this._boostersActive.length; i++) { const booster = this._boostersActive[i]; @@ -300,5 +312,7 @@ export class GameManager extends Singleton() { } this._boostersActive.push(new Booster(type, time)); EventManger.instance.emit(GameEvent.BoosterActive, type); + await Utilities.delay(0.2); + SoundManager.instance.playSfx(this._boosterActiveSound); } } diff --git a/assets/_Game/Scripts/Manager/SoundManager.ts b/assets/_Game/Scripts/Manager/SoundManager.ts index 75ea310..9fe35b3 100644 --- a/assets/_Game/Scripts/Manager/SoundManager.ts +++ b/assets/_Game/Scripts/Manager/SoundManager.ts @@ -23,9 +23,15 @@ class SoundSource { } else { this.source.volume = this.volume; } + + this._mute = value; } public play() { + if (this.source.playing) { + this.source.playOneShot(this.source.clip, this.mute ? 0 : this.volume); + return; + } this.source.play(); } @@ -39,19 +45,19 @@ export class SoundManager extends Singleton('SoundManager') { private _audioSourcesSfx: { [key: string]: SoundSource } = {}; private _audioSourceBgm: SoundSource; - private isMute = false; + private _isMute = false; public toggleMute(): boolean { - this.isMute = !this.isMute; - this.setMute(this.isMute); - return this.isMute; + this._isMute = !this._isMute; + this.setMute(this._isMute); + return this._isMute; } public setMute(mute: boolean) { - this.isMute = mute; - this._audioSourceBgm.mute = this.isMute; + this._isMute = mute; + this._audioSourceBgm.mute = this._isMute; for (const key in this._audioSourcesSfx) { - this._audioSourcesSfx[key].mute = this.isMute; + this._audioSourcesSfx[key].mute = this._isMute; } } @@ -65,7 +71,7 @@ export class SoundManager extends Singleton('SoundManager') { this._audioSourceBgm.volume = volume; this._audioSourceBgm.source.clip = audio; this._audioSourceBgm.source.loop = loop; - this._audioSourceBgm.mute = this.isMute; + this._audioSourceBgm.mute = this._isMute; this._audioSourceBgm.play(); } @@ -76,10 +82,6 @@ export class SoundManager extends Singleton('SoundManager') { soundSource.volume = volume; soundSource.source.loop = loop; if (loop) return; - if (soundSource.source.playing) { - soundSource.source.playOneShot(audioClip, this.isMute ? 0 : volume); - return; - } soundSource.play(); return; } @@ -90,7 +92,7 @@ export class SoundManager extends Singleton('SoundManager') { soundSource.source.clip = audioClip; soundSource.source.loop = loop; soundSource.source.volume = volume; - soundSource.mute = this.isMute; + soundSource.mute = this._isMute; this._audioSourcesSfx[audioClip.uuid] = soundSource; soundSource.play(); } diff --git a/assets/_Game/Scripts/Manager/SpawnObjectManager.ts b/assets/_Game/Scripts/Manager/SpawnObjectManager.ts index 7b0fc8a..66f5487 100644 --- a/assets/_Game/Scripts/Manager/SpawnObjectManager.ts +++ b/assets/_Game/Scripts/Manager/SpawnObjectManager.ts @@ -160,6 +160,8 @@ export class SpawnObjectManager extends Component { switch (state) { case GameState.Init: break; + case GameState.Ready: + break; case GameState.Playing: this._playing = true; if (this._isReplay) return; diff --git a/assets/_Game/Scripts/Pool/ObjectPool.ts b/assets/_Game/Scripts/Pool/ObjectPool.ts index a9b045d..7373418 100644 --- a/assets/_Game/Scripts/Pool/ObjectPool.ts +++ b/assets/_Game/Scripts/Pool/ObjectPool.ts @@ -1,6 +1,5 @@ import { Component, Node, Prefab, director, instantiate } from 'cc'; import IPoolable from './IPoolable'; -import { error } from 'cc'; export default class ObjectPool { private _inactive: Node[] = []; @@ -58,14 +57,24 @@ export default class ObjectPool { //#endregion public get(parent?: Node): Node; - public get(parent?: Node, classConstructor?: new () => T): T; - public get(parent?: Node, classConstructor?: new () => T): T | Node { + public get(classConstructor: new () => T): T; + public get(classConstructor: new () => T, parent: Node): T; + public get(a?: (new () => T) | Node, b?: Node): T | Node { if (!!!this._prefab) { console.error('prefab cant be null or undefine'); return; } + + let parent: Node; + let classConstructor: new () => T; + if (a instanceof Node) { + parent = a || director.getScene(); + } else { + parent = b || director.getScene(); + classConstructor = a; + } + let obj: Node = null; - let p = parent || director.getScene(); if (this._inactive.length > 0) { // Pop the last object in pool obj = this._inactive.pop(); @@ -78,14 +87,13 @@ export default class ObjectPool { obj.removeFromParent(); } - obj.setParent(p); + obj.setParent(parent); this._actives.push(obj); // Invoke pool handler const handler = this._poolHandlerComp ? obj.getComponent(this._poolHandlerComp) : null; if (handler) { (handler as unknown as IPoolable)?.onGet(); } - if (classConstructor) { return handler == classConstructor ? handler : obj.getComponent(classConstructor); } diff --git a/assets/_Game/Scripts/UI/ButonSound.ts b/assets/_Game/Scripts/UI/ButonSound.ts new file mode 100644 index 0000000..56a3168 --- /dev/null +++ b/assets/_Game/Scripts/UI/ButonSound.ts @@ -0,0 +1,17 @@ +import { _decorator, Button, Component, Node } from 'cc'; +import { SoundManager } from '../Manager/SoundManager'; +const { ccclass, property } = _decorator; + +@ccclass('ButonSound') +export class ButonSound extends Component { + @property({ type: Node, visible: true }) + private _unMute: Node; + @property({ type: Node, visible: true }) + private _mute: Node; + + public clickBtn() { + const mute = SoundManager.instance.toggleMute(); + this._mute.active = mute; + this._unMute.active = !mute; + } +} diff --git a/assets/_Game/Scripts/UI/ButonSound.ts.meta b/assets/_Game/Scripts/UI/ButonSound.ts.meta new file mode 100644 index 0000000..805fb23 --- /dev/null +++ b/assets/_Game/Scripts/UI/ButonSound.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "fe6191ed-117d-4e42-aee8-78008aac035d", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/_Game/Scripts/UI/GameOverPanel.ts b/assets/_Game/Scripts/UI/GameOverPanel.ts index cc53470..93d6fac 100644 --- a/assets/_Game/Scripts/UI/GameOverPanel.ts +++ b/assets/_Game/Scripts/UI/GameOverPanel.ts @@ -1,4 +1,4 @@ -import { _decorator, Component, Label, Node, Prefab, Tween, tween, Vec3 } from 'cc'; +import { _decorator, AudioClip, Component, Label, Node, Prefab, Tween, tween, Vec3 } from 'cc'; import BEConnector from '../API/BEConnector'; import { GameManager } from '../Manager/GameManager'; import ObjectPool from '../Pool/ObjectPool'; @@ -6,6 +6,7 @@ import Utilities from '../Utilities'; import { EventManger } from '../Manager/EventManger'; import GameEvent from '../Events/GameEvent'; import GameState from '../Enum/GameState'; +import { SoundManager } from '../Manager/SoundManager'; const { ccclass, property } = _decorator; @ccclass('GameOverPanel') @@ -26,9 +27,13 @@ export class GameOverPanel extends Component { @property({ type: Prefab, visible: true }) private _scorePrefab: Prefab; + @property({ type: AudioClip, visible: true }) + private _soundCollectCoinFx: AudioClip; + private _pool: ObjectPool; private _active = false; private _clicked = false; + private _end = false; protected onLoad(): void { this._pool = new ObjectPool(this._scorePrefab, 100, true); @@ -48,13 +53,24 @@ export class GameOverPanel extends Component { private async onGameStateChange(state: GameState) { switch (state) { - case GameState.End: - this._buyTicketBtn.active = false; - this._quitBtn.active = false; + case GameState.Init: + break; + case GameState.Ready: + break; + case GameState.Playing: break; case GameState.GameOver: break; - default: + case GameState.End: + this._buyTicketBtn.active = false; + this._quitBtn.active = false; + this._end = true; + if (this._active) { + await Utilities.delay(1); + BEConnector.instance.postScoreToServer(GameManager.instance.score); + } + break; + case GameState.Relive: break; } } @@ -94,13 +110,13 @@ export class GameOverPanel extends Component { private async playCollectEffect(gameScore: number, currentScore: number) { if (!this._active) { - let items = Math.round(gameScore / 5); - let x = 5; - if (items >= 300) { - items = 300; + let x = 10; + let items = Math.ceil(gameScore / x); + if (items >= 50) { + items = 50; x = Math.round(gameScore / items); } - const time = items < 10 ? 0.1 : 2 / items; + const time = 0.04; let score = currentScore; for (let i = 0; i < items; i++) { score += x; @@ -112,18 +128,23 @@ export class GameOverPanel extends Component { Tween.stopAllByTarget(this.yourScore); tween(this.yourScore.node) .to(0.1, { scale: new Vec3(1.3, 1.3, 1.3) }) - .call(() => { - this.yourScore.string = - items == 0 - ? (gameScore + BEConnector.instance.currentScore).toString() - : score.toString(); + .call(async () => { + if (i == items - 1) { + this.yourScore.string = (gameScore + BEConnector.instance.currentScore).toString(); + if (this._end) { + await Utilities.delay(1); + BEConnector.instance.postScoreToServer(gameScore); + } + } else { + this.yourScore.string = score.toString(); + } }) .set({ scale: Vec3.ONE }) .start(); }) .call(() => ObjectPool.release(obj)) .start(); - items--; + SoundManager.instance.playSfx(this._soundCollectCoinFx); await Utilities.delay(time); } } diff --git a/assets/_Game/Scripts/UI/UIController.ts b/assets/_Game/Scripts/UI/UIController.ts index cb0bf3a..db66126 100644 --- a/assets/_Game/Scripts/UI/UIController.ts +++ b/assets/_Game/Scripts/UI/UIController.ts @@ -79,8 +79,14 @@ export class UIController extends Component { this._scoreLabel.string = '0'; this._timeLabel.string = this.secondsToTime(GameManager.instance.gameTime); break; + case GameState.Ready: + this._tutorialPanel.active = true; + this._startPanel.active = false; + break; case GameState.Playing: this._overPanel.active = false; + this._ticketLabel.string = BEConnector.instance.numberTicket.toString(); + break; case GameState.GameOver: this.showEventLabel('TIME UP!!!'); @@ -95,6 +101,8 @@ export class UIController extends Component { break; case GameState.Relive: this._overPanel.active = false; + this._ticketLabel.string = BEConnector.instance.numberTicket.toString(); + break; } } @@ -115,8 +123,7 @@ export class UIController extends Component { } public starGame() { - this._tutorialPanel.active = true; - this._startPanel.active = false; + GameManager.instance.Ready(); } private onTimeUpdate(time: number) { diff --git a/assets/_Game/Sounds/Ball-Hit-Ground.mp3 b/assets/_Game/Sounds/Ball-Hit-Ground.mp3 deleted file mode 100644 index ea63b5a..0000000 Binary files a/assets/_Game/Sounds/Ball-Hit-Ground.mp3 and /dev/null differ diff --git a/assets/_Game/Sounds/BallHitPlayer.mp3 b/assets/_Game/Sounds/BallHitPlayer.mp3 deleted file mode 100644 index 70d6962..0000000 Binary files a/assets/_Game/Sounds/BallHitPlayer.mp3 and /dev/null differ diff --git a/assets/_Game/Sounds/Goal-02.mp3 b/assets/_Game/Sounds/Goal-02.mp3 deleted file mode 100644 index 2d63fda..0000000 Binary files a/assets/_Game/Sounds/Goal-02.mp3 and /dev/null differ diff --git a/assets/_Game/Sounds/MS_BG_ingame.mp3 b/assets/_Game/Sounds/MS_BG_ingame.mp3 deleted file mode 100644 index 310b8cc..0000000 Binary files a/assets/_Game/Sounds/MS_BG_ingame.mp3 and /dev/null differ diff --git a/assets/_Game/Sounds/MenuTap.mp3 b/assets/_Game/Sounds/MenuTap.mp3 deleted file mode 100644 index cb9d924..0000000 Binary files a/assets/_Game/Sounds/MenuTap.mp3 and /dev/null differ diff --git a/assets/_Game/Sounds/MenuTap.mp3.meta b/assets/_Game/Sounds/MenuTap.mp3.meta deleted file mode 100644 index f16e802..0000000 --- a/assets/_Game/Sounds/MenuTap.mp3.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "5318386a-c072-4982-b604-d79513736912", - "files": [ - ".json", - ".mp3" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/_Game/Sounds/SFX_score.mp3 b/assets/_Game/Sounds/SFX_score.mp3 deleted file mode 100644 index 73b2555..0000000 Binary files a/assets/_Game/Sounds/SFX_score.mp3 and /dev/null differ diff --git a/assets/_Game/Sounds/SFX_score.mp3.meta b/assets/_Game/Sounds/SFX_score.mp3.meta deleted file mode 100644 index 7b4a720..0000000 --- a/assets/_Game/Sounds/SFX_score.mp3.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "1f602e14-2769-4903-b4d2-b0977eeaf36b", - "files": [ - ".json", - ".mp3" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/_Game/Sounds/bgm_ingame.mp3 b/assets/_Game/Sounds/bgm_ingame.mp3 new file mode 100644 index 0000000..1d4775e Binary files /dev/null and b/assets/_Game/Sounds/bgm_ingame.mp3 differ diff --git a/assets/_Game/Sounds/Goal-02.mp3.meta b/assets/_Game/Sounds/bgm_ingame.mp3.meta similarity index 77% rename from assets/_Game/Sounds/Goal-02.mp3.meta rename to assets/_Game/Sounds/bgm_ingame.mp3.meta index 5eff14d..37affac 100644 --- a/assets/_Game/Sounds/Goal-02.mp3.meta +++ b/assets/_Game/Sounds/bgm_ingame.mp3.meta @@ -2,7 +2,7 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "b8e26fea-3d75-4254-8fe6-4a57c40d6121", + "uuid": "40b027bb-9e2f-40e5-85a7-cd32e2ad51af", "files": [ ".json", ".mp3" diff --git a/assets/_Game/Sounds/bgm_result.mp3 b/assets/_Game/Sounds/bgm_result.mp3 new file mode 100644 index 0000000..0283432 Binary files /dev/null and b/assets/_Game/Sounds/bgm_result.mp3 differ diff --git a/assets/_Game/Sounds/Ball-Hit-Ground.mp3.meta b/assets/_Game/Sounds/bgm_result.mp3.meta similarity index 77% rename from assets/_Game/Sounds/Ball-Hit-Ground.mp3.meta rename to assets/_Game/Sounds/bgm_result.mp3.meta index a67a9c0..6198481 100644 --- a/assets/_Game/Sounds/Ball-Hit-Ground.mp3.meta +++ b/assets/_Game/Sounds/bgm_result.mp3.meta @@ -2,7 +2,7 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "6a432293-3852-4267-be19-c671f36fe9f0", + "uuid": "bab45dd0-83c3-45fe-958c-5a21a4c4a5bb", "files": [ ".json", ".mp3" diff --git a/assets/_Game/Sounds/sfx_ballHitFlipper.mp3 b/assets/_Game/Sounds/sfx_ballHitFlipper.mp3 new file mode 100644 index 0000000..9f1489a Binary files /dev/null and b/assets/_Game/Sounds/sfx_ballHitFlipper.mp3 differ diff --git a/assets/_Game/Sounds/MS_BG_ingame.mp3.meta b/assets/_Game/Sounds/sfx_ballHitFlipper.mp3.meta similarity index 77% rename from assets/_Game/Sounds/MS_BG_ingame.mp3.meta rename to assets/_Game/Sounds/sfx_ballHitFlipper.mp3.meta index 54bbd4d..8a7cc59 100644 --- a/assets/_Game/Sounds/MS_BG_ingame.mp3.meta +++ b/assets/_Game/Sounds/sfx_ballHitFlipper.mp3.meta @@ -2,7 +2,7 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "fc66df28-6c8c-4915-adbd-5a3da652cfc6", + "uuid": "a76cc94a-6331-47e7-b8aa-0caeea6a79eb", "files": [ ".json", ".mp3" diff --git a/assets/_Game/Sounds/sfx_ballout.mp3 b/assets/_Game/Sounds/sfx_ballout.mp3 new file mode 100644 index 0000000..779c8d9 Binary files /dev/null and b/assets/_Game/Sounds/sfx_ballout.mp3 differ diff --git a/assets/_Game/Sounds/BallHitPlayer.mp3.meta b/assets/_Game/Sounds/sfx_ballout.mp3.meta similarity index 77% rename from assets/_Game/Sounds/BallHitPlayer.mp3.meta rename to assets/_Game/Sounds/sfx_ballout.mp3.meta index b3f2d9f..34c36b0 100644 --- a/assets/_Game/Sounds/BallHitPlayer.mp3.meta +++ b/assets/_Game/Sounds/sfx_ballout.mp3.meta @@ -2,7 +2,7 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "97c8a166-c717-41bd-837f-bd1733e2ee1c", + "uuid": "90fc5275-7ce7-4e86-a757-0674c4fe8f18", "files": [ ".json", ".mp3" diff --git a/assets/_Game/Sounds/sfx_booster.mp3 b/assets/_Game/Sounds/sfx_booster.mp3 new file mode 100644 index 0000000..4eb0b84 Binary files /dev/null and b/assets/_Game/Sounds/sfx_booster.mp3 differ diff --git a/assets/_Game/Sounds/sfx_booster.mp3.meta b/assets/_Game/Sounds/sfx_booster.mp3.meta new file mode 100644 index 0000000..51a75b6 --- /dev/null +++ b/assets/_Game/Sounds/sfx_booster.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "4dba398c-e777-4670-8b1b-76b3fbfb4625", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/sfx_canon.mp3 b/assets/_Game/Sounds/sfx_canon.mp3 new file mode 100644 index 0000000..970996d Binary files /dev/null and b/assets/_Game/Sounds/sfx_canon.mp3 differ diff --git a/assets/_Game/Sounds/sfx_canon.mp3.meta b/assets/_Game/Sounds/sfx_canon.mp3.meta new file mode 100644 index 0000000..8025e47 --- /dev/null +++ b/assets/_Game/Sounds/sfx_canon.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "c4a1c16a-96e4-4e8a-9188-cf42b4f35f73", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/sfx_collect.mp3 b/assets/_Game/Sounds/sfx_collect.mp3 new file mode 100644 index 0000000..fc3a0b0 Binary files /dev/null and b/assets/_Game/Sounds/sfx_collect.mp3 differ diff --git a/assets/_Game/Sounds/sfx_collect.mp3.meta b/assets/_Game/Sounds/sfx_collect.mp3.meta new file mode 100644 index 0000000..3ebd48a --- /dev/null +++ b/assets/_Game/Sounds/sfx_collect.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "65a023cb-b98f-4470-ba2d-4eba9fe184fe", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/sfx_collectBooster.mp3 b/assets/_Game/Sounds/sfx_collectBooster.mp3 new file mode 100644 index 0000000..3a79793 Binary files /dev/null and b/assets/_Game/Sounds/sfx_collectBooster.mp3 differ diff --git a/assets/_Game/Sounds/sfx_collectBooster.mp3.meta b/assets/_Game/Sounds/sfx_collectBooster.mp3.meta new file mode 100644 index 0000000..9e0777e --- /dev/null +++ b/assets/_Game/Sounds/sfx_collectBooster.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "1ac12acc-dde3-4d31-9106-dfc30c030d40", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/sfx_flipper.mp3 b/assets/_Game/Sounds/sfx_flipper.mp3 new file mode 100644 index 0000000..9fa6892 Binary files /dev/null and b/assets/_Game/Sounds/sfx_flipper.mp3 differ diff --git a/assets/_Game/Sounds/sfx_flipper.mp3.meta b/assets/_Game/Sounds/sfx_flipper.mp3.meta new file mode 100644 index 0000000..e38f4bc --- /dev/null +++ b/assets/_Game/Sounds/sfx_flipper.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/sfx_goal.mp3 b/assets/_Game/Sounds/sfx_goal.mp3 index 4ff4bfe..2992763 100644 Binary files a/assets/_Game/Sounds/sfx_goal.mp3 and b/assets/_Game/Sounds/sfx_goal.mp3 differ diff --git a/assets/_Game/Sounds/sfx_goal.mp3.meta b/assets/_Game/Sounds/sfx_goal.mp3.meta index 2f34fd5..11fc5d5 100644 --- a/assets/_Game/Sounds/sfx_goal.mp3.meta +++ b/assets/_Game/Sounds/sfx_goal.mp3.meta @@ -2,7 +2,7 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "d93b45ca-fea1-4d38-b460-170b6b65ae08", + "uuid": "4ce9d2c6-98c5-4d05-94af-70193bb795fe", "files": [ ".json", ".mp3" diff --git a/assets/_Game/Sounds/sfx_hitbone.mp3 b/assets/_Game/Sounds/sfx_hitbone.mp3 new file mode 100644 index 0000000..509bbfc Binary files /dev/null and b/assets/_Game/Sounds/sfx_hitbone.mp3 differ diff --git a/assets/_Game/Sounds/sfx_hitbone.mp3.meta b/assets/_Game/Sounds/sfx_hitbone.mp3.meta new file mode 100644 index 0000000..7e80d51 --- /dev/null +++ b/assets/_Game/Sounds/sfx_hitbone.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "ac267249-4228-4a86-b4d4-39f84a210668", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/sfx_impact.mp3 b/assets/_Game/Sounds/sfx_impact.mp3 new file mode 100644 index 0000000..07801cb Binary files /dev/null and b/assets/_Game/Sounds/sfx_impact.mp3 differ diff --git a/assets/_Game/Sounds/sfx_impact.mp3.meta b/assets/_Game/Sounds/sfx_impact.mp3.meta new file mode 100644 index 0000000..b7274a3 --- /dev/null +++ b/assets/_Game/Sounds/sfx_impact.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "b122d38e-ecf1-42e2-8b26-c09d306d90d9", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/sfx_multiball.mp3 b/assets/_Game/Sounds/sfx_multiball.mp3 new file mode 100644 index 0000000..8b11e99 Binary files /dev/null and b/assets/_Game/Sounds/sfx_multiball.mp3 differ diff --git a/assets/_Game/Sounds/sfx_multiball.mp3.meta b/assets/_Game/Sounds/sfx_multiball.mp3.meta new file mode 100644 index 0000000..80032ea --- /dev/null +++ b/assets/_Game/Sounds/sfx_multiball.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "d3b9a148-5c8e-41f4-9e87-c09175e20b2d", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/sfx_slingshot1.mp3 b/assets/_Game/Sounds/sfx_slingshot1.mp3 new file mode 100644 index 0000000..0b36fd3 Binary files /dev/null and b/assets/_Game/Sounds/sfx_slingshot1.mp3 differ diff --git a/assets/_Game/Sounds/sfx_slingshot1.mp3.meta b/assets/_Game/Sounds/sfx_slingshot1.mp3.meta new file mode 100644 index 0000000..1e42270 --- /dev/null +++ b/assets/_Game/Sounds/sfx_slingshot1.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "87e078a9-1082-4700-bd78-e6d0a06a150d", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/sfx_slingshot2.mp3 b/assets/_Game/Sounds/sfx_slingshot2.mp3 new file mode 100644 index 0000000..09beba6 Binary files /dev/null and b/assets/_Game/Sounds/sfx_slingshot2.mp3 differ diff --git a/assets/_Game/Sounds/sfx_slingshot2.mp3.meta b/assets/_Game/Sounds/sfx_slingshot2.mp3.meta new file mode 100644 index 0000000..8c60835 --- /dev/null +++ b/assets/_Game/Sounds/sfx_slingshot2.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "8602f38f-d976-4e2b-baa2-621a62f20261", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/sfx_start.mp3 b/assets/_Game/Sounds/sfx_start.mp3 new file mode 100644 index 0000000..7fde11a Binary files /dev/null and b/assets/_Game/Sounds/sfx_start.mp3 differ diff --git a/assets/_Game/Sounds/sfx_start.mp3.meta b/assets/_Game/Sounds/sfx_start.mp3.meta new file mode 100644 index 0000000..db31652 --- /dev/null +++ b/assets/_Game/Sounds/sfx_start.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "015d5eb5-b790-46d8-a580-b35ecb94caf3", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/startWistle.mp3 b/assets/_Game/Sounds/startWistle.mp3 deleted file mode 100644 index 50c17a1..0000000 Binary files a/assets/_Game/Sounds/startWistle.mp3 and /dev/null differ diff --git a/assets/_Game/Sounds/startWistle.mp3.meta b/assets/_Game/Sounds/startWistle.mp3.meta deleted file mode 100644 index f33f339..0000000 --- a/assets/_Game/Sounds/startWistle.mp3.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "6452248b-259c-4844-b0e1-70f47d69955e", - "files": [ - ".json", - ".mp3" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/_Game/Sprites/P4P_BG-01.png b/assets/_Game/Sprites/P4P_BG-01.png deleted file mode 100644 index 2b44bd4..0000000 Binary files a/assets/_Game/Sprites/P4P_BG-01.png and /dev/null differ diff --git a/assets/_Game/Sprites/Play_Button.png b/assets/_Game/Sprites/Play_Button.png deleted file mode 100644 index 67e3e9f..0000000 Binary files a/assets/_Game/Sprites/Play_Button.png and /dev/null differ diff --git a/assets/_Game/Sprites/UI/No_Sound.png b/assets/_Game/Sprites/UI/No_Sound.png new file mode 100644 index 0000000..16cd851 Binary files /dev/null and b/assets/_Game/Sprites/UI/No_Sound.png differ diff --git a/assets/_Game/Sprites/Play_Button.png.meta b/assets/_Game/Sprites/UI/No_Sound.png.meta similarity index 70% rename from assets/_Game/Sprites/Play_Button.png.meta rename to assets/_Game/Sprites/UI/No_Sound.png.meta index 896ce49..dee0980 100644 --- a/assets/_Game/Sprites/Play_Button.png.meta +++ b/assets/_Game/Sprites/UI/No_Sound.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.25", "importer": "image", "imported": true, - "uuid": "ff046972-01bd-4d20-b27d-92120e050ca3", + "uuid": "4bcfb3c4-ecab-48a0-8bd6-c2916fd3acb3", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "ff046972-01bd-4d20-b27d-92120e050ca3@6c48a", - "displayName": "Play_Button", + "uuid": "4bcfb3c4-ecab-48a0-8bd6-c2916fd3acb3@6c48a", + "displayName": "No_Sound", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "ff046972-01bd-4d20-b27d-92120e050ca3", + "imageUuidOrDatabaseUri": "4bcfb3c4-ecab-48a0-8bd6-c2916fd3acb3", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "ff046972-01bd-4d20-b27d-92120e050ca3@f9941", - "displayName": "Play_Button", + "uuid": "4bcfb3c4-ecab-48a0-8bd6-c2916fd3acb3@f9941", + "displayName": "No_Sound", "id": "f9941", "name": "spriteFrame", "userData": { @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 478, - "height": 194, - "rawWidth": 478, - "rawHeight": 194, + "width": 203, + "height": 159, + "rawWidth": 203, + "rawHeight": 159, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -239, - -97, + -101.5, + -79.5, 0, - 239, - -97, + 101.5, + -79.5, 0, - -239, - 97, + -101.5, + 79.5, 0, - 239, - 97, + 101.5, + 79.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 194, - 478, - 194, + 159, + 203, + 159, 0, 0, - 478, + 203, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -239, - -97, + -101.5, + -79.5, 0 ], "maxPos": [ - 239, - 97, + 101.5, + 79.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "ff046972-01bd-4d20-b27d-92120e050ca3@6c48a", + "imageUuidOrDatabaseUri": "4bcfb3c4-ecab-48a0-8bd6-c2916fd3acb3@6c48a", "atlasUuid": "" }, "ver": "1.0.11", @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": true, "hasAlpha": true, - "redirect": "ff046972-01bd-4d20-b27d-92120e050ca3@f9941" + "redirect": "4bcfb3c4-ecab-48a0-8bd6-c2916fd3acb3@f9941" } } diff --git a/assets/_Game/Sprites/UI/Sound.png b/assets/_Game/Sprites/UI/Sound.png new file mode 100644 index 0000000..62d521c Binary files /dev/null and b/assets/_Game/Sprites/UI/Sound.png differ diff --git a/assets/_Game/Sprites/P4P_BG-01.png.meta b/assets/_Game/Sprites/UI/Sound.png.meta similarity index 70% rename from assets/_Game/Sprites/P4P_BG-01.png.meta rename to assets/_Game/Sprites/UI/Sound.png.meta index adacddb..69a5781 100644 --- a/assets/_Game/Sprites/P4P_BG-01.png.meta +++ b/assets/_Game/Sprites/UI/Sound.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.25", "importer": "image", "imported": true, - "uuid": "98ce9fe6-ed8c-477d-96ba-d283b6ac387a", + "uuid": "834b7b1a-0bf9-437a-b2ee-627c08bc87cc", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "98ce9fe6-ed8c-477d-96ba-d283b6ac387a@6c48a", - "displayName": "P4P_BG-01", + "uuid": "834b7b1a-0bf9-437a-b2ee-627c08bc87cc@6c48a", + "displayName": "Sound", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "98ce9fe6-ed8c-477d-96ba-d283b6ac387a", + "imageUuidOrDatabaseUri": "834b7b1a-0bf9-437a-b2ee-627c08bc87cc", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "98ce9fe6-ed8c-477d-96ba-d283b6ac387a@f9941", - "displayName": "P4P_BG-01", + "uuid": "834b7b1a-0bf9-437a-b2ee-627c08bc87cc@f9941", + "displayName": "Sound", "id": "f9941", "name": "spriteFrame", "userData": { @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 512, - "height": 512, - "rawWidth": 512, - "rawHeight": 512, + "width": 209, + "height": 159, + "rawWidth": 209, + "rawHeight": 159, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -256, - -256, + -104.5, + -79.5, 0, - 256, - -256, + 104.5, + -79.5, 0, - -256, - 256, + -104.5, + 79.5, 0, - 256, - 256, + 104.5, + 79.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 512, - 512, - 512, + 159, + 209, + 159, 0, 0, - 512, + 209, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -256, - -256, + -104.5, + -79.5, 0 ], "maxPos": [ - 256, - 256, + 104.5, + 79.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "98ce9fe6-ed8c-477d-96ba-d283b6ac387a@6c48a", + "imageUuidOrDatabaseUri": "834b7b1a-0bf9-437a-b2ee-627c08bc87cc@6c48a", "atlasUuid": "" }, "ver": "1.0.11", @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": true, "hasAlpha": true, - "redirect": "98ce9fe6-ed8c-477d-96ba-d283b6ac387a@f9941" + "redirect": "834b7b1a-0bf9-437a-b2ee-627c08bc87cc@f9941" } } diff --git a/assets/_Game/Sprites/tap.png b/assets/_Game/Sprites/tap.png deleted file mode 100644 index dc0b4ce..0000000 Binary files a/assets/_Game/Sprites/tap.png and /dev/null differ diff --git a/assets/_Game/Sprites/tap.png.meta b/assets/_Game/Sprites/tap.png.meta deleted file mode 100644 index da50f54..0000000 --- a/assets/_Game/Sprites/tap.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.25", - "importer": "image", - "imported": true, - "uuid": "6a5c564e-65a2-4dfc-89df-621f6e68ef2a", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "6a5c564e-65a2-4dfc-89df-621f6e68ef2a@6c48a", - "displayName": "tap", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "6a5c564e-65a2-4dfc-89df-621f6e68ef2a", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "6a5c564e-65a2-4dfc-89df-621f6e68ef2a@f9941", - "displayName": "tap", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 317, - "trimY": 175, - "width": 617, - "height": 900, - "rawWidth": 1251, - "rawHeight": 1250, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -308.5, - -450, - 0, - 308.5, - -450, - 0, - -308.5, - 450, - 0, - 308.5, - 450, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 317, - 1075, - 934, - 1075, - 317, - 175, - 934, - 175 - ], - "nuv": [ - 0.2533972821742606, - 0.14, - 0.7466027178257394, - 0.14, - 0.2533972821742606, - 0.86, - 0.7466027178257394, - 0.86 - ], - "minPos": [ - -308.5, - -450, - 0 - ], - "maxPos": [ - 308.5, - 450, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "6a5c564e-65a2-4dfc-89df-621f6e68ef2a@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.11", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": true, - "hasAlpha": true, - "redirect": "6a5c564e-65a2-4dfc-89df-621f6e68ef2a@f9941" - } -}