diff --git a/assets/_Game/Prefabs/Themes/City/City_Ball.prefab b/assets/_Game/Prefabs/Themes/City/City_Ball.prefab index 384b02b..83df57d 100644 --- a/assets/_Game/Prefabs/Themes/City/City_Ball.prefab +++ b/assets/_Game/Prefabs/Themes/City/City_Ball.prefab @@ -23,9 +23,6 @@ ], "_active": true, "_components": [ - { - "__id__": 51 - }, { "__id__": 53 }, @@ -43,10 +40,13 @@ }, { "__id__": 63 + }, + { + "__id__": 65 } ], "_prefab": { - "__id__": 67 + "__id__": 69 }, "_lpos": { "__type__": "cc.Vec3", @@ -92,26 +92,26 @@ "__id__": 9 }, { - "__id__": 17 + "__id__": 19 }, { - "__id__": 23 + "__id__": 25 }, { - "__id__": 29 + "__id__": 31 }, { - "__id__": 37 + "__id__": 39 } ], "_active": true, "_components": [ { - "__id__": 48 + "__id__": 50 } ], "_prefab": { - "__id__": 50 + "__id__": 52 }, "_lpos": { "__type__": "cc.Vec3", @@ -321,6 +321,9 @@ }, { "__id__": 16 + }, + { + "__id__": 17 } ], "removedComponents": [] @@ -387,6 +390,24 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 18 + }, + "propertyPath": [ + "_trailModule", + "lifeTime", + "constant" + ], + "value": 0.15 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "46cV34eRFEJo7sL1+RIesi" + ] + }, { "__type__": "cc.Node", "_name": "Sprite", @@ -398,14 +419,14 @@ "_active": true, "_components": [ { - "__id__": 18 + "__id__": 20 }, { - "__id__": 20 + "__id__": 22 } ], "_prefab": { - "__id__": 22 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -441,11 +462,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 17 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", @@ -468,11 +489,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 17 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 23 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -531,14 +552,14 @@ "_active": true, "_components": [ { - "__id__": 24 + "__id__": 26 }, { - "__id__": 26 + "__id__": 28 } ], "_prefab": { - "__id__": 28 + "__id__": 30 }, "_lpos": { "__type__": "cc.Vec3", @@ -574,11 +595,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 23 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 27 }, "_contentSize": { "__type__": "cc.Size", @@ -601,11 +622,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 23 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 29 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -660,14 +681,14 @@ "__id__": 2 }, "_prefab": { - "__id__": 30 + "__id__": 32 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 29 + "__id__": 31 }, "asset": { "__uuid__": "e14fcc1f-f971-42d3-9b4c-b18518610c85", @@ -675,7 +696,7 @@ }, "fileId": "67xZ2cRkJFAr/RCUJZ4Wsx", "instance": { - "__id__": 31 + "__id__": 33 }, "targetOverrides": null }, @@ -688,17 +709,17 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 32 - }, { "__id__": 34 }, { - "__id__": 35 + "__id__": 36 }, { - "__id__": 36 + "__id__": 37 + }, + { + "__id__": 38 } ], "removedComponents": [] @@ -706,7 +727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_name" @@ -722,7 +743,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -737,7 +758,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lrot" @@ -753,7 +774,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_euler" @@ -772,14 +793,14 @@ "__id__": 2 }, "_prefab": { - "__id__": 38 + "__id__": 40 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 37 + "__id__": 39 }, "asset": { "__uuid__": "65ac0d84-803c-4033-a26d-d045b44256b2", @@ -787,7 +808,7 @@ }, "fileId": "a9ie+TsG9IqLmCtkDUOeNi", "instance": { - "__id__": 39 + "__id__": 41 }, "targetOverrides": null }, @@ -800,23 +821,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 40 - }, { "__id__": 42 }, - { - "__id__": 43 - }, { "__id__": 44 }, { "__id__": 45 }, + { + "__id__": 46 + }, { "__id__": 47 + }, + { + "__id__": 49 } ], "removedComponents": [] @@ -824,7 +845,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 41 + "__id__": 43 }, "propertyPath": [ "_name" @@ -840,7 +861,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 41 + "__id__": 43 }, "propertyPath": [ "_lpos" @@ -855,7 +876,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 41 + "__id__": 43 }, "propertyPath": [ "_lrot" @@ -871,7 +892,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 41 + "__id__": 43 }, "propertyPath": [ "_euler" @@ -886,7 +907,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 48 }, "propertyPath": [ "startColor", @@ -909,7 +930,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 48 }, "propertyPath": [ "playOnAwake" @@ -925,7 +946,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 51 }, "_contentSize": { "__type__": "cc.Size", @@ -966,7 +987,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 54 }, "_contentSize": { "__type__": "cc.Size", @@ -994,7 +1015,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "tag": 0, "_group": 4, @@ -1024,7 +1045,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "enabledContactListener": true, "bullet": true, @@ -1057,7 +1078,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "_impactPrefab": { "__uuid__": "018b85ed-f07a-4f26-b29c-7c3eb28cc634", @@ -1065,22 +1086,22 @@ }, "_maxSpeed": 60, "_rigidBody": { - "__id__": 55 + "__id__": 57 }, "_animation": { - "__id__": 59 + "__id__": 61 }, "_trail": null, "_buffParticle": null, "_fireParticle": null, "_collider": { - "__id__": 53 + "__id__": 55 }, "_normalSprite": { - "__id__": 20 + "__id__": 22 }, "_cheeseModeSprite": { - "__id__": 26 + "__id__": 28 }, "_spriteShadow": { "__id__": 6 @@ -1094,14 +1115,14 @@ "__expectedType__": "cc.AudioClip" }, "_collectSound": { - "__id__": 61 - }, - "_cheeseModeCollectSound": { "__id__": 63 }, - "_jumpCurve": { + "_cheeseModeCollectSound": { "__id__": 65 }, + "_jumpCurve": { + "__id__": 67 + }, "_id": "" }, { @@ -1117,7 +1138,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "playOnLoad": false, "_clips": [ @@ -1145,7 +1166,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "_duration": 1, "_audioClips": [ @@ -1217,7 +1238,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 66 }, "_duration": 1, "_audioClips": [ @@ -1283,7 +1304,7 @@ { "__type__": "cc.AnimationCurve", "_curve": { - "__id__": 66 + "__id__": 68 } }, { @@ -1358,9 +1379,6 @@ "fileId": "ecwvc2xHdIf6kSfbLqrETl", "instance": null, "targetOverrides": [ - { - "__id__": 68 - }, { "__id__": 70 }, @@ -1368,15 +1386,21 @@ "__id__": 72 }, { - "__id__": 75 + "__id__": 74 + }, + { + "__id__": 77 + }, + { + "__id__": 79 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 37 + "__id__": 39 }, { - "__id__": 29 + "__id__": 31 }, { "__id__": 9 @@ -1386,17 +1410,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 57 + "__id__": 59 }, "sourceInfo": null, "propertyPath": [ "_buffParticle" ], "target": { - "__id__": 29 + "__id__": 31 }, "targetInfo": { - "__id__": 69 + "__id__": 71 } }, { @@ -1408,7 +1432,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 57 + "__id__": 59 }, "sourceInfo": null, "propertyPath": [ @@ -1418,7 +1442,7 @@ "__id__": 9 }, "targetInfo": { - "__id__": 71 + "__id__": 73 } }, { @@ -1430,20 +1454,20 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 37 + "__id__": 39 }, "sourceInfo": { - "__id__": 73 + "__id__": 75 }, "propertyPath": [ "_trailModule", "_particleSystem" ], "target": { - "__id__": 37 + "__id__": 39 }, "targetInfo": { - "__id__": 74 + "__id__": 76 } }, { @@ -1461,17 +1485,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 57 + "__id__": 59 }, "sourceInfo": null, "propertyPath": [ "_fireParticle" ], "target": { - "__id__": 37 + "__id__": 39 }, "targetInfo": { - "__id__": 76 + "__id__": 78 } }, { @@ -1479,5 +1503,36 @@ "localID": [ "ebFxV/KgpERbIDCVfDiEuU" ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 9 + }, + "sourceInfo": { + "__id__": 80 + }, + "propertyPath": [ + "_trailModule", + "_particleSystem" + ], + "target": { + "__id__": 9 + }, + "targetInfo": { + "__id__": 81 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "46cV34eRFEJo7sL1+RIesi" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "46cV34eRFEJo7sL1+RIesi" + ] } ] \ No newline at end of file diff --git a/assets/_Game/Prefabs/Themes/Park/Park_Ball.prefab b/assets/_Game/Prefabs/Themes/Park/Park_Ball.prefab index cfc6117..fbe5c46 100644 --- a/assets/_Game/Prefabs/Themes/Park/Park_Ball.prefab +++ b/assets/_Game/Prefabs/Themes/Park/Park_Ball.prefab @@ -23,9 +23,6 @@ ], "_active": true, "_components": [ - { - "__id__": 53 - }, { "__id__": 55 }, @@ -43,10 +40,13 @@ }, { "__id__": 65 + }, + { + "__id__": 67 } ], "_prefab": { - "__id__": 69 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -92,26 +92,26 @@ "__id__": 9 }, { - "__id__": 17 + "__id__": 19 }, { - "__id__": 23 + "__id__": 25 }, { - "__id__": 29 + "__id__": 31 }, { - "__id__": 37 + "__id__": 39 } ], "_active": true, "_components": [ { - "__id__": 50 + "__id__": 52 } ], "_prefab": { - "__id__": 52 + "__id__": 54 }, "_lpos": { "__type__": "cc.Vec3", @@ -321,6 +321,9 @@ }, { "__id__": 16 + }, + { + "__id__": 17 } ], "removedComponents": [] @@ -387,6 +390,24 @@ "z": 0 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 18 + }, + "propertyPath": [ + "_trailModule", + "lifeTime", + "constant" + ], + "value": 0.15 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "46cV34eRFEJo7sL1+RIesi" + ] + }, { "__type__": "cc.Node", "_name": "Sprite", @@ -398,14 +419,14 @@ "_active": true, "_components": [ { - "__id__": 18 + "__id__": 20 }, { - "__id__": 20 + "__id__": 22 } ], "_prefab": { - "__id__": 22 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -441,11 +462,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 17 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", @@ -468,11 +489,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 17 + "__id__": 19 }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 23 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -531,14 +552,14 @@ "_active": false, "_components": [ { - "__id__": 24 + "__id__": 26 }, { - "__id__": 26 + "__id__": 28 } ], "_prefab": { - "__id__": 28 + "__id__": 30 }, "_lpos": { "__type__": "cc.Vec3", @@ -574,11 +595,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 23 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 25 + "__id__": 27 }, "_contentSize": { "__type__": "cc.Size", @@ -601,11 +622,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 23 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 29 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -660,14 +681,14 @@ "__id__": 2 }, "_prefab": { - "__id__": 30 + "__id__": 32 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 29 + "__id__": 31 }, "asset": { "__uuid__": "e14fcc1f-f971-42d3-9b4c-b18518610c85", @@ -675,7 +696,7 @@ }, "fileId": "67xZ2cRkJFAr/RCUJZ4Wsx", "instance": { - "__id__": 31 + "__id__": 33 }, "targetOverrides": null }, @@ -688,17 +709,17 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 32 - }, { "__id__": 34 }, { - "__id__": 35 + "__id__": 36 }, { - "__id__": 36 + "__id__": 37 + }, + { + "__id__": 38 } ], "removedComponents": [] @@ -706,7 +727,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_name" @@ -722,7 +743,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lpos" @@ -737,7 +758,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_lrot" @@ -753,7 +774,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 33 + "__id__": 35 }, "propertyPath": [ "_euler" @@ -772,14 +793,14 @@ "__id__": 2 }, "_prefab": { - "__id__": 38 + "__id__": 40 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 37 + "__id__": 39 }, "asset": { "__uuid__": "65ac0d84-803c-4033-a26d-d045b44256b2", @@ -787,7 +808,7 @@ }, "fileId": "a9ie+TsG9IqLmCtkDUOeNi", "instance": { - "__id__": 39 + "__id__": 41 }, "targetOverrides": null }, @@ -800,29 +821,29 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 40 - }, { "__id__": 42 }, - { - "__id__": 43 - }, { "__id__": 44 }, { "__id__": 45 }, + { + "__id__": 46 + }, { "__id__": 47 }, { - "__id__": 48 + "__id__": 49 }, { - "__id__": 49 + "__id__": 50 + }, + { + "__id__": 51 } ], "removedComponents": [] @@ -830,7 +851,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 41 + "__id__": 43 }, "propertyPath": [ "_name" @@ -846,7 +867,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 41 + "__id__": 43 }, "propertyPath": [ "_lpos" @@ -861,7 +882,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 41 + "__id__": 43 }, "propertyPath": [ "_lrot" @@ -877,7 +898,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 41 + "__id__": 43 }, "propertyPath": [ "_euler" @@ -892,7 +913,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 48 }, "propertyPath": [ "startColor", @@ -915,7 +936,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 48 }, "propertyPath": [ "playOnAwake" @@ -925,7 +946,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 48 }, "propertyPath": [ "rateOverTime", @@ -936,7 +957,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 46 + "__id__": 48 }, "propertyPath": [ "_prewarm" @@ -952,7 +973,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 53 }, "_contentSize": { "__type__": "cc.Size", @@ -993,7 +1014,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -1021,7 +1042,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 58 }, "tag": 0, "_group": 4, @@ -1051,7 +1072,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 60 }, "enabledContactListener": true, "bullet": true, @@ -1084,7 +1105,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 62 }, "_impactPrefab": { "__uuid__": "018b85ed-f07a-4f26-b29c-7c3eb28cc634", @@ -1092,22 +1113,22 @@ }, "_maxSpeed": 60, "_rigidBody": { - "__id__": 57 + "__id__": 59 }, "_animation": { - "__id__": 61 + "__id__": 63 }, "_trail": null, "_buffParticle": null, "_fireParticle": null, "_collider": { - "__id__": 55 + "__id__": 57 }, "_normalSprite": { - "__id__": 20 + "__id__": 22 }, "_cheeseModeSprite": { - "__id__": 26 + "__id__": 28 }, "_spriteShadow": { "__id__": 6 @@ -1121,14 +1142,14 @@ "__expectedType__": "cc.AudioClip" }, "_collectSound": { - "__id__": 63 - }, - "_cheeseModeCollectSound": { "__id__": 65 }, - "_jumpCurve": { + "_cheeseModeCollectSound": { "__id__": 67 }, + "_jumpCurve": { + "__id__": 69 + }, "_id": "" }, { @@ -1144,7 +1165,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 64 }, "playOnLoad": false, "_clips": [ @@ -1169,7 +1190,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 66 }, "_duration": 1, "_audioClips": [ @@ -1241,7 +1262,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 68 }, "_duration": 1, "_audioClips": [ @@ -1307,7 +1328,7 @@ { "__type__": "cc.AnimationCurve", "_curve": { - "__id__": 68 + "__id__": 70 } }, { @@ -1382,9 +1403,6 @@ "fileId": "ecwvc2xHdIf6kSfbLqrETl", "instance": null, "targetOverrides": [ - { - "__id__": 70 - }, { "__id__": 72 }, @@ -1392,15 +1410,21 @@ "__id__": 74 }, { - "__id__": 77 + "__id__": 76 + }, + { + "__id__": 79 + }, + { + "__id__": 81 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 37 + "__id__": 39 }, { - "__id__": 29 + "__id__": 31 }, { "__id__": 9 @@ -1410,17 +1434,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 59 + "__id__": 61 }, "sourceInfo": null, "propertyPath": [ "_buffParticle" ], "target": { - "__id__": 29 + "__id__": 31 }, "targetInfo": { - "__id__": 71 + "__id__": 73 } }, { @@ -1432,7 +1456,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 59 + "__id__": 61 }, "sourceInfo": null, "propertyPath": [ @@ -1442,7 +1466,7 @@ "__id__": 9 }, "targetInfo": { - "__id__": 73 + "__id__": 75 } }, { @@ -1454,20 +1478,20 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 37 + "__id__": 39 }, "sourceInfo": { - "__id__": 75 + "__id__": 77 }, "propertyPath": [ "_trailModule", "_particleSystem" ], "target": { - "__id__": 37 + "__id__": 39 }, "targetInfo": { - "__id__": 76 + "__id__": 78 } }, { @@ -1485,17 +1509,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 59 + "__id__": 61 }, "sourceInfo": null, "propertyPath": [ "_fireParticle" ], "target": { - "__id__": 37 + "__id__": 39 }, "targetInfo": { - "__id__": 78 + "__id__": 80 } }, { @@ -1503,5 +1527,36 @@ "localID": [ "ebFxV/KgpERbIDCVfDiEuU" ] + }, + { + "__type__": "cc.TargetOverrideInfo", + "source": { + "__id__": 9 + }, + "sourceInfo": { + "__id__": 82 + }, + "propertyPath": [ + "_trailModule", + "_particleSystem" + ], + "target": { + "__id__": 9 + }, + "targetInfo": { + "__id__": 83 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "46cV34eRFEJo7sL1+RIesi" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "46cV34eRFEJo7sL1+RIesi" + ] } ] \ No newline at end of file diff --git a/assets/_Game/Scenes/City-theme.scene b/assets/_Game/Scenes/City-theme.scene index 20c3002..1af9e32 100644 --- a/assets/_Game/Scenes/City-theme.scene +++ b/assets/_Game/Scenes/City-theme.scene @@ -4768,7 +4768,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -140, + "y": -141, "z": 0 }, "_lrot": { @@ -4829,10 +4829,10 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 + "r": 66, + "g": 174, + "b": 201, + "a": 150 }, "_spriteFrame": { "__uuid__": "a5d6b003-efa8-4090-8f49-66ee18b2c04a@f9941", @@ -4874,7 +4874,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -140, + "y": -141, "z": 0 }, "_lrot": { @@ -13748,6 +13748,10 @@ "_timeIcon": { "__id__": 487 }, + "_countDownSound": { + "__uuid__": "c96f7bd8-69d7-4810-a6d4-3cfa61766b2c", + "__expectedType__": "cc.AudioClip" + }, "_id": "18IxpNfaJJ3roZPXlNUjB0" }, { @@ -17359,7 +17363,7 @@ "__id__": 625 }, "_speed": 50, - "_requireGoal": 1, + "_requireGoal": 3, "_curveY": true, "_patrolCurve": { "__id__": 629 @@ -17986,7 +17990,7 @@ "__id__": 644 }, "_speed": 50, - "_requireGoal": 3, + "_requireGoal": 6, "_curveY": false, "_patrolCurve": { "__id__": 648 @@ -18613,7 +18617,7 @@ "__id__": 663 }, "_speed": 50, - "_requireGoal": 6, + "_requireGoal": 9, "_curveY": false, "_patrolCurve": { "__id__": 667 @@ -19240,7 +19244,7 @@ "__id__": 682 }, "_speed": 50, - "_requireGoal": 9, + "_requireGoal": 12, "_curveY": false, "_patrolCurve": { "__id__": 686 diff --git a/assets/_Game/Scenes/Default-theme.scene b/assets/_Game/Scenes/Default-theme.scene index f4ab040..4f08d95 100644 --- a/assets/_Game/Scenes/Default-theme.scene +++ b/assets/_Game/Scenes/Default-theme.scene @@ -7183,7 +7183,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -140, + "y": -141.5, "z": 0 }, "_lrot": { @@ -7244,10 +7244,10 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 + "r": 97, + "g": 84, + "b": 203, + "a": 200 }, "_spriteFrame": { "__uuid__": "a5d6b003-efa8-4090-8f49-66ee18b2c04a@f9941", @@ -7289,7 +7289,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -140, + "y": -141.5, "z": 0 }, "_lrot": { @@ -16163,6 +16163,10 @@ "_timeIcon": { "__id__": 575 }, + "_countDownSound": { + "__uuid__": "c96f7bd8-69d7-4810-a6d4-3cfa61766b2c", + "__expectedType__": "cc.AudioClip" + }, "_id": "e7xHiUII5EsZwLz4FOp4Nb" }, { @@ -17861,7 +17865,7 @@ "__id__": 639 }, "_speed": 50, - "_requireGoal": 1, + "_requireGoal": 3, "_curveY": true, "_patrolCurve": { "__id__": 643 @@ -18488,7 +18492,7 @@ "__id__": 658 }, "_speed": 50, - "_requireGoal": 3, + "_requireGoal": 6, "_curveY": false, "_patrolCurve": { "__id__": 662 @@ -19115,7 +19119,7 @@ "__id__": 677 }, "_speed": 50, - "_requireGoal": 6, + "_requireGoal": 9, "_curveY": false, "_patrolCurve": { "__id__": 681 @@ -19742,7 +19746,7 @@ "__id__": 696 }, "_speed": 50, - "_requireGoal": 9, + "_requireGoal": 12, "_curveY": false, "_patrolCurve": { "__id__": 700 @@ -34430,7 +34434,7 @@ "y": -1200, "z": 0 }, - "_timePlay": 120, + "_timePlay": 30, "_clockIcon": { "__uuid__": "f7bd5166-9d5f-4d43-a3d3-58ae9a4957fc@f9941", "__expectedType__": "cc.SpriteFrame" diff --git a/assets/_Game/Scenes/Farm-theme.scene b/assets/_Game/Scenes/Farm-theme.scene index cf49613..482e38c 100644 --- a/assets/_Game/Scenes/Farm-theme.scene +++ b/assets/_Game/Scenes/Farm-theme.scene @@ -4874,7 +4874,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -140, + "y": -141.5, "z": 0 }, "_lrot": { @@ -4935,10 +4935,10 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 + "r": 225, + "g": 83, + "b": 61, + "a": 150 }, "_spriteFrame": { "__uuid__": "a5d6b003-efa8-4090-8f49-66ee18b2c04a@f9941", @@ -4980,7 +4980,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -140, + "y": -141.5, "z": 0 }, "_lrot": { @@ -10562,7 +10562,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -578.5, + "y": -629.203, "z": 0 }, "_lrot": { @@ -10906,7 +10906,10 @@ "b": 124, "a": 255 }, - "_normalSprite": null, + "_normalSprite": { + "__uuid__": "07500b86-217e-4ee1-b9a1-075c19ec6316@f9941", + "__expectedType__": "cc.SpriteFrame" + }, "_hoverSprite": null, "_pressedSprite": null, "_disabledSprite": null, @@ -10941,7 +10944,7 @@ "_left": 0, "_right": 0, "_top": 668.5, - "_bottom": 100, + "_bottom": 49.297000000000025, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -13478,12 +13481,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "9606a1e4-6a67-4da1-a0a6-9e4a34536408@f9941", + "__uuid__": "438bb087-658d-4535-9688-087d51d7736a@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -13851,6 +13854,10 @@ "_timeIcon": { "__id__": 490 }, + "_countDownSound": { + "__uuid__": "c96f7bd8-69d7-4810-a6d4-3cfa61766b2c", + "__expectedType__": "cc.AudioClip" + }, "_id": "6fdj3Tkt5PGb62zuCqs4D/" }, { @@ -17721,7 +17728,7 @@ "__id__": 635 }, "_speed": 50, - "_requireGoal": 1, + "_requireGoal": 3, "_curveY": true, "_patrolCurve": { "__id__": 639 @@ -18348,7 +18355,7 @@ "__id__": 654 }, "_speed": 50, - "_requireGoal": 3, + "_requireGoal": 6, "_curveY": false, "_patrolCurve": { "__id__": 658 @@ -18975,7 +18982,7 @@ "__id__": 673 }, "_speed": 50, - "_requireGoal": 6, + "_requireGoal": 9, "_curveY": false, "_patrolCurve": { "__id__": 677 @@ -19602,7 +19609,7 @@ "__id__": 692 }, "_speed": 50, - "_requireGoal": 9, + "_requireGoal": 12, "_curveY": false, "_patrolCurve": { "__id__": 696 diff --git a/assets/_Game/Scenes/Park-theme.scene b/assets/_Game/Scenes/Park-theme.scene index 97764a2..be265fd 100644 --- a/assets/_Game/Scenes/Park-theme.scene +++ b/assets/_Game/Scenes/Park-theme.scene @@ -4884,7 +4884,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -140, + "y": -141.5, "z": 0 }, "_lrot": { @@ -4945,10 +4945,10 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 + "r": 163, + "g": 229, + "b": 232, + "a": 200 }, "_spriteFrame": { "__uuid__": "a5d6b003-efa8-4090-8f49-66ee18b2c04a@f9941", @@ -4990,7 +4990,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -140, + "y": -141.5, "z": 0 }, "_lrot": { @@ -9056,7 +9056,7 @@ "__id__": 358 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 360 @@ -9072,7 +9072,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 454.9, + "y": 633.9, "z": 0 }, "_lrot": { @@ -9220,7 +9220,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -100, + "y": -210, "z": 0 }, "_lrot": { @@ -10333,8 +10333,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 658, - "height": 898 + "width": 760, + "height": 976 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10437,8 +10437,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 658, - "height": 898 + "width": 760, + "height": 976 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10522,8 +10522,8 @@ "_target": null, "_left": 150, "_right": 150, - "_top": 400, - "_bottom": 200, + "_top": 650, + "_bottom": 230, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -10572,7 +10572,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -568.5, + "y": -747.5, "z": 0 }, "_lrot": { @@ -10997,7 +10997,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -899, + "y": -1078, "z": 0 }, "_lrot": { @@ -11270,8 +11270,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 958, - "height": 1498 + "width": 1060, + "height": 1856 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -11300,7 +11300,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ea5ee070-892f-4ea9-b4c1-8736f9a367d3@f9941", + "__uuid__": "46311a1e-0d4f-496e-86ef-d3391f6b18c5@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -13491,12 +13491,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "9606a1e4-6a67-4da1-a0a6-9e4a34536408@f9941", + "__uuid__": "37467220-98e7-497d-b3fa-0c8705066f65@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -13864,6 +13864,10 @@ "_timeIcon": { "__id__": 490 }, + "_countDownSound": { + "__uuid__": "c96f7bd8-69d7-4810-a6d4-3cfa61766b2c", + "__expectedType__": "cc.AudioClip" + }, "_id": "e7xHiUII5EsZwLz4FOp4Nb" }, { @@ -14455,7 +14459,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "c60afd72-3284-4d02-a2fa-f70904bfd53a@f9941", + "__uuid__": "331b0c49-7ecb-4e93-8725-2d840301c975@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -14684,7 +14688,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "e0c0178f-5dd8-45fc-86e9-3ada3fd96dc2@f9941", + "__uuid__": "b9241eed-996a-4342-8db9-a7b5c256f507@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -16601,7 +16605,10 @@ "__expectedType__": "cc.AnimationClip" } ], - "_defaultClip": null, + "_defaultClip": { + "__uuid__": "3b9f2736-62dd-4a6e-8c4c-d51be931c409", + "__expectedType__": "cc.AnimationClip" + }, "_id": "278/a3uJlNNqYhDzXQHUGJ" }, { @@ -17658,7 +17665,7 @@ "__id__": 632 }, "_speed": 50, - "_requireGoal": 1, + "_requireGoal": 3, "_curveY": true, "_patrolCurve": { "__id__": 636 @@ -18285,7 +18292,7 @@ "__id__": 651 }, "_speed": 50, - "_requireGoal": 3, + "_requireGoal": 6, "_curveY": false, "_patrolCurve": { "__id__": 655 @@ -18912,7 +18919,7 @@ "__id__": 670 }, "_speed": 50, - "_requireGoal": 6, + "_requireGoal": 9, "_curveY": false, "_patrolCurve": { "__id__": 674 @@ -19539,7 +19546,7 @@ "__id__": 689 }, "_speed": 50, - "_requireGoal": 9, + "_requireGoal": 12, "_curveY": false, "_patrolCurve": { "__id__": 693 diff --git a/assets/_Game/Scripts/Environments/CumulativeBar.ts b/assets/_Game/Scripts/Environments/CumulativeBar.ts index 853edc7..58b5360 100644 --- a/assets/_Game/Scripts/Environments/CumulativeBar.ts +++ b/assets/_Game/Scripts/Environments/CumulativeBar.ts @@ -133,7 +133,7 @@ export class CumulativeBar extends Component { switch (type) { case ScoreType.DestroyObject: if (!this._active) return; - const star = this._starPool.get(this.node); + const star = this._starPool.get(GameManager.instance.topContainer); star.setWorldPosition(position); tween(star) .to( @@ -165,10 +165,10 @@ export class CumulativeBar extends Component { break; case ScoreType.Goal: if (this._currentValue == 0) { - SoundManager.instance.playSfx(this._goalSound, 3); + SoundManager.instance.playSfx(this._goalSound, { volume: 3 }); return; } - SoundManager.instance.playSfx(this._cheeseModeGoalSound, 3); + SoundManager.instance.playSfx(this._cheeseModeGoalSound, { volume: 3 }); this._multiplier = 0; this._goal = true; let items = Math.ceil(this._currentValue / 10); diff --git a/assets/_Game/Scripts/Environments/SequenceSound.ts b/assets/_Game/Scripts/Environments/SequenceSound.ts index c62a2db..3bc9813 100644 --- a/assets/_Game/Scripts/Environments/SequenceSound.ts +++ b/assets/_Game/Scripts/Environments/SequenceSound.ts @@ -20,12 +20,12 @@ export class SequenceSound extends Component { public playSound(volume: number = 1) { if (this._timer > 0) { - SoundManager.instance.playSfx(this._audioClips[this._currentIndex], volume); + SoundManager.instance.playSfx(this._audioClips[this._currentIndex], { volume }); this._currentIndex++; if (this._currentIndex >= this._audioClips.length) this._currentIndex = 0; } else { this._currentIndex = 0; - SoundManager.instance.playSfx(this._audioClips[this._currentIndex], volume); + SoundManager.instance.playSfx(this._audioClips[this._currentIndex], { volume }); } this._timer = this._duration; } diff --git a/assets/_Game/Scripts/Manager/GameManager.ts b/assets/_Game/Scripts/Manager/GameManager.ts index 24d605a..8796204 100644 --- a/assets/_Game/Scripts/Manager/GameManager.ts +++ b/assets/_Game/Scripts/Manager/GameManager.ts @@ -213,10 +213,6 @@ export class GameManager extends Singleton() { this._warningTime = true; EventManger.instance.emit(GameEvent.WarningTime, true); } - if (this._warningTime && this._timer > 10) { - this._warningTime = false; - EventManger.instance.emit(GameEvent.WarningTime, false); - } EventManger.instance.emit(GameEvent.TimeUpdate, this._timer); await Utilities.delay(1); } @@ -298,6 +294,10 @@ export class GameManager extends Singleton() { public addTime(time: number) { this._timer += time; + if (this._warningTime && this._timer > 10) { + this._warningTime = false; + EventManger.instance.emit(GameEvent.WarningTime, false); + } EventManger.instance.emit(GameEvent.TimeUpdate, this._timer); } @@ -317,7 +317,7 @@ export class GameManager extends Singleton() { } public Ready() { - SoundManager.instance.playBGM(this._backgroundMusic, 1); + SoundManager.instance.playBGM(this._backgroundMusic); this.changeGameState(GameState.Ready); } @@ -336,7 +336,7 @@ export class GameManager extends Singleton() { this._timer = this._timePlay + TimeConfig.DelayPLay; this._currentBallInGame = 0; this._isMultiBall = false; - SoundManager.instance.playBGM(this._backgroundMusic, 1); + SoundManager.instance.playBGM(this._backgroundMusic); this.changeGameState(GameState.Playing); await Utilities.delay(TimeConfig.DelayPLay); this.spawnBall(true); diff --git a/assets/_Game/Scripts/Manager/SoundManager.ts b/assets/_Game/Scripts/Manager/SoundManager.ts index cae343e..22d29b5 100644 --- a/assets/_Game/Scripts/Manager/SoundManager.ts +++ b/assets/_Game/Scripts/Manager/SoundManager.ts @@ -3,7 +3,7 @@ import Singleton from '../Singleton'; import { Howl } from 'howler'; const { ccclass, property } = _decorator; -class SoundSource { +export class SoundSource { public source: AudioSource; private _volume = 1; public get volume() { @@ -62,13 +62,13 @@ export class SoundManager extends Singleton('SoundManager') { } } - public playBGM(audio: AudioClip, volume = 1, loop = true, rate = 1) { + public playBGM(audio: AudioClip, opts?: { volume?: number; loop?: boolean; rate?: number }) { this._audioSourceBgm?.stop(); this._audioSourceBgm = new globalThis.Howl({ src: audio.nativeUrl, - volume: volume, - loop: loop, - rate: rate, + volume: opts?.volume || 1, + loop: !!opts?.loop, + rate: opts?.rate || 1, mute: this._isMute, }); this._audioSourceBgm.play(); @@ -78,13 +78,13 @@ export class SoundManager extends Singleton('SoundManager') { this._audioSourceBgm.rate(rate); } - public playSfx(audioClip: AudioClip, volume = 1, loop = false) { + public playSfx(audioClip: AudioClip, opts?: { volume?: number; loop?: boolean }) { let soundSource = this._audioSourcesSfx[audioClip.uuid]; if (soundSource) { - soundSource.volume = volume; - soundSource.source.loop = loop; - if (loop) return; + soundSource.volume = opts?.volume || 1; + soundSource.source.loop = !!opts?.loop; + if (soundSource.source.playing && !!opts?.loop) return; soundSource.play(); return; } @@ -93,8 +93,8 @@ export class SoundManager extends Singleton('SoundManager') { soundSource.source = audioSource; soundSource.source.playOnAwake = false; soundSource.source.clip = audioClip; - soundSource.source.loop = loop; - soundSource.source.volume = volume; + soundSource.source.loop = !!opts?.loop; + soundSource.source.volume = opts?.volume || 1; soundSource.mute = this._isMute; this._audioSourcesSfx[audioClip.uuid] = soundSource; soundSource.play(); diff --git a/assets/_Game/Scripts/UI/TimeUI.ts b/assets/_Game/Scripts/UI/TimeUI.ts index 8fc0ac8..f394cb6 100644 --- a/assets/_Game/Scripts/UI/TimeUI.ts +++ b/assets/_Game/Scripts/UI/TimeUI.ts @@ -1,8 +1,9 @@ -import { _decorator, clamp01, Color, Component, Label, lerp, Node, Sprite, Tween, tween, Vec3 } from 'cc'; +import { _decorator, AudioClip, clamp01, Color, Component, Label, lerp, Node, Sprite, Tween, tween, Vec3 } from 'cc'; import { EventManger } from '../Manager/EventManger'; import GameEvent from '../Events/GameEvent'; import GameState from '../Enum/GameState'; import { GameManager } from '../Manager/GameManager'; +import { SoundManager } from '../Manager/SoundManager'; const { ccclass, property } = _decorator; @ccclass('TimeUI') @@ -14,6 +15,8 @@ export class TimeUI extends Component { @property({ type: Node, visible: true }) private _timeIcon: Node; + @property({ type: AudioClip, visible: true }) + private _countDownSound: AudioClip; private _gameTime: number = 1; private _fillValue: number = 1; @@ -38,6 +41,7 @@ export class TimeUI extends Component { case GameState.Playing: break; case GameState.GameOver: + SoundManager.instance.stopSfx(this._countDownSound); break; case GameState.End: break; @@ -53,6 +57,7 @@ export class TimeUI extends Component { private onWarningTime(warning: boolean) { if (warning) { + SoundManager.instance.playSfx(this._countDownSound, { loop: true }); this._fill.color = Color.RED; tween(this._timeIcon) .to(0.05, { position: new Vec3(3.117, 3.177) }) @@ -67,6 +72,7 @@ export class TimeUI extends Component { .start(); this._timeLabel.color = Color.RED; } else { + SoundManager.instance.stopSfx(this._countDownSound); Tween.stopAllByTarget(this._timeIcon); this._fill.color = Color.GREEN; this._timeLabel.color = Color.WHITE; diff --git a/assets/_Game/Sounds/sfx_countdown.mp3 b/assets/_Game/Sounds/sfx_countdown.mp3 new file mode 100644 index 0000000..7d9b0c2 Binary files /dev/null and b/assets/_Game/Sounds/sfx_countdown.mp3 differ diff --git a/assets/_Game/Sounds/sfx_countdown.mp3.meta b/assets/_Game/Sounds/sfx_countdown.mp3.meta new file mode 100644 index 0000000..9920c99 --- /dev/null +++ b/assets/_Game/Sounds/sfx_countdown.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "c96f7bd8-69d7-4810-a6d4-3cfa61766b2c", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/_Game/Sprites/Themes/Park/UI.meta b/assets/_Game/Sprites/Themes/Park/UI.meta new file mode 100644 index 0000000..d061a86 --- /dev/null +++ b/assets/_Game/Sprites/Themes/Park/UI.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.1.0", + "importer": "directory", + "imported": true, + "uuid": "8c005761-527c-4542-954f-7aaef58f663a", + "files": [], + "subMetas": {}, + "userData": { + "compressionType": {}, + "isRemoteBundle": {} + } +} diff --git a/assets/_Game/Sprites/Themes/Park/UI/Avatar.png b/assets/_Game/Sprites/Themes/Park/UI/Avatar.png new file mode 100644 index 0000000..47a6cd7 Binary files /dev/null and b/assets/_Game/Sprites/Themes/Park/UI/Avatar.png differ diff --git a/assets/_Game/Sprites/Themes/Park/UI/Avatar.png.meta b/assets/_Game/Sprites/Themes/Park/UI/Avatar.png.meta new file mode 100644 index 0000000..97e02d7 --- /dev/null +++ b/assets/_Game/Sprites/Themes/Park/UI/Avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.25", + "importer": "image", + "imported": true, + "uuid": "b9241eed-996a-4342-8db9-a7b5c256f507", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "b9241eed-996a-4342-8db9-a7b5c256f507@6c48a", + "displayName": "Avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "b9241eed-996a-4342-8db9-a7b5c256f507", + "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": "b9241eed-996a-4342-8db9-a7b5c256f507@f9941", + "displayName": "Avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 397, + "height": 177, + "rawWidth": 397, + "rawHeight": 177, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -198.5, + -88.5, + 0, + 198.5, + -88.5, + 0, + -198.5, + 88.5, + 0, + 198.5, + 88.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 177, + 397, + 177, + 0, + 0, + 397, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -198.5, + -88.5, + 0 + ], + "maxPos": [ + 198.5, + 88.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "b9241eed-996a-4342-8db9-a7b5c256f507@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.11", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": true, + "hasAlpha": true, + "redirect": "b9241eed-996a-4342-8db9-a7b5c256f507@f9941" + } +} diff --git a/assets/_Game/Sprites/Themes/Park/UI/Leader_Board.png b/assets/_Game/Sprites/Themes/Park/UI/Leader_Board.png new file mode 100644 index 0000000..0cc8730 Binary files /dev/null and b/assets/_Game/Sprites/Themes/Park/UI/Leader_Board.png differ diff --git a/assets/_Game/Sprites/Themes/Park/UI/Leader_Board.png.meta b/assets/_Game/Sprites/Themes/Park/UI/Leader_Board.png.meta new file mode 100644 index 0000000..342806f --- /dev/null +++ b/assets/_Game/Sprites/Themes/Park/UI/Leader_Board.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.25", + "importer": "image", + "imported": true, + "uuid": "46311a1e-0d4f-496e-86ef-d3391f6b18c5", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "46311a1e-0d4f-496e-86ef-d3391f6b18c5@6c48a", + "displayName": "Leader_Board", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "46311a1e-0d4f-496e-86ef-d3391f6b18c5", + "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": "46311a1e-0d4f-496e-86ef-d3391f6b18c5@f9941", + "displayName": "Leader_Board", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 1060, + "height": 1856, + "rawWidth": 1060, + "rawHeight": 1856, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -530, + -928, + 0, + 530, + -928, + 0, + -530, + 928, + 0, + 530, + 928, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 1856, + 1060, + 1856, + 0, + 0, + 1060, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -530, + -928, + 0 + ], + "maxPos": [ + 530, + 928, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "46311a1e-0d4f-496e-86ef-d3391f6b18c5@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.11", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": true, + "hasAlpha": true, + "redirect": "46311a1e-0d4f-496e-86ef-d3391f6b18c5@f9941" + } +} diff --git a/assets/_Game/Sprites/Themes/Park/UI/Retry_Button.png b/assets/_Game/Sprites/Themes/Park/UI/Retry_Button.png new file mode 100644 index 0000000..ffc2bdd Binary files /dev/null and b/assets/_Game/Sprites/Themes/Park/UI/Retry_Button.png differ diff --git a/assets/_Game/Sprites/Themes/Park/UI/Retry_Button.png.meta b/assets/_Game/Sprites/Themes/Park/UI/Retry_Button.png.meta new file mode 100644 index 0000000..bca7f67 --- /dev/null +++ b/assets/_Game/Sprites/Themes/Park/UI/Retry_Button.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.25", + "importer": "image", + "imported": true, + "uuid": "5f98cac4-a1c0-4de5-9f90-3c41ca39bb37", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "5f98cac4-a1c0-4de5-9f90-3c41ca39bb37@6c48a", + "displayName": "Retry_Button", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "5f98cac4-a1c0-4de5-9f90-3c41ca39bb37", + "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": "5f98cac4-a1c0-4de5-9f90-3c41ca39bb37@f9941", + "displayName": "Retry_Button", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 269, + "height": 161, + "rawWidth": 269, + "rawHeight": 161, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -134.5, + -80.5, + 0, + 134.5, + -80.5, + 0, + -134.5, + 80.5, + 0, + 134.5, + 80.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 161, + 269, + 161, + 0, + 0, + 269, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -134.5, + -80.5, + 0 + ], + "maxPos": [ + 134.5, + 80.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "5f98cac4-a1c0-4de5-9f90-3c41ca39bb37@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.11", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": true, + "hasAlpha": true, + "redirect": "5f98cac4-a1c0-4de5-9f90-3c41ca39bb37@f9941" + } +} diff --git a/assets/_Game/Sprites/combo_bar_base.png b/assets/_Game/Sprites/combo_bar_base.png index 50cb7f4..8d4a8ea 100644 Binary files a/assets/_Game/Sprites/combo_bar_base.png and b/assets/_Game/Sprites/combo_bar_base.png differ diff --git a/assets/_Game/Sprites/combo_bar_base.png.meta b/assets/_Game/Sprites/combo_bar_base.png.meta index b313bec..bcc6c64 100644 --- a/assets/_Game/Sprites/combo_bar_base.png.meta +++ b/assets/_Game/Sprites/combo_bar_base.png.meta @@ -42,14 +42,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 4.5, - "offsetY": 1.5, - "trimX": 26, - "trimY": 20, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, "width": 861, "height": 374, - "rawWidth": 904, - "rawHeight": 417, + "rawWidth": 861, + "rawHeight": 374, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -83,24 +83,24 @@ 3 ], "uv": [ - 26, - 397, - 887, - 397, - 26, - 23, - 887, - 23 + 0, + 374, + 861, + 374, + 0, + 0, + 861, + 0 ], "nuv": [ - 0.028761061946902654, - 0.05515587529976019, - 0.9811946902654868, - 0.05515587529976019, - 0.028761061946902654, - 0.9520383693045563, - 0.9811946902654868, - 0.9520383693045563 + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 ], "minPos": [ -430.5,