diff --git a/MrBigsock/Assets/Code/Character.cs b/MrBigsock/Assets/Code/Character.cs
index 0f725136666a2c230a3c9c67984a66fa7962fec2..75120bfb210fa3f8f124b0e374222f6ceb2059e4 100644
--- a/MrBigsock/Assets/Code/Character.cs
+++ b/MrBigsock/Assets/Code/Character.cs
@@ -106,7 +106,10 @@ namespace BigSock {
public Character() {
Inventory = new Inventory(this);
- Inventory.BackpackCap = 5;
+ Inventory.BackpackCap = 6;
+ Inventory.AccessoriesCap = 3;
+ Inventory.EquipmentCap = 3;
+ Inventory.ToolsCap = 3;
}
protected virtual void Start() {
diff --git a/MrBigsock/Assets/Code/Item/Inventory.cs b/MrBigsock/Assets/Code/Item/Inventory.cs
index b9b552cc2e8d89cff9fe310912547f69f7a999a1..da6b664d5273fdd40c619814693262beae1757cd 100644
--- a/MrBigsock/Assets/Code/Item/Inventory.cs
+++ b/MrBigsock/Assets/Code/Item/Inventory.cs
@@ -136,7 +136,7 @@ namespace BigSock.Item {
public Character Owner { get; }
- public Inventory(Character owner, int backpackCap = 1, int accessoriesCap = 1, int equipmentCap = 1, int toolsCap = 4) {
+ public Inventory(Character owner, int backpackCap = 1, int accessoriesCap = 1, int equipmentCap = 1, int toolsCap = 1) {
if(owner == null) throw new ArgumentNullException(paramName: nameof(owner));
Owner = owner;
BackpackCap = backpackCap;
diff --git a/MrBigsock/Assets/Code/PlayerController.cs b/MrBigsock/Assets/Code/PlayerController.cs
index 1da5c97e057884dc0bbfd3db7e74e05d06b18fc4..8a5b37fd07d91a2d9d23c1d70307761af7bb36b8 100644
--- a/MrBigsock/Assets/Code/PlayerController.cs
+++ b/MrBigsock/Assets/Code/PlayerController.cs
@@ -17,7 +17,7 @@ namespace BigSock {
{
public const int SKILL_POINTS_PR_LVL = 3; // Skill points to gain pr level up.
- public const int SKILL_POINTS_START = 5; // Skill points to start with.
+ public const int SKILL_POINTS_START = 0; // Skill points to start with.
public const float XP_SCALE_RATE = 3.0f; // Multiplier for xp gain, helps test system while game is tiny.
@@ -61,14 +61,14 @@ namespace BigSock {
{
base.Start();
-
- utilBar?.WithXP((int)xp, (int)maxXp)
+
+ utilBar?.WithXP((int)xp, (int)maxXp)
?.WithHealth(Convert.ToInt32(HP), Convert.ToInt32(MaxHP));
animator = GetComponent<Animator>();
spriteRenderer = GetComponent<SpriteRenderer>();
-
+
//!! DEBUG: Add item to player at start to test if it works.
@@ -81,10 +81,14 @@ namespace BigSock {
//var tmp = PrefabService.SINGLETON;
//var tmp = SpriteService.SINGLETON;
- _testAttack = (IAttack) AbilityService.SINGLETON.Get(104);
- _testAttack2 = (IAttack) AbilityService.SINGLETON.Get(102);
- _testAttack3 = (IAttack) AbilityService.SINGLETON.Get(101);
+ _testAttack = (IAttack)AbilityService.SINGLETON.Get(104);
+ _testAttack2 = (IAttack)AbilityService.SINGLETON.Get(102);
+ _testAttack3 = (IAttack)AbilityService.SINGLETON.Get(101);
_dodge = AbilityService.SINGLETON.Get(201);
+
+ _ = AudioService.SINGLETON;
+ _ = SpriteService.SINGLETON;
+ _ = PrefabService.SINGLETON;
}
diff --git a/MrBigsock/Assets/Code/UI/AbilityCluster.cs b/MrBigsock/Assets/Code/UI/AbilityCluster.cs
new file mode 100644
index 0000000000000000000000000000000000000000..63fde66fb70be46ab6c128de88e47caf42962617
--- /dev/null
+++ b/MrBigsock/Assets/Code/UI/AbilityCluster.cs
@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace BigSock.UI
+{
+ public class AbilityCluster : MonoBehaviour
+ {
+
+
+
+
+ }
+}
diff --git a/MrBigsock/Assets/Code/UI/AbilityCluster.cs.meta b/MrBigsock/Assets/Code/UI/AbilityCluster.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..d3d7f3354d659d6169e14c0c2486b7453444e5d9
--- /dev/null
+++ b/MrBigsock/Assets/Code/UI/AbilityCluster.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 968782e336bfcae44a16f719171f7399
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/MrBigsock/Assets/Code/UI/AbilityElement.cs b/MrBigsock/Assets/Code/UI/AbilityElement.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f82a1b2d373e18e17f4c7616665bc37a56a08276
--- /dev/null
+++ b/MrBigsock/Assets/Code/UI/AbilityElement.cs
@@ -0,0 +1,44 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+
+namespace BigSock.UI
+{
+ public class AbilityElement : MonoBehaviour
+ {
+ private Slider ChargeSlider, ReloadSlider;
+
+ public AbilityElement WithCharge(int? value = null, int? maxValue = null)
+ {
+ if (value != null) ChargeSlider.value = value.Value;
+
+ if (maxValue != null) ChargeSlider.maxValue = maxValue.Value;
+ return this;
+ }
+
+ public AbilityElement WithReload(int? value = null, int? maxValue = null)
+ {
+ if (value != null) ReloadSlider.value = value.Value;
+
+ if (maxValue != null) ReloadSlider.maxValue = maxValue.Value;
+ return this;
+ }
+
+
+
+ // Start is called before the first frame update
+ void Start()
+ {
+ ChargeSlider = transform.Find("ChargeSlider").GetComponent<Slider>();
+ ReloadSlider = transform.Find("ReloadSlider").GetComponent<Slider>();
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+ }
+}
diff --git a/MrBigsock/Assets/Code/UI/AbilityElement.cs.meta b/MrBigsock/Assets/Code/UI/AbilityElement.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..4e238653fe53a5a8b4beab752c274b4ca916abb4
--- /dev/null
+++ b/MrBigsock/Assets/Code/UI/AbilityElement.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a57bd4c3ae63c74438e86bb79955791f
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/MrBigsock/Assets/Code/UI/EndScreen.cs b/MrBigsock/Assets/Code/UI/EndScreen.cs
index c44abb087d7e15bb4567a9bf487346611434076e..673314ad06ab26e695c7d520510a604cb1689f30 100644
--- a/MrBigsock/Assets/Code/UI/EndScreen.cs
+++ b/MrBigsock/Assets/Code/UI/EndScreen.cs
@@ -3,31 +3,35 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
-public class EndScreen : MonoBehaviour
-{
-
- public void Start()
- {
- Time.timeScale = 0;
- GameObject menu = GameObject.Find("PlayerMenu(Clone)");
- if (menu != null) {
- Destroy(menu.gameObject);
+namespace BigSock.UI
+{
+ public class EndScreen : MonoBehaviour
+ {
+
+ public void Start()
+ {
+ Time.timeScale = 0;
+ GameObject menu = GameObject.Find("PlayerMenu(Clone)");
+ if (menu != null)
+ {
+ Destroy(menu.gameObject);
+ }
}
- }
- public void OnDestroy()
- {
- Time.timeScale = 1;
- }
+ public void OnDestroy()
+ {
+ Time.timeScale = 1;
+ }
- public void GiveUp()
- {
- Application.Quit();
- }
+ public void GiveUp()
+ {
+ Application.Quit();
+ }
- public void TryAgain()
- {
- Destroy(gameObject);
- SceneManager.LoadScene("MainMenu");
+ public void TryAgain()
+ {
+ Destroy(gameObject);
+ SceneManager.LoadScene("MainMenu");
+ }
}
}
diff --git a/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab b/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab
index 65c081ce1c376acbd62ac5f135eded7a2aa63ea9..bcb42954b8e9e3258b13b2847f57e0e2fd0b6430 100644
--- a/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab
+++ b/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab
@@ -178,7 +178,7 @@ MonoBehaviour:
knockbackForce: 3
baseHP: 20
baseMaxHP: 20
- dropXP: 0
+ dropXP: 20
xp: 0
maxXp: 0
level: 0
diff --git a/MrBigsock/Assets/Resources/Prefabs/UI/Ability.prefab b/MrBigsock/Assets/Resources/Prefabs/UI/Ability.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..5a9e21578f0035e966afa2b1defb3abfccb05d90
--- /dev/null
+++ b/MrBigsock/Assets/Resources/Prefabs/UI/Ability.prefab
@@ -0,0 +1,537 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &608863183303895080
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1162967135590492495}
+ - component: {fileID: 3088922330173658661}
+ m_Layer: 5
+ m_Name: ReloadSlider
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1162967135590492495
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 608863183303895080}
+ 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: 2352360143660502489}
+ m_Father: {fileID: 7162627082446979882}
+ m_RootOrder: 2
+ 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, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3088922330173658661
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 608863183303895080}
+ 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: 0
+ m_TargetGraphic: {fileID: 0}
+ m_FillRect: {fileID: 2352360143660502489}
+ m_HandleRect: {fileID: 0}
+ m_Direction: 0
+ m_MinValue: 0
+ m_MaxValue: 1
+ m_WholeNumbers: 0
+ m_Value: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!1 &861279964008999123
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4659232873625163481}
+ - component: {fileID: 8262861634476856854}
+ - component: {fileID: 4666205745523556728}
+ m_Layer: 5
+ m_Name: Sprite
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4659232873625163481
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 861279964008999123}
+ 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: 7162627082446979882}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0.55371094, y: 0.5538025}
+ m_SizeDelta: {x: -15, y: -15}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8262861634476856854
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 861279964008999123}
+ m_CullTransparentMesh: 1
+--- !u!114 &4666205745523556728
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 861279964008999123}
+ 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: 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_Sprite: {fileID: -625882450, guid: 1710de3411c84ee46a2964301101ea13, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 1
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2297026710472313614
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3403526473274215257}
+ - component: {fileID: 7904693069911768052}
+ m_Layer: 5
+ m_Name: ChargeSlider
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3403526473274215257
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2297026710472313614}
+ 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: 528640627046341212}
+ m_Father: {fileID: 7162627082446979882}
+ m_RootOrder: 3
+ 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, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7904693069911768052
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2297026710472313614}
+ 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: 0
+ m_TargetGraphic: {fileID: 0}
+ m_FillRect: {fileID: 528640627046341212}
+ m_HandleRect: {fileID: 0}
+ m_Direction: 0
+ m_MinValue: 0
+ m_MaxValue: 1
+ m_WholeNumbers: 0
+ m_Value: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!1 &3158598339582484820
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 528640627046341212}
+ - component: {fileID: 8322364645434875127}
+ - component: {fileID: 3014320130401371756}
+ m_Layer: 5
+ m_Name: Charge
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &528640627046341212
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3158598339582484820}
+ 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: 3403526473274215257}
+ m_RootOrder: 0
+ 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}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8322364645434875127
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3158598339582484820}
+ m_CullTransparentMesh: 1
+--- !u!114 &3014320130401371756
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3158598339582484820}
+ 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.7075472, g: 0, b: 0, a: 0.5686275}
+ 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 &4922676236975142027
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7162627082446979882}
+ - component: {fileID: 1843569694638837707}
+ m_Layer: 5
+ m_Name: Ability
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7162627082446979882
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4922676236975142027}
+ 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: 7469312420497489659}
+ - {fileID: 4659232873625163481}
+ - {fileID: 1162967135590492495}
+ - {fileID: 3403526473274215257}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 118, y: 106}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1843569694638837707
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4922676236975142027}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a57bd4c3ae63c74438e86bb79955791f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &5347789890487579117
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7469312420497489659}
+ - component: {fileID: 8627409617719541973}
+ - component: {fileID: 9105020043293484011}
+ m_Layer: 5
+ m_Name: BackGround
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7469312420497489659
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5347789890487579117}
+ 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: 7162627082446979882}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8627409617719541973
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5347789890487579117}
+ m_CullTransparentMesh: 1
+--- !u!114 &9105020043293484011
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5347789890487579117}
+ 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.09433961, g: 0.09433961, b: 0.09433961, a: 0.74509805}
+ 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 &6442501450572636124
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2352360143660502489}
+ - component: {fileID: 4701596690585040451}
+ - component: {fileID: 2436005161279142188}
+ m_Layer: 5
+ m_Name: Reload
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2352360143660502489
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6442501450572636124}
+ 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: 1162967135590492495}
+ m_RootOrder: 0
+ 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}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4701596690585040451
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6442501450572636124}
+ m_CullTransparentMesh: 1
+--- !u!114 &2436005161279142188
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6442501450572636124}
+ 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.1981132, g: 0.1981132, b: 0.1981132, a: 0.5882353}
+ 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
diff --git a/MrBigsock/Assets/Resources/Prefabs/UI/Ability.prefab.meta b/MrBigsock/Assets/Resources/Prefabs/UI/Ability.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1e4c632f106a34a1cf44ff7a2b07f773927dadc8
--- /dev/null
+++ b/MrBigsock/Assets/Resources/Prefabs/UI/Ability.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d61a6f887e4d8ae4ba738deb80c286d2
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab b/MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab
index 07f46cc1b832638929d6cd33811e09358141da2f..16f16233be453563253b159247dfac44e8212b2f 100644
--- a/MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab
+++ b/MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab
@@ -178,7 +178,7 @@ MonoBehaviour:
knockbackForce: 2
baseHP: 10
baseMaxHP: 10
- dropXP: 0
+ dropXP: 20
xp: 0
maxXp: 0
level: 0
diff --git a/MrBigsock/Assets/Resources/Prefabs/enemy_orc_warrior.prefab b/MrBigsock/Assets/Resources/Prefabs/enemy_orc_warrior.prefab
index 2e365bb62850ce29727b4bb76b34a2e52bcd7f9f..ea2aa534130beb238e0b1ba4045e87a40708a7cd 100644
--- a/MrBigsock/Assets/Resources/Prefabs/enemy_orc_warrior.prefab
+++ b/MrBigsock/Assets/Resources/Prefabs/enemy_orc_warrior.prefab
@@ -151,7 +151,7 @@ MonoBehaviour:
knockbackForce: 3
baseHP: 10
baseMaxHP: 10
- dropXP: 0
+ dropXP: 20
xp: 0
maxXp: 0
level: 0
diff --git a/MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/SpriteSheet/Bringer-of-Death-SpritSheet.png.meta b/MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/SpriteSheet/Bringer-of-Death-SpritSheet.png.meta
index f9c01b59e9995cf30e0a3fc73b41b32183909165..44fdff3b16384c40f68683ab8068800899e34d9d 100644
--- a/MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/SpriteSheet/Bringer-of-Death-SpritSheet.png.meta
+++ b/MrBigsock/Assets/Resources/Sprites/Enemy/Boss/Sprites/Bringer_of_death/SpriteSheet/Bringer-of-Death-SpritSheet.png.meta
@@ -1519,10 +1519,10 @@ TextureImporter:
Bringer-of-Death-SpritSheet_3: -1354585760
Bringer-of-Death-SpritSheet_62: -1981653235
Bringer-of-Death-SpritSheet_32: -758833498
- Bringer-of-Death-SpritSheet_6: -2002076032
Bringer-of-Death-SpritSheet_41: 249659269
- Bringer-of-Death-SpritSheet_21: -133352305
Bringer-of-Death-SpritSheet_1: 959836911
+ Bringer-of-Death-SpritSheet_21: -133352305
+ Bringer-of-Death-SpritSheet_6: -2002076032
Bringer-of-Death-SpritSheet_0: -216419084
Bringer-of-Death-SpritSheet_22: 1421686516
Bringer-of-Death-SpritSheet_20: 1849084138