From aff066813c7329a2f3cb76acf1dd98181516c2bd Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 11 Aug 2024 14:38:48 +0100 Subject: [PATCH] More items & inventory load bugfix --- ...3-Crimson Sovereign's Twilight Talon.asset | 2 +- ...reign's Phylactery of Undying Malice.asset | 2 +- ...ereign's Signet of Vampiric Dominion.asset | 2 +- ...mson Sovereign's Bloodthirst Pendant.asset | 2 +- ...chon's Crown of Cosmic Enlightenment.asset | 4 +- ...ent Archon's Reality-Warping Raiment.asset | 4 +- ...Archon's Scepter of Universal Truths.asset | 4 +- ...Archon's Codex of Multiversal Axioms.asset | 4 +- ...rchon's Seal of Transcendent Thought.asset | 2 +- ...Archon's Nexus of Infinite Cognition.asset | 2 +- .../Primordial Titan's Earthshaking Fury.meta | 8 + ... Titan's Crown of Untamed Wilderness.asset | 30 ++ ...n's Crown of Untamed Wilderness.asset.meta | 8 + ...mordial Titan's Primal Force Cuirass.asset | 30 ++ ...al Titan's Primal Force Cuirass.asset.meta | 8 + ...Primordial Titan's Worldbreaker Maul.asset | 30 ++ ...rdial Titan's Worldbreaker Maul.asset.meta | 8 + ...al Titan's Heart of the Savage Earth.asset | 30 ++ ...tan's Heart of the Savage Earth.asset.meta | 8 + ...rdial Titan's Band of Tectonic Might.asset | 30 ++ ... Titan's Band of Tectonic Might.asset.meta | 8 + ...dial Titan's Totem of Ancestral Rage.asset | 30 ++ ...Titan's Totem of Ancestral Rage.asset.meta | 8 + .../Items & Inventory/Scripts/Inventory.cs | 10 +- .../Prefabs/Persistent Objects.prefab | 6 + ...agonBossEnemyPrefabTemplate Variant.prefab | 66 ++++ Assets/Resources/ItemDrop_EndGame.prefab | 352 ++++++++++++++++++ Assets/Resources/ItemDrop_EndGame.prefab.meta | 7 + Assets/Scenes/4-DragonsLair.unity | 201 +++++++++- Assets/Scenes/4-RiverAve.unity | 98 +++++ Assets/Scripts/Health.cs | 10 +- Assets/Starfield Skybox/Skybox.mat | 2 +- 32 files changed, 991 insertions(+), 25 deletions(-) create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury.meta create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/1-Primordial Titan's Crown of Untamed Wilderness.asset create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/1-Primordial Titan's Crown of Untamed Wilderness.asset.meta create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/2-Primordial Titan's Primal Force Cuirass.asset create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/2-Primordial Titan's Primal Force Cuirass.asset.meta create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/3-Primordial Titan's Worldbreaker Maul.asset create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/3-Primordial Titan's Worldbreaker Maul.asset.meta create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/4-Primordial Titan's Heart of the Savage Earth.asset create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/4-Primordial Titan's Heart of the Savage Earth.asset.meta create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/5-Primordial Titan's Band of Tectonic Might.asset create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/5-Primordial Titan's Band of Tectonic Might.asset.meta create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/6-Primordial Titan's Totem of Ancestral Rage.asset create mode 100644 Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/6-Primordial Titan's Totem of Ancestral Rage.asset.meta create mode 100644 Assets/Resources/ItemDrop_EndGame.prefab create mode 100644 Assets/Resources/ItemDrop_EndGame.prefab.meta diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/3-Crimson Sovereign's Twilight Talon.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/3-Crimson Sovereign's Twilight Talon.asset index dfd7e8d7..646c09a4 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/3-Crimson Sovereign's Twilight Talon.asset +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/3-Crimson Sovereign's Twilight Talon.asset @@ -21,7 +21,7 @@ MonoBehaviour: AgilityBonus: 500 IntelligenceBonus: 0 SpiritBonus: 0 - VitalityBonus: 0 + VitalityBonus: 20 StrengthPercentBonus: 0.2 AgilityPercentBonus: 0.8 IntelligencePercentBonus: 0 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/4-Crimson Sovereign's Phylactery of Undying Malice.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/4-Crimson Sovereign's Phylactery of Undying Malice.asset index b4ee07f6..cd953c81 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/4-Crimson Sovereign's Phylactery of Undying Malice.asset +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/4-Crimson Sovereign's Phylactery of Undying Malice.asset @@ -21,7 +21,7 @@ MonoBehaviour: AgilityBonus: 400 IntelligenceBonus: 0 SpiritBonus: 0 - VitalityBonus: 50 + VitalityBonus: 80 StrengthPercentBonus: 0.2 AgilityPercentBonus: 0.6 IntelligencePercentBonus: 0 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/5-Crimson Sovereign's Signet of Vampiric Dominion.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/5-Crimson Sovereign's Signet of Vampiric Dominion.asset index 2d9565d6..790da298 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/5-Crimson Sovereign's Signet of Vampiric Dominion.asset +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/5-Crimson Sovereign's Signet of Vampiric Dominion.asset @@ -21,7 +21,7 @@ MonoBehaviour: AgilityBonus: 350 IntelligenceBonus: 0 SpiritBonus: 0 - VitalityBonus: 50 + VitalityBonus: 100 StrengthPercentBonus: 0.35 AgilityPercentBonus: 0.6 IntelligencePercentBonus: 0 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/6-Crimson Sovereign's Bloodthirst Pendant.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/6-Crimson Sovereign's Bloodthirst Pendant.asset index 574b4ada..fa66a3da 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/6-Crimson Sovereign's Bloodthirst Pendant.asset +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Crimson Sovereign's Eternal Night/6-Crimson Sovereign's Bloodthirst Pendant.asset @@ -21,7 +21,7 @@ MonoBehaviour: AgilityBonus: 350 IntelligenceBonus: 0 SpiritBonus: 0 - VitalityBonus: 50 + VitalityBonus: 100 StrengthPercentBonus: 0.35 AgilityPercentBonus: 0.6 IntelligencePercentBonus: 0 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/1-Omniscient Archon's Crown of Cosmic Enlightenment.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/1-Omniscient Archon's Crown of Cosmic Enlightenment.asset index 7825b3c3..7d66cc4e 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/1-Omniscient Archon's Crown of Cosmic Enlightenment.asset +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/1-Omniscient Archon's Crown of Cosmic Enlightenment.asset @@ -19,12 +19,12 @@ MonoBehaviour: description: StrengthBonus: 0 AgilityBonus: 0 - IntelligenceBonus: 100 + IntelligenceBonus: 150 SpiritBonus: 40 VitalityBonus: 200 StrengthPercentBonus: 0 AgilityPercentBonus: 0 IntelligencePercentBonus: 0 SpiritPercentBonus: 0 - VitalityPercentBonus: 0.8 + VitalityPercentBonus: 1 EquipmentType: 0 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/2-Omniscient Archon's Reality-Warping Raiment.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/2-Omniscient Archon's Reality-Warping Raiment.asset index aff81efd..a118a16c 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/2-Omniscient Archon's Reality-Warping Raiment.asset +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/2-Omniscient Archon's Reality-Warping Raiment.asset @@ -19,12 +19,12 @@ MonoBehaviour: description: StrengthBonus: 0 AgilityBonus: 0 - IntelligenceBonus: 100 + IntelligenceBonus: 150 SpiritBonus: 40 VitalityBonus: 200 StrengthPercentBonus: 0 AgilityPercentBonus: 0 IntelligencePercentBonus: 0 SpiritPercentBonus: 0 - VitalityPercentBonus: 0.8 + VitalityPercentBonus: 1 EquipmentType: 1 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/3-Omniscient Archon's Scepter of Universal Truths.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/3-Omniscient Archon's Scepter of Universal Truths.asset index 1a47a335..4454373e 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/3-Omniscient Archon's Scepter of Universal Truths.asset +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/3-Omniscient Archon's Scepter of Universal Truths.asset @@ -19,9 +19,9 @@ MonoBehaviour: description: StrengthBonus: 30 AgilityBonus: 0 - IntelligenceBonus: 500 + IntelligenceBonus: 650 SpiritBonus: 100 - VitalityBonus: 0 + VitalityBonus: 20 StrengthPercentBonus: 0 AgilityPercentBonus: 0 IntelligencePercentBonus: 1 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/4-Omniscient Archon's Codex of Multiversal Axioms.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/4-Omniscient Archon's Codex of Multiversal Axioms.asset index 79e92139..5861aa0f 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/4-Omniscient Archon's Codex of Multiversal Axioms.asset +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/4-Omniscient Archon's Codex of Multiversal Axioms.asset @@ -19,9 +19,9 @@ MonoBehaviour: description: StrengthBonus: 0 AgilityBonus: 0 - IntelligenceBonus: 400 + IntelligenceBonus: 500 SpiritBonus: 100 - VitalityBonus: 50 + VitalityBonus: 60 StrengthPercentBonus: 0 AgilityPercentBonus: 0 IntelligencePercentBonus: 0.8 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/5-Omniscient Archon's Seal of Transcendent Thought.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/5-Omniscient Archon's Seal of Transcendent Thought.asset index a7c7b9e5..179c322e 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/5-Omniscient Archon's Seal of Transcendent Thought.asset +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/5-Omniscient Archon's Seal of Transcendent Thought.asset @@ -21,7 +21,7 @@ MonoBehaviour: AgilityBonus: 0 IntelligenceBonus: 350 SpiritBonus: 100 - VitalityBonus: 50 + VitalityBonus: 80 StrengthPercentBonus: 0 AgilityPercentBonus: 0 IntelligencePercentBonus: 0.6 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/6-Omniscient Archon's Nexus of Infinite Cognition.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/6-Omniscient Archon's Nexus of Infinite Cognition.asset index 3879a2f9..740e301d 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/6-Omniscient Archon's Nexus of Infinite Cognition.asset +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Omniscient Archon's Paradigm/6-Omniscient Archon's Nexus of Infinite Cognition.asset @@ -21,7 +21,7 @@ MonoBehaviour: AgilityBonus: 0 IntelligenceBonus: 350 SpiritBonus: 100 - VitalityBonus: 50 + VitalityBonus: 80 StrengthPercentBonus: 0 AgilityPercentBonus: 0 IntelligencePercentBonus: 0.6 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury.meta b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury.meta new file mode 100644 index 00000000..35f78118 --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b1eaf003ba3693242964d5680a64717b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/1-Primordial Titan's Crown of Untamed Wilderness.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/1-Primordial Titan's Crown of Untamed Wilderness.asset new file mode 100644 index 00000000..c8ea533d --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/1-Primordial Titan's Crown of Untamed Wilderness.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7a67ee28b6adf441814e60bcb404307, type: 3} + m_Name: 1-Primordial Titan's Crown of Untamed Wilderness + m_EditorClassIdentifier: + ItemName: Primordial Titan's Crown of Untamed Wilderness + Icon: {fileID: 21300000, guid: 5b0758303c2217140b27779e0aa96f90, type: 3} + sellPricePlayer: 5000 + sellPriceVendor: 100000 + description: + StrengthBonus: 120 + AgilityBonus: 20 + IntelligenceBonus: 0 + SpiritBonus: 20 + VitalityBonus: 350 + StrengthPercentBonus: 0 + AgilityPercentBonus: 0 + IntelligencePercentBonus: 0 + SpiritPercentBonus: 0 + VitalityPercentBonus: 1.5 + EquipmentType: 0 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/1-Primordial Titan's Crown of Untamed Wilderness.asset.meta b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/1-Primordial Titan's Crown of Untamed Wilderness.asset.meta new file mode 100644 index 00000000..e38f1cd0 --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/1-Primordial Titan's Crown of Untamed Wilderness.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 29fa797929d7aeb4e8750354c62385d4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/2-Primordial Titan's Primal Force Cuirass.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/2-Primordial Titan's Primal Force Cuirass.asset new file mode 100644 index 00000000..dc21afbb --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/2-Primordial Titan's Primal Force Cuirass.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7a67ee28b6adf441814e60bcb404307, type: 3} + m_Name: 2-Primordial Titan's Primal Force Cuirass + m_EditorClassIdentifier: + ItemName: Primordial Titan's Primal Force Cuirass + Icon: {fileID: 21300000, guid: f24be65464ebd244592ee4bca42d8885, type: 3} + sellPricePlayer: 5000 + sellPriceVendor: 100000 + description: + StrengthBonus: 120 + AgilityBonus: 20 + IntelligenceBonus: 0 + SpiritBonus: 20 + VitalityBonus: 350 + StrengthPercentBonus: 0 + AgilityPercentBonus: 0 + IntelligencePercentBonus: 0 + SpiritPercentBonus: 0 + VitalityPercentBonus: 1.5 + EquipmentType: 1 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/2-Primordial Titan's Primal Force Cuirass.asset.meta b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/2-Primordial Titan's Primal Force Cuirass.asset.meta new file mode 100644 index 00000000..760ff5c0 --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/2-Primordial Titan's Primal Force Cuirass.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ad2da60d480dac4ba938457eb4458c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/3-Primordial Titan's Worldbreaker Maul.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/3-Primordial Titan's Worldbreaker Maul.asset new file mode 100644 index 00000000..a91be963 --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/3-Primordial Titan's Worldbreaker Maul.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7a67ee28b6adf441814e60bcb404307, type: 3} + m_Name: 3-Primordial Titan's Worldbreaker Maul + m_EditorClassIdentifier: + ItemName: Primordial Titan's Worldbreaker Maul + Icon: {fileID: 21300000, guid: 25636ac0220704542806ec79692e6b34, type: 3} + sellPricePlayer: 5000 + sellPriceVendor: 100000 + description: + StrengthBonus: 500 + AgilityBonus: 20 + IntelligenceBonus: 0 + SpiritBonus: 20 + VitalityBonus: 200 + StrengthPercentBonus: 0.8 + AgilityPercentBonus: 0.2 + IntelligencePercentBonus: 0 + SpiritPercentBonus: 0 + VitalityPercentBonus: 0.5 + EquipmentType: 4 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/3-Primordial Titan's Worldbreaker Maul.asset.meta b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/3-Primordial Titan's Worldbreaker Maul.asset.meta new file mode 100644 index 00000000..8c208e19 --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/3-Primordial Titan's Worldbreaker Maul.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8eef5c0011a564942b82c298531876d3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/4-Primordial Titan's Heart of the Savage Earth.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/4-Primordial Titan's Heart of the Savage Earth.asset new file mode 100644 index 00000000..a90f4c40 --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/4-Primordial Titan's Heart of the Savage Earth.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7a67ee28b6adf441814e60bcb404307, type: 3} + m_Name: 4-Primordial Titan's Heart of the Savage Earth + m_EditorClassIdentifier: + ItemName: Primordial Titan's Heart of the Savage Earth + Icon: {fileID: 21300000, guid: 7e0e9e6e965a9d04ab82b46f5f7fcda8, type: 3} + sellPricePlayer: 5000 + sellPriceVendor: 100000 + description: + StrengthBonus: 400 + AgilityBonus: 50 + IntelligenceBonus: 0 + SpiritBonus: 10 + VitalityBonus: 100 + StrengthPercentBonus: 0.6 + AgilityPercentBonus: 0.2 + IntelligencePercentBonus: 0 + SpiritPercentBonus: 0 + VitalityPercentBonus: 0.2 + EquipmentType: 5 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/4-Primordial Titan's Heart of the Savage Earth.asset.meta b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/4-Primordial Titan's Heart of the Savage Earth.asset.meta new file mode 100644 index 00000000..4a955c57 --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/4-Primordial Titan's Heart of the Savage Earth.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d1c36ebfd86effe478456c1e653c5b4c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/5-Primordial Titan's Band of Tectonic Might.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/5-Primordial Titan's Band of Tectonic Might.asset new file mode 100644 index 00000000..2296a9ee --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/5-Primordial Titan's Band of Tectonic Might.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7a67ee28b6adf441814e60bcb404307, type: 3} + m_Name: 5-Primordial Titan's Band of Tectonic Might + m_EditorClassIdentifier: + ItemName: Primordial Titan's Band of Tectonic Might + Icon: {fileID: 21300000, guid: 286ce66ac3cfed84aa731d535cefe851, type: 3} + sellPricePlayer: 5000 + sellPriceVendor: 100000 + description: + StrengthBonus: 350 + AgilityBonus: 50 + IntelligenceBonus: 0 + SpiritBonus: 10 + VitalityBonus: 150 + StrengthPercentBonus: 0.6 + AgilityPercentBonus: 0.1 + IntelligencePercentBonus: 0 + SpiritPercentBonus: 0.05 + VitalityPercentBonus: 0.5 + EquipmentType: 6 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/5-Primordial Titan's Band of Tectonic Might.asset.meta b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/5-Primordial Titan's Band of Tectonic Might.asset.meta new file mode 100644 index 00000000..1a324176 --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/5-Primordial Titan's Band of Tectonic Might.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c726d1097e80dbc4980186c788b33e5d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/6-Primordial Titan's Totem of Ancestral Rage.asset b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/6-Primordial Titan's Totem of Ancestral Rage.asset new file mode 100644 index 00000000..f978b99a --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/6-Primordial Titan's Totem of Ancestral Rage.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7a67ee28b6adf441814e60bcb404307, type: 3} + m_Name: 6-Primordial Titan's Totem of Ancestral Rage + m_EditorClassIdentifier: + ItemName: Primordial Titan's Totem of Ancestral Rage + Icon: {fileID: 21300000, guid: 8e2fd3a855c00bc44abba231731eb2a3, type: 3} + sellPricePlayer: 5000 + sellPriceVendor: 100000 + description: + StrengthBonus: 350 + AgilityBonus: 50 + IntelligenceBonus: 0 + SpiritBonus: 10 + VitalityBonus: 150 + StrengthPercentBonus: 0.6 + AgilityPercentBonus: 0.1 + IntelligencePercentBonus: 0 + SpiritPercentBonus: 0.05 + VitalityPercentBonus: 0.5 + EquipmentType: 7 diff --git a/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/6-Primordial Titan's Totem of Ancestral Rage.asset.meta b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/6-Primordial Titan's Totem of Ancestral Rage.asset.meta new file mode 100644 index 00000000..abfdada7 --- /dev/null +++ b/Assets/Character Stats/Examples/Items & Inventory/Items/RevampedItems/2-Late-Items/Primordial Titan's Earthshaking Fury/6-Primordial Titan's Totem of Ancestral Rage.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 070945b349b052d4fa19fa4f7a2654c7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Character Stats/Examples/Items & Inventory/Scripts/Inventory.cs b/Assets/Character Stats/Examples/Items & Inventory/Scripts/Inventory.cs index a4a5e296..c62b9de7 100644 --- a/Assets/Character Stats/Examples/Items & Inventory/Scripts/Inventory.cs +++ b/Assets/Character Stats/Examples/Items & Inventory/Scripts/Inventory.cs @@ -132,10 +132,13 @@ namespace Kryz.CharacterStats.Examples public void LoadInventory() { - inventoryData = PlayerDataHandler.Instance.LoadCharacterInventoryData(PlayerDataHandler.Instance.currentPlayerName.Value, PlayerDataHandler.Instance.currentCharacterName.Value); + items.Clear(); + inventoryData = PlayerDataHandler.Instance.LoadCharacterInventoryData(PlayerDataHandler.Instance.currentPlayerName.Value, PlayerDataHandler.Instance.currentCharacterName.Value); + if (inventoryData != null) { + Debug.Log("Success Loading Inventory"); for (int i = 0; i < inventoryData.inventoryItems.Length; i++) { @@ -150,9 +153,8 @@ namespace Kryz.CharacterStats.Examples { inventoryData = new InventoryData(); - items.Clear(); - - PlayerDataHandler.Instance.SaveCharacterInventoryData(PlayerDataHandler.Instance.currentPlayerName.Value, PlayerDataHandler.Instance.currentCharacterName.Value, inventoryData); + RefreshUI(true); + //PlayerDataHandler.Instance.SaveCharacterInventoryData(PlayerDataHandler.Instance.currentPlayerName.Value, PlayerDataHandler.Instance.currentCharacterName.Value, inventoryData); } } diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 41542e70..77d7d7f9 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -5070,6 +5070,12 @@ MonoBehaviour: - {fileID: 11400000, guid: 1b5eb705b57032d4ea657aa7be809c98, type: 2} - {fileID: 11400000, guid: 150ef8a7544df9841b1edf5ea7d7f62f, type: 2} - {fileID: 11400000, guid: 10979054b6f09444f8dc5c31436a207c, type: 2} + - {fileID: 11400000, guid: 29fa797929d7aeb4e8750354c62385d4, type: 2} + - {fileID: 11400000, guid: 3ad2da60d480dac4ba938457eb4458c0, type: 2} + - {fileID: 11400000, guid: 8eef5c0011a564942b82c298531876d3, type: 2} + - {fileID: 11400000, guid: d1c36ebfd86effe478456c1e653c5b4c, type: 2} + - {fileID: 11400000, guid: c726d1097e80dbc4980186c788b33e5d, type: 2} + - {fileID: 11400000, guid: 070945b349b052d4fa19fa4f7a2654c7, type: 2} --- !u!1 &6229054688875263704 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Bosses/DragonBossEnemyPrefabTemplate Variant.prefab b/Assets/Resources/Bosses/DragonBossEnemyPrefabTemplate Variant.prefab index 94c2b80e..7b4410ea 100644 --- a/Assets/Resources/Bosses/DragonBossEnemyPrefabTemplate Variant.prefab +++ b/Assets/Resources/Bosses/DragonBossEnemyPrefabTemplate Variant.prefab @@ -67,6 +67,70 @@ PrefabInstance: propertyPath: sceneViewId value: 0 objectReference: {fileID: 0} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: coinAmount + value: 100000 + objectReference: {fileID: 0} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDropChance + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.size + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: interactableDropPrefab + value: + objectReference: {fileID: 7187375229850072788, guid: 287f31c473cbc5e4bb5e988acb4965ca, type: 3} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[0] + value: + objectReference: {fileID: 11400000, guid: 82861399b82033c4ab5257a88417fed7, type: 2} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[1] + value: + objectReference: {fileID: 11400000, guid: 9466d6108dd144c4584d13fea118f664, type: 2} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[2] + value: + objectReference: {fileID: 11400000, guid: 163957985d9209140bde23596b4de840, type: 2} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[3] + value: + objectReference: {fileID: 11400000, guid: 1b5eb705b57032d4ea657aa7be809c98, type: 2} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[4] + value: + objectReference: {fileID: 11400000, guid: 150ef8a7544df9841b1edf5ea7d7f62f, type: 2} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[5] + value: + objectReference: {fileID: 11400000, guid: 10979054b6f09444f8dc5c31436a207c, type: 2} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[6] + value: + objectReference: {fileID: 11400000, guid: 1e27bea92ff48364ba9dc397e3316b2c, type: 2} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[7] + value: + objectReference: {fileID: 11400000, guid: 8e56e0546013af448ab17a9e7433c8ed, type: 2} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[8] + value: + objectReference: {fileID: 11400000, guid: ef0494920863be7429087750bb98012d, type: 2} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[9] + value: + objectReference: {fileID: 11400000, guid: 76269ac8420a29143828b1e5829c28a5, type: 2} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[10] + value: + objectReference: {fileID: 11400000, guid: 060ee950913e5e24ba99fe17c6e63c2f, type: 2} + - target: {fileID: 1052511481682793738, guid: d9b43fa944715a7489818765baa8fc11, type: 3} + propertyPath: extraDrops.Array.data[11] + value: + objectReference: {fileID: 11400000, guid: 5c106cf4f12872641bbb89c5047284d0, type: 2} - target: {fileID: 2278116590711127942, guid: d9b43fa944715a7489818765baa8fc11, type: 3} propertyPath: m_RootOrder value: 0 @@ -157,6 +221,8 @@ MonoBehaviour: experienceOnDeath: {fileID: 11400000, guid: 57959f6a9d7e8ab409d77bd400e80224, type: 2} onBossDead: {fileID: 11400000, guid: bac9f6f93a105804ba6fb0597e9d757c, type: 2} onDragonDead: {fileID: 11400000, guid: 239ce628e444d3045bdf820954aea139, type: 2} + NorthMostFlyingPoint: {fileID: 0} + SouthMostFlyingPoint: {fileID: 0} flyingAbilityPriorityManager: {fileID: 0} --- !u!4 &5909578744954783083 stripped Transform: diff --git a/Assets/Resources/ItemDrop_EndGame.prefab b/Assets/Resources/ItemDrop_EndGame.prefab new file mode 100644 index 00000000..53997691 --- /dev/null +++ b/Assets/Resources/ItemDrop_EndGame.prefab @@ -0,0 +1,352 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7187375229850072788 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7187375229850072791} + - component: {fileID: 2903605308500103306} + - component: {fileID: 6961750306551488121} + - component: {fileID: 3758058927284355959} + m_Layer: 0 + m_Name: ItemDrop_EndGame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7187375229850072791 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7187375229850072788} + 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: + - {fileID: 7183679910667640660} + - {fileID: 7067498331277073024} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2903605308500103306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7187375229850072788} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0655215211725524ab947b3480a3a8cc, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 1 + interactableWithRange: 0 + rangedRadius: 10 + interactionTransform: {fileID: 7187375229850072791} + itemDrop: {fileID: 0} +--- !u!54 &6961750306551488121 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7187375229850072788} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!135 &3758058927284355959 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7187375229850072788} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.4 + m_Center: {x: 0, y: 0.25, z: 0} +--- !u!1001 &7187375228888348370 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7187375229850072791} + m_Modifications: + - target: {fileID: 1770571109050598, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_Name + value: SM_Icon_CoinBag_01 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalScale.x + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalScale.y + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalScale.z + value: 0.8 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalPosition.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} +--- !u!4 &7183679910667640660 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4258828872886662, guid: 26ebce2f78526014da0d1b69d835b6e9, type: 3} + m_PrefabInstance: {fileID: 7187375228888348370} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7187375228941502008 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7187375229850072791} + m_Modifications: + - target: {fileID: 120018264446870152, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_Name + value: ItemEpicModular + objectReference: {fileID: 0} + - target: {fileID: 120018264447160284, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 120018264447160284, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 120018264447160284, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 120018264447160284, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalPosition.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 120018264447160284, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 120018264447219682, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 120018264447219682, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 120018264447219682, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 120018264447219682, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 120018264461291020, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.042452812 + objectReference: {fileID: 0} + - target: {fileID: 120018264461291020, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.55640244 + objectReference: {fileID: 0} + - target: {fileID: 120018264461291020, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 120018264461306244, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.042452812 + objectReference: {fileID: 0} + - target: {fileID: 120018264461306244, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.55640244 + objectReference: {fileID: 0} + - target: {fileID: 120018264461306244, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 120018264461337192, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.042452812 + objectReference: {fileID: 0} + - target: {fileID: 120018264461337192, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.55640244 + objectReference: {fileID: 0} + - target: {fileID: 120018264461337192, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 120018264462480538, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 120018264462519802, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 120018264462537864, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 553397403800513046, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 553397403800513046, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 553397403800513046, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 553397403800513046, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4966203874945994432, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.042452812 + objectReference: {fileID: 0} + - target: {fileID: 4966203874945994432, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.55640244 + objectReference: {fileID: 0} + - target: {fileID: 4966203874945994432, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5695417263390055358, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} +--- !u!4 &7067498331277073024 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 120018264447229112, guid: ccc7a45cd4207984db88f91da69c61be, type: 3} + m_PrefabInstance: {fileID: 7187375228941502008} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/ItemDrop_EndGame.prefab.meta b/Assets/Resources/ItemDrop_EndGame.prefab.meta new file mode 100644 index 00000000..1d355202 --- /dev/null +++ b/Assets/Resources/ItemDrop_EndGame.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 287f31c473cbc5e4bb5e988acb4965ca +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/4-DragonsLair.unity b/Assets/Scenes/4-DragonsLair.unity index b4168517..532347d3 100644 --- a/Assets/Scenes/4-DragonsLair.unity +++ b/Assets/Scenes/4-DragonsLair.unity @@ -272,6 +272,104 @@ Transform: m_CorrespondingSourceObject: {fileID: 3461970411504524829, guid: 68964ef68d4721342b6540648758e55b, type: 3} m_PrefabInstance: {fileID: 389728287} m_PrefabAsset: {fileID: 0} +--- !u!1 &459176243 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 459176247} + - component: {fileID: 459176246} + - component: {fileID: 459176245} + - component: {fileID: 459176244} + m_Layer: 3 + m_Name: RayHitAOE + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &459176244 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459176243} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &459176245 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459176243} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &459176246 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459176243} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &459176247 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 459176243} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 32.8, y: 0.3, z: 9.9} + m_LocalScale: {x: 7.5747375, y: 1, z: 10.717688} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &469895083 GameObject: m_ObjectHideFlags: 0 @@ -416,6 +514,95 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &821634039 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 632822146462218232, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_Name + value: Vendor_Template_Barbarian_Variant + objectReference: {fileID: 0} + - target: {fileID: 632822146462218233, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_RootOrder + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 632822146462218233, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_LocalPosition.x + value: 47.68 + objectReference: {fileID: 0} + - target: {fileID: 632822146462218233, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 632822146462218233, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_LocalPosition.z + value: -28.24 + objectReference: {fileID: 0} + - target: {fileID: 632822146462218233, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9931239 + objectReference: {fileID: 0} + - target: {fileID: 632822146462218233, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 632822146462218233, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_LocalRotation.y + value: -0.11706805 + objectReference: {fileID: 0} + - target: {fileID: 632822146462218233, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 632822146462218233, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 632822146462218233, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -13.446 + objectReference: {fileID: 0} + - target: {fileID: 632822146462218233, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 632822146462218234, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: vendorData.items.Array.data[0].item + value: + objectReference: {fileID: 11400000, guid: 29fa797929d7aeb4e8750354c62385d4, type: 2} + - target: {fileID: 632822146462218234, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: vendorData.items.Array.data[1].item + value: + objectReference: {fileID: 11400000, guid: 3ad2da60d480dac4ba938457eb4458c0, type: 2} + - target: {fileID: 632822146462218234, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: vendorData.items.Array.data[2].item + value: + objectReference: {fileID: 11400000, guid: 8eef5c0011a564942b82c298531876d3, type: 2} + - target: {fileID: 632822146462218234, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: vendorData.items.Array.data[3].item + value: + objectReference: {fileID: 11400000, guid: d1c36ebfd86effe478456c1e653c5b4c, type: 2} + - target: {fileID: 632822146462218234, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: vendorData.items.Array.data[4].item + value: + objectReference: {fileID: 11400000, guid: c726d1097e80dbc4980186c788b33e5d, type: 2} + - target: {fileID: 632822146462218234, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: vendorData.items.Array.data[5].item + value: + objectReference: {fileID: 11400000, guid: 070945b349b052d4fa19fa4f7a2654c7, type: 2} + - target: {fileID: 5907933960340573574, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_text + value: Wild Titan + objectReference: {fileID: 0} + - target: {fileID: 5907933960340573574, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} + propertyPath: m_fontSize + value: 350 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 49d34a321a7438843a65dfaa969c61ce, type: 3} --- !u!1001 &1157748257 PrefabInstance: m_ObjectHideFlags: 0 @@ -539,6 +726,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 790891270675364150, guid: 953fdfa9e893aae4d881f391dc1e5c1c, type: 3} + propertyPath: m_text + value: Sovereign + objectReference: {fileID: 0} + - target: {fileID: 3206249341598300513, guid: 953fdfa9e893aae4d881f391dc1e5c1c, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6038414138835698504, guid: 953fdfa9e893aae4d881f391dc1e5c1c, type: 3} propertyPath: m_Name value: Vendor_Template_ShadowDancer_Variant @@ -825,7 +1020,11 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 5c106cf4f12872641bbb89c5047284d0, type: 2} - target: {fileID: 5172313010851302851, guid: 66e6f54f5f694944fa623a6603f8c2ff, type: 3} propertyPath: m_text - value: Archmage Vendor + value: Archon + objectReference: {fileID: 0} + - target: {fileID: 5172313010851302851, guid: 66e6f54f5f694944fa623a6603f8c2ff, type: 3} + propertyPath: m_fontSize + value: 350 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66e6f54f5f694944fa623a6603f8c2ff, type: 3} diff --git a/Assets/Scenes/4-RiverAve.unity b/Assets/Scenes/4-RiverAve.unity index 240e3665..593e5a4d 100644 --- a/Assets/Scenes/4-RiverAve.unity +++ b/Assets/Scenes/4-RiverAve.unity @@ -5863,6 +5863,104 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 665408573} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &674133261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 674133265} + - component: {fileID: 674133264} + - component: {fileID: 674133263} + - component: {fileID: 674133262} + m_Layer: 3 + m_Name: RayHitAOE + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &674133262 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 674133261} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &674133263 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 674133261} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &674133264 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 674133261} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &674133265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 674133261} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -13.3, y: 0.04, z: -3.8} + m_LocalScale: {x: 10.42158, y: 1, z: 10.6348295} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &692073256 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Health.cs b/Assets/Scripts/Health.cs index 0c39712c..d762f9f4 100644 --- a/Assets/Scripts/Health.cs +++ b/Assets/Scripts/Health.cs @@ -76,14 +76,14 @@ public class Health : Resource if (damageIncomeModifierEffectInstance.IsActive) { - Debug.Log("Incoming damage b4 mitigation: " + incomingValue); + //Debug.Log("Incoming damage b4 mitigation: " + incomingValue); incomingValue = damageIncomeModifierEffectInstance.ModifyDamageIncome(incomingValue); if (incomingValue > 0) //avoid damage ultra mitigated turning into healing incomingValue = 0; } - Debug.Log("Incoming damage after mitigation: " + incomingValue); + //Debug.Log("Incoming damage after mitigation: " + incomingValue); } } @@ -93,14 +93,14 @@ public class Health : Resource { if (absorbEffectInstance.IsActive) { - Debug.Log("Incoming damage b4 absorbs: " + incomingValue); + //Debug.Log("Incoming damage b4 absorbs: " + incomingValue); incomingValue = absorbEffectInstance.AbsorbDamage(incomingValue); if (incomingValue > 0) //avoid complete absorbs turning into healing incomingValue = 0; } - Debug.Log("Incoming damage after absorbs: " + incomingValue); + //Debug.Log("Incoming damage after absorbs: " + incomingValue); } } @@ -143,7 +143,7 @@ public class Health : Resource public void RPC_ChangeValueHealth(float value) { if (!photonView.IsMine) return; - Debug.Log("Received ChangeValue from RPC from someone"); + //Debug.Log("Received ChangeValue from RPC from someone"); ChangeValue(value); } diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index e68dc998..83ee64bc 100644 --- a/Assets/Starfield Skybox/Skybox.mat +++ b/Assets/Starfield Skybox/Skybox.mat @@ -94,7 +94,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 6.526123 + - _Rotation: 51.168888 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1