diff --git a/assets/Data/eng.json b/assets/Data/eng.json index 9e475ef..eb43ab7 100644 --- a/assets/Data/eng.json +++ b/assets/Data/eng.json @@ -1,13 +1,13 @@ { - "WEAPON_LENGTH_TITLE": "Weapon Length", + "WEAPON_LENGTH_TITLE": "Sword Length", "WEAPON_LENGTH_DESC": "", - "WEAPON_DAMAGE_TITLE": "Weapon Damage", + "WEAPON_DAMAGE_TITLE": "Sword Damage", "WEAPON_DAMAGE_DESC": "", - "HORIZONTAL_PROJECTILE_TITLE": "Horizontal Projectile", + "HORIZONTAL_PROJECTILE_TITLE": "Throwing Dagger", "HORIZONTAL_PROJECTILE_DESC": "", - "DIAGONAL_PROJECTILE_TITLE": "Diagonal Projectile", + "DIAGONAL_PROJECTILE_TITLE": "Arcane Shot", "DIAGONAL_PROJECTILE_DESC": "", - "HALO_PROJECTILE_TITLE": "Halo Projectile", + "HALO_PROJECTILE_TITLE": "Fiery Nova", "HALO_PROJECTILE_DESC": "", "REGENERATION_TITLE": "Regeneration", "REGENERATION_DESC": "", diff --git a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg new file mode 100644 index 0000000..f360cd9 Binary files /dev/null and b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg differ diff --git a/assets/Media/Audio/Game/Sound/Bluezone_BC0261_mountain_dweller_texture_fire_whoosh_003 v5.ogg.meta b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg.meta similarity index 77% rename from assets/Media/Audio/Game/Sound/Bluezone_BC0261_mountain_dweller_texture_fire_whoosh_003 v5.ogg.meta rename to assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg.meta index 1451f39..cd420ca 100644 --- a/assets/Media/Audio/Game/Sound/Bluezone_BC0261_mountain_dweller_texture_fire_whoosh_003 v5.ogg.meta +++ b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).ogg.meta @@ -2,7 +2,7 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "9e3817fd-494b-4d98-99ab-a529124adf67", + "uuid": "50cb41a8-d6e7-4938-ac3c-f44f68f8bcac", "files": [ ".json", ".ogg" diff --git a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).wav b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).wav deleted file mode 100644 index f2a1bb1..0000000 Binary files a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/01_chest_open_1.ogg b/assets/Media/Audio/Game/Sound/01_chest_open_1.ogg new file mode 100644 index 0000000..4d16b56 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/01_chest_open_1.ogg differ diff --git a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).wav.meta b/assets/Media/Audio/Game/Sound/01_chest_open_1.ogg.meta similarity index 72% rename from assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).wav.meta rename to assets/Media/Audio/Game/Sound/01_chest_open_1.ogg.meta index c856c2c..9858441 100644 --- a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).wav.meta +++ b/assets/Media/Audio/Game/Sound/01_chest_open_1.ogg.meta @@ -2,10 +2,10 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "0faecdcf-e5d6-4cc1-b3cf-3b2873f8ee62", + "uuid": "e21ed27e-1fdc-43a1-b22d-fda9d9b8f67c", "files": [ ".json", - ".wav" + ".ogg" ], "subMetas": {}, "userData": { diff --git a/assets/Media/Audio/Game/Sound/01_chest_open_1.wav b/assets/Media/Audio/Game/Sound/01_chest_open_1.wav deleted file mode 100644 index eff087d..0000000 Binary files a/assets/Media/Audio/Game/Sound/01_chest_open_1.wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/07_human_atk_sword_1.wav b/assets/Media/Audio/Game/Sound/07_human_atk_sword_1.wav deleted file mode 100644 index f6626f5..0000000 Binary files a/assets/Media/Audio/Game/Sound/07_human_atk_sword_1.wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/07_human_atk_sword_1.wav.meta b/assets/Media/Audio/Game/Sound/07_human_atk_sword_1.wav.meta deleted file mode 100644 index bd171a6..0000000 --- a/assets/Media/Audio/Game/Sound/07_human_atk_sword_1.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "5ad08e27-4461-464a-ad19-8c933abf5a5d", - "files": [ - ".json", - ".wav" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/12_human_jump_3.wav b/assets/Media/Audio/Game/Sound/12_human_jump_3.wav deleted file mode 100644 index 02d67f1..0000000 Binary files a/assets/Media/Audio/Game/Sound/12_human_jump_3.wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/15_human_dash_2.ogg b/assets/Media/Audio/Game/Sound/15_human_dash_2.ogg new file mode 100644 index 0000000..c33587f Binary files /dev/null and b/assets/Media/Audio/Game/Sound/15_human_dash_2.ogg differ diff --git a/assets/Media/Audio/Game/Sound/12_human_jump_3.wav.meta b/assets/Media/Audio/Game/Sound/15_human_dash_2.ogg.meta similarity index 72% rename from assets/Media/Audio/Game/Sound/12_human_jump_3.wav.meta rename to assets/Media/Audio/Game/Sound/15_human_dash_2.ogg.meta index 62f6f1b..87039a7 100644 --- a/assets/Media/Audio/Game/Sound/12_human_jump_3.wav.meta +++ b/assets/Media/Audio/Game/Sound/15_human_dash_2.ogg.meta @@ -2,10 +2,10 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "36c577cb-8a85-40a7-9390-455863dfef8f", + "uuid": "1ae98f55-3a82-4303-8e43-a350d4ad47be", "files": [ ".json", - ".wav" + ".ogg" ], "subMetas": {}, "userData": { diff --git a/assets/Media/Audio/Game/Sound/15_human_dash_2.wav b/assets/Media/Audio/Game/Sound/15_human_dash_2.wav deleted file mode 100644 index 256aa38..0000000 Binary files a/assets/Media/Audio/Game/Sound/15_human_dash_2.wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/15_human_dash_2.wav.meta b/assets/Media/Audio/Game/Sound/15_human_dash_2.wav.meta deleted file mode 100644 index 76d5a6d..0000000 --- a/assets/Media/Audio/Game/Sound/15_human_dash_2.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "a7b634e1-7842-402c-a2a9-4007435c9a4a", - "files": [ - ".json", - ".wav" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/27_sword_miss_1.wav b/assets/Media/Audio/Game/Sound/27_sword_miss_1.wav deleted file mode 100644 index ca0b742..0000000 Binary files a/assets/Media/Audio/Game/Sound/27_sword_miss_1.wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/27_sword_miss_1.wav.meta b/assets/Media/Audio/Game/Sound/27_sword_miss_1.wav.meta deleted file mode 100644 index 5bc3f54..0000000 --- a/assets/Media/Audio/Game/Sound/27_sword_miss_1.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "adeff7ed-6f7e-471b-8790-d0eb14e048f9", - "files": [ - ".json", - ".wav" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/Bluezone_BC0261_mountain_dweller_texture_fire_whoosh_003 v5.ogg b/assets/Media/Audio/Game/Sound/Bluezone_BC0261_mountain_dweller_texture_fire_whoosh_003 v5.ogg deleted file mode 100644 index 0a10f45..0000000 Binary files a/assets/Media/Audio/Game/Sound/Bluezone_BC0261_mountain_dweller_texture_fire_whoosh_003 v5.ogg and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg new file mode 100644 index 0000000..a5ce144 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg differ diff --git a/assets/Media/Audio/Game/Sound/01_chest_open_1.wav.meta b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg.meta similarity index 72% rename from assets/Media/Audio/Game/Sound/01_chest_open_1.wav.meta rename to assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg.meta index f17c5d9..184b82c 100644 --- a/assets/Media/Audio/Game/Sound/01_chest_open_1.wav.meta +++ b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.ogg.meta @@ -2,10 +2,10 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "a26cfab9-1d95-4f99-83bf-297696072f6c", + "uuid": "e24d1743-95d5-4d10-a76e-2fbb0d093957", "files": [ ".json", - ".wav" + ".ogg" ], "subMetas": {}, "userData": { diff --git a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.wav b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.wav deleted file mode 100644 index fa7bab8..0000000 Binary files a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.wav.meta b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.wav.meta deleted file mode 100644 index 52d89b4..0000000 --- a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "68ebed5f-544b-4337-a49c-d4ba32e8e6a2", - "files": [ - ".json", - ".wav" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/GP_Damage_8.wav b/assets/Media/Audio/Game/Sound/GP_Damage_8.wav deleted file mode 100644 index d12e9cc..0000000 Binary files a/assets/Media/Audio/Game/Sound/GP_Damage_8.wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/GP_Damage_8.wav.meta b/assets/Media/Audio/Game/Sound/GP_Damage_8.wav.meta deleted file mode 100644 index 7cb1744..0000000 --- a/assets/Media/Audio/Game/Sound/GP_Damage_8.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "efed223f-7b17-47ad-b265-7a951ace6d85", - "files": [ - ".json", - ".wav" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/GP_Damage_9.wav b/assets/Media/Audio/Game/Sound/GP_Damage_9.wav deleted file mode 100644 index a1b0e09..0000000 Binary files a/assets/Media/Audio/Game/Sound/GP_Damage_9.wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/GP_Damage_9.wav.meta b/assets/Media/Audio/Game/Sound/GP_Damage_9.wav.meta deleted file mode 100644 index f7979ee..0000000 --- a/assets/Media/Audio/Game/Sound/GP_Damage_9.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "99fb12ce-b248-4560-85fd-c1a61689adf2", - "files": [ - ".json", - ".wav" - ], - "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 new file mode 100644 index 0000000..bf77ac9 Binary files /dev/null and b/assets/Media/Audio/Game/Sound/GP_Heal_1.ogg 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 new file mode 100644 index 0000000..ac3b173 --- /dev/null +++ b/assets/Media/Audio/Game/Sound/GP_Heal_1.ogg.meta @@ -0,0 +1,14 @@ +{ + "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_Heal_1.wav b/assets/Media/Audio/Game/Sound/GP_Heal_1.wav deleted file mode 100644 index d63c07a..0000000 Binary files a/assets/Media/Audio/Game/Sound/GP_Heal_1.wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/GP_Heal_1.wav.meta b/assets/Media/Audio/Game/Sound/GP_Heal_1.wav.meta deleted file mode 100644 index 247f092..0000000 --- a/assets/Media/Audio/Game/Sound/GP_Heal_1.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "4bf29238-2767-4178-a74a-3c2857685265", - "files": [ - ".json", - ".wav" - ], - "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 new file mode 100644 index 0000000..4c35caa Binary files /dev/null and b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.ogg 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 new file mode 100644 index 0000000..829ac6e --- /dev/null +++ b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.ogg.meta @@ -0,0 +1,14 @@ +{ + "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/GP_Turbo_Discard_2.wav b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.wav deleted file mode 100644 index dda983b..0000000 Binary files a/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.wav.meta b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.wav.meta deleted file mode 100644 index 10c823d..0000000 --- a/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "6af287fc-820f-4e12-8b8f-858a5dd41d2c", - "files": [ - ".json", - ".wav" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Game/Sound/Special_Powerup_10.WAV b/assets/Media/Audio/Game/Sound/Special_Powerup_10.WAV deleted file mode 100644 index 7e5941e..0000000 Binary files a/assets/Media/Audio/Game/Sound/Special_Powerup_10.WAV and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/Special_Powerup_10.WAV.meta b/assets/Media/Audio/Game/Sound/Special_Powerup_10.WAV.meta deleted file mode 100644 index 724ef98..0000000 --- a/assets/Media/Audio/Game/Sound/Special_Powerup_10.WAV.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "b1564752-035d-4989-aed0-2c0684d8a0e9", - "files": [ - ".json", - ".wav" - ], - "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 new file mode 100644 index 0000000..6a8a77b Binary files /dev/null and b/assets/Media/Audio/Game/Sound/Special_Powerup_10.ogg 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 new file mode 100644 index 0000000..a723034 --- /dev/null +++ b/assets/Media/Audio/Game/Sound/Special_Powerup_10.ogg.meta @@ -0,0 +1,14 @@ +{ + "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/UI_Select_2.wav b/assets/Media/Audio/Game/Sound/UI_Select_2.wav deleted file mode 100644 index c870f6a..0000000 Binary files a/assets/Media/Audio/Game/Sound/UI_Select_2.wav and /dev/null differ diff --git a/assets/Media/Audio/Game/Sound/UI_Select_2.wav.meta b/assets/Media/Audio/Game/Sound/UI_Select_2.wav.meta deleted file mode 100644 index 6adde8b..0000000 --- a/assets/Media/Audio/Game/Sound/UI_Select_2.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "c36e792e-caa2-42f7-b314-eb3f8ad3b280", - "files": [ - ".json", - ".wav" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/Media/Audio/Menu/Special_Powerup_09.ogg b/assets/Media/Audio/Menu/Special_Powerup_09.ogg new file mode 100644 index 0000000..13412c9 Binary files /dev/null and b/assets/Media/Audio/Menu/Special_Powerup_09.ogg differ diff --git a/assets/Media/Audio/Menu/Special_Powerup_09.ogg.meta b/assets/Media/Audio/Menu/Special_Powerup_09.ogg.meta new file mode 100644 index 0000000..3592449 --- /dev/null +++ b/assets/Media/Audio/Menu/Special_Powerup_09.ogg.meta @@ -0,0 +1,14 @@ +{ + "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/Prefabs/Game/GameAudioAdapter.prefab b/assets/Media/Prefabs/Game/GameAudioAdapter.prefab index ff55efe..d1a5dd0 100644 --- a/assets/Media/Prefabs/Game/GameAudioAdapter.prefab +++ b/assets/Media/Prefabs/Game/GameAudioAdapter.prefab @@ -67,7 +67,7 @@ "__id__": 3 }, "music": { - "__uuid__": "0faecdcf-e5d6-4cc1-b3cf-3b2873f8ee62", + "__uuid__": "50cb41a8-d6e7-4938-ac3c-f44f68f8bcac", "__expectedType__": "cc.AudioClip" }, "enemyHit": { @@ -79,7 +79,7 @@ "__expectedType__": "cc.AudioClip" }, "playerDeath": { - "__uuid__": "68ebed5f-544b-4337-a49c-d4ba32e8e6a2", + "__uuid__": "e24d1743-95d5-4d10-a76e-2fbb0d093957", "__expectedType__": "cc.AudioClip" }, "weaponSwing": { @@ -87,7 +87,7 @@ "__expectedType__": "cc.AudioClip" }, "xpPickup": { - "__uuid__": "6af287fc-820f-4e12-8b8f-858a5dd41d2c", + "__uuid__": "ff242c51-6ab4-4735-bf4c-dd9af2b6847a", "__expectedType__": "cc.AudioClip" }, "goldPickup": { @@ -95,7 +95,7 @@ "__expectedType__": "cc.AudioClip" }, "healthPotionPickup": { - "__uuid__": "b1564752-035d-4989-aed0-2c0684d8a0e9", + "__uuid__": "ab4e2b21-da3e-45a7-b5df-455bcd830779", "__expectedType__": "cc.AudioClip" }, "magnetPickup": { @@ -103,15 +103,15 @@ "__expectedType__": "cc.AudioClip" }, "chestPickup": { - "__uuid__": "a26cfab9-1d95-4f99-83bf-297696072f6c", + "__uuid__": "e21ed27e-1fdc-43a1-b22d-fda9d9b8f67c", "__expectedType__": "cc.AudioClip" }, "levelUp": { - "__uuid__": "4bf29238-2767-4178-a74a-3c2857685265", + "__uuid__": "e5439679-87a6-49e2-b623-83314ecdda68", "__expectedType__": "cc.AudioClip" }, "horizontalProjectileLaunch": { - "__uuid__": "36c577cb-8a85-40a7-9390-455863dfef8f", + "__uuid__": "2cdf2e52-ca81-493b-a694-3a746f06a99d", "__expectedType__": "cc.AudioClip" }, "diagonalProjectileLaunch": { @@ -119,7 +119,7 @@ "__expectedType__": "cc.AudioClip" }, "haloProjectileLaunch": { - "__uuid__": "a7b634e1-7842-402c-a2a9-4007435c9a4a", + "__uuid__": "1ae98f55-3a82-4303-8e43-a350d4ad47be", "__expectedType__": "cc.AudioClip" }, "_id": ""