diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index ca7a236..665893f 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -21,7 +21,7 @@ MonoBehaviour: m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - m_GUID: ed9b80145a89c8a4f8d456971d242c3c - m_Address: Assets/Database/UI/PortraitsHolder.asset + m_Address: PortraitsHolder m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 diff --git a/Assets/Code/GameState/Entities/EntitiesDefinitions.cs b/Assets/Code/GameState/Entities/EntitiesDefinitions.cs index 13b0626..df18bf9 100644 --- a/Assets/Code/GameState/Entities/EntitiesDefinitions.cs +++ b/Assets/Code/GameState/Entities/EntitiesDefinitions.cs @@ -147,6 +147,7 @@ namespace Nox.Game { Role = Role, Race = Race, Class = Class, + PortraitIndex = PortraitIndex, Attributes = new EntityAttributes { attributes = Attributes?.attributes?.AsValueEnumerable().Select(a => new Attribute(a.attribute, a.value)).ToArray() }, diff --git a/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs b/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs index af46519..0305211 100644 --- a/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs +++ b/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs @@ -3,6 +3,7 @@ using Jovian.ZoneSystem; using Nox.Core; using Nox.Platform; using Nox.Game.UI; +using Nox.UI; using ZLinq; using UnityEngine; using UnityEngine.AddressableAssets; @@ -37,6 +38,7 @@ namespace Nox.Game { private AdventureSettings adventureSettings; private TimeHandler timeHandler; private PartyInventoryHandler partyInventoryHandler; + private PartyGuiView partyGuiView; public AdventurePlayMode( PlatformSettings platformSettings, @@ -130,6 +132,12 @@ namespace Nox.Game { adventureView ??= new AdventureView(gameDataState, guiReferences, inputActions, adventureData, adventureSettings); adventureView.Initialize(); + if(partyGuiView == null && guiReferences.partyMemberSlotPrefab != null) { + var portraitsHolder = Addressables.LoadAssetAsync("PortraitsHolder").WaitForCompletion(); + partyGuiView = new PartyGuiView(guiReferences.portraitsContainer, guiReferences.partyMemberSlotPrefab, portraitsHolder); + partyGuiView.Initialize(partyDefinition); + } + IsGameModeInitialized = true; } @@ -142,6 +150,7 @@ namespace Nox.Game { partyInventoryHandler.Tick(); partyMovementHandler.Tick(); adventureView.Tick(); + partyGuiView?.Tick(); if(inputActions.UI.PauseMenu.WasPerformedThisFrame()) { gameDataState.ChangePlayMode(PlayMode.PauseMenu); @@ -168,6 +177,7 @@ namespace Nox.Game { public void Dispose() { cameraController?.Dispose(); partyMovementHandler?.Dispose(); + partyGuiView?.Dispose(); } } diff --git a/Assets/Code/GameState/UI/GuiReferences.cs b/Assets/Code/GameState/UI/GuiReferences.cs index 1cd3c74..573b7c8 100644 --- a/Assets/Code/GameState/UI/GuiReferences.cs +++ b/Assets/Code/GameState/UI/GuiReferences.cs @@ -5,6 +5,7 @@ using UnityEngine.UI; namespace Nox.Game.UI { public class GuiReferences : MonoBehaviour { public Transform portraitsContainer; + public PartyMemberSlot partyMemberSlotPrefab; public Image suppliesBar; public TextMeshProUGUI suppliesText; public Button pauseMenuButton; diff --git a/Assets/Code/GameState/UI/PartyGuiView.cs b/Assets/Code/GameState/UI/PartyGuiView.cs new file mode 100644 index 0000000..58c6825 --- /dev/null +++ b/Assets/Code/GameState/UI/PartyGuiView.cs @@ -0,0 +1,107 @@ +using System.Collections.Generic; +using Nox.UI; +using UnityEngine; +using Object = UnityEngine.Object; + +namespace Nox.Game.UI { + public class PartyGuiView { + private readonly Transform portraitsContainer; + private readonly PartyMemberSlot slotPrefab; + private readonly PortraitsHolder portraitsHolder; + private readonly List activeSlots = new(); + + private PartyDefinition trackedParty; + private int trackedMemberCount; + + public PartyGuiView(Transform portraitsContainer, PartyMemberSlot slotPrefab, PortraitsHolder portraitsHolder) { + this.portraitsContainer = portraitsContainer; + this.slotPrefab = slotPrefab; + this.portraitsHolder = portraitsHolder; + } + + public void Initialize(PartyDefinition party) { + trackedParty = party; + trackedMemberCount = 0; + RebuildSlots(); + } + + public void Tick() { + if(trackedParty == null) { + return; + } + + // Rebuild if member count changed + if(trackedParty.members.Count != trackedMemberCount) { + RebuildSlots(); + } + + // Update dynamic values (health, mana) + for(int i = 0; i < activeSlots.Count && i < trackedParty.members.Count; i++) { + var member = trackedParty.members[i]; + var slot = activeSlots[i]; + UpdateSlotStats(slot, member); + } + } + + private void RebuildSlots() { + // Clear existing + foreach(var slot in activeSlots) { + Object.Destroy(slot.gameObject); + } + activeSlots.Clear(); + + if(trackedParty?.members == null) { + return; + } + + trackedMemberCount = trackedParty.members.Count; + + foreach(var member in trackedParty.members) { + var slot = Object.Instantiate(slotPrefab, portraitsContainer); + slot.gameObject.SetActive(true); + + // Portrait + if(portraitsHolder != null && portraitsHolder.portraits.Length > 0) { + var idx = Mathf.Clamp(member.PortraitIndex, 0, portraitsHolder.portraits.Length - 1); + slot.portrait.sprite = portraitsHolder.portraits[idx]; + } + + // Name + if(slot.nameText != null) { + slot.nameText.text = member.Name; + } + + UpdateSlotStats(slot, member); + activeSlots.Add(slot); + } + } + + private static void UpdateSlotStats(PartyMemberSlot slot, CharacterDefinition member) { + var health = member.Stats.GetValue(StatType.Health); + var mana = member.Stats.GetValue(StatType.Mana); + + if(slot.healthBar != null) { + slot.healthBar.fillAmount = Mathf.Clamp01(health / 100f); + } + if(slot.healthText != null) { + slot.healthText.text = health.ToString(); + } + + if(slot.manaBar != null) { + slot.manaBar.fillAmount = Mathf.Clamp01(mana / 100f); + } + if(slot.manaText != null) { + slot.manaText.text = mana.ToString(); + } + } + + public void Dispose() { + foreach(var slot in activeSlots) { + if(slot != null) { + Object.Destroy(slot.gameObject); + } + } + activeSlots.Clear(); + } + } +} diff --git a/Assets/Code/GameState/UI/PartyGuiView.cs.meta b/Assets/Code/GameState/UI/PartyGuiView.cs.meta new file mode 100644 index 0000000..24c8ebc --- /dev/null +++ b/Assets/Code/GameState/UI/PartyGuiView.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a95c5f20aad5baf498f79d7d61049e06 \ No newline at end of file diff --git a/Assets/Code/GameState/UI/PartyMemberSlot.cs b/Assets/Code/GameState/UI/PartyMemberSlot.cs new file mode 100644 index 0000000..af8ebec --- /dev/null +++ b/Assets/Code/GameState/UI/PartyMemberSlot.cs @@ -0,0 +1,14 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace Nox.Game.UI { + public class PartyMemberSlot : MonoBehaviour { + public Image portrait; + public Image healthBar; + public Image manaBar; + public TextMeshProUGUI nameText; + public TextMeshProUGUI healthText; + public TextMeshProUGUI manaText; + } +} diff --git a/Assets/Code/GameState/UI/PartyMemberSlot.cs.meta b/Assets/Code/GameState/UI/PartyMemberSlot.cs.meta new file mode 100644 index 0000000..0d13892 --- /dev/null +++ b/Assets/Code/GameState/UI/PartyMemberSlot.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7cc43dfd6e3e7d644a6cb462d8094164 \ No newline at end of file diff --git a/Assets/Prefabs/UI/GUI.prefab b/Assets/Prefabs/UI/GUI.prefab index fc1024e..2416acd 100644 --- a/Assets/Prefabs/UI/GUI.prefab +++ b/Assets/Prefabs/UI/GUI.prefab @@ -413,17 +413,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2124443195524357696} - - {fileID: 7497223681040273609} - - {fileID: 6675701153400291410} - - {fileID: 836462145768403853} + m_Children: [] m_Father: {fileID: 9014584537546893468} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 86, y: -617.50366} - m_SizeDelta: {x: 126.1022, y: 876.7058} + m_AnchoredPosition: {x: 97.608, y: -715.75195} + m_SizeDelta: {x: 149.32, y: 1073.2023} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1630395335026015654 CanvasRenderer: @@ -864,6 +860,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: '::' portraitsContainer: {fileID: 3932659130287953104} + partyMemberSlotPrefab: {fileID: 8423735514293658133, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} suppliesBar: {fileID: 5036729711740760361} suppliesText: {fileID: 5790168282117808138} pauseMenuButton: {fileID: 8796640271604079323} @@ -1551,506 +1548,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1001 &2297603084578374942 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3932659130287953104} - m_Modifications: - - target: {fileID: 821015928509599053, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1445432521138085750, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: deae0f160a4f0314486d83fe7313cfcd, type: 3} - - target: {fileID: 2738445106580039420, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_SizeDelta.x - value: 123.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_SizeDelta.y - value: 212.8684 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5596812297104419965, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7521504480723579343, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Name - value: HeroPortrait (2) - objectReference: {fileID: 0} - - target: {fileID: 7521504480723579343, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8280588642123098778, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} ---- !u!224 &6675701153400291410 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - m_PrefabInstance: {fileID: 2297603084578374942} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3120183334890149253 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3932659130287953104} - m_Modifications: - - target: {fileID: 821015928509599053, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1445432521138085750, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 6cb6255ee69dbf04abe2eac591388adf, type: 3} - - target: {fileID: 2738445106580039420, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_SizeDelta.x - value: 123.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_SizeDelta.y - value: 212.8684 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5596812297104419965, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7521504480723579343, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Name - value: HeroPortrait (1) - objectReference: {fileID: 0} - - target: {fileID: 7521504480723579343, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8280588642123098778, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} ---- !u!224 &7497223681040273609 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - m_PrefabInstance: {fileID: 3120183334890149253} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &5250589009463473857 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3932659130287953104} - m_Modifications: - - target: {fileID: 821015928509599053, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1445432521138085750, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 21833c6afc1e0b047a3c49dc9ea35996, type: 3} - - target: {fileID: 2738445106580039420, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_SizeDelta.x - value: 123.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_SizeDelta.y - value: 212.8684 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5596812297104419965, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7521504480723579343, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Name - value: HeroPortrait (3) - objectReference: {fileID: 0} - - target: {fileID: 7521504480723579343, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8280588642123098778, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} ---- !u!224 &836462145768403853 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - m_PrefabInstance: {fileID: 5250589009463473857} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &6790842017829903116 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3932659130287953104} - m_Modifications: - - target: {fileID: 821015928509599053, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2738445106580039420, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_SizeDelta.x - value: 123.5 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_SizeDelta.y - value: 212.8684 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5596812297104419965, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7521504480723579343, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Name - value: HeroPortrait - objectReference: {fileID: 0} - - target: {fileID: 7521504480723579343, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8280588642123098778, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} ---- !u!224 &2124443195524357696 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4847670906605389132, guid: 7d8ddde92b6271e4c84fd1caa7d21932, type: 3} - m_PrefabInstance: {fileID: 6790842017829903116} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7133999759154951594 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/HeroPortrait.prefab b/Assets/Prefabs/UI/HeroPortrait.prefab index b73aa3a..a1639d4 100644 --- a/Assets/Prefabs/UI/HeroPortrait.prefab +++ b/Assets/Prefabs/UI/HeroPortrait.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8650249646219082848} - component: {fileID: 5238289607019819546} - component: {fileID: 9206939971592915387} - m_Layer: 0 + m_Layer: 5 m_Name: PortraitFrame m_TagString: Untagged m_Icon: {fileID: 0} @@ -32,10 +32,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 635472993512454406} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 60.460003, y: -101.67001} - m_SizeDelta: {x: 126.08, y: 203.78} + m_AnchorMin: {x: 0, y: 0.010000001} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.75, y: -1.1700134} + m_SizeDelta: {x: 1.5, y: 2.7799988} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5238289607019819546 CanvasRenderer: @@ -75,6 +75,280 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1184231360166740480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7663002820715980796} + - component: {fileID: 8678506847545687859} + - component: {fileID: 7895725010274726425} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7663002820715980796 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1184231360166740480} + 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: 635472993512454406} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0.00011432, y: -9.099998} + m_SizeDelta: {x: 121.85, y: 15.442001} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8678506847545687859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1184231360166740480} + m_CullTransparentMesh: 1 +--- !u!114 &7895725010274726425 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1184231360166740480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a0ee74bf6f853704a8a568d5ef638ee9, type: 2} + m_sharedMaterial: {fileID: 9074173216178389243, guid: a0ee74bf6f853704a8a568d5ef638ee9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4292671487 + m_fontColor: {r: 1, g: 0.96781355, b: 0.8632076, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 10.96 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 3.68 + m_fontSizeMax: 10.96 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_characterHorizontalScale: 1 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1833499354507367205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8741529769002405325} + - component: {fileID: 3759434860690868045} + - component: {fileID: 1991527881912334546} + m_Layer: 5 + m_Name: manaText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8741529769002405325 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1833499354507367205} + 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: 5556157417741217720} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.0010054111, y: -0.11654663} + m_SizeDelta: {x: 121.61, y: 3.691} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3759434860690868045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1833499354507367205} + m_CullTransparentMesh: 1 +--- !u!114 &1991527881912334546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1833499354507367205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a0ee74bf6f853704a8a568d5ef638ee9, type: 2} + m_sharedMaterial: {fileID: 9074173216178389243, guid: a0ee74bf6f853704a8a568d5ef638ee9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 3.65 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_characterHorizontalScale: 1 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2738445106580039420 GameObject: m_ObjectHideFlags: 0 @@ -86,8 +360,8 @@ GameObject: - component: {fileID: 5556157417741217720} - component: {fileID: 8211986896708609430} - component: {fileID: 4614622083837966787} - m_Layer: 0 - m_Name: StaminaBar + m_Layer: 5 + m_Name: ManaBar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -104,13 +378,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 8741529769002405325} m_Father: {fileID: 4847670906605389132} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 60.806, y: -104.47347} - m_SizeDelta: {x: 121.61, y: 3.9133} + m_AnchorMin: {x: 0, y: 0.022604525} + m_AnchorMax: {x: 1, y: 0.022604525} + m_AnchoredPosition: {x: -0.19400787, y: -2.4734497} + m_SizeDelta: {x: -0.3899994, y: 3.9132996} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8211986896708609430 CanvasRenderer: @@ -150,6 +425,143 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4098823303455980251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 32220060764936852} + - component: {fileID: 5426572004113888556} + - component: {fileID: 2204466678496895551} + m_Layer: 5 + m_Name: HealthText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &32220060764936852 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4098823303455980251} + 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: 3679437589391954677} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.0010033, y: -0.00012398} + m_SizeDelta: {x: 121.61, y: 3.691} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5426572004113888556 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4098823303455980251} + m_CullTransparentMesh: 1 +--- !u!114 &2204466678496895551 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4098823303455980251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a0ee74bf6f853704a8a568d5ef638ee9, type: 2} + m_sharedMaterial: {fileID: 9074173216178389243, guid: a0ee74bf6f853704a8a568d5ef638ee9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 3.65 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_characterHorizontalScale: 1 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5596812297104419965 GameObject: m_ObjectHideFlags: 0 @@ -161,7 +573,7 @@ GameObject: - component: {fileID: 635472993512454406} - component: {fileID: 713960887884573537} - component: {fileID: 1445432521138085750} - m_Layer: 0 + m_Layer: 5 m_Name: HeroPortrait m_TagString: Untagged m_Icon: {fileID: 0} @@ -181,12 +593,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8650249646219082848} + - {fileID: 7663002820715980796} m_Father: {fileID: 4847670906605389132} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 61.75, y: -101.78} - m_SizeDelta: {x: 123.5, y: 203.56} + m_AnchorMin: {x: 0, y: 0.041302264} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.19400787, y: -0.000015258789} + m_SizeDelta: {x: -0.38810003, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &713960887884573537 CanvasRenderer: @@ -236,7 +649,9 @@ GameObject: m_Component: - component: {fileID: 4847670906605389132} - component: {fileID: 1058805764866833899} - m_Layer: 0 + - component: {fileID: 8423735514293658133} + - component: {fileID: 3828666794624103248} + m_Layer: 5 m_Name: HeroPortrait m_TagString: Untagged m_Icon: {fileID: 0} @@ -250,7 +665,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7521504480723579343} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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 @@ -273,6 +688,44 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7521504480723579343} m_CullTransparentMesh: 1 +--- !u!114 &8423735514293658133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7521504480723579343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7cc43dfd6e3e7d644a6cb462d8094164, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Nox.Game.UI.PartyMemberSlot + portrait: {fileID: 1445432521138085750} + healthBar: {fileID: 4550488616099254946} + manaBar: {fileID: 4614622083837966787} + nameText: {fileID: 7895725010274726425} + healthText: {fileID: 2204466678496895551} + manaText: {fileID: 1991527881912334546} +--- !u!114 &3828666794624103248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7521504480723579343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.LayoutElement + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: 1 + m_LayoutPriority: 1 --- !u!1 &8280588642123098778 GameObject: m_ObjectHideFlags: 0 @@ -284,7 +737,7 @@ GameObject: - component: {fileID: 3679437589391954677} - component: {fileID: 2223287144791830491} - component: {fileID: 4550488616099254946} - m_Layer: 0 + m_Layer: 5 m_Name: HealthBar m_TagString: Untagged m_Icon: {fileID: 0} @@ -302,13 +755,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 32220060764936852} m_Father: {fileID: 4847670906605389132} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 60.806023, y: -99.96694} - m_SizeDelta: {x: 121.612, y: 3.6904} + m_AnchorMin: {x: 0, y: 0.041302264} + m_AnchorMax: {x: 1, y: 0.041302264} + m_AnchoredPosition: {x: -0.19399261, y: -1.4669495} + m_SizeDelta: {x: -0.3880005, y: 2.6903992} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2223287144791830491 CanvasRenderer: diff --git a/Assets/Scenes/Adventure.unity b/Assets/Scenes/Adventure.unity index 7e990e8..c951780 100644 --- a/Assets/Scenes/Adventure.unity +++ b/Assets/Scenes/Adventure.unity @@ -592,38 +592,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 836462145768403853, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 836462145768403853, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 836462145768403853, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 836462145768403853, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2124443195524357696, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2124443195524357696, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2124443195524357696, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2124443195524357696, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2913371113149423864, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} propertyPath: m_Name value: GUI @@ -708,38 +676,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6675701153400291410, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6675701153400291410, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6675701153400291410, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6675701153400291410, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7497223681040273609, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7497223681040273609, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7497223681040273609, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7497223681040273609, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: []