diff --git a/Assets/Data/Cards/Card_Brosten 1.asset b/Assets/Data/Cards/Card_Brosten 1.asset index 78e1b374..0c541177 100644 --- a/Assets/Data/Cards/Card_Brosten 1.asset +++ b/Assets/Data/Cards/Card_Brosten 1.asset @@ -12,13 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} m_Name: Card_Brosten 1 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 02b4d88e-7afe-40f1-8ca8-5e5375dc1856 + Id: 593ccd2d-8fa1-43a2-a0b2-79d6fdf5aa69 Name: Brosten UseCustomFileName: 0 CustomFileName: - Description: Friendly bros. - Rarity: 0 + Description: Card description + Rarity: 2 Zone: 0 CardImage: {fileID: 716150661, guid: 88427f554aebb2a49a9bc9705bb0f7bf, type: 3} - CollectionIndex: 6 - reactionVoiceClip: {fileID: 8300000, guid: 47a241c71e99e3d4ab10952374bcede5, type: 3} + CollectionIndex: 5 + reactionVoiceClip: {fileID: 8300000, guid: c7ec56b9d9f48cc45a9a3e6490a2d76e, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 47a241c71e99e3d4ab10952374bcede5, type: 3} diff --git a/Assets/Data/Cards/Card_Brosten 1.asset.meta b/Assets/Data/Cards/Card_Brosten 1.asset.meta index a6133c25..271a92e7 100644 --- a/Assets/Data/Cards/Card_Brosten 1.asset.meta +++ b/Assets/Data/Cards/Card_Brosten 1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 774d2cb3ff7798a4480cd3a559f8d8d0 +guid: cd07dfe9285ad414a9b3bd71829b1c41 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/Cards/Card_Brosten 3.asset b/Assets/Data/Cards/Card_Brosten 2.asset similarity index 65% rename from Assets/Data/Cards/Card_Brosten 3.asset rename to Assets/Data/Cards/Card_Brosten 2.asset index 9c6fcc6e..43eaa0c7 100644 --- a/Assets/Data/Cards/Card_Brosten 3.asset +++ b/Assets/Data/Cards/Card_Brosten 2.asset @@ -10,15 +10,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_Brosten 3 + m_Name: Card_Brosten 2 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 593ccd2d-8fa1-43a2-a0b2-79d6fdf5aa69 + Id: 02b4d88e-7afe-40f1-8ca8-5e5375dc1856 Name: Brosten UseCustomFileName: 0 CustomFileName: - Description: Card description - Rarity: 2 + Description: Friendly bros. + Rarity: 0 Zone: 0 CardImage: {fileID: 716150661, guid: 88427f554aebb2a49a9bc9705bb0f7bf, type: 3} - CollectionIndex: 5 - reactionVoiceClip: {fileID: 8300000, guid: c7ec56b9d9f48cc45a9a3e6490a2d76e, type: 3} + CollectionIndex: 6 + reactionVoiceClip: {fileID: 8300000, guid: 47a241c71e99e3d4ab10952374bcede5, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 47a241c71e99e3d4ab10952374bcede5, type: 3} diff --git a/Assets/Data/Cards/Card_HRKvarts 3.asset.meta b/Assets/Data/Cards/Card_Brosten 2.asset.meta similarity index 79% rename from Assets/Data/Cards/Card_HRKvarts 3.asset.meta rename to Assets/Data/Cards/Card_Brosten 2.asset.meta index 39876d19..a6133c25 100644 --- a/Assets/Data/Cards/Card_HRKvarts 3.asset.meta +++ b/Assets/Data/Cards/Card_Brosten 2.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c73a9b19b3208d940b9fae7360287a48 +guid: 774d2cb3ff7798a4480cd3a559f8d8d0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/Cards/Card_Brosten.asset b/Assets/Data/Cards/Card_Brosten.asset index 83bd5a58..cb6cece3 100644 --- a/Assets/Data/Cards/Card_Brosten.asset +++ b/Assets/Data/Cards/Card_Brosten.asset @@ -22,3 +22,4 @@ MonoBehaviour: CardImage: {fileID: 716150661, guid: 88427f554aebb2a49a9bc9705bb0f7bf, type: 3} CollectionIndex: 0 reactionVoiceClip: {fileID: 8300000, guid: aa7bbc69411c7924088f337303fcfc0b, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 47a241c71e99e3d4ab10952374bcede5, type: 3} diff --git a/Assets/Data/Cards/Card_GrusOm 1.asset b/Assets/Data/Cards/Card_GrusOm 1.asset index 5b603ca5..d5db04a7 100644 --- a/Assets/Data/Cards/Card_GrusOm 1.asset +++ b/Assets/Data/Cards/Card_GrusOm 1.asset @@ -12,13 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} m_Name: Card_GrusOm 1 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 9bead355-29c7-47cb-a1a2-1ebd9b506e86 + Id: 9d44f273-d378-4ce6-87e7-0196a405aef5 Name: Grus Om UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 2 + Rarity: 1 Zone: 1 CardImage: {fileID: 8845951135018861698, guid: a7b0921e11597d64ea26f53508ae25d7, type: 3} - CollectionIndex: 8 - reactionVoiceClip: {fileID: 8300000, guid: c9757c9af3b962e418628b0e220acfe3, type: 3} + CollectionIndex: 7 + reactionVoiceClip: {fileID: 8300000, guid: cf3550a89ee6994449d2afa99bad6168, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 7e377ae910cba0e4e9486c5d5e783a83, type: 3} diff --git a/Assets/Data/Cards/Card_GrusOm 3.asset b/Assets/Data/Cards/Card_GrusOm 2.asset similarity index 69% rename from Assets/Data/Cards/Card_GrusOm 3.asset rename to Assets/Data/Cards/Card_GrusOm 2.asset index 7e6da07d..36594062 100644 --- a/Assets/Data/Cards/Card_GrusOm 3.asset +++ b/Assets/Data/Cards/Card_GrusOm 2.asset @@ -10,15 +10,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_GrusOm 3 + m_Name: Card_GrusOm 2 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 9d44f273-d378-4ce6-87e7-0196a405aef5 + Id: 9bead355-29c7-47cb-a1a2-1ebd9b506e86 Name: Grus Om UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 1 + Rarity: 2 Zone: 1 CardImage: {fileID: 8845951135018861698, guid: a7b0921e11597d64ea26f53508ae25d7, type: 3} - CollectionIndex: 7 - reactionVoiceClip: {fileID: 8300000, guid: cf3550a89ee6994449d2afa99bad6168, type: 3} + CollectionIndex: 8 + reactionVoiceClip: {fileID: 8300000, guid: c9757c9af3b962e418628b0e220acfe3, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 7e377ae910cba0e4e9486c5d5e783a83, type: 3} diff --git a/Assets/Data/Cards/Card_Brosten 3.asset.meta b/Assets/Data/Cards/Card_GrusOm 2.asset.meta similarity index 79% rename from Assets/Data/Cards/Card_Brosten 3.asset.meta rename to Assets/Data/Cards/Card_GrusOm 2.asset.meta index 271a92e7..de93fe9e 100644 --- a/Assets/Data/Cards/Card_Brosten 3.asset.meta +++ b/Assets/Data/Cards/Card_GrusOm 2.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd07dfe9285ad414a9b3bd71829b1c41 +guid: 12a59553805b9374aa830df9b3866864 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/Cards/Card_GrusOm.asset b/Assets/Data/Cards/Card_GrusOm.asset index b9175694..50117ecc 100644 --- a/Assets/Data/Cards/Card_GrusOm.asset +++ b/Assets/Data/Cards/Card_GrusOm.asset @@ -22,3 +22,4 @@ MonoBehaviour: CardImage: {fileID: 8845951135018861698, guid: a7b0921e11597d64ea26f53508ae25d7, type: 3} CollectionIndex: 3 reactionVoiceClip: {fileID: 8300000, guid: 7e377ae910cba0e4e9486c5d5e783a83, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 7e377ae910cba0e4e9486c5d5e783a83, type: 3} diff --git a/Assets/Data/Cards/Card_HRKvarts 3.asset b/Assets/Data/Cards/Card_HRKvarts 1.asset similarity index 69% rename from Assets/Data/Cards/Card_HRKvarts 3.asset rename to Assets/Data/Cards/Card_HRKvarts 1.asset index 1b500a75..527991ae 100644 --- a/Assets/Data/Cards/Card_HRKvarts 3.asset +++ b/Assets/Data/Cards/Card_HRKvarts 1.asset @@ -10,15 +10,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_HRKvarts 3 + m_Name: Card_HRKvarts 1 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 8ae21f15-0e7e-4ebc-a3c5-7ad290b505cd + Id: f672923b-176b-41a3-83f6-002b6945dc4d Name: HR Kvarts UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 1 + Rarity: 2 Zone: 3 CardImage: {fileID: 2056719709, guid: 57aacc442c45ede49af137c00df8f2da, type: 3} - CollectionIndex: 9 - reactionVoiceClip: {fileID: 8300000, guid: 9605f90caf8d34545b79ea720d79d4c2, type: 3} + CollectionIndex: 10 + reactionVoiceClip: {fileID: 8300000, guid: 6721049138147514ba7cfa4639f3bf0f, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 5e5693f33b8271a4d88b4738355c55b5, type: 3} diff --git a/Assets/Data/Cards/Card_HRPimpsten 2.asset.meta b/Assets/Data/Cards/Card_HRKvarts 1.asset.meta similarity index 79% rename from Assets/Data/Cards/Card_HRPimpsten 2.asset.meta rename to Assets/Data/Cards/Card_HRKvarts 1.asset.meta index 95200d6f..5b026c60 100644 --- a/Assets/Data/Cards/Card_HRPimpsten 2.asset.meta +++ b/Assets/Data/Cards/Card_HRKvarts 1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0cdbd83156224f242b3cab9bb96a7b41 +guid: 1d60a4c02e1dbb64dbd638d32d2bcf44 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/Cards/Card_HRKvarts 2.asset b/Assets/Data/Cards/Card_HRKvarts 2.asset index 565387f2..3a743abf 100644 --- a/Assets/Data/Cards/Card_HRKvarts 2.asset +++ b/Assets/Data/Cards/Card_HRKvarts 2.asset @@ -12,13 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} m_Name: Card_HRKvarts 2 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: f672923b-176b-41a3-83f6-002b6945dc4d + Id: 8ae21f15-0e7e-4ebc-a3c5-7ad290b505cd Name: HR Kvarts UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 2 + Rarity: 1 Zone: 3 CardImage: {fileID: 2056719709, guid: 57aacc442c45ede49af137c00df8f2da, type: 3} - CollectionIndex: 10 - reactionVoiceClip: {fileID: 8300000, guid: 6721049138147514ba7cfa4639f3bf0f, type: 3} + CollectionIndex: 9 + reactionVoiceClip: {fileID: 8300000, guid: 9605f90caf8d34545b79ea720d79d4c2, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 5e5693f33b8271a4d88b4738355c55b5, type: 3} diff --git a/Assets/Data/Cards/Card_HRKvarts.asset b/Assets/Data/Cards/Card_HRKvarts.asset index 20047a6c..bd0a6027 100644 --- a/Assets/Data/Cards/Card_HRKvarts.asset +++ b/Assets/Data/Cards/Card_HRKvarts.asset @@ -22,3 +22,4 @@ MonoBehaviour: CardImage: {fileID: 2056719709, guid: 57aacc442c45ede49af137c00df8f2da, type: 3} CollectionIndex: 8 reactionVoiceClip: {fileID: 8300000, guid: 5e5693f33b8271a4d88b4738355c55b5, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 5e5693f33b8271a4d88b4738355c55b5, type: 3} diff --git a/Assets/Data/Cards/Card_HRPimpsten 1.asset b/Assets/Data/Cards/Card_HRPimpsten 1.asset index 837f1089..482fd9bd 100644 --- a/Assets/Data/Cards/Card_HRPimpsten 1.asset +++ b/Assets/Data/Cards/Card_HRPimpsten 1.asset @@ -12,13 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} m_Name: Card_HRPimpsten 1 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: a9d1f700-e4a3-43a9-a0da-e10bc14098b4 + Id: 4d5cbb78-342a-4a72-89cd-ec5c3dcdc624 Name: HR Pimpsten UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 1 + Rarity: 2 Zone: 2 CardImage: {fileID: 844850041, guid: ab39d3c28640d3646ada092af9b639e6, type: 3} - CollectionIndex: 12 - reactionVoiceClip: {fileID: 8300000, guid: d0042c46d219448409f9f4d5dbe70586, type: 3} + CollectionIndex: 13 + reactionVoiceClip: {fileID: 8300000, guid: e4390101eff33bc459c3c6592065e17e, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 7c371dce7fc09874c8b07a6c55134ae0, type: 3} diff --git a/Assets/Data/Cards/Card_HRPimpsten 2.asset b/Assets/Data/Cards/Card_HRPimpsten 3.asset similarity index 69% rename from Assets/Data/Cards/Card_HRPimpsten 2.asset rename to Assets/Data/Cards/Card_HRPimpsten 3.asset index da9684ab..77ab8f9d 100644 --- a/Assets/Data/Cards/Card_HRPimpsten 2.asset +++ b/Assets/Data/Cards/Card_HRPimpsten 3.asset @@ -10,15 +10,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_HRPimpsten 2 + m_Name: Card_HRPimpsten 3 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 4d5cbb78-342a-4a72-89cd-ec5c3dcdc624 + Id: a9d1f700-e4a3-43a9-a0da-e10bc14098b4 Name: HR Pimpsten UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 2 + Rarity: 1 Zone: 2 CardImage: {fileID: 844850041, guid: ab39d3c28640d3646ada092af9b639e6, type: 3} - CollectionIndex: 13 - reactionVoiceClip: {fileID: 8300000, guid: e4390101eff33bc459c3c6592065e17e, type: 3} + CollectionIndex: 12 + reactionVoiceClip: {fileID: 8300000, guid: d0042c46d219448409f9f4d5dbe70586, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 7c371dce7fc09874c8b07a6c55134ae0, type: 3} diff --git a/Assets/Data/Cards/Card_GrusOm 3.asset.meta b/Assets/Data/Cards/Card_HRPimpsten 3.asset.meta similarity index 79% rename from Assets/Data/Cards/Card_GrusOm 3.asset.meta rename to Assets/Data/Cards/Card_HRPimpsten 3.asset.meta index 63ec7704..7fc1e51c 100644 --- a/Assets/Data/Cards/Card_GrusOm 3.asset.meta +++ b/Assets/Data/Cards/Card_HRPimpsten 3.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0f47589539ec1d948890869cea0bfdf0 +guid: 73d54071304571647b3238a799d9781f NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/Cards/Card_HRPimpsten.asset b/Assets/Data/Cards/Card_HRPimpsten.asset index fb2efafa..3a1b5ba3 100644 --- a/Assets/Data/Cards/Card_HRPimpsten.asset +++ b/Assets/Data/Cards/Card_HRPimpsten.asset @@ -22,3 +22,4 @@ MonoBehaviour: CardImage: {fileID: 844850041, guid: ab39d3c28640d3646ada092af9b639e6, type: 3} CollectionIndex: 11 reactionVoiceClip: {fileID: 8300000, guid: 7c371dce7fc09874c8b07a6c55134ae0, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 7c371dce7fc09874c8b07a6c55134ae0, type: 3} diff --git a/Assets/Data/Cards/Card_KalkUlation 1.asset b/Assets/Data/Cards/Card_KalkUlation 1.asset index d3f2f745..515c2800 100644 --- a/Assets/Data/Cards/Card_KalkUlation 1.asset +++ b/Assets/Data/Cards/Card_KalkUlation 1.asset @@ -12,13 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} m_Name: Card_KalkUlation 1 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 1006b95d-e3e1-4426-bc76-ab816e316b33 + Id: 9f3fd9b8-3350-421e-b2ec-b4f019596506 Name: Kalk Ulation UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 2 + Rarity: 1 Zone: 5 CardImage: {fileID: 5907816357319480503, guid: 84b744282e7e8084f935104f492f17b2, type: 3} - CollectionIndex: 16 - reactionVoiceClip: {fileID: 8300000, guid: f7254ad4467fca74b85d8d8a56365d07, type: 3} + CollectionIndex: 15 + reactionVoiceClip: {fileID: 8300000, guid: 0224d7baee3f7fd4fb7f0bce68da0a82, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 82d34c5e2ad4edc4e85c28f5d18528e1, type: 3} diff --git a/Assets/Data/Cards/Card_KalkUlation 1.asset.meta b/Assets/Data/Cards/Card_KalkUlation 1.asset.meta index 324eeebd..fa438c37 100644 --- a/Assets/Data/Cards/Card_KalkUlation 1.asset.meta +++ b/Assets/Data/Cards/Card_KalkUlation 1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bcbebd216e6c867409206d33b4395b5b +guid: 4f4ec75013bc276429c2f4fa52d165e0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/Cards/Card_KalkUlation 3.asset b/Assets/Data/Cards/Card_KalkUlation 2.asset similarity index 69% rename from Assets/Data/Cards/Card_KalkUlation 3.asset rename to Assets/Data/Cards/Card_KalkUlation 2.asset index 08905b94..14e866e2 100644 --- a/Assets/Data/Cards/Card_KalkUlation 3.asset +++ b/Assets/Data/Cards/Card_KalkUlation 2.asset @@ -10,15 +10,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_KalkUlation 3 + m_Name: Card_KalkUlation 2 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 9f3fd9b8-3350-421e-b2ec-b4f019596506 + Id: 1006b95d-e3e1-4426-bc76-ab816e316b33 Name: Kalk Ulation UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 1 + Rarity: 2 Zone: 5 CardImage: {fileID: 5907816357319480503, guid: 84b744282e7e8084f935104f492f17b2, type: 3} - CollectionIndex: 15 - reactionVoiceClip: {fileID: 8300000, guid: 0224d7baee3f7fd4fb7f0bce68da0a82, type: 3} + CollectionIndex: 16 + reactionVoiceClip: {fileID: 8300000, guid: f7254ad4467fca74b85d8d8a56365d07, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 82d34c5e2ad4edc4e85c28f5d18528e1, type: 3} diff --git a/Assets/Data/Cards/Card_KalkUlation 2.asset.meta b/Assets/Data/Cards/Card_KalkUlation 2.asset.meta new file mode 100644 index 00000000..324eeebd --- /dev/null +++ b/Assets/Data/Cards/Card_KalkUlation 2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bcbebd216e6c867409206d33b4395b5b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Cards/Card_KalkUlation 3.asset.meta b/Assets/Data/Cards/Card_KalkUlation 3.asset.meta deleted file mode 100644 index fa438c37..00000000 --- a/Assets/Data/Cards/Card_KalkUlation 3.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4f4ec75013bc276429c2f4fa52d165e0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/Cards/Card_KalkUlation.asset b/Assets/Data/Cards/Card_KalkUlation.asset index a5843068..bd768738 100644 --- a/Assets/Data/Cards/Card_KalkUlation.asset +++ b/Assets/Data/Cards/Card_KalkUlation.asset @@ -22,3 +22,4 @@ MonoBehaviour: CardImage: {fileID: 5907816357319480503, guid: 84b744282e7e8084f935104f492f17b2, type: 3} CollectionIndex: 14 reactionVoiceClip: {fileID: 8300000, guid: 82d34c5e2ad4edc4e85c28f5d18528e1, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 82d34c5e2ad4edc4e85c28f5d18528e1, type: 3} diff --git a/Assets/Data/Cards/Card_MormorMarmor 1.asset b/Assets/Data/Cards/Card_MormorMarmor 1.asset index 82484423..5f00835c 100644 --- a/Assets/Data/Cards/Card_MormorMarmor 1.asset +++ b/Assets/Data/Cards/Card_MormorMarmor 1.asset @@ -12,13 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} m_Name: Card_MormorMarmor 1 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 798301d9-70a5-46d4-8b81-e375de0abfb3 + Id: 9d7a1e8d-6c9f-4dc9-b013-cda836e7b413 Name: Mormor Marmor UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 2 + Rarity: 1 Zone: 6 CardImage: {fileID: -1694013536, guid: c28c2d55edc2fbc4baf57d2672c0c3df, type: 3} - CollectionIndex: 19 - reactionVoiceClip: {fileID: 8300000, guid: 4cc9a7b469f41e845a6af75df1ede2b7, type: 3} + CollectionIndex: 18 + reactionVoiceClip: {fileID: 8300000, guid: 4c8f862e036ce8243baeb147429abbac, type: 3} + nameVoiceClip: {fileID: 8300000, guid: f95dff570ed1cd94ca91b7c771c6236e, type: 3} diff --git a/Assets/Data/Cards/Card_MormorMarmor 1.asset.meta b/Assets/Data/Cards/Card_MormorMarmor 1.asset.meta index 4408ba4a..626bbf82 100644 --- a/Assets/Data/Cards/Card_MormorMarmor 1.asset.meta +++ b/Assets/Data/Cards/Card_MormorMarmor 1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7e3c8a4745009804b9a620e3ae15070f +guid: 53996921ed2094948aa317efe4ca6630 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/Cards/Card_MormorMarmor 3.asset b/Assets/Data/Cards/Card_MormorMarmor 2.asset similarity index 69% rename from Assets/Data/Cards/Card_MormorMarmor 3.asset rename to Assets/Data/Cards/Card_MormorMarmor 2.asset index dfa5b069..d9a3e5cd 100644 --- a/Assets/Data/Cards/Card_MormorMarmor 3.asset +++ b/Assets/Data/Cards/Card_MormorMarmor 2.asset @@ -10,15 +10,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_MormorMarmor 3 + m_Name: Card_MormorMarmor 2 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 9d7a1e8d-6c9f-4dc9-b013-cda836e7b413 + Id: 798301d9-70a5-46d4-8b81-e375de0abfb3 Name: Mormor Marmor UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 1 + Rarity: 2 Zone: 6 CardImage: {fileID: -1694013536, guid: c28c2d55edc2fbc4baf57d2672c0c3df, type: 3} - CollectionIndex: 18 - reactionVoiceClip: {fileID: 8300000, guid: 4c8f862e036ce8243baeb147429abbac, type: 3} + CollectionIndex: 19 + reactionVoiceClip: {fileID: 8300000, guid: 4cc9a7b469f41e845a6af75df1ede2b7, type: 3} + nameVoiceClip: {fileID: 8300000, guid: f95dff570ed1cd94ca91b7c771c6236e, type: 3} diff --git a/Assets/Data/Cards/Card_MormorMarmor 2.asset.meta b/Assets/Data/Cards/Card_MormorMarmor 2.asset.meta new file mode 100644 index 00000000..4408ba4a --- /dev/null +++ b/Assets/Data/Cards/Card_MormorMarmor 2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e3c8a4745009804b9a620e3ae15070f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Cards/Card_MormorMarmor 3.asset.meta b/Assets/Data/Cards/Card_MormorMarmor 3.asset.meta deleted file mode 100644 index 626bbf82..00000000 --- a/Assets/Data/Cards/Card_MormorMarmor 3.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 53996921ed2094948aa317efe4ca6630 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/Cards/Card_MormorMarmor.asset b/Assets/Data/Cards/Card_MormorMarmor.asset index bacb1f6a..a4fec903 100644 --- a/Assets/Data/Cards/Card_MormorMarmor.asset +++ b/Assets/Data/Cards/Card_MormorMarmor.asset @@ -22,3 +22,4 @@ MonoBehaviour: CardImage: {fileID: -1694013536, guid: c28c2d55edc2fbc4baf57d2672c0c3df, type: 3} CollectionIndex: 17 reactionVoiceClip: {fileID: 8300000, guid: f95dff570ed1cd94ca91b7c771c6236e, type: 3} + nameVoiceClip: {fileID: 8300000, guid: f95dff570ed1cd94ca91b7c771c6236e, type: 3} diff --git a/Assets/Data/Cards/Card_MorsomMursten 1.asset b/Assets/Data/Cards/Card_MorsomMursten 1.asset index 12b25ec0..4de80591 100644 --- a/Assets/Data/Cards/Card_MorsomMursten 1.asset +++ b/Assets/Data/Cards/Card_MorsomMursten 1.asset @@ -12,13 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} m_Name: Card_MorsomMursten 1 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 0287251c-05fa-4cc2-8885-4632e2c25481 + Id: ad827a0d-cf57-48c5-a8c6-bc0678d79d0d Name: Morsom Mursten UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 2 + Rarity: 1 Zone: 1 CardImage: {fileID: 4152663935159485533, guid: 6989d9ece4c4db14db551468dfb0c72e, type: 3} - CollectionIndex: 22 - reactionVoiceClip: {fileID: 8300000, guid: 0e32ac4cc7495ba46ab22ef557c6fd93, type: 3} + CollectionIndex: 21 + reactionVoiceClip: {fileID: 8300000, guid: b9bc418d6c6ec9545a2c657533acf876, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 1cf03ed4cf3d1724aa7d1e86b1ca5109, type: 3} diff --git a/Assets/Data/Cards/Card_MorsomMursten 3.asset b/Assets/Data/Cards/Card_MorsomMursten 2.asset similarity index 69% rename from Assets/Data/Cards/Card_MorsomMursten 3.asset rename to Assets/Data/Cards/Card_MorsomMursten 2.asset index 053c32b5..3ddcd116 100644 --- a/Assets/Data/Cards/Card_MorsomMursten 3.asset +++ b/Assets/Data/Cards/Card_MorsomMursten 2.asset @@ -10,15 +10,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_MorsomMursten 3 + m_Name: Card_MorsomMursten 2 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: ad827a0d-cf57-48c5-a8c6-bc0678d79d0d + Id: 0287251c-05fa-4cc2-8885-4632e2c25481 Name: Morsom Mursten UseCustomFileName: 0 CustomFileName: Description: Card description - Rarity: 1 + Rarity: 2 Zone: 1 CardImage: {fileID: 4152663935159485533, guid: 6989d9ece4c4db14db551468dfb0c72e, type: 3} - CollectionIndex: 21 - reactionVoiceClip: {fileID: 8300000, guid: b9bc418d6c6ec9545a2c657533acf876, type: 3} + CollectionIndex: 22 + reactionVoiceClip: {fileID: 8300000, guid: 0e32ac4cc7495ba46ab22ef557c6fd93, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 1cf03ed4cf3d1724aa7d1e86b1ca5109, type: 3} diff --git a/Assets/Data/Cards/Card_MorsomMursten 2.asset.meta b/Assets/Data/Cards/Card_MorsomMursten 2.asset.meta new file mode 100644 index 00000000..9595ea17 --- /dev/null +++ b/Assets/Data/Cards/Card_MorsomMursten 2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7ac7081045409f469f2b28c0482aa17 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Cards/Card_MorsomMursten 3.asset.meta b/Assets/Data/Cards/Card_MorsomMursten 3.asset.meta deleted file mode 100644 index 96dae64b..00000000 --- a/Assets/Data/Cards/Card_MorsomMursten 3.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 99d8e528a8f9ead438e4c88a08c6f6c0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/Cards/Card_MorsomMursten.asset b/Assets/Data/Cards/Card_MorsomMursten.asset index 8fc79580..053fdb0e 100644 --- a/Assets/Data/Cards/Card_MorsomMursten.asset +++ b/Assets/Data/Cards/Card_MorsomMursten.asset @@ -22,3 +22,4 @@ MonoBehaviour: CardImage: {fileID: 4152663935159485533, guid: 6989d9ece4c4db14db551468dfb0c72e, type: 3} CollectionIndex: 20 reactionVoiceClip: {fileID: 8300000, guid: 1cf03ed4cf3d1724aa7d1e86b1ca5109, type: 3} + nameVoiceClip: {fileID: 8300000, guid: 1cf03ed4cf3d1724aa7d1e86b1ca5109, type: 3} diff --git a/Assets/Editor/CardSystem/CardEditorWindow.cs b/Assets/Editor/CardSystem/CardEditorWindow.cs index f046ae7f..04328003 100644 --- a/Assets/Editor/CardSystem/CardEditorWindow.cs +++ b/Assets/Editor/CardSystem/CardEditorWindow.cs @@ -393,6 +393,7 @@ namespace Editor.CardSystem // Audio EditorGUILayout.LabelField("Audio", EditorStyles.boldLabel); _editingCard.reactionVoiceClip = (AudioResource)EditorGUILayout.ObjectField("Reaction audio clip", _editingCard.reactionVoiceClip, typeof(AudioResource),false); + _editingCard.nameVoiceClip = (AudioResource)EditorGUILayout.ObjectField("Name audio clip", _editingCard.nameVoiceClip, typeof(AudioResource), false); if (EditorGUI.EndChangeCheck()) { diff --git a/Assets/Prefabs/Managers/AudioManager.prefab b/Assets/Prefabs/Managers/AudioManager.prefab index ac636abb..0c38c3b4 100644 --- a/Assets/Prefabs/Managers/AudioManager.prefab +++ b/Assets/Prefabs/Managers/AudioManager.prefab @@ -146,6 +146,152 @@ MonoBehaviour: audioSource: {fileID: 0} clipPriority: 0 sourcePriority: 0 +--- !u!1 &1995564680593461242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6443458666442384083} + - component: {fileID: 4345614888297089243} + - component: {fileID: 317588225693455851} + m_Layer: 0 + m_Name: UIVO + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6443458666442384083 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995564680593461242} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 536416456044738252} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &4345614888297089243 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995564680593461242} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &317588225693455851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995564680593461242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 0 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &3537966589320347862 GameObject: m_ObjectHideFlags: 0 @@ -323,6 +469,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1098418429538915048} + - {fileID: 6443458666442384083} - {fileID: 2741520622244653073} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -348,3 +495,4 @@ MonoBehaviour: SFXSources: [] uiAudioSource: {fileID: 836822111543205959} uiMusicSource: {fileID: 6954913982444384522} + uiVOSource: {fileID: 317588225693455851} diff --git a/Assets/Scripts/CardSystem/Data/CardData.cs b/Assets/Scripts/CardSystem/Data/CardData.cs index 8dc15f10..6fd637d2 100644 --- a/Assets/Scripts/CardSystem/Data/CardData.cs +++ b/Assets/Scripts/CardSystem/Data/CardData.cs @@ -1,5 +1,6 @@ using System; using UnityEngine; +using UnityEngine.Audio; namespace AppleHills.Data.CardSystem { @@ -22,6 +23,8 @@ namespace AppleHills.Data.CardSystem public CardZone Zone => _definition?.Zone ?? CardZone.AppleHills; public int CollectionIndex => _definition?.CollectionIndex ?? 0; public Sprite CardImage => _definition?.CardImage; + public AudioResource ReactionAudio => _definition?.reactionVoiceClip; + public AudioResource NameAudio => _definition?.nameVoiceClip; // Default constructor public CardData() diff --git a/Assets/Scripts/CardSystem/Data/CardDefinition.cs b/Assets/Scripts/CardSystem/Data/CardDefinition.cs index a7977875..ecb750f1 100644 --- a/Assets/Scripts/CardSystem/Data/CardDefinition.cs +++ b/Assets/Scripts/CardSystem/Data/CardDefinition.cs @@ -37,6 +37,7 @@ namespace AppleHills.Data.CardSystem [Header("Audio")] public AudioResource reactionVoiceClip; + public AudioResource nameVoiceClip; /// /// Creates a new CardData instance from this definition diff --git a/Assets/Scripts/CardSystem/StateMachine/States/CardAlbumEnlargedState.cs b/Assets/Scripts/CardSystem/StateMachine/States/CardAlbumEnlargedState.cs index e1cb9b58..19689787 100644 --- a/Assets/Scripts/CardSystem/StateMachine/States/CardAlbumEnlargedState.cs +++ b/Assets/Scripts/CardSystem/StateMachine/States/CardAlbumEnlargedState.cs @@ -59,6 +59,9 @@ namespace UI.CardSystem.StateMachine.States } // Play pick up card audio AudioManager.Instance.LoadAndPlayUIAudio("card_albumdrop_deep", false); + + // Play card name audio + AudioManager.Instance.PlayCardVO(_context.CardData.NameAudio); Logging.Debug($"[CardAlbumEnlargedState] Card enlarged from album: {_context.CardData?.Name}"); } diff --git a/Assets/Scripts/CardSystem/StateMachine/States/CardEnlargedNewState.cs b/Assets/Scripts/CardSystem/StateMachine/States/CardEnlargedNewState.cs index 325e1c3d..da01567e 100644 --- a/Assets/Scripts/CardSystem/StateMachine/States/CardEnlargedNewState.cs +++ b/Assets/Scripts/CardSystem/StateMachine/States/CardEnlargedNewState.cs @@ -51,6 +51,9 @@ namespace UI.CardSystem.StateMachine.States { newCardBadge.SetActive(true); } + + // Reaction to new card + AudioManager.Instance.PlayCardVO(_context.CardData.ReactionAudio); } public void OnCardClicked(CardContext context) diff --git a/Assets/Scripts/Sound/AudioManager.cs b/Assets/Scripts/Sound/AudioManager.cs index 884c7f05..5d71c11a 100644 --- a/Assets/Scripts/Sound/AudioManager.cs +++ b/Assets/Scripts/Sound/AudioManager.cs @@ -38,6 +38,7 @@ public class AudioManager : ManagedBehaviour, IPausable public AppleAudioSource uiAudioSource; public AppleAudioSource uiMusicSource; + public AppleAudioSource uiVOSource; // Dictionary to track addressable handles by AudioManager private Dictionary> _addressableHandles = new Dictionary>(); @@ -344,4 +345,10 @@ public class AudioManager : ManagedBehaviour, IPausable // Clean up any remaining addressable handles when disabled ReleaseAllHandles(); } + + public void PlayCardVO(AudioResource clipToPlay) + { + uiVOSource.audioSource.resource = clipToPlay; + uiVOSource.audioSource.Play(); + } }