Merge pull request #26 from MartinKral/mp3

Mp3 conversion
2024-12-25 11:18:54 +00:00 · 2023-01-04 12:29:00 +01:00 · 2023-01-04 12:29:00 +01:00 · c54d9c37ed
commit c54d9c37ed
parent dfe1ceae66 bf28e8dc88
39 changed files with 74 additions and 32 deletions
--- a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3
+++ b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3
--- a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3.meta
+++ b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3.meta
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "62c90d56-a5f2-4125-9748-a8784593fc9a",
+  "uuid": "aceed48f-96ea-4a01-ba0e-a0b546ee0dee",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3.meta~merged
+++ b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).mp3.meta~merged
@ -0,0 +1,14 @@
+{
+  "ver": "1.0.0",
+  "importer": "audio-clip",
+  "imported": true,
+  "uuid": "aceed48f-96ea-4a01-ba0e-a0b546ee0dee",
+  "files": [
+    ".json",
+    ".mp3"
+  ],
+  "subMetas": {},
+  "userData": {
+    "downloadMode": 0
+  }
+}
--- a/assets/Media/Audio/Game/Sound/01_chest_open_1.mp3
+++ b/assets/Media/Audio/Game/Sound/01_chest_open_1.mp3
--- a/assets/Media/Audio/Game/Sound/01_chest_open_1.mp3.meta
+++ b/assets/Media/Audio/Game/Sound/01_chest_open_1.mp3.meta
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "80076621-0a4f-416f-bf60-78ebaf55c763",
+  "uuid": "7cd20211-eda0-4a59-8285-375fc6652503",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/12_human_jump_3
+++ b/assets/Media/Audio/Game/Sound/12_human_jump_3
--- a/assets/Media/Audio/Game/Sound/12_human_jump_3
+++ b/assets/Media/Audio/Game/Sound/12_human_jump_3
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "597eb90e-1155-4002-a44c-ab61e56042b2",
+  "uuid": "17984bfa-ef0a-4389-9748-e7c383f1527b",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/12_human_jump_3
+++ b/assets/Media/Audio/Game/Sound/12_human_jump_3
@ -0,0 +1,14 @@
+{
+  "ver": "1.0.0",
+  "importer": "audio-clip",
+  "imported": true,
+  "uuid": "17984bfa-ef0a-4389-9748-e7c383f1527b",
+  "files": [
+    ".json",
+    ".mp3"
+  ],
+  "subMetas": {},
+  "userData": {
+    "downloadMode": 0
+  }
+}
--- a/assets/Media/Audio/Game/Sound/15_human_dash_2.mp3
+++ b/assets/Media/Audio/Game/Sound/15_human_dash_2.mp3
--- a/assets/Media/Audio/Game/Sound/15_human_dash_2.mp3.meta
+++ b/assets/Media/Audio/Game/Sound/15_human_dash_2.mp3.meta
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "030c2b59-0c32-4495-85c2-73a8384ef3fc",
+  "uuid": "18c2252a-a748-470f-8088-15d2d21094d5",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/222400
+++ b/assets/Media/Audio/Game/Sound/222400
--- a/assets/Media/Audio/Game/Sound/222400
+++ b/assets/Media/Audio/Game/Sound/222400
@ -0,0 +1,14 @@
+{
+  "ver": "1.0.0",
+  "importer": "audio-clip",
+  "imported": true,
+  "uuid": "80ce5261-1153-49d8-aab9-4c4a04e463a6",
+  "files": [
+    ".json",
+    ".mp3"
+  ],
+  "subMetas": {},
+  "userData": {
+    "downloadMode": 0
+  }
+}
--- a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.mp3
+++ b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.mp3
--- a/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.mp3.meta
+++ b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.mp3.meta
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "9c0132cb-25ca-4396-aed0-a3c236c84674",
+  "uuid": "71e5ed19-6702-4075-8104-50be828838c9",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/GP_Heal_1.mp3
+++ b/assets/Media/Audio/Game/Sound/GP_Heal_1.mp3
--- a/assets/Media/Audio/Game/Sound/GP_Heal_1.mp3.meta
+++ b/assets/Media/Audio/Game/Sound/GP_Heal_1.mp3.meta
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "b54680a6-e26b-4be5-8fd2-494ceff6206e",
+  "uuid": "ad47d413-ab14-492d-b81f-4de244288c35",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.mp3
+++ b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.mp3
--- a/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.mp3.meta
+++ b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.mp3.meta
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "ed32090d-ceda-4a90-ab94-0df1c6dba067",
+  "uuid": "0b2fdc47-ea30-4569-8bfa-893a28c0f99e",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/Headbutt
+++ b/assets/Media/Audio/Game/Sound/Headbutt
--- a/assets/Media/Audio/Game/Sound/Headbutt
+++ b/assets/Media/Audio/Game/Sound/Headbutt
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "27b24616-76c3-4374-abe5-4a8b1cab09b4",
+  "uuid": "37dd21e3-6fb1-49e7-b894-0261e6c6aa34",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14
+++ b/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14
--- a/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14
+++ b/assets/Media/Audio/Game/Sound/Magic_Spells_CastShort_Push14
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "9b7158e3-add7-44b7-a491-c2a99d9624dd",
+  "uuid": "8cf975c5-5e51-4b53-88c3-b345e8531f9b",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/Magnet
+++ b/assets/Media/Audio/Game/Sound/Magnet
--- a/assets/Media/Audio/Game/Sound/Magnet
+++ b/assets/Media/Audio/Game/Sound/Magnet
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "8993de31-a9ea-4492-9c7f-4e64a2262443",
+  "uuid": "bcdb843b-2958-4fb4-af84-84adb90cf357",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25
+++ b/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25
--- a/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25
+++ b/assets/Media/Audio/Game/Sound/PM_BBI_Bullet_Impact_Hit_Body_Flesh_25
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "5b716f29-0cee-4f32-ab8a-8c81b47bb47f",
+  "uuid": "a1c5a9be-2370-49e9-b676-67a67ef0557f",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/Special_Powerup_10.mp3
+++ b/assets/Media/Audio/Game/Sound/Special_Powerup_10.mp3
--- a/assets/Media/Audio/Game/Sound/Special_Powerup_10.mp3.meta
+++ b/assets/Media/Audio/Game/Sound/Special_Powerup_10.mp3.meta
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "7bfddc0e-3dc4-4c0a-81e4-368a2799ac8e",
+  "uuid": "ad6eb940-f1cf-4b2b-b965-fa3893da3e9c",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/Sword
+++ b/assets/Media/Audio/Game/Sound/Sword
--- a/assets/Media/Audio/Game/Sound/Sword
+++ b/assets/Media/Audio/Game/Sound/Sword
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "05c8a2f1-f334-4bb0-aafd-9c62137801f4",
+  "uuid": "74f8d16f-bbf3-4497-977f-e8328bd66378",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Game/Sound/coin.1.mp3
+++ b/assets/Media/Audio/Game/Sound/coin.1.mp3
--- a/assets/Media/Audio/Game/Sound/coin.1.mp3.meta
+++ b/assets/Media/Audio/Game/Sound/coin.1.mp3.meta
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "d9dd07f7-8509-43f8-b882-d5e91fe6cc9c",
+  "uuid": "265510e3-77da-49b8-be5f-93605a70aed2",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Menu/Special_Powerup_09.mp3
+++ b/assets/Media/Audio/Menu/Special_Powerup_09.mp3
--- a/assets/Media/Audio/Menu/Special_Powerup_09.mp3.meta
+++ b/assets/Media/Audio/Menu/Special_Powerup_09.mp3.meta
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "3491678b-ddc7-4d2f-b6fa-afed3d884801",
+  "uuid": "94ffa08c-4e50-4101-a277-ec86a003de69",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Audio/Shared/UI_Click_1.mp3
+++ b/assets/Media/Audio/Shared/UI_Click_1.mp3
--- a/assets/Media/Audio/Shared/UI_Click_1.mp3.meta
+++ b/assets/Media/Audio/Shared/UI_Click_1.mp3.meta
@ -2,7 +2,7 @@
  "ver": "1.0.0",
  "importer": "audio-clip",
  "imported": true,
-  "uuid": "4de5634a-07e1-47ab-9f14-9d35ef295595",
+  "uuid": "5ad4383b-cb1e-4e45-a881-898ba2b2b5b8",
  "files": [
    ".json",
    ".mp3"
--- a/assets/Media/Prefabs/Game/GameAudioAdapter.prefab
+++ b/assets/Media/Prefabs/Game/GameAudioAdapter.prefab
@ -67,59 +67,59 @@
      "__id__": 3
    },
    "music": {
-      "__uuid__": "62c90d56-a5f2-4125-9748-a8784593fc9a",
+      "__uuid__": "aceed48f-96ea-4a01-ba0e-a0b546ee0dee",
      "__expectedType__": "cc.AudioClip"
    },
    "enemyHit": {
-      "__uuid__": "5b716f29-0cee-4f32-ab8a-8c81b47bb47f",
+      "__uuid__": "a1c5a9be-2370-49e9-b676-67a67ef0557f",
      "__expectedType__": "cc.AudioClip"
    },
    "playerHit": {
-      "__uuid__": "27b24616-76c3-4374-abe5-4a8b1cab09b4",
+      "__uuid__": "37dd21e3-6fb1-49e7-b894-0261e6c6aa34",
      "__expectedType__": "cc.AudioClip"
    },
    "playerDeath": {
-      "__uuid__": "9c0132cb-25ca-4396-aed0-a3c236c84674",
+      "__uuid__": "71e5ed19-6702-4075-8104-50be828838c9",
      "__expectedType__": "cc.AudioClip"
    },
    "weaponSwing": {
-      "__uuid__": "05c8a2f1-f334-4bb0-aafd-9c62137801f4",
+      "__uuid__": "74f8d16f-bbf3-4497-977f-e8328bd66378",
      "__expectedType__": "cc.AudioClip"
    },
    "xpPickup": {
-      "__uuid__": "ed32090d-ceda-4a90-ab94-0df1c6dba067",
+      "__uuid__": "0b2fdc47-ea30-4569-8bfa-893a28c0f99e",
      "__expectedType__": "cc.AudioClip"
    },
    "goldPickup": {
-      "__uuid__": "d9dd07f7-8509-43f8-b882-d5e91fe6cc9c",
+      "__uuid__": "265510e3-77da-49b8-be5f-93605a70aed2",
      "__expectedType__": "cc.AudioClip"
    },
    "healthPotionPickup": {
-      "__uuid__": "7bfddc0e-3dc4-4c0a-81e4-368a2799ac8e",
+      "__uuid__": "ad6eb940-f1cf-4b2b-b965-fa3893da3e9c",
      "__expectedType__": "cc.AudioClip"
    },
    "magnetPickup": {
-      "__uuid__": "8993de31-a9ea-4492-9c7f-4e64a2262443",
+      "__uuid__": "bcdb843b-2958-4fb4-af84-84adb90cf357",
      "__expectedType__": "cc.AudioClip"
    },
    "chestPickup": {
-      "__uuid__": "80076621-0a4f-416f-bf60-78ebaf55c763",
+      "__uuid__": "7cd20211-eda0-4a59-8285-375fc6652503",
      "__expectedType__": "cc.AudioClip"
    },
    "levelUp": {
-      "__uuid__": "b54680a6-e26b-4be5-8fd2-494ceff6206e",
+      "__uuid__": "ad47d413-ab14-492d-b81f-4de244288c35",
      "__expectedType__": "cc.AudioClip"
    },
    "horizontalProjectileLaunch": {
-      "__uuid__": "597eb90e-1155-4002-a44c-ab61e56042b2",
+      "__uuid__": "17984bfa-ef0a-4389-9748-e7c383f1527b",
      "__expectedType__": "cc.AudioClip"
    },
    "diagonalProjectileLaunch": {
-      "__uuid__": "9b7158e3-add7-44b7-a491-c2a99d9624dd",
+      "__uuid__": "8cf975c5-5e51-4b53-88c3-b345e8531f9b",
      "__expectedType__": "cc.AudioClip"
    },
    "haloProjectileLaunch": {
-      "__uuid__": "030c2b59-0c32-4495-85c2-73a8384ef3fc",
+      "__uuid__": "18c2252a-a748-470f-8088-15d2d21094d5",
      "__expectedType__": "cc.AudioClip"
    },
    "_id": ""
--- a/assets/Media/Prefabs/GameAssets.prefab
+++ b/assets/Media/Prefabs/GameAssets.prefab
@ -314,7 +314,7 @@
      "__id__": 12
    },
    "buttonClick": {
-      "__uuid__": "4de5634a-07e1-47ab-9f14-9d35ef295595",
+      "__uuid__": "5ad4383b-cb1e-4e45-a881-898ba2b2b5b8",
      "__expectedType__": "cc.AudioClip"
    },
    "_id": ""
--- a/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab
+++ b/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab
@ -3245,7 +3245,7 @@
      "__id__": 90
    },
    "upgradeAudioClip": {
-      "__uuid__": "3491678b-ddc7-4d2f-b6fa-afed3d884801",
+      "__uuid__": "94ffa08c-4e50-4101-a277-ec86a003de69",
      "__expectedType__": "cc.AudioClip"
    },
    "_id": ""