diff --git a/assets/_Game/Prefabs/Booster/CumulativeBooster.prefab b/assets/_Game/Prefabs/Booster/CumulativeBooster.prefab index c8a0459..7939c33 100644 --- a/assets/_Game/Prefabs/Booster/CumulativeBooster.prefab +++ b/assets/_Game/Prefabs/Booster/CumulativeBooster.prefab @@ -1137,7 +1137,8 @@ "__id__": 73 }, "displayName": "CHEESE", - "time": 10, + "duration": 10, + "speedUpBgm": 1.5, "_id": "" }, { diff --git a/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_Clock.prefab b/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_Clock.prefab index 6df5b1d..f281545 100644 --- a/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_Clock.prefab +++ b/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_Clock.prefab @@ -326,7 +326,7 @@ "__id__": 16 }, "_hitSound": { - "__uuid__": "1fe7a4a1-5174-476b-a19c-a3366391bfcc", + "__uuid__": "a5d745ea-77ac-45f7-9add-2d7cecf14588", "__expectedType__": "cc.AudioClip" }, "_score": 0, diff --git a/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_CumulativeBooster.prefab b/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_CumulativeBooster.prefab index 7c6d7f4..2200f41 100644 --- a/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_CumulativeBooster.prefab +++ b/assets/_Game/Prefabs/Themes/Chocolate/Chocolate_CumulativeBooster.prefab @@ -1916,7 +1916,7 @@ "__id__": 145 }, "_collectSound": { - "__uuid__": "05a2671e-35bb-4be0-9244-43d541b9a26a", + "__uuid__": "b1cc499c-0470-4e1c-bc27-776d6b3a7589", "__expectedType__": "cc.AudioClip" }, "_animation": { @@ -1927,6 +1927,11 @@ }, "displayName": "CHEESE", "duration": 10, + "speedUpBgm": 1, + "backgroundMusic": { + "__uuid__": "6cf3abb2-39ba-4429-89dc-e55c89109b58", + "__expectedType__": "cc.AudioClip" + }, "_id": "" }, { diff --git a/assets/_Game/Scenes/Chocolate-theme.scene b/assets/_Game/Scenes/Chocolate-theme.scene index 6f87aee..e9b5f1b 100644 --- a/assets/_Game/Scenes/Chocolate-theme.scene +++ b/assets/_Game/Scenes/Chocolate-theme.scene @@ -607,7 +607,13 @@ "__id__": 39 }, { - "__id__": 103 + "__id__": 75 + }, + { + "__id__": 110 + }, + { + "__id__": 124 }, { "__id__": 138 @@ -1491,19 +1497,13 @@ "__id__": 56 }, { - "__id__": 70 - }, - { - "__id__": 84 - }, - { - "__id__": 93 + "__id__": 65 } ], "_active": true, "_components": [ { - "__id__": 102 + "__id__": 74 } ], "_prefab": null, @@ -2180,1098 +2180,6 @@ "_fixedRotation": false, "_id": "9515x+7YZNq6CNImHKduDU" }, - { - "__type__": "cc.Node", - "_name": "slingshot-002", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 39 - }, - "_children": [ - { - "__id__": 57 - }, - { - "__id__": 62 - } - ], - "_active": true, - "_components": [ - { - "__id__": 67 - }, - { - "__id__": 68 - }, - { - "__id__": 69 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": -500, - "y": -340, - "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": "e9anlkYgFICIJhOob2sNRk" - }, - { - "__type__": "cc.Node", - "_name": "Sprite", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 56 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 58 - }, - { - "__id__": 59 - }, - { - "__id__": 60 - }, - { - "__id__": 61 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 12.9055, - "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": "8excwgSD9LRZVC4BCY9WqL" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 57 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 35.732, - "height": 119.39389583333332 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "84Fww37ItEv7Haklq7VAD4" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 57 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "ec5be981-a359-4c8b-9610-612b3e9a2d1f@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": "11bzeTNoBNn4aTclXtGhvv" - }, - { - "__type__": "cc.PolygonCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 57 - }, - "_enabled": true, - "__prefab": null, - "tag": 0, - "_group": 1, - "_density": 1, - "_sensor": false, - "_friction": 2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_points": [ - { - "__type__": "cc.Vec2", - "x": 6.87153846153846, - "y": 59.69694791666666 - }, - { - "__type__": "cc.Vec2", - "x": -17.866, - "y": 56.63556597222221 - }, - { - "__type__": "cc.Vec2", - "x": -17.866, - "y": -55.8702204861111 - }, - { - "__type__": "cc.Vec2", - "x": 17.866, - "y": -59.69694791666666 - }, - { - "__type__": "cc.Vec2", - "x": 17.866, - "y": 59.69694791666666 - } - ], - "_id": "8cF/gwB85JE4c2QsgTu1N0" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 57 - }, - "_enabled": true, - "__prefab": null, - "enabledContactListener": true, - "bullet": false, - "awakeOnLoad": true, - "_group": 1, - "_type": 0, - "_allowSleep": true, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "cfMyUOKiBGdoWm77j8mNQ0" - }, - { - "__type__": "cc.Node", - "_name": "Slingshot_2", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 56 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 63 - }, - { - "__id__": 64 - }, - { - "__id__": 65 - }, - { - "__id__": 66 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 13, - "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": "dehQP+qbBNQIUOhXRPEd+b" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 62 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 55.784000000000006, - "height": 102.38004705882355 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 1, - "y": 0.5 - }, - "_id": "28FKWJqi1Nq5TeF11yZ+Mb" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 62 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "374073f2-ef97-43be-baa0-3a85f1f59b9d@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": "0cZuLx5XNA2ZQ3VtlUr7p/" - }, - { - "__type__": "cc.PolygonCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 62 - }, - "_enabled": true, - "__prefab": null, - "tag": 0, - "_group": 1, - "_density": 1, - "_sensor": false, - "_friction": 2, - "_restitution": 1.5, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_points": [ - { - "__type__": "cc.Vec2", - "x": -15.09449411764706, - "y": 51.19002352941179 - }, - { - "__type__": "cc.Vec2", - "x": -34.12668235294118, - "y": 50.5337411764706 - }, - { - "__type__": "cc.Vec2", - "x": -44.6272, - "y": 43.314635294117664 - }, - { - "__type__": "cc.Vec2", - "x": -52.50258823529413, - "y": 32.814117647058836 - }, - { - "__type__": "cc.Vec2", - "x": -55.784000000000006, - "y": 15.094494117647073 - }, - { - "__type__": "cc.Vec2", - "x": -54.471435294117654, - "y": -22.96988235294118 - }, - { - "__type__": "cc.Vec2", - "x": -48.564894117647064, - "y": -37.40809411764707 - }, - { - "__type__": "cc.Vec2", - "x": -32.157835294117646, - "y": -51.190023529411775 - }, - { - "__type__": "cc.Vec2", - "x": -11.156800000000004, - "y": -50.5337411764706 - }, - { - "__type__": "cc.Vec2", - "x": -0.6562823529411759, - "y": -40.68950588235295 - }, - { - "__type__": "cc.Vec2", - "x": 0, - "y": 40.68950588235296 - }, - { - "__type__": "cc.Vec2", - "x": -10.500517647058828, - "y": 50.5337411764706 - } - ], - "_id": "39dCOll3BFHqdDF27QyTaa" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 62 - }, - "_enabled": true, - "__prefab": null, - "enabledContactListener": true, - "bullet": false, - "awakeOnLoad": true, - "_group": 1, - "_type": 0, - "_allowSleep": true, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "aemR/hEnhNoJnGKNLLQUoI" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 56 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "68gelDGjFLeZvigjPanN8G" - }, - { - "__type__": "6bb6fbw5PNPYq7zksYK1kHJ", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 56 - }, - "_enabled": true, - "__prefab": null, - "_animation": { - "__id__": 69 - }, - "_collider": { - "__id__": 65 - }, - "_soundFx": { - "__uuid__": "8602f38f-d976-4e2b-baa2-621a62f20261", - "__expectedType__": "cc.AudioClip" - }, - "_id": "aaFVCScoxJ5a270n4ihc6t" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 56 - }, - "_enabled": true, - "__prefab": null, - "playOnLoad": false, - "_clips": [ - { - "__uuid__": "056fc55f-e504-40d6-b7b6-e1cfc86639e9", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "056fc55f-e504-40d6-b7b6-e1cfc86639e9", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "05Xwcjh35G5ZaZaycA8Ss2" - }, - { - "__type__": "cc.Node", - "_name": "slingshot-003", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 39 - }, - "_children": [ - { - "__id__": 71 - }, - { - "__id__": 76 - } - ], - "_active": true, - "_components": [ - { - "__id__": 81 - }, - { - "__id__": 82 - }, - { - "__id__": 83 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 500, - "y": -340, - "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": "93BHPAuQdPdbRDrwMK8aNd" - }, - { - "__type__": "cc.Node", - "_name": "Sprite", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 70 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 2.394, - "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": "5a2P265MpFQoVWqeM2QHvB" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 71 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 29.461, - "height": 119.39389583333332 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "857KmHkAhPuLmTqnisa6EC" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 71 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "ec5be981-a359-4c8b-9610-612b3e9a2d1f@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": "4dZtPqRa9BRKjF8fn4JIFT" - }, - { - "__type__": "cc.PolygonCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 71 - }, - "_enabled": true, - "__prefab": null, - "tag": 0, - "_group": 1, - "_density": 1, - "_sensor": false, - "_friction": 2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_points": [ - { - "__type__": "cc.Vec2", - "x": 5.665576923076923, - "y": 59.69694791666666 - }, - { - "__type__": "cc.Vec2", - "x": -14.7305, - "y": 56.63556597222221 - }, - { - "__type__": "cc.Vec2", - "x": -14.7305, - "y": -55.8702204861111 - }, - { - "__type__": "cc.Vec2", - "x": 14.7305, - "y": -59.69694791666666 - }, - { - "__type__": "cc.Vec2", - "x": 14.7305, - "y": 59.69694791666666 - } - ], - "_id": "a7/XtRjQRA8pJ0mk6PN1N1" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 71 - }, - "_enabled": true, - "__prefab": null, - "enabledContactListener": true, - "bullet": false, - "awakeOnLoad": true, - "_group": 1, - "_type": 0, - "_allowSleep": true, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "6c0IZS7rJOCZbEM475VZ8c" - }, - { - "__type__": "cc.Node", - "_name": "Slingshot_2", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 70 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 77 - }, - { - "__id__": 78 - }, - { - "__id__": 79 - }, - { - "__id__": 80 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 13, - "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": "c55BRhBvdL+4mS1laIjXDE" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 76 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 55.784000000000006, - "height": 102.38004705882355 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 1, - "y": 0.5 - }, - "_id": "978Pv7okVKJaezztPUcNnp" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 76 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "374073f2-ef97-43be-baa0-3a85f1f59b9d@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": "f7JNicmBRDeJByTZ6mWIui" - }, - { - "__type__": "cc.PolygonCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 76 - }, - "_enabled": true, - "__prefab": null, - "tag": 0, - "_group": 1, - "_density": 1, - "_sensor": false, - "_friction": 2, - "_restitution": 1.5, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_points": [ - { - "__type__": "cc.Vec2", - "x": -15.09449411764706, - "y": 51.19002352941179 - }, - { - "__type__": "cc.Vec2", - "x": -34.12668235294118, - "y": 50.5337411764706 - }, - { - "__type__": "cc.Vec2", - "x": -44.6272, - "y": 43.314635294117664 - }, - { - "__type__": "cc.Vec2", - "x": -52.50258823529413, - "y": 32.814117647058836 - }, - { - "__type__": "cc.Vec2", - "x": -55.784000000000006, - "y": 15.094494117647073 - }, - { - "__type__": "cc.Vec2", - "x": -54.471435294117654, - "y": -22.96988235294118 - }, - { - "__type__": "cc.Vec2", - "x": -48.564894117647064, - "y": -37.40809411764707 - }, - { - "__type__": "cc.Vec2", - "x": -32.157835294117646, - "y": -51.190023529411775 - }, - { - "__type__": "cc.Vec2", - "x": -11.156800000000004, - "y": -50.5337411764706 - }, - { - "__type__": "cc.Vec2", - "x": -0.6562823529411759, - "y": -40.68950588235295 - }, - { - "__type__": "cc.Vec2", - "x": 0, - "y": 40.68950588235296 - }, - { - "__type__": "cc.Vec2", - "x": -10.500517647058828, - "y": 50.5337411764706 - } - ], - "_id": "40PgLLPn9IXq5fEcQ/yfnR" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 76 - }, - "_enabled": true, - "__prefab": null, - "enabledContactListener": true, - "bullet": false, - "awakeOnLoad": true, - "_group": 1, - "_type": 0, - "_allowSleep": true, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "8fcgbOZbtCx4pDNETbstdi" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 70 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "0fOTKoH/dOv5DGScOguadX" - }, - { - "__type__": "6bb6fbw5PNPYq7zksYK1kHJ", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 70 - }, - "_enabled": true, - "__prefab": null, - "_animation": { - "__id__": 83 - }, - "_collider": { - "__id__": 79 - }, - "_soundFx": { - "__uuid__": "8602f38f-d976-4e2b-baa2-621a62f20261", - "__expectedType__": "cc.AudioClip" - }, - "_id": "56W5XkecxF9qFPiuwUcOye" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 70 - }, - "_enabled": true, - "__prefab": null, - "playOnLoad": false, - "_clips": [ - { - "__uuid__": "056fc55f-e504-40d6-b7b6-e1cfc86639e9", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "056fc55f-e504-40d6-b7b6-e1cfc86639e9", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "d0QLszLOdPgq7nvqnRpGzC" - }, { "__type__": "cc.Node", "_name": "slingshot-004", @@ -3282,19 +2190,19 @@ }, "_children": [ { - "__id__": 85 + "__id__": 57 } ], "_active": true, "_components": [ { - "__id__": 90 + "__id__": 62 }, { - "__id__": 91 + "__id__": 63 }, { - "__id__": 92 + "__id__": 64 } ], "_prefab": null, @@ -3333,22 +2241,22 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 84 + "__id__": 56 }, "_children": [], "_active": true, "_components": [ { - "__id__": 86 + "__id__": 58 }, { - "__id__": 87 + "__id__": 59 }, { - "__id__": 88 + "__id__": 60 }, { - "__id__": 89 + "__id__": 61 } ], "_prefab": null, @@ -3387,7 +2295,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 57 }, "_enabled": true, "__prefab": null, @@ -3409,7 +2317,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 57 }, "_enabled": true, "__prefab": null, @@ -3448,7 +2356,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 57 }, "_enabled": true, "__prefab": null, @@ -3533,7 +2441,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 57 }, "_enabled": true, "__prefab": null, @@ -3561,7 +2469,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 56 }, "_enabled": true, "__prefab": null, @@ -3583,15 +2491,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 56 }, "_enabled": true, "__prefab": null, "_animation": { - "__id__": 92 + "__id__": 64 }, "_collider": { - "__id__": 88 + "__id__": 60 }, "_soundFx": { "__uuid__": "8602f38f-d976-4e2b-baa2-621a62f20261", @@ -3605,7 +2513,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 56 }, "_enabled": true, "__prefab": null, @@ -3632,19 +2540,19 @@ }, "_children": [ { - "__id__": 94 + "__id__": 66 } ], "_active": true, "_components": [ { - "__id__": 99 + "__id__": 71 }, { - "__id__": 100 + "__id__": 72 }, { - "__id__": 101 + "__id__": 73 } ], "_prefab": null, @@ -3683,22 +2591,22 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 93 + "__id__": 65 }, "_children": [], "_active": true, "_components": [ { - "__id__": 95 + "__id__": 67 }, { - "__id__": 96 + "__id__": 68 }, { - "__id__": 97 + "__id__": 69 }, { - "__id__": 98 + "__id__": 70 } ], "_prefab": null, @@ -3737,7 +2645,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 66 }, "_enabled": true, "__prefab": null, @@ -3759,7 +2667,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 66 }, "_enabled": true, "__prefab": null, @@ -3798,7 +2706,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 66 }, "_enabled": true, "__prefab": null, @@ -3883,7 +2791,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 66 }, "_enabled": true, "__prefab": null, @@ -3911,7 +2819,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -3933,15 +2841,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 65 }, "_enabled": true, "__prefab": null, "_animation": { - "__id__": 101 + "__id__": 73 }, "_collider": { - "__id__": 97 + "__id__": 69 }, "_soundFx": { "__uuid__": "8602f38f-d976-4e2b-baa2-621a62f20261", @@ -3955,7 +2863,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 65 }, "_enabled": true, "__prefab": null, @@ -4004,31 +2912,31 @@ }, "_children": [ { - "__id__": 104 + "__id__": 76 }, { - "__id__": 109 + "__id__": 81 }, { - "__id__": 114 + "__id__": 86 }, { - "__id__": 119 + "__id__": 91 }, { - "__id__": 124 + "__id__": 96 }, { - "__id__": 129 + "__id__": 101 }, { - "__id__": 134 + "__id__": 106 } ], "_active": true, "_components": [ { - "__id__": 137 + "__id__": 109 } ], "_prefab": null, @@ -4067,22 +2975,22 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 75 }, "_children": [], "_active": true, "_components": [ { - "__id__": 105 + "__id__": 77 }, { - "__id__": 106 + "__id__": 78 }, { - "__id__": 107 + "__id__": 79 }, { - "__id__": 108 + "__id__": 80 } ], "_prefab": null, @@ -4121,7 +3029,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -4143,7 +3051,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -4182,7 +3090,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -4302,7 +3210,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -4330,22 +3238,22 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 75 }, "_children": [], "_active": true, "_components": [ { - "__id__": 110 + "__id__": 82 }, { - "__id__": 111 + "__id__": 83 }, { - "__id__": 112 + "__id__": 84 }, { - "__id__": 113 + "__id__": 85 } ], "_prefab": null, @@ -4384,7 +3292,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 81 }, "_enabled": true, "__prefab": null, @@ -4406,7 +3314,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 81 }, "_enabled": true, "__prefab": null, @@ -4445,7 +3353,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 81 }, "_enabled": true, "__prefab": null, @@ -4565,7 +3473,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 81 }, "_enabled": true, "__prefab": null, @@ -4593,22 +3501,22 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 75 }, "_children": [], "_active": true, "_components": [ { - "__id__": 115 + "__id__": 87 }, { - "__id__": 116 + "__id__": 88 }, { - "__id__": 117 + "__id__": 89 }, { - "__id__": 118 + "__id__": 90 } ], "_prefab": null, @@ -4647,7 +3555,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 86 }, "_enabled": true, "__prefab": null, @@ -4669,7 +3577,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 86 }, "_enabled": true, "__prefab": null, @@ -4708,7 +3616,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 86 }, "_enabled": true, "__prefab": null, @@ -4773,7 +3681,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 114 + "__id__": 86 }, "_enabled": true, "__prefab": null, @@ -4801,22 +3709,22 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 75 }, "_children": [], "_active": true, "_components": [ { - "__id__": 120 + "__id__": 92 }, { - "__id__": 121 + "__id__": 93 }, { - "__id__": 122 + "__id__": 94 }, { - "__id__": 123 + "__id__": 95 } ], "_prefab": null, @@ -4855,7 +3763,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 91 }, "_enabled": true, "__prefab": null, @@ -4877,7 +3785,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 91 }, "_enabled": true, "__prefab": null, @@ -4916,7 +3824,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 91 }, "_enabled": true, "__prefab": null, @@ -4981,7 +3889,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 91 }, "_enabled": true, "__prefab": null, @@ -5009,22 +3917,22 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 75 }, "_children": [], "_active": true, "_components": [ { - "__id__": 125 + "__id__": 97 }, { - "__id__": 126 + "__id__": 98 }, { - "__id__": 127 + "__id__": 99 }, { - "__id__": 128 + "__id__": 100 } ], "_prefab": null, @@ -5063,7 +3971,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 124 + "__id__": 96 }, "_enabled": true, "__prefab": null, @@ -5085,7 +3993,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 124 + "__id__": 96 }, "_enabled": true, "__prefab": null, @@ -5124,7 +4032,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 124 + "__id__": 96 }, "_enabled": true, "__prefab": null, @@ -5184,7 +4092,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 124 + "__id__": 96 }, "_enabled": true, "__prefab": null, @@ -5212,22 +4120,22 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 75 }, "_children": [], "_active": true, "_components": [ { - "__id__": 130 + "__id__": 102 }, { - "__id__": 131 + "__id__": 103 }, { - "__id__": 132 + "__id__": 104 }, { - "__id__": 133 + "__id__": 105 } ], "_prefab": null, @@ -5266,7 +4174,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 129 + "__id__": 101 }, "_enabled": true, "__prefab": null, @@ -5288,7 +4196,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 129 + "__id__": 101 }, "_enabled": true, "__prefab": null, @@ -5327,7 +4235,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 129 + "__id__": 101 }, "_enabled": true, "__prefab": null, @@ -5387,7 +4295,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 129 + "__id__": 101 }, "_enabled": true, "__prefab": null, @@ -5415,16 +4323,16 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 75 }, "_children": [], "_active": true, "_components": [ { - "__id__": 135 + "__id__": 107 }, { - "__id__": 136 + "__id__": 108 } ], "_prefab": null, @@ -5463,7 +4371,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 106 }, "_enabled": true, "__prefab": null, @@ -5485,7 +4393,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 106 }, "_enabled": true, "__prefab": null, @@ -5524,7 +4432,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 75 }, "_enabled": true, "__prefab": null, @@ -5540,6 +4448,1098 @@ }, "_id": "0ehK/p3EZHDahkXN1vbDIJ" }, + { + "__type__": "cc.Node", + "_name": "slingshot-002", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 16 + }, + "_children": [ + { + "__id__": 111 + }, + { + "__id__": 116 + } + ], + "_active": true, + "_components": [ + { + "__id__": 121 + }, + { + "__id__": 122 + }, + { + "__id__": 123 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": -500, + "y": -340, + "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": "e9anlkYgFICIJhOob2sNRk" + }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 110 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 112 + }, + { + "__id__": 113 + }, + { + "__id__": 114 + }, + { + "__id__": 115 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 12.9055, + "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": "8excwgSD9LRZVC4BCY9WqL" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 111 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 35.732, + "height": 119.39389583333332 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "84Fww37ItEv7Haklq7VAD4" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 111 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "ec5be981-a359-4c8b-9610-612b3e9a2d1f@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": "11bzeTNoBNn4aTclXtGhvv" + }, + { + "__type__": "cc.PolygonCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 111 + }, + "_enabled": true, + "__prefab": null, + "tag": 0, + "_group": 1, + "_density": 1, + "_sensor": false, + "_friction": 2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_points": [ + { + "__type__": "cc.Vec2", + "x": 6.87153846153846, + "y": 59.69694791666666 + }, + { + "__type__": "cc.Vec2", + "x": -17.866, + "y": 56.63556597222221 + }, + { + "__type__": "cc.Vec2", + "x": -17.866, + "y": -55.8702204861111 + }, + { + "__type__": "cc.Vec2", + "x": 17.866, + "y": -59.69694791666666 + }, + { + "__type__": "cc.Vec2", + "x": 17.866, + "y": 59.69694791666666 + } + ], + "_id": "8cF/gwB85JE4c2QsgTu1N0" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 111 + }, + "_enabled": true, + "__prefab": null, + "enabledContactListener": true, + "bullet": false, + "awakeOnLoad": true, + "_group": 1, + "_type": 0, + "_allowSleep": true, + "_gravityScale": 1, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "cfMyUOKiBGdoWm77j8mNQ0" + }, + { + "__type__": "cc.Node", + "_name": "Slingshot_2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 110 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 117 + }, + { + "__id__": 118 + }, + { + "__id__": 119 + }, + { + "__id__": 120 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 13, + "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": "dehQP+qbBNQIUOhXRPEd+b" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 116 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 55.784000000000006, + "height": 102.38004705882355 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 1, + "y": 0.5 + }, + "_id": "28FKWJqi1Nq5TeF11yZ+Mb" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 116 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "374073f2-ef97-43be-baa0-3a85f1f59b9d@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": "0cZuLx5XNA2ZQ3VtlUr7p/" + }, + { + "__type__": "cc.PolygonCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 116 + }, + "_enabled": true, + "__prefab": null, + "tag": 0, + "_group": 1, + "_density": 1, + "_sensor": false, + "_friction": 2, + "_restitution": 1.5, + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_points": [ + { + "__type__": "cc.Vec2", + "x": -15.09449411764706, + "y": 51.19002352941179 + }, + { + "__type__": "cc.Vec2", + "x": -34.12668235294118, + "y": 50.5337411764706 + }, + { + "__type__": "cc.Vec2", + "x": -44.6272, + "y": 43.314635294117664 + }, + { + "__type__": "cc.Vec2", + "x": -52.50258823529413, + "y": 32.814117647058836 + }, + { + "__type__": "cc.Vec2", + "x": -55.784000000000006, + "y": 15.094494117647073 + }, + { + "__type__": "cc.Vec2", + "x": -54.471435294117654, + "y": -22.96988235294118 + }, + { + "__type__": "cc.Vec2", + "x": -48.564894117647064, + "y": -37.40809411764707 + }, + { + "__type__": "cc.Vec2", + "x": -32.157835294117646, + "y": -51.190023529411775 + }, + { + "__type__": "cc.Vec2", + "x": -11.156800000000004, + "y": -50.5337411764706 + }, + { + "__type__": "cc.Vec2", + "x": -0.6562823529411759, + "y": -40.68950588235295 + }, + { + "__type__": "cc.Vec2", + "x": 0, + "y": 40.68950588235296 + }, + { + "__type__": "cc.Vec2", + "x": -10.500517647058828, + "y": 50.5337411764706 + } + ], + "_id": "39dCOll3BFHqdDF27QyTaa" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 116 + }, + "_enabled": true, + "__prefab": null, + "enabledContactListener": true, + "bullet": false, + "awakeOnLoad": true, + "_group": 1, + "_type": 0, + "_allowSleep": true, + "_gravityScale": 1, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "aemR/hEnhNoJnGKNLLQUoI" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 110 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "68gelDGjFLeZvigjPanN8G" + }, + { + "__type__": "6bb6fbw5PNPYq7zksYK1kHJ", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 110 + }, + "_enabled": true, + "__prefab": null, + "_animation": { + "__id__": 123 + }, + "_collider": { + "__id__": 119 + }, + "_soundFx": { + "__uuid__": "8602f38f-d976-4e2b-baa2-621a62f20261", + "__expectedType__": "cc.AudioClip" + }, + "_id": "aaFVCScoxJ5a270n4ihc6t" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 110 + }, + "_enabled": true, + "__prefab": null, + "playOnLoad": false, + "_clips": [ + { + "__uuid__": "056fc55f-e504-40d6-b7b6-e1cfc86639e9", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "056fc55f-e504-40d6-b7b6-e1cfc86639e9", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "05Xwcjh35G5ZaZaycA8Ss2" + }, + { + "__type__": "cc.Node", + "_name": "slingshot-003", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 16 + }, + "_children": [ + { + "__id__": 125 + }, + { + "__id__": 130 + } + ], + "_active": true, + "_components": [ + { + "__id__": 135 + }, + { + "__id__": 136 + }, + { + "__id__": 137 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 500, + "y": -340, + "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": "93BHPAuQdPdbRDrwMK8aNd" + }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 124 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 126 + }, + { + "__id__": 127 + }, + { + "__id__": 128 + }, + { + "__id__": 129 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 2.394, + "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": "5a2P265MpFQoVWqeM2QHvB" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 125 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 29.461, + "height": 119.39389583333332 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "857KmHkAhPuLmTqnisa6EC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 125 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "ec5be981-a359-4c8b-9610-612b3e9a2d1f@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": "4dZtPqRa9BRKjF8fn4JIFT" + }, + { + "__type__": "cc.PolygonCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 125 + }, + "_enabled": true, + "__prefab": null, + "tag": 0, + "_group": 1, + "_density": 1, + "_sensor": false, + "_friction": 2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_points": [ + { + "__type__": "cc.Vec2", + "x": 5.665576923076923, + "y": 59.69694791666666 + }, + { + "__type__": "cc.Vec2", + "x": -14.7305, + "y": 56.63556597222221 + }, + { + "__type__": "cc.Vec2", + "x": -14.7305, + "y": -55.8702204861111 + }, + { + "__type__": "cc.Vec2", + "x": 14.7305, + "y": -59.69694791666666 + }, + { + "__type__": "cc.Vec2", + "x": 14.7305, + "y": 59.69694791666666 + } + ], + "_id": "a7/XtRjQRA8pJ0mk6PN1N1" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 125 + }, + "_enabled": true, + "__prefab": null, + "enabledContactListener": true, + "bullet": false, + "awakeOnLoad": true, + "_group": 1, + "_type": 0, + "_allowSleep": true, + "_gravityScale": 1, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "6c0IZS7rJOCZbEM475VZ8c" + }, + { + "__type__": "cc.Node", + "_name": "Slingshot_2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 124 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 131 + }, + { + "__id__": 132 + }, + { + "__id__": 133 + }, + { + "__id__": 134 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 13, + "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": "c55BRhBvdL+4mS1laIjXDE" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 130 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 55.784000000000006, + "height": 102.38004705882355 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 1, + "y": 0.5 + }, + "_id": "978Pv7okVKJaezztPUcNnp" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 130 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "374073f2-ef97-43be-baa0-3a85f1f59b9d@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": "f7JNicmBRDeJByTZ6mWIui" + }, + { + "__type__": "cc.PolygonCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 130 + }, + "_enabled": true, + "__prefab": null, + "tag": 0, + "_group": 1, + "_density": 1, + "_sensor": false, + "_friction": 2, + "_restitution": 1.5, + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_points": [ + { + "__type__": "cc.Vec2", + "x": -15.09449411764706, + "y": 51.19002352941179 + }, + { + "__type__": "cc.Vec2", + "x": -34.12668235294118, + "y": 50.5337411764706 + }, + { + "__type__": "cc.Vec2", + "x": -44.6272, + "y": 43.314635294117664 + }, + { + "__type__": "cc.Vec2", + "x": -52.50258823529413, + "y": 32.814117647058836 + }, + { + "__type__": "cc.Vec2", + "x": -55.784000000000006, + "y": 15.094494117647073 + }, + { + "__type__": "cc.Vec2", + "x": -54.471435294117654, + "y": -22.96988235294118 + }, + { + "__type__": "cc.Vec2", + "x": -48.564894117647064, + "y": -37.40809411764707 + }, + { + "__type__": "cc.Vec2", + "x": -32.157835294117646, + "y": -51.190023529411775 + }, + { + "__type__": "cc.Vec2", + "x": -11.156800000000004, + "y": -50.5337411764706 + }, + { + "__type__": "cc.Vec2", + "x": -0.6562823529411759, + "y": -40.68950588235295 + }, + { + "__type__": "cc.Vec2", + "x": 0, + "y": 40.68950588235296 + }, + { + "__type__": "cc.Vec2", + "x": -10.500517647058828, + "y": 50.5337411764706 + } + ], + "_id": "40PgLLPn9IXq5fEcQ/yfnR" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 130 + }, + "_enabled": true, + "__prefab": null, + "enabledContactListener": true, + "bullet": false, + "awakeOnLoad": true, + "_group": 1, + "_type": 0, + "_allowSleep": true, + "_gravityScale": 1, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "8fcgbOZbtCx4pDNETbstdi" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 124 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "0fOTKoH/dOv5DGScOguadX" + }, + { + "__type__": "6bb6fbw5PNPYq7zksYK1kHJ", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 124 + }, + "_enabled": true, + "__prefab": null, + "_animation": { + "__id__": 137 + }, + "_collider": { + "__id__": 133 + }, + "_soundFx": { + "__uuid__": "8602f38f-d976-4e2b-baa2-621a62f20261", + "__expectedType__": "cc.AudioClip" + }, + "_id": "56W5XkecxF9qFPiuwUcOye" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 124 + }, + "_enabled": true, + "__prefab": null, + "playOnLoad": false, + "_clips": [ + { + "__uuid__": "056fc55f-e504-40d6-b7b6-e1cfc86639e9", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "056fc55f-e504-40d6-b7b6-e1cfc86639e9", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "d0QLszLOdPgq7nvqnRpGzC" + }, { "__type__": "cc.Node", "_name": "Goal", @@ -6551,7 +6551,7 @@ "__id__": 668 }, "_goalSound": { - "__uuid__": "4ce9d2c6-98c5-4d05-94af-70193bb795fe", + "__uuid__": "9f162a5a-b9cf-4a00-844f-76d340443ca3", "__expectedType__": "cc.AudioClip" }, "_cheeseModeGoalSound": { @@ -20964,7 +20964,7 @@ }, "_multiplierCurve": 120, "_hitSound": { - "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__uuid__": "bf2b43d1-2342-4f8e-b1f5-de818e510b27", "__expectedType__": "cc.AudioClip" }, "_id": "9cJaywMb9Fr4Z0zlx1Pdcb" @@ -21608,7 +21608,7 @@ }, "_multiplierCurve": 100, "_hitSound": { - "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__uuid__": "bf2b43d1-2342-4f8e-b1f5-de818e510b27", "__expectedType__": "cc.AudioClip" }, "_id": "f2+Qohf8JAhZ3Xqi9g9xV1" @@ -22252,7 +22252,7 @@ }, "_multiplierCurve": 100, "_hitSound": { - "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__uuid__": "bf2b43d1-2342-4f8e-b1f5-de818e510b27", "__expectedType__": "cc.AudioClip" }, "_id": "99Yu77Ej9N4JRBZjD+OE2I" @@ -22896,7 +22896,7 @@ }, "_multiplierCurve": 100, "_hitSound": { - "__uuid__": "ac267249-4228-4a86-b4d4-39f84a210668", + "__uuid__": "bf2b43d1-2342-4f8e-b1f5-de818e510b27", "__expectedType__": "cc.AudioClip" }, "_id": "2bedVMe25Ou4KcU4DmnB4q" @@ -23566,7 +23566,7 @@ "_motorSpeedDeActive": 10000, "side": 0, "_activeSound": { - "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__uuid__": "4f0fe9f4-a46a-4921-9519-7f657c31fba0", "__expectedType__": "cc.AudioClip" }, "_id": "dbyGJf4ZlNuqnbz9gSPD7E" @@ -24153,7 +24153,7 @@ "_motorSpeedDeActive": -10000, "side": 1, "_activeSound": { - "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__uuid__": "4f0fe9f4-a46a-4921-9519-7f657c31fba0", "__expectedType__": "cc.AudioClip" }, "_id": "c2LBQkbqpMS7ebeAdAWNd2" @@ -24740,7 +24740,7 @@ "_motorSpeedDeActive": -10000, "side": 1, "_activeSound": { - "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__uuid__": "4f0fe9f4-a46a-4921-9519-7f657c31fba0", "__expectedType__": "cc.AudioClip" }, "_id": "14hqKrgTVA0r/f0mOYZ/aP" @@ -25312,7 +25312,7 @@ "_motorSpeedDeActive": 10000, "side": 0, "_activeSound": { - "__uuid__": "ac21d2c4-7749-4701-af6a-b4ac4b43e7a5", + "__uuid__": "4f0fe9f4-a46a-4921-9519-7f657c31fba0", "__expectedType__": "cc.AudioClip" }, "_id": "a3/6ZctnhAFb+E8W1w8jJR" @@ -32593,7 +32593,7 @@ }, "_force": 40, "_soundFx": { - "__uuid__": "c4a1c16a-96e4-4e8a-9188-cf42b4f35f73", + "__uuid__": "1a6c406c-d5fa-4d17-a1b9-85aea90167f6", "__expectedType__": "cc.AudioClip" }, "onDone": [], @@ -34611,7 +34611,7 @@ }, "_force": 40, "_soundFx": { - "__uuid__": "c4a1c16a-96e4-4e8a-9188-cf42b4f35f73", + "__uuid__": "1a6c406c-d5fa-4d17-a1b9-85aea90167f6", "__expectedType__": "cc.AudioClip" }, "onDone": [], @@ -35220,15 +35220,15 @@ "__expectedType__": "cc.SpriteFrame" }, "_startSound": { - "__uuid__": "015d5eb5-b790-46d8-a580-b35ecb94caf3", + "__uuid__": "bdf9a0db-f93a-4185-aaab-65274b7f5736", "__expectedType__": "cc.AudioClip" }, "_ballOutSound": { - "__uuid__": "90fc5275-7ce7-4e86-a757-0674c4fe8f18", + "__uuid__": "77ea2061-3c8b-4d5d-abc9-0d3c22f9316b", "__expectedType__": "cc.AudioClip" }, "_backgroundMusic": { - "__uuid__": "40b027bb-9e2f-40e5-85a7-cd32e2ad51af", + "__uuid__": "2b216677-9822-44f6-9ce6-39a0054afb5e", "__expectedType__": "cc.AudioClip" }, "_gameOverMusic": { diff --git a/assets/_Game/Scripts/Booster/BoosterBase.ts b/assets/_Game/Scripts/Booster/BoosterBase.ts index 6c31dc0..6ccff1b 100644 --- a/assets/_Game/Scripts/Booster/BoosterBase.ts +++ b/assets/_Game/Scripts/Booster/BoosterBase.ts @@ -18,7 +18,6 @@ import AudioManager from '../Manager/AudioManager'; import { EventManger } from '../Manager/EventManger'; import { GameManager } from '../Manager/GameManager'; import IPoolable from '../Pool/IPoolable'; -import ObjectPool from '../Pool/ObjectPool'; import Utils from '../Utilities'; const { ccclass, property } = _decorator; @@ -40,7 +39,7 @@ export class BoosterBase extends Component implements IPoolable { protected duration: number = 10; public readonly type: BoosterType; - private _timer: number = 0; + protected timer: number = 0; private _activeCollider: boolean = true; private _active: boolean = false; @@ -67,19 +66,19 @@ export class BoosterBase extends Component implements IPoolable { public tick(dt: number) { if (!this._active) return; - this._timer += dt; - if (this._timer >= this.duration) { + this.timer += dt; + if (this.timer >= this.duration) { this._active = false; } } public resetTime() { - this._timer = 0; + this.timer = 0; } public collect(collector: Node) { this._active = true; - this._timer = 0; + this.timer = 0; this.sprite.setNodeActive(false); this.node.setParent(collector, false); } diff --git a/assets/_Game/Scripts/Booster/CumulativeBooster.ts b/assets/_Game/Scripts/Booster/CumulativeBooster.ts index 6547653..657c40a 100644 --- a/assets/_Game/Scripts/Booster/CumulativeBooster.ts +++ b/assets/_Game/Scripts/Booster/CumulativeBooster.ts @@ -1,7 +1,7 @@ -import { _decorator, Component, Node } from 'cc'; +import { _decorator, AudioClip, CCFloat, clamp01, Component, game, macro, Node } from 'cc'; import SpineAnimationHandler from '../Base/SpineAnimationHandler'; import BoosterType from '../Enum/BoosterType'; -import AudioManager from '../Manager/AudioManager'; +import AudioManager, { SoundSource } from '../Manager/AudioManager'; import { BoosterBase } from './BoosterBase'; const { ccclass, property } = _decorator; @@ -9,6 +9,13 @@ const { ccclass, property } = _decorator; export class CumulativeBooster extends BoosterBase { @property(SpineAnimationHandler) private animationHandler: SpineAnimationHandler; + @property(CCFloat) + private speedUpBgm: number = 1.5; + @property(AudioClip) + private backgroundMusic: AudioClip; + + private _prePlayRate: number; + private _backgroundSfx: SoundSource; public readonly type: BoosterType = BoosterType.CumulativeBar; @@ -19,14 +26,48 @@ export class CumulativeBooster extends BoosterBase { public async collect(collector: Node): Promise { super.collect(collector); - AudioManager.setPlayRateBGM(1.5); + this._prePlayRate = AudioManager.bgmPlaybackRate; + if (this.backgroundMusic) { + AudioManager.playSfx(this.backgroundMusic, { loop: true, volume: 0 }); + this._backgroundSfx = AudioManager.findAudioSourcesSfx(this.backgroundMusic); + } + AudioManager.setPlayRateBGM(this.speedUpBgm); await this.animationHandler?.setAnimationAsync('active'); this.animationHandler?.setNodeActive(false); } + public tick(dt: number): void { + super.tick(dt); + if (this.duration - this.timer <= 1) { + if (AudioManager.bgmVolume < 1) { + AudioManager.bgmVolume += dt * 2; + if (AudioManager.bgmVolume > 1) { + AudioManager.bgmVolume = 1; + } + } + + if (this._backgroundSfx.volume > 0) { + this._backgroundSfx.volume -= dt * 2; + } + } else { + if (AudioManager.bgmVolume > 0) { + AudioManager.bgmVolume -= dt * 0.5; + } + + if (this._backgroundSfx.volume < 1) { + this._backgroundSfx.volume += dt * 2; + if (this._backgroundSfx.volume > 1) { + this._backgroundSfx.volume = 1; + } + } + } + } + public end(): void { super.end(); - AudioManager.setPlayRateBGM(1); + this._backgroundSfx?.stop(); + AudioManager.setPlayRateBGM(this._prePlayRate); + AudioManager.bgmVolume = 1; } async onGet(): Promise { diff --git a/assets/_Game/Scripts/Environments/CumulativeBar.ts b/assets/_Game/Scripts/Environments/CumulativeBar.ts index e89e1f8..8baf2b6 100644 --- a/assets/_Game/Scripts/Environments/CumulativeBar.ts +++ b/assets/_Game/Scripts/Environments/CumulativeBar.ts @@ -132,7 +132,7 @@ export class CumulativeBar extends Component { case ScoreType.DestroyObject: if (!this._active) return; const star = this._floatingStartFactory.create(GameManager.instance.topContainer); - star.node.setWorldPosition(position); + star.node.setWorldPosition(position ? position : Vec3.ZERO); tween(star.node) .to( 1, diff --git a/assets/_Game/Scripts/Extension/Extension.ts b/assets/_Game/Scripts/Extension/Extension.ts index ac5bf3b..2d9cf9b 100644 --- a/assets/_Game/Scripts/Extension/Extension.ts +++ b/assets/_Game/Scripts/Extension/Extension.ts @@ -339,6 +339,14 @@ AudioSource.prototype.getPlaybackRate = function () { AudioSource.prototype.setPlaybackRate = function (value: number) { this._playbackRate = value; + if (this._player) { + try { + this._player._player._sourceNode.playbackRate.value = value; + } catch (e) {} + this._playbackRate = value; + } else { + this._playbackRate = value; + } }; //#endregion diff --git a/assets/_Game/Scripts/Manager/AudioManager.ts b/assets/_Game/Scripts/Manager/AudioManager.ts index c3363c2..5bb1c1c 100644 --- a/assets/_Game/Scripts/Manager/AudioManager.ts +++ b/assets/_Game/Scripts/Manager/AudioManager.ts @@ -88,13 +88,29 @@ export class SoundSource { export default class AudioManager { private static readonly storageKey = 'gad-game-galaxy-seeker-mute'; private static _audioSourcesSfx: Map = new Map(); - private static _audioSourceBgm: SoundSource; + private static _primaryAudioSourceBgm: SoundSource; private static _isMute: boolean = false; public static get mute() { return this._isMute; } + public static get bgmPlaybackRate(): number { + return this._primaryAudioSourceBgm.playbackRate; + } + + public static get bgmClip(): AudioClip { + return this._primaryAudioSourceBgm.clip; + } + + public static get bgmVolume(): number { + return this._primaryAudioSourceBgm.volume; + } + + public static set bgmVolume(value: number) { + this._primaryAudioSourceBgm.volume = value; + } + public static toggleMute(): boolean { this._isMute = !this._isMute; this.setMute(this._isMute); @@ -102,7 +118,7 @@ export default class AudioManager { } public static setMute(mute: boolean) { - this._audioSourceBgm.mute = mute; + this._primaryAudioSourceBgm.mute = mute; this._audioSourcesSfx.forEach((source) => { source.mute = mute; }); @@ -117,21 +133,21 @@ export default class AudioManager { playbackRate: 1, ...opts, }; - if (this._audioSourceBgm) { - this._audioSourceBgm.stop(); - this._audioSourceBgm.clip = audio; + if (this._primaryAudioSourceBgm) { + this._primaryAudioSourceBgm.stop(); + this._primaryAudioSourceBgm.clip = audio; } else { - this._audioSourceBgm = new SoundSource(audio); + this._primaryAudioSourceBgm = new SoundSource(audio); } - this._audioSourceBgm.loop = config.loop; - this._audioSourceBgm.volume = config.volume; - this._audioSourceBgm.mute = this._isMute; - this._audioSourceBgm.play(); - this._audioSourceBgm.playbackRate = config.playbackRate; + this._primaryAudioSourceBgm.loop = config.loop; + this._primaryAudioSourceBgm.volume = config.volume; + this._primaryAudioSourceBgm.mute = this._isMute; + this._primaryAudioSourceBgm.play(); + this._primaryAudioSourceBgm.playbackRate = config.playbackRate; } public static setPlayRateBGM(rate: number) { - this._audioSourceBgm.playbackRate = rate; + this._primaryAudioSourceBgm.playbackRate = rate; } public static playSfx(audioClip: AudioClip, opts?: ISoundOptions) { @@ -160,7 +176,7 @@ export default class AudioManager { } public static stopBgm() { - this._audioSourceBgm.stop(); + this._primaryAudioSourceBgm.stop(); } public static stopSfx(audioClip: AudioClip) { diff --git a/assets/_Game/Sounds/Theme/Chocolate.meta b/assets/_Game/Sounds/Theme/Chocolate.meta new file mode 100644 index 0000000..9af987b --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "41ffc22c-cc16-4ac9-b9d7-4cc2a775a7bb", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/ball_out.mp3 b/assets/_Game/Sounds/Theme/Chocolate/ball_out.mp3 new file mode 100644 index 0000000..7de8cbf Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/ball_out.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/ball_out.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/ball_out.mp3.meta new file mode 100644 index 0000000..faccc8d --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/ball_out.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "77ea2061-3c8b-4d5d-abc9-0d3c22f9316b", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/bgm.mp3 b/assets/_Game/Sounds/Theme/Chocolate/bgm.mp3 new file mode 100644 index 0000000..3bacffc Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/bgm.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/bgm.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/bgm.mp3.meta new file mode 100644 index 0000000..ba4b5a1 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/bgm.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "2b216677-9822-44f6-9ce6-39a0054afb5e", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/bgm_cheese.mp3 b/assets/_Game/Sounds/Theme/Chocolate/bgm_cheese.mp3 new file mode 100644 index 0000000..49bd6d4 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/bgm_cheese.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/bgm_cheese.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/bgm_cheese.mp3.meta new file mode 100644 index 0000000..2c7051a --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/bgm_cheese.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "6cf3abb2-39ba-4429-89dc-e55c89109b58", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/booster_active.mp3 b/assets/_Game/Sounds/Theme/Chocolate/booster_active.mp3 new file mode 100644 index 0000000..80027c2 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/booster_active.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/booster_active.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/booster_active.mp3.meta new file mode 100644 index 0000000..80da5ca --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/booster_active.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "b1cc499c-0470-4e1c-bc27-776d6b3a7589", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/cannon.mp3 b/assets/_Game/Sounds/Theme/Chocolate/cannon.mp3 new file mode 100644 index 0000000..40cc97c Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/cannon.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/cannon.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/cannon.mp3.meta new file mode 100644 index 0000000..f3a401d --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/cannon.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "1a6c406c-d5fa-4d17-a1b9-85aea90167f6", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/clock.mp3 b/assets/_Game/Sounds/Theme/Chocolate/clock.mp3 new file mode 100644 index 0000000..8d2fe2b Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/clock.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/clock.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/clock.mp3.meta new file mode 100644 index 0000000..45eb396 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/clock.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "a5d745ea-77ac-45f7-9add-2d7cecf14588", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/collect.mp3 b/assets/_Game/Sounds/Theme/Chocolate/collect.mp3 new file mode 100644 index 0000000..ac45feb Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/collect.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/collect.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/collect.mp3.meta new file mode 100644 index 0000000..e0ab775 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/collect.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "e9447eed-f826-4415-ae20-d558cbdad5ba", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/collectBooster.mp3 b/assets/_Game/Sounds/Theme/Chocolate/collectBooster.mp3 new file mode 100644 index 0000000..0415402 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/collectBooster.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/collectBooster.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/collectBooster.mp3.meta new file mode 100644 index 0000000..fc5dd44 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/collectBooster.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "c9c374b4-e722-4ae7-b158-2348a2131d39", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/enemy.mp3 b/assets/_Game/Sounds/Theme/Chocolate/enemy.mp3 new file mode 100644 index 0000000..b7570f6 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/enemy.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/enemy.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/enemy.mp3.meta new file mode 100644 index 0000000..7807fce --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/enemy.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "bf2b43d1-2342-4f8e-b1f5-de818e510b27", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/flipper.mp3 b/assets/_Game/Sounds/Theme/Chocolate/flipper.mp3 new file mode 100644 index 0000000..ee9364e Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/flipper.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/flipper.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/flipper.mp3.meta new file mode 100644 index 0000000..ed04662 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/flipper.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "4f0fe9f4-a46a-4921-9519-7f657c31fba0", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/goal.mp3 b/assets/_Game/Sounds/Theme/Chocolate/goal.mp3 new file mode 100644 index 0000000..e338e08 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/goal.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/goal.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/goal.mp3.meta new file mode 100644 index 0000000..bb519db --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/goal.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "9f162a5a-b9cf-4a00-844f-76d340443ca3", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/multi.mp3 b/assets/_Game/Sounds/Theme/Chocolate/multi.mp3 new file mode 100644 index 0000000..c0fb4e2 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/multi.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/multi.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/multi.mp3.meta new file mode 100644 index 0000000..f303fd1 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/multi.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "7fde9104-56e1-4720-9e56-17d2c1399d73", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/slingshot1.mp3 b/assets/_Game/Sounds/Theme/Chocolate/slingshot1.mp3 new file mode 100644 index 0000000..fcf7082 Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/slingshot1.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/slingshot1.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/slingshot1.mp3.meta new file mode 100644 index 0000000..ce8d179 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/slingshot1.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "35743b89-bf0d-4cba-8424-7804a28eb7c2", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/slingshot2.mp3 b/assets/_Game/Sounds/Theme/Chocolate/slingshot2.mp3 new file mode 100644 index 0000000..83b2f4d Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/slingshot2.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/slingshot2.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/slingshot2.mp3.meta new file mode 100644 index 0000000..a07fac0 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/slingshot2.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "e168bc33-68e5-4e1a-afc5-204ff6445d96", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sounds/Theme/Chocolate/start.mp3 b/assets/_Game/Sounds/Theme/Chocolate/start.mp3 new file mode 100644 index 0000000..189540f Binary files /dev/null and b/assets/_Game/Sounds/Theme/Chocolate/start.mp3 differ diff --git a/assets/_Game/Sounds/Theme/Chocolate/start.mp3.meta b/assets/_Game/Sounds/Theme/Chocolate/start.mp3.meta new file mode 100644 index 0000000..399bf93 --- /dev/null +++ b/assets/_Game/Sounds/Theme/Chocolate/start.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "bdf9a0db-f93a-4185-aaab-65274b7f5736", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +}