diff --git a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3 b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3 new file mode 100644 index 0000000..a4d6641 Binary files /dev/null and b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3 differ diff --git a/assets/Media/Audio/Game/Sound/12_human_jump_3 v2.ogg.meta b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3.meta similarity index 72% rename from assets/Media/Audio/Game/Sound/12_human_jump_3 v2.ogg.meta rename to assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3.meta index 70776ed..92683df 100644 --- a/assets/Media/Audio/Game/Sound/12_human_jump_3 v2.ogg.meta +++ b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3.meta @@ -2,10 +2,10 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "2cdf2e52-ca81-493b-a694-3a746f06a99d", + "uuid": "62c90d56-a5f2-4125-9748-a8784593fc9a", "files": [ ".json", - ".ogg" + ".mp3" ], "subMetas": {}, "userData": { diff --git a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg deleted file mode 100644 index 14bae6a..0000000 Binary files a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/01_chest_open_1.mp3 b/assets/Media/Audio/Game/Sound/01_chest_open_1.mp3 new file mode 100644 index 0000000..217a2d4 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/01_chest_open_1.mp3 differ diff --git a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg.meta b/assets/Media/Audio/Game/Sound/01_chest_open_1.mp3.meta similarity index 72% rename from assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg.meta rename to assets/Media/Audio/Game/Sound/01_chest_open_1.mp3.meta index cd420ca..5163540 100644 --- a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg.meta +++ b/assets/Media/Audio/Game/Sound/01_chest_open_1.mp3.meta @@ -2,10 +2,10 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "50cb41a8-d6e7-4938-ac3c-f44f68f8bcac", + "uuid": "80076621-0a4f-416f-bf60-78ebaf55c763", "files": [ ".json", - ".ogg" + ".mp3" ], "subMetas": {}, "userData": { diff --git a/assets/Media/Audio/Game/Sound/01_chest_open_1.ogg b/assets/Media/Audio/Game/Sound/01_chest_open_1.ogg deleted file mode 100644 index 4d16b56..0000000 Binary files a/assets/Media/Audio/Game/Sound/01_chest_open_1.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/12_human_jump_3 v2.mp3 b/assets/Media/Audio/Game/Sound/12_human_jump_3 v2.mp3 new file mode 100644 index 0000000..bb63b55 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/12_human_jump_3 v2.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/15_human_dash_2.ogg.meta b/assets/Media/Audio/Game/Sound/12_human_jump_3 v2.mp3.meta similarity index 72% rename from assets/Media/Audio/Game/Sound/15_human_dash_2.ogg.meta rename to assets/Media/Audio/Game/Sound/12_human_jump_3 v2.mp3.meta index 87039a7..f01973c 100644 --- a/assets/Media/Audio/Game/Sound/15_human_dash_2.ogg.meta +++ b/assets/Media/Audio/Game/Sound/12_human_jump_3 v2.mp3.meta @@ -2,10 +2,10 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "1ae98f55-3a82-4303-8e43-a350d4ad47be", + "uuid": "597eb90e-1155-4002-a44c-ab61e56042b2", "files": [ ".json", - ".ogg" + ".mp3" ], "subMetas": {}, "userData": { diff --git a/assets/Media/Audio/Game/Sound/12_human_jump_3 v2.ogg b/assets/Media/Audio/Game/Sound/12_human_jump_3 v2.ogg deleted file mode 100644 index 4b6f22e..0000000 Binary files a/assets/Media/Audio/Game/Sound/12_human_jump_3 v2.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/15_human_dash_2.mp3 b/assets/Media/Audio/Game/Sound/15_human_dash_2.mp3 new file mode 100644 index 0000000..efccfc2 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/15_human_dash_2.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/01_chest_open_1.ogg.meta b/assets/Media/Audio/Game/Sound/15_human_dash_2.mp3.meta similarity index 72% rename from assets/Media/Audio/Game/Sound/01_chest_open_1.ogg.meta rename to assets/Media/Audio/Game/Sound/15_human_dash_2.mp3.meta index 9858441..961af5e 100644 --- a/assets/Media/Audio/Game/Sound/01_chest_open_1.ogg.meta +++ b/assets/Media/Audio/Game/Sound/15_human_dash_2.mp3.meta @@ -2,10 +2,10 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "e21ed27e-1fdc-43a1-b22d-fda9d9b8f67c", + "uuid": "030c2b59-0c32-4495-85c2-73a8384ef3fc", "files": [ ".json", - ".ogg" + ".mp3" ], "subMetas": {}, "userData": { diff --git a/assets/Media/Audio/Game/Sound/15_human_dash_2.ogg b/assets/Media/Audio/Game/Sound/15_human_dash_2.ogg deleted file mode 100644 index c33587f..0000000 Binary files a/assets/Media/Audio/Game/Sound/15_human_dash_2.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/222400 - Dynamic Vacuum Suction 01 - Loop v3.ogg b/assets/Media/Audio/Game/Sound/222400 - Dynamic Vacuum Suction 01 - Loop v3.ogg deleted file mode 100644 index 6e3cc3c..0000000 Binary files a/assets/Media/Audio/Game/Sound/222400 - Dynamic Vacuum Suction 01 - Loop v3.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/222400 - Dynamic Vacuum Suction 01 - Loop v3.ogg.meta b/assets/Media/Audio/Game/Sound/222400 - Dynamic Vacuum Suction 01 - Loop v3.ogg.meta deleted file mode 100644 index 7d9091c..0000000 --- a/assets/Media/Audio/Game/Sound/222400 - Dynamic Vacuum Suction 01 - Loop v3.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "54afc48e-5d15-4f1e-8b54-1cea20f16025", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.mp3 b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.mp3 new file mode 100644 index 0000000..f6d84e4 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.mp3.meta b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.mp3.meta new file mode 100644 index 0000000..c57459b --- /dev/null +++ b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "9c0132cb-25ca-4396-aed0-a3c236c84674", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg deleted file mode 100644 index bab0d63..0000000 Binary files a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg.meta b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg.meta deleted file mode 100644 index 184b82c..0000000 --- a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "e24d1743-95d5-4d10-a76e-2fbb0d093957", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/GP_Heal_1.mp3 b/assets/Media/Audio/Game/Sound/GP_Heal_1.mp3 new file mode 100644 index 0000000..49f0d10 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/GP_Heal_1.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/GP_Heal_1.mp3.meta b/assets/Media/Audio/Game/Sound/GP_Heal_1.mp3.meta new file mode 100644 index 0000000..430d620 --- /dev/null +++ b/assets/Media/Audio/Game/Sound/GP_Heal_1.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "b54680a6-e26b-4be5-8fd2-494ceff6206e", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Game/Sound/GP_Heal_1.ogg b/assets/Media/Audio/Game/Sound/GP_Heal_1.ogg deleted file mode 100644 index 17473c6..0000000 Binary files a/assets/Media/Audio/Game/Sound/GP_Heal_1.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/GP_Heal_1.ogg.meta b/assets/Media/Audio/Game/Sound/GP_Heal_1.ogg.meta deleted file mode 100644 index ac3b173..0000000 --- a/assets/Media/Audio/Game/Sound/GP_Heal_1.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "e5439679-87a6-49e2-b623-83314ecdda68", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.mp3 b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.mp3 new file mode 100644 index 0000000..84f6270 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.mp3.meta b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.mp3.meta new file mode 100644 index 0000000..4be323e --- /dev/null +++ b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "ed32090d-ceda-4a90-ab94-0df1c6dba067", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.ogg b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.ogg deleted file mode 100644 index 4c35caa..0000000 Binary files a/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.ogg.meta b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.ogg.meta deleted file mode 100644 index 829ac6e..0000000 --- a/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "ff242c51-6ab4-4735-bf4c-dd9af2b6847a", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/Headbutt v2.mp3 b/assets/Media/Audio/Game/Sound/Headbutt v2.mp3 new file mode 100644 index 0000000..cde8069 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/Headbutt v2.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/Headbutt v2.mp3.meta b/assets/Media/Audio/Game/Sound/Headbutt v2.mp3.meta new file mode 100644 index 0000000..9359af9 --- /dev/null +++ b/assets/Media/Audio/Game/Sound/Headbutt v2.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "27b24616-76c3-4374-abe5-4a8b1cab09b4", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Game/Sound/Headbutt v2.ogg b/assets/Media/Audio/Game/Sound/Headbutt v2.ogg deleted file mode 100644 index 0fe5ba0..0000000 Binary files a/assets/Media/Audio/Game/Sound/Headbutt v2.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/Headbutt v2.ogg.meta b/assets/Media/Audio/Game/Sound/Headbutt v2.ogg.meta deleted file mode 100644 index 1110e4e..0000000 --- a/assets/Media/Audio/Game/Sound/Headbutt v2.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "94356aff-2a75-43b2-8258-4f18b3006ef6", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.mp3 b/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.mp3 new file mode 100644 index 0000000..3c4911c Binary files /dev/null and b/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.mp3.meta b/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.mp3.meta new file mode 100644 index 0000000..c848732 --- /dev/null +++ b/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "9b7158e3-add7-44b7-a491-c2a99d9624dd", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.ogg b/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.ogg deleted file mode 100644 index 92d893e..0000000 Binary files a/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.ogg.meta b/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.ogg.meta deleted file mode 100644 index aace964..0000000 --- a/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14 v3.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "72661b76-bef4-4ed8-9cb6-dd38d839f1b9", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/Magnet v3.mp3 b/assets/Media/Audio/Game/Sound/Magnet v3.mp3 new file mode 100644 index 0000000..7943c4a Binary files /dev/null and b/assets/Media/Audio/Game/Sound/Magnet v3.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/Magnet v3.mp3.meta b/assets/Media/Audio/Game/Sound/Magnet v3.mp3.meta new file mode 100644 index 0000000..14d6dbb --- /dev/null +++ b/assets/Media/Audio/Game/Sound/Magnet v3.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "8993de31-a9ea-4492-9c7f-4e64a2262443", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Game/Sound/Magnet v3.ogg b/assets/Media/Audio/Game/Sound/Magnet v3.ogg deleted file mode 100644 index d7932ce..0000000 Binary files a/assets/Media/Audio/Game/Sound/Magnet v3.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/Magnet v3.ogg.meta b/assets/Media/Audio/Game/Sound/Magnet v3.ogg.meta deleted file mode 100644 index a765449..0000000 --- a/assets/Media/Audio/Game/Sound/Magnet v3.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "baf95420-77c5-4747-80ed-6f05b14e8777", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.mp3 b/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.mp3 new file mode 100644 index 0000000..f067284 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.mp3.meta b/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.mp3.meta new file mode 100644 index 0000000..24ddf2a --- /dev/null +++ b/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "5b716f29-0cee-4f32-ab8a-8c81b47bb47f", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.ogg b/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.ogg deleted file mode 100644 index f13f2a5..0000000 Binary files a/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.ogg.meta b/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.ogg.meta deleted file mode 100644 index 90643fa..0000000 --- a/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25 v3.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "41d1d0d3-b915-46cc-bdaa-ac443d0b8dd8", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/Special_Powerup_10.mp3 b/assets/Media/Audio/Game/Sound/Special_Powerup_10.mp3 new file mode 100644 index 0000000..a8d84c5 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/Special_Powerup_10.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/Special_Powerup_10.mp3.meta b/assets/Media/Audio/Game/Sound/Special_Powerup_10.mp3.meta new file mode 100644 index 0000000..3f7c54b --- /dev/null +++ b/assets/Media/Audio/Game/Sound/Special_Powerup_10.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "7bfddc0e-3dc4-4c0a-81e4-368a2799ac8e", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Game/Sound/Special_Powerup_10.ogg b/assets/Media/Audio/Game/Sound/Special_Powerup_10.ogg deleted file mode 100644 index 4e3a6ea..0000000 Binary files a/assets/Media/Audio/Game/Sound/Special_Powerup_10.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/Special_Powerup_10.ogg.meta b/assets/Media/Audio/Game/Sound/Special_Powerup_10.ogg.meta deleted file mode 100644 index a723034..0000000 --- a/assets/Media/Audio/Game/Sound/Special_Powerup_10.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "ab4e2b21-da3e-45a7-b5df-455bcd830779", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/Sword Combo v3.mp3 b/assets/Media/Audio/Game/Sound/Sword Combo v3.mp3 new file mode 100644 index 0000000..0f5d669 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/Sword Combo v3.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/Sword Combo v3.mp3.meta b/assets/Media/Audio/Game/Sound/Sword Combo v3.mp3.meta new file mode 100644 index 0000000..ddccae1 --- /dev/null +++ b/assets/Media/Audio/Game/Sound/Sword Combo v3.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "05c8a2f1-f334-4bb0-aafd-9c62137801f4", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Game/Sound/Sword Combo v3.ogg b/assets/Media/Audio/Game/Sound/Sword Combo v3.ogg deleted file mode 100644 index 99cfdef..0000000 Binary files a/assets/Media/Audio/Game/Sound/Sword Combo v3.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/Sword Combo v3.ogg.meta b/assets/Media/Audio/Game/Sound/Sword Combo v3.ogg.meta deleted file mode 100644 index f645a11..0000000 --- a/assets/Media/Audio/Game/Sound/Sword Combo v3.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "2ca33a43-08af-44e8-ac28-28e051838892", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/coin.1.mp3 b/assets/Media/Audio/Game/Sound/coin.1.mp3 new file mode 100644 index 0000000..8f6ac40 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/coin.1.mp3 differ diff --git a/assets/Media/Audio/Game/Sound/coin.1.mp3.meta b/assets/Media/Audio/Game/Sound/coin.1.mp3.meta new file mode 100644 index 0000000..89eb7ef --- /dev/null +++ b/assets/Media/Audio/Game/Sound/coin.1.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "d9dd07f7-8509-43f8-b882-d5e91fe6cc9c", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Game/Sound/coin.1.ogg b/assets/Media/Audio/Game/Sound/coin.1.ogg deleted file mode 100644 index e1cd573..0000000 Binary files a/assets/Media/Audio/Game/Sound/coin.1.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/coin.1.ogg.meta b/assets/Media/Audio/Game/Sound/coin.1.ogg.meta deleted file mode 100644 index 2b3e34d..0000000 --- a/assets/Media/Audio/Game/Sound/coin.1.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "580b2ceb-3daa-409b-b6c4-7d81c7182650", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Menu/Special_Powerup_09.mp3 b/assets/Media/Audio/Menu/Special_Powerup_09.mp3 new file mode 100644 index 0000000..b574faf Binary files /dev/null and b/assets/Media/Audio/Menu/Special_Powerup_09.mp3 differ diff --git a/assets/Media/Audio/Menu/Special_Powerup_09.mp3.meta b/assets/Media/Audio/Menu/Special_Powerup_09.mp3.meta new file mode 100644 index 0000000..e73864e --- /dev/null +++ b/assets/Media/Audio/Menu/Special_Powerup_09.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "3491678b-ddc7-4d2f-b6fa-afed3d884801", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Menu/Special_Powerup_09.ogg b/assets/Media/Audio/Menu/Special_Powerup_09.ogg deleted file mode 100644 index 13412c9..0000000 Binary files a/assets/Media/Audio/Menu/Special_Powerup_09.ogg and /dev/null differ diff --git a/assets/Media/Audio/Menu/Special_Powerup_09.ogg.meta b/assets/Media/Audio/Menu/Special_Powerup_09.ogg.meta deleted file mode 100644 index 3592449..0000000 --- a/assets/Media/Audio/Menu/Special_Powerup_09.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "36aa3213-569a-45a3-b851-0c0d7fbfaa26", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Shared/UI_Click_1.mp3 b/assets/Media/Audio/Shared/UI_Click_1.mp3 new file mode 100644 index 0000000..f492cbc Binary files /dev/null and b/assets/Media/Audio/Shared/UI_Click_1.mp3 differ diff --git a/assets/Media/Audio/Shared/UI_Click_1.mp3.meta b/assets/Media/Audio/Shared/UI_Click_1.mp3.meta new file mode 100644 index 0000000..a5500c2 --- /dev/null +++ b/assets/Media/Audio/Shared/UI_Click_1.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "4de5634a-07e1-47ab-9f14-9d35ef295595", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Audio/Shared/UI_Click_1.ogg b/assets/Media/Audio/Shared/UI_Click_1.ogg deleted file mode 100644 index 3f34e68..0000000 Binary files a/assets/Media/Audio/Shared/UI_Click_1.ogg and /dev/null differ diff --git a/assets/Media/Audio/Shared/UI_Click_1.ogg.meta b/assets/Media/Audio/Shared/UI_Click_1.ogg.meta deleted file mode 100644 index 89efbe0..0000000 --- a/assets/Media/Audio/Shared/UI_Click_1.ogg.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "808b1611-bcff-4fb7-8bf9-f4482dc1cc9e", - "files": [ - ".json", - ".ogg" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Prefabs/AppRoot.prefab b/assets/Media/Prefabs/AppRoot.prefab index 4e1be19..35f2b21 100644 --- a/assets/Media/Prefabs/AppRoot.prefab +++ b/assets/Media/Prefabs/AppRoot.prefab @@ -247,7 +247,7 @@ "__id__": 9 }, "_clip": { - "__uuid__": "0faecdcf-e5d6-4cc1-b3cf-3b2873f8ee62", + "__uuid__": "62c90d56-a5f2-4125-9748-a8784593fc9a", "__expectedType__": "cc.AudioClip" }, "_loop": true, @@ -1351,7 +1351,7 @@ "_priority": 1073741824, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 542.6728110599079, + "_orthoHeight": 480.00000000000006, "_near": 0, "_far": 2000, "_color": { diff --git a/assets/Media/Prefabs/Game/GameAudioAdapter.prefab b/assets/Media/Prefabs/Game/GameAudioAdapter.prefab index d1a5dd0..d1cfe93 100644 --- a/assets/Media/Prefabs/Game/GameAudioAdapter.prefab +++ b/assets/Media/Prefabs/Game/GameAudioAdapter.prefab @@ -67,59 +67,59 @@ "__id__": 3 }, "music": { - "__uuid__": "50cb41a8-d6e7-4938-ac3c-f44f68f8bcac", + "__uuid__": "62c90d56-a5f2-4125-9748-a8784593fc9a", "__expectedType__": "cc.AudioClip" }, "enemyHit": { - "__uuid__": "41d1d0d3-b915-46cc-bdaa-ac443d0b8dd8", + "__uuid__": "5b716f29-0cee-4f32-ab8a-8c81b47bb47f", "__expectedType__": "cc.AudioClip" }, "playerHit": { - "__uuid__": "94356aff-2a75-43b2-8258-4f18b3006ef6", + "__uuid__": "27b24616-76c3-4374-abe5-4a8b1cab09b4", "__expectedType__": "cc.AudioClip" }, "playerDeath": { - "__uuid__": "e24d1743-95d5-4d10-a76e-2fbb0d093957", + "__uuid__": "9c0132cb-25ca-4396-aed0-a3c236c84674", "__expectedType__": "cc.AudioClip" }, "weaponSwing": { - "__uuid__": "2ca33a43-08af-44e8-ac28-28e051838892", + "__uuid__": "05c8a2f1-f334-4bb0-aafd-9c62137801f4", "__expectedType__": "cc.AudioClip" }, "xpPickup": { - "__uuid__": "ff242c51-6ab4-4735-bf4c-dd9af2b6847a", + "__uuid__": "ed32090d-ceda-4a90-ab94-0df1c6dba067", "__expectedType__": "cc.AudioClip" }, "goldPickup": { - "__uuid__": "580b2ceb-3daa-409b-b6c4-7d81c7182650", + "__uuid__": "d9dd07f7-8509-43f8-b882-d5e91fe6cc9c", "__expectedType__": "cc.AudioClip" }, "healthPotionPickup": { - "__uuid__": "ab4e2b21-da3e-45a7-b5df-455bcd830779", + "__uuid__": "7bfddc0e-3dc4-4c0a-81e4-368a2799ac8e", "__expectedType__": "cc.AudioClip" }, "magnetPickup": { - "__uuid__": "baf95420-77c5-4747-80ed-6f05b14e8777", + "__uuid__": "8993de31-a9ea-4492-9c7f-4e64a2262443", "__expectedType__": "cc.AudioClip" }, "chestPickup": { - "__uuid__": "e21ed27e-1fdc-43a1-b22d-fda9d9b8f67c", + "__uuid__": "80076621-0a4f-416f-bf60-78ebaf55c763", "__expectedType__": "cc.AudioClip" }, "levelUp": { - "__uuid__": "e5439679-87a6-49e2-b623-83314ecdda68", + "__uuid__": "b54680a6-e26b-4be5-8fd2-494ceff6206e", "__expectedType__": "cc.AudioClip" }, "horizontalProjectileLaunch": { - "__uuid__": "2cdf2e52-ca81-493b-a694-3a746f06a99d", + "__uuid__": "597eb90e-1155-4002-a44c-ab61e56042b2", "__expectedType__": "cc.AudioClip" }, "diagonalProjectileLaunch": { - "__uuid__": "72661b76-bef4-4ed8-9cb6-dd38d839f1b9", + "__uuid__": "9b7158e3-add7-44b7-a491-c2a99d9624dd", "__expectedType__": "cc.AudioClip" }, "haloProjectileLaunch": { - "__uuid__": "1ae98f55-3a82-4303-8e43-a350d4ad47be", + "__uuid__": "030c2b59-0c32-4495-85c2-73a8384ef3fc", "__expectedType__": "cc.AudioClip" }, "_id": "" diff --git a/assets/Media/Prefabs/GameAssets.prefab b/assets/Media/Prefabs/GameAssets.prefab index 2fd21c0..2e1fab7 100644 --- a/assets/Media/Prefabs/GameAssets.prefab +++ b/assets/Media/Prefabs/GameAssets.prefab @@ -314,7 +314,7 @@ "__id__": 12 }, "buttonClick": { - "__uuid__": "808b1611-bcff-4fb7-8bf9-f4482dc1cc9e", + "__uuid__": "4de5634a-07e1-47ab-9f14-9d35ef295595", "__expectedType__": "cc.AudioClip" }, "_id": "" diff --git a/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab index e09bcd1..35a9081 100644 --- a/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab @@ -3245,7 +3245,7 @@ "__id__": 90 }, "upgradeAudioClip": { - "__uuid__": "36aa3213-569a-45a3-b851-0c0d7fbfaa26", + "__uuid__": "3491678b-ddc7-4d2f-b6fa-afed3d884801", "__expectedType__": "cc.AudioClip" }, "_id": "" diff --git a/settings/v2/packages/builder.json b/settings/v2/packages/builder.json index c6a084d..98b2a14 100644 --- a/settings/v2/packages/builder.json +++ b/settings/v2/packages/builder.json @@ -2,13 +2,13 @@ "splash-setting": { "totalTime": 2000, "displayWatermark": false, - "url": "project://assets/Media/Images/Game/UI/Y8Logo.png", + "url": "project://assets/Media/Images/Game/UI/Y8LogoSplash.png", "clearColor": { "x": 0, "y": 0, "z": 0, "w": 1 }, - "displayRatio": 0.05 + "displayRatio": 0.1 } }