From 55c146e1a9383f5d555bda8690884bb716fa8cc5 Mon Sep 17 00:00:00 2001 From: Gard <gardaf@stud.ntnu.no> Date: Mon, 3 Oct 2022 16:50:56 +0200 Subject: [PATCH 1/2] Added simple xp bar --- MrBigsock/Assets/Code/Character.cs | 24 +++++++++++++--- MrBigsock/Assets/Code/PlayerController.cs | 23 ++++++++++++++++ MrBigsock/Assets/Code/orc/EnemyController.cs | 1 + MrBigsock/Assets/XpBar.cs | 29 ++++++++++++++++++++ MrBigsock/Assets/XpBar.cs.meta | 11 ++++++++ 5 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 MrBigsock/Assets/XpBar.cs create mode 100644 MrBigsock/Assets/XpBar.cs.meta diff --git a/MrBigsock/Assets/Code/Character.cs b/MrBigsock/Assets/Code/Character.cs index 50524d5e..2e5eed3e 100644 --- a/MrBigsock/Assets/Code/Character.cs +++ b/MrBigsock/Assets/Code/Character.cs @@ -56,6 +56,13 @@ namespace BigSock { public float MaxHP => Stats.MaxHP; public float baseMaxHP = 10; + /* + Xp.... + */ + public float dropXP; + public float xp; + public float maxXp; + public int level; /* @@ -194,7 +201,11 @@ namespace BigSock { Alive = false; // Inform the attacker killed us. - if(attack.Actor != null) attack.Actor.TargetKilled(this, attack); + if(attack.Actor != null) { + attack.Actor.TargetKilled(this, attack); + if(attack.Actor is PlayerController player) + player.GainXp(dropXP); + } AfterDeath(); @@ -239,7 +250,6 @@ namespace BigSock { print($"[Character.AfterDeath()] start. | {HP}, {Alive}"); Destroy(gameObject); } - } @@ -328,6 +338,12 @@ namespace BigSock { public void TargetKilled(Character target, AttackStats attack) { OnKill?.Invoke(this, target, attack); } + + + public void GiveXp(float xp) { + this.xp += xp; + OnGainedXP?.Invoke(this, xp); + } /* Triggers when character uses an attack. @@ -381,9 +397,9 @@ namespace BigSock { /* Triggers when character gains xp. - Params: actor, amount. + Params: sorce, amount. */ - public event Action<Character, int> OnGainedXP; + public event Action<Character, float> OnGainedXP; /* Triggers when character levels up. diff --git a/MrBigsock/Assets/Code/PlayerController.cs b/MrBigsock/Assets/Code/PlayerController.cs index 300cedfb..86ef3041 100644 --- a/MrBigsock/Assets/Code/PlayerController.cs +++ b/MrBigsock/Assets/Code/PlayerController.cs @@ -17,6 +17,9 @@ namespace BigSock { { public HPBar hpBar; + public XpBar xpBar; + + public float collisionOffset = 0.05f; public ContactFilter2D movementFilter; @@ -43,6 +46,10 @@ namespace BigSock { protected override void Start() { base.Start(); + + xpBar.SetMaxXp(maxXp); + xpBar.SetXp(xp); + animator = GetComponent<Animator>(); spriteRenderer = GetComponent<SpriteRenderer>(); hpBar.SetMaxHealth(Convert.ToInt32(MaxHP)); @@ -163,5 +170,21 @@ namespace BigSock { base.AfterDamage(attack); hpBar.SetHealth(Convert.ToInt32(HP)); } + + public void GainXp(float xp){ + GiveXp(xp); + CheckXp(); + xpBar.SetXp(this.xp); + } + + private void CheckXp(){ + if(xp > maxXp){ + level += 1; + xp -= maxXp; + maxXp = (level + 1) * 100; + xpBar.SetMaxXp(maxXp); + + } + } } } diff --git a/MrBigsock/Assets/Code/orc/EnemyController.cs b/MrBigsock/Assets/Code/orc/EnemyController.cs index 5e286172..b965d45b 100644 --- a/MrBigsock/Assets/Code/orc/EnemyController.cs +++ b/MrBigsock/Assets/Code/orc/EnemyController.cs @@ -9,6 +9,7 @@ namespace BigSock { public partial class EnemyController : Character { public float collisionOffset = 0.05f; + public ContactFilter2D movementFilter; protected List<RaycastHit2D> castCollisions = new List<RaycastHit2D>(); diff --git a/MrBigsock/Assets/XpBar.cs b/MrBigsock/Assets/XpBar.cs new file mode 100644 index 00000000..d22ce773 --- /dev/null +++ b/MrBigsock/Assets/XpBar.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using TMPro; + +namespace BigSock.UI{ + + public class XpBar : MonoBehaviour +{ + + public Slider slider; + public TextMeshPro xpText; + + protected void Start(){ + slider = GetComponent<Slider>(); + // xpText = GetComponent<TextMeshPro>(); + } + + public void SetXp(float xp){ + slider.value = xp; + xpText.SetText($"{xp}/{slider.maxValue}"); + } + + public void SetMaxXp(float xp){ + slider.maxValue = xp; + } +} +} diff --git a/MrBigsock/Assets/XpBar.cs.meta b/MrBigsock/Assets/XpBar.cs.meta new file mode 100644 index 00000000..7cf8ca1b --- /dev/null +++ b/MrBigsock/Assets/XpBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a2ed0e7debd7bc7468e3a430508a7e71 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- GitLab From b25dd0afe064f17a72ef6f941a7793c7587f5cb4 Mon Sep 17 00:00:00 2001 From: Gard <gardaf@stud.ntnu.no> Date: Mon, 3 Oct 2022 16:56:49 +0200 Subject: [PATCH 2/2] =?UTF-8?q?gl=C3=B8mte=20=C3=A5=20last=20opp=20xpbar?= =?UTF-8?q?=20og=20sceen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MrBigsock/Assets/Prefabs/UI/XpBar.prefab | 409 +++++++++++++++++++++++ MrBigsock/Assets/Scenes/example.unity | 305 ++++++++++++----- 2 files changed, 637 insertions(+), 77 deletions(-) create mode 100644 MrBigsock/Assets/Prefabs/UI/XpBar.prefab diff --git a/MrBigsock/Assets/Prefabs/UI/XpBar.prefab b/MrBigsock/Assets/Prefabs/UI/XpBar.prefab new file mode 100644 index 00000000..2f162e01 --- /dev/null +++ b/MrBigsock/Assets/Prefabs/UI/XpBar.prefab @@ -0,0 +1,409 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4004970964909595303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4004970964909595302} + - component: {fileID: 4004970964909595300} + - component: {fileID: 4004970964909595301} + m_Layer: 0 + m_Name: XpBarFill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4004970964909595302 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4004970964909595303} + 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: 4004970966474345104} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.0000009536743} + m_SizeDelta: {x: 0, y: -0.0000009537798} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4004970964909595300 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4004970964909595303} + m_CullTransparentMesh: 1 +--- !u!114 &4004970964909595301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4004970964909595303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9716981, g: 0.93845934, b: 0.2520915, 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_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4004970964999823545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4004970964999823544} + - component: {fileID: 4004970964999823494} + - component: {fileID: 4004970964999823492} + - component: {fileID: 4004970964999823493} + m_Layer: 0 + m_Name: xp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4004970964999823544 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4004970964999823545} + 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: 4004970966474345104} + m_RootOrder: 0 + 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: -6.3, y: 0} + m_SizeDelta: {x: 57.19, y: 27.33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4004970964999823494 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4004970964999823545} + m_CullTransparentMesh: 1 +--- !u!23 &4004970964999823492 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4004970964999823545} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + 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: 9 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &4004970964999823493 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4004970964999823545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + 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: 0/100 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 256 + m_fontSizeBase: 256 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + 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: -52.486343, w: -6.533576} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 4004970964999823492} + m_maskType: 0 +--- !u!1 &8581101802057755547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4004970966474345104} + - component: {fileID: 4004970966474345118} + - component: {fileID: 4004970966474345119} + - component: {fileID: 4004970966474345116} + - component: {fileID: 4004970966474345117} + m_Layer: 0 + m_Name: XpBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4004970966474345104 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8581101802057755547} + 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: 4004970964999823544} + - {fileID: 4004970964909595302} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: -428.77, y: 156.61} + m_SizeDelta: {x: 302.94, y: 27.33} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4004970966474345118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8581101802057755547} + m_CullTransparentMesh: 1 +--- !u!114 &4004970966474345119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8581101802057755547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, 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_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4004970966474345116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8581101802057755547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4004970964909595301} + m_FillRect: {fileID: 4004970964909595302} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 100 + m_WholeNumbers: 1 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4004970966474345117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8581101802057755547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2ed0e7debd7bc7468e3a430508a7e71, type: 3} + m_Name: + m_EditorClassIdentifier: + slider: {fileID: 4004970966474345116} + xpText: {fileID: 4004970964999823493} diff --git a/MrBigsock/Assets/Scenes/example.unity b/MrBigsock/Assets/Scenes/example.unity index 7efdbd34..52a143b1 100644 --- a/MrBigsock/Assets/Scenes/example.unity +++ b/MrBigsock/Assets/Scenes/example.unity @@ -1084,15 +1084,15 @@ Canvas: m_GameObject: {fileID: 158679240} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} + m_RenderMode: 1 + m_Camera: {fileID: 1763586305} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1109,8 +1109,9 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 651767214} + - {fileID: 392657079} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1233,7 +1234,7 @@ Transform: - {fileID: 1008853218} - {fileID: 532417265} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &248757423 PrefabInstance: @@ -1248,7 +1249,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3} propertyPath: m_LocalPosition.x @@ -1294,10 +1295,22 @@ PrefabInstance: propertyPath: m_Name value: BigSock objectReference: {fileID: 0} + - target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3} + propertyPath: xp + value: 90 + objectReference: {fileID: 0} - target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3} propertyPath: hpBar value: objectReference: {fileID: 651767215} + - target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3} + propertyPath: maxXp + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3} + propertyPath: xpBar + value: + objectReference: {fileID: 392657082} - target: {fileID: 9039433759692224201, guid: 008ac26ba660ab94484970b17c589923, type: 3} propertyPath: knockbackForce value: 1 @@ -1757,6 +1770,27 @@ TilemapCollider2D: m_Offset: {x: 0, y: 0} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0.00001 +--- !u!224 &392657079 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + m_PrefabInstance: {fileID: 4004970966316986919} + m_PrefabAsset: {fileID: 0} +--- !u!114 &392657082 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4004970966474345117, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + m_PrefabInstance: {fileID: 4004970966316986919} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2ed0e7debd7bc7468e3a430508a7e71, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &421139538 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5978214257084853710, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + m_PrefabInstance: {fileID: 2004502025} + m_PrefabAsset: {fileID: 0} --- !u!4 &532417265 stripped Transform: m_CorrespondingSourceObject: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} @@ -1785,6 +1819,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -2882901802891604921, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: baseHP + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -2882901802891604921, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: dropXP + value: 12 + objectReference: {fileID: 0} - target: {fileID: 2996495149472241661, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} propertyPath: m_Name value: Enemy_Slime @@ -1903,72 +1945,16 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &981952721 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5978214257507849323, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + m_PrefabInstance: {fileID: 2004502025} + m_PrefabAsset: {fileID: 0} --- !u!4 &1008853218 stripped Transform: m_CorrespondingSourceObject: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} m_PrefabInstance: {fileID: 1912704979} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1229029431 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2996495149472241661, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_Name - value: enemy_orc_warrior - objectReference: {fileID: 0} - - target: {fileID: 2996495149472241661, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_LocalPosition.x - value: 2.82 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: f256acc71054c194a819c82677b399a7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f256acc71054c194a819c82677b399a7, type: 3} --- !u!1 &1483953643 GameObject: m_ObjectHideFlags: 0 @@ -2692,7 +2678,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_AnchorMax.y @@ -2708,7 +2694,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_SizeDelta.x - value: -1107.3955 + value: 72.60449 objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_SizeDelta.y @@ -2728,27 +2714,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7049308 objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.7092762 objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_AnchoredPosition.x - value: -502.69778 + value: 250 objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_AnchoredPosition.y - value: 466.42114 + value: 216 objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2760,7 +2746,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: 90.352 objectReference: {fileID: 0} - target: {fileID: 5978214255517273169, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_Name @@ -2768,12 +2754,20 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5978214255517273170, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_Value - value: 1.88 + value: 6 objectReference: {fileID: 0} - target: {fileID: 5978214255517273170, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_MaxValue value: 10 objectReference: {fileID: 0} + - target: {fileID: 5978214255517273170, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_HandleRect + value: + objectReference: {fileID: 981952721} + - target: {fileID: 5978214257084853697, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 0} - target: {fileID: 5978214257084853710, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2782,6 +2776,58 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5978214257084853710, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5978214257084853710, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5978214257084853710, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_SizeDelta.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 5978214257084853710, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_SizeDelta.y + value: -0.000061035 + objectReference: {fileID: 0} + - target: {fileID: 5978214257084853710, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_AnchoredPosition.x + value: 7.5 + objectReference: {fileID: 0} + - target: {fileID: 5978214257084853710, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.000030517578 + objectReference: {fileID: 0} + - target: {fileID: 5978214257507849323, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5978214257507849323, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5978214257507849323, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5978214257507849323, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5978214257507849323, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_SizeDelta.x + value: 72 + objectReference: {fileID: 0} + - target: {fileID: 5978214257507849323, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_SizeDelta.y + value: -485 + objectReference: {fileID: 0} + - target: {fileID: 5978214257507849323, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} --- !u!1001 &2107497264 @@ -2841,3 +2887,108 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} +--- !u!1001 &4004970966316986919 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 158679244} + m_Modifications: + - target: {fileID: 4004970964909595302, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_SizeDelta.x + value: 302.94 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_SizeDelta.y + value: 27.33 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_AnchoredPosition.x + value: -428.77 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_AnchoredPosition.y + value: 156.61 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345104, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4004970966474345116, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_HandleRect + value: + objectReference: {fileID: 421139538} + - target: {fileID: 8581101802057755547, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} + propertyPath: m_Name + value: XpBar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bef45346e7f6b9408856831d829ce37, type: 3} -- GitLab