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/FollowPlayer.cs b/MrBigsock/Assets/Code/FollowPlayer.cs
index 6f178e01850ac03da8d9eb4807a5fa1507a04488..89d4fe1efdecc0d0d6a6b9b3a6b9697ef787f59a 100644
--- a/MrBigsock/Assets/Code/FollowPlayer.cs
+++ b/MrBigsock/Assets/Code/FollowPlayer.cs
@@ -1,9 +1,7 @@
-using System.Collections;
using System.Collections.Generic;
+using BigSock.Interact;
using Cinemachine;
using UnityEngine;
-using UnityEngine.Tilemaps;
-using static System.Net.WebRequestMethods;
namespace Bigsock
@@ -15,27 +13,103 @@ namespace Bigsock
[SerializeField]
private CinemachineConfiner2D cameraMap;
+ private int levels = 1;
+
+
Vector3 offset = new Vector3(0, 0, -10);
int i = 0;
+ GameObject[] boss;
+ GameObject player;
+ GameObject[] enemies;
+ GameObject[] Chest;
+ List<GameObject> chests;
+ GameObject stair;
+ private int roomNr = 0;
+ bool stairs_down;
void Start()
{
+ chests = new List<GameObject>();
neighborMapGenerator.RunProceduralGeneration();
-
+ player = GameObject.Find("BigSock");
+ stair = GameObject.Find("Stairs(Clone)");
+ Chest = GameObject.FindGameObjectsWithTag("Chest");
+ foreach(GameObject c in Chest)
+ {
+ chests.Add(c);
+ c.SetActive(false);
+ }
+ stairs_down = stair.GetComponent<Stairs>().stairs_touch;
+ stair.SetActive(false);
}
void LateUpdate()
{
+ boss = GameObject.FindGameObjectsWithTag("Boss");
+ enemies = GameObject.FindGameObjectsWithTag((roomNr).ToString());
+ if (boss.Length == 0 && levels <= 1)
+ {
+ stair.SetActive(true);
+ stairs_down = stair.GetComponent<Stairs>().stairs_touch;
+ }
+
+
+ if (stairs_down)
+ {
+ roomNr = 0;
+ foreach(GameObject c in chests)
+ {
+ DestroyImmediate(c);
+ }
+ DestroyImmediate(stair);
+ chests.Clear();
+ TilemapGenerator.resetMaps();
+ TilemapGenerator.SetRoomIDZero();
+ player.transform.position = new Vector3(9,5,0);
+ neighborMapGenerator.RunProceduralGeneration();
+ Chest = GameObject.FindGameObjectsWithTag("Chest");
+ stair = GameObject.Find("Stairs(Clone)");
+ stairs_down = stair.GetComponent<Stairs>().stairs_touch;
+ foreach (GameObject c in Chest)
+ {
+ if(c != null)
+ {
+ c.SetActive(false);
+ chests.Add(c);
+ }
+ }
+ stair.SetActive(false);
+ levels++;
+ }
+
int i = 0;
if(i == 0) {
cameraMap.InvalidateCache();
- i++;
+ }
+
+ if (enemies.Length == 0)
+ {
+ chests[roomNr].SetActive(true);
+ if(roomNr + 1 < NeighbourMapGenerator.GetRoomListCount() - 1)
+ {
+ roomNr++;
+ }
+ }
+ if(boss.Length == 0)
+ {
+ chests[1 + roomNr].SetActive(true);
}
}
private void OnDestroy()
{
+ roomNr = 0;
+ foreach (GameObject c in chests)
+ {
+ DestroyImmediate(c);
+ }
+ DestroyImmediate(stair);
NeighbourMapGenerator.ClearRoomList();
TilemapGenerator.SetRoomIDZero();
TilemapGenerator.resetMaps();
diff --git a/MrBigsock/Assets/Code/InteractionSystem/Door.cs b/MrBigsock/Assets/Code/InteractionSystem/Door.cs
index 7ce964c2d521220b255d6fb35c7f625b237a1ec8..604867d67d80a89a257da3b9e9406e3f34718f51 100644
--- a/MrBigsock/Assets/Code/InteractionSystem/Door.cs
+++ b/MrBigsock/Assets/Code/InteractionSystem/Door.cs
@@ -14,6 +14,7 @@ namespace BigSock.Interact {
private GameObject cameraPlayer;
private int i = TilemapGenerator.NextRoom();
private GameObject boundary;
+ GameObject door;
public string InteractionPrompt => _prompt;
@@ -30,6 +31,8 @@ namespace BigSock.Interact {
player.transform.position = TilemapGenerator.DoorLocaitonTransport(i);
cameraPlayer.transform.position = player.transform.position;
boundary.GetComponent<PolygonCollider2D>().SetPath(0, TilemapGenerator.GetRoomBoundary(i));
+ door = GameObject.Find("ClosedDoor(Clone)");
+ Destroy(door);
return true;
}
return false;
diff --git a/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs b/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs
new file mode 100644
index 0000000000000000000000000000000000000000..01e072dd33da97f370fd8c47f28406fbcc1fb51f
--- /dev/null
+++ b/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs
@@ -0,0 +1,27 @@
+using Bigsock;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+namespace BigSock.Interact
+{
+ public class Stairs : MonoBehaviour, IInteractable
+ {
+ [SerializeField] private string _prompt;
+
+ public string InteractionPrompt => _prompt;
+ public bool stairs_touch = false;
+
+ public bool Interact(Interactor interactor)
+ {
+ if (!stairs_touch)
+ {
+ stairs_touch = true;
+ return true;
+ }
+ return false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs.meta b/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..bf55bda4e1810be17367da03997d49bfc595c242
--- /dev/null
+++ b/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4a3905e3d079fb64ca71936a1caba90d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
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/Map/NeighbourMapGenerator.cs b/MrBigsock/Assets/Code/Map/NeighbourMapGenerator.cs
index 4dd6c90bdac929e4453f94ccc989b3e1aaf61758..5d253d85c9d62cd28567c0ef6a403907c1eca628 100644
--- a/MrBigsock/Assets/Code/Map/NeighbourMapGenerator.cs
+++ b/MrBigsock/Assets/Code/Map/NeighbourMapGenerator.cs
@@ -1,5 +1,6 @@
using System.Collections;
using System.Collections.Generic;
+using System.Security.Cryptography;
using UnityEngine;
namespace Bigsock
@@ -15,7 +16,7 @@ namespace Bigsock
public override void RunProceduralGeneration()
{
roomList.Clear();
-
+
for (int i = 0; i <= RoomCount - 1; i++)
{
int randomMap = Random.Range(0, mapParam.Length);
@@ -29,6 +30,7 @@ namespace Bigsock
roomList.Add(bossMap);
tilemapGenerator.RenderMap(roomList[roomList.Count - 1],roomList.Count - 1, true);
tilemapGenerator.SpawnBoss(bossMap, roomList.Count - 1);
+ tilemapGenerator.SpawnStairs(bossMap, roomList.Count - 1);
tilemapGenerator.polyCollider(roomList[0], 0);
}
diff --git a/MrBigsock/Assets/Code/Map/TilemapGenerator.cs b/MrBigsock/Assets/Code/Map/TilemapGenerator.cs
index 7b73c7854c6df828f07d11d25385096eacb83005..2cf2f94ae1492154d936bf6f5ab712056464fe69 100644
--- a/MrBigsock/Assets/Code/Map/TilemapGenerator.cs
+++ b/MrBigsock/Assets/Code/Map/TilemapGenerator.cs
@@ -15,6 +15,8 @@ namespace Bigsock
[SerializeField] GameObject Door;
[SerializeField] GameObject[] Enemy;
[SerializeField] GameObject Boss;
+ [SerializeField] GameObject Stairs;
+ [SerializeField] GameObject Chest;
private int z_value = 0;
private static int roomID = 0;
@@ -197,6 +199,7 @@ namespace Bigsock
fast++;
}
}
+ spawnChest(map, roomNr);
SetMapBoundary(map, roomNr);
}
@@ -232,7 +235,7 @@ namespace Bigsock
}
public static void SetRoomIDZero() {
- roomID = 0;
+ roomID = 1;
}
public static void resetMaps()
@@ -349,5 +352,19 @@ namespace Bigsock
WallTop[roomNr].ClearAllTiles();
}
}
+
+ public void SpawnStairs(int[,] bossRoom, int roomNr)
+ {
+ Instantiate(Stairs, new Vector3(FloorTilemap[roomNr].transform.position.x + bossRoom.GetUpperBound(0) / 2 + 0.5f,
+ FloorTilemap[roomNr].transform.position.y + bossRoom.GetUpperBound(1) - 3 + 0.5f, 0), Quaternion.identity);
+ }
+
+ //Spawns a chest in the middle of the room
+ public void spawnChest(int[,] room, int roomNr)
+ {
+ Chest.tag = "Chest";
+ Instantiate(Chest, new Vector3(FloorTilemap[roomNr].transform.position.x + room.GetUpperBound(0) / 2,
+ FloorTilemap[roomNr].transform.position.y + room.GetUpperBound(1) / 2, 0), Quaternion.identity);
+ }
}
}
\ No newline at end of file
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/ChestDisplay.cs b/MrBigsock/Assets/Code/UI/ChestDisplay.cs
index 08839c01ca39303e745b4b76bcb3824ce0db5a72..b28b01df071351a9de5399016680f56541451aa6 100644
--- a/MrBigsock/Assets/Code/UI/ChestDisplay.cs
+++ b/MrBigsock/Assets/Code/UI/ChestDisplay.cs
@@ -28,7 +28,8 @@ namespace BigSock.UI {
// Gets button gameobjects and adds onClick listener
for (int i = 0; i < 3; i++) {
var button = itemButtonLocation.transform.Find("ButtonItem"+(i+1).ToString()).GetComponent<Button>();
- button.onClick.AddListener(delegate {ItemPicked(i); });
+ int j = i;
+ button.onClick.AddListener(delegate {ItemPicked(j); });
buttons.Add(button);
}
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/Prefabs/MapObjects/Stairs.prefab b/MrBigsock/Assets/Prefabs/MapObjects/Stairs.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..1bc17042bbfe6b90961a24c896824801c2bdf028
--- /dev/null
+++ b/MrBigsock/Assets/Prefabs/MapObjects/Stairs.prefab
@@ -0,0 +1,127 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4409019817617405666
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8860318727928166917}
+ - component: {fileID: -6422210887197446182}
+ - component: {fileID: 1254199348833719201}
+ - component: {fileID: 4770025611691691476}
+ m_Layer: 11
+ m_Name: Stairs
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &8860318727928166917
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4409019817617405666}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.49, y: -0.45, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &-6422210887197446182
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4409019817617405666}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4a3905e3d079fb64ca71936a1caba90d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _prompt:
+--- !u!212 &1254199348833719201
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4409019817617405666}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 1
+ m_Sprite: {fileID: 2090772569, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 1, y: 1}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!61 &4770025611691691476
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4409019817617405666}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 1, y: 1}
+ newSize: {x: 1, y: 1}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 1, y: 1}
+ m_EdgeRadius: 0
diff --git a/MrBigsock/Assets/Prefabs/MapObjects/Stairs.prefab.meta b/MrBigsock/Assets/Prefabs/MapObjects/Stairs.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..d8093fc229333f7d87a5bf753c8d4f8d4a2f193d
--- /dev/null
+++ b/MrBigsock/Assets/Prefabs/MapObjects/Stairs.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b4bdc0b7e656c1c498446d9f7bcda837
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
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
diff --git a/MrBigsock/Assets/Scenes/GenTilemap.unity b/MrBigsock/Assets/Scenes/GenTilemap.unity
index e9f64e9b8dbb74c91bc31b753cc93b76dca2ade4..9503a7385f7bd6b1f5f6f8221709235791eab8f0 100644
--- a/MrBigsock/Assets/Scenes/GenTilemap.unity
+++ b/MrBigsock/Assets/Scenes/GenTilemap.unity
@@ -32250,6 +32250,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_3
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -34158,6 +34162,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_3_WallTop
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -37906,8 +37914,66 @@ PrefabInstance:
propertyPath: m_Name
value: Room_3_WallSide
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+--- !u!1 &131141253 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8298925029098438477, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 137619414}
+ m_PrefabAsset: {fileID: 0}
+--- !u!66 &131141256
+CompositeCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 131141253}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_GeometryType: 0
+ m_GenerationType: 0
+ m_EdgeRadius: 0
+ m_ColliderPaths:
+ - m_Collider: {fileID: 408973062}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 781747438}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 1868906157}
+ m_ColliderPaths: []
+ m_CompositePaths:
+ m_Paths: []
+ m_VertexDistance: 0.0005
+ m_OffsetDistance: 0.00005
+--- !u!50 &131141257
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 131141253}
+ m_BodyType: 2
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 0
--- !u!1 &135519493
GameObject:
m_ObjectHideFlags: 0
@@ -70130,6 +70196,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_4
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -72038,6 +72108,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_4_WallTop
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -75794,6 +75868,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_4_WallSide
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
--- !u!1839735485 &189901374 stripped
@@ -75947,6 +76025,60 @@ Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 8298925029637945467}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &319082911 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8298925029098438477, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 2140204255}
+ m_PrefabAsset: {fileID: 0}
+--- !u!66 &319082914
+CompositeCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 319082911}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_GeometryType: 0
+ m_GenerationType: 0
+ m_EdgeRadius: 0
+ m_ColliderPaths:
+ - m_Collider: {fileID: 1723533961}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 1077349011}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 1772948684}
+ m_ColliderPaths: []
+ m_CompositePaths:
+ m_Paths: []
+ m_VertexDistance: 0.0005
+ m_OffsetDistance: 0.00005
+--- !u!50 &319082915
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 319082911}
+ m_BodyType: 2
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 0
--- !u!4 &325978726 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3}
@@ -76072,6 +76204,16 @@ Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029994248936, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 8298925029637945467}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &390939284 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 8298925029637945467}
+ m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &408973062 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 137619414}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &481723729
PrefabInstance:
m_ObjectHideFlags: 0
@@ -76435,6 +76577,11 @@ Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 137619414}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &781747438 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 137619414}
+ m_PrefabAsset: {fileID: 0}
--- !u!1839735485 &782896374 stripped
Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
@@ -76621,7 +76768,7 @@ TilemapCollider2D:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
- m_UsedByComposite: 0
+ m_UsedByComposite: 1
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
@@ -76635,6 +76782,11 @@ Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029994248936, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 1078429408}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &890806721 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 1078429408}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &948401215
GameObject:
m_ObjectHideFlags: 0
@@ -76742,16 +76894,31 @@ Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 27939564}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &994294373 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 27939564}
+ m_PrefabAsset: {fileID: 0}
--- !u!1839735485 &1027987323 stripped
Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 27939564}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &1027987325 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 27939564}
+ m_PrefabAsset: {fileID: 0}
--- !u!1839735485 &1077349009 stripped
Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 2140204255}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &1077349011 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 2140204255}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1078429408
PrefabInstance:
m_ObjectHideFlags: 0
@@ -80515,6 +80682,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_5
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -81523,6 +81694,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_5_WallTop
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -83151,6 +83326,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_5_WallSide
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
--- !u!1 &1223302857
@@ -83222,6 +83401,8 @@ MonoBehaviour:
- {fileID: 2996495149472241661, guid: f256acc71054c194a819c82677b399a7, type: 3}
- {fileID: 2996495149472241661, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3}
Boss: {fileID: 4349609284953701266, guid: 11ac40832f040ae40b407577564319a7, type: 3}
+ Stairs: {fileID: 4409019817617405666, guid: b4bdc0b7e656c1c498446d9f7bcda837, type: 3}
+ Chest: {fileID: 3524574384065166323, guid: 6316ceeef3bc33a4d9c8cfb97e6f6415, type: 3}
--- !u!4 &1223302859
Transform:
m_ObjectHideFlags: 0
@@ -83242,11 +83423,70 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 548098089045340650, guid: 0084b5b0ada944246bec51b6c43da947, type: 3}
m_PrefabInstance: {fileID: 338846639}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1299460864 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8298925029098438477, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 1078429408}
+ m_PrefabAsset: {fileID: 0}
+--- !u!66 &1299460867
+CompositeCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1299460864}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_GeometryType: 0
+ m_GenerationType: 0
+ m_EdgeRadius: 0
+ m_ColliderPaths:
+ - m_Collider: {fileID: 1924118253}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 1935398484}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 890806721}
+ m_ColliderPaths: []
+ m_CompositePaths:
+ m_Paths: []
+ m_VertexDistance: 0.0005
+ m_OffsetDistance: 0.00005
+--- !u!50 &1299460868
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1299460864}
+ m_BodyType: 2
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 0
--- !u!1839735485 &1360448338 stripped
Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029994248936, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 27939564}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &1360448339 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 27939564}
+ m_PrefabAsset: {fileID: 0}
--- !u!224 &1406204873 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4907253106310901575, guid: 2cae32c775bbc234888526fb9c73163a, type: 3}
@@ -83263,6 +83503,60 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2d7f19087286e834f816cbf2da1d1aba, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &1476359944 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8298925029098438477, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 27939564}
+ m_PrefabAsset: {fileID: 0}
+--- !u!66 &1476359947
+CompositeCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1476359944}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_GeometryType: 0
+ m_GenerationType: 0
+ m_EdgeRadius: 0
+ m_ColliderPaths:
+ - m_Collider: {fileID: 1027987325}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 994294373}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 1360448339}
+ m_ColliderPaths: []
+ m_CompositePaths:
+ m_Paths: []
+ m_VertexDistance: 0.0005
+ m_OffsetDistance: 0.00005
+--- !u!50 &1476359948
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1476359944}
+ m_BodyType: 2
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 0
--- !u!1 &1576245750
GameObject:
m_ObjectHideFlags: 0
@@ -83428,10 +83722,15 @@ TilemapCollider2D:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
- m_UsedByComposite: 0
+ m_UsedByComposite: 1
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
+--- !u!19719996 &1605655302 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 8298925029637945467}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1698585129
PrefabInstance:
m_ObjectHideFlags: 0
@@ -115615,6 +115914,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_6
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -117523,6 +117826,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_6_WallTop
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -121303,13 +121610,76 @@ PrefabInstance:
propertyPath: m_Name
value: Room_6_WallSide
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+--- !u!1 &1717853035 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8298925029098438477, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 1698585129}
+ m_PrefabAsset: {fileID: 0}
+--- !u!66 &1717853038
+CompositeCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1717853035}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_GeometryType: 0
+ m_GenerationType: 0
+ m_EdgeRadius: 0
+ m_ColliderPaths:
+ - m_Collider: {fileID: 2138035019}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 2110004378}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 1792957264}
+ m_ColliderPaths: []
+ m_CompositePaths:
+ m_Paths: []
+ m_VertexDistance: 0.0005
+ m_OffsetDistance: 0.00005
+--- !u!50 &1717853039
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1717853035}
+ m_BodyType: 2
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 0
--- !u!1839735485 &1723533959 stripped
Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 2140204255}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &1723533961 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 2140204255}
+ m_PrefabAsset: {fileID: 0}
--- !u!1839735485 &1759853368 stripped
Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
@@ -121320,11 +121690,21 @@ Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029994248936, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 2140204255}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &1772948684 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 2140204255}
+ m_PrefabAsset: {fileID: 0}
--- !u!1839735485 &1792957263 stripped
Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029994248936, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 1698585129}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &1792957264 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 1698585129}
+ m_PrefabAsset: {fileID: 0}
--- !u!1839735485 &1819844231 stripped
Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029036549884, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
@@ -121340,6 +121720,8 @@ GameObject:
m_Component:
- component: {fileID: 1823803728}
- component: {fileID: 1823803727}
+ - component: {fileID: 1823803730}
+ - component: {fileID: 1823803729}
m_Layer: 0
m_Name: BossRoom
m_TagString: Untagged
@@ -121378,11 +121760,75 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!66 &1823803729
+CompositeCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1823803726}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_GeometryType: 0
+ m_GenerationType: 0
+ m_EdgeRadius: 0
+ m_ColliderPaths:
+ - m_Collider: {fileID: 866945746}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 2071785562}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 1576245754}
+ m_ColliderPaths: []
+ m_CompositePaths:
+ m_Paths: []
+ m_VertexDistance: 0.0005
+ m_OffsetDistance: 0.00005
+--- !u!50 &1823803730
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1823803726}
+ m_BodyType: 2
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 0
--- !u!1839735485 &1868906156 stripped
Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029994248936, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 137619414}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &1868906157 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 137619414}
+ m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &1924118253 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 1078429408}
+ m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &1935398484 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 1078429408}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1958860095
GameObject:
m_ObjectHideFlags: 0
@@ -121604,6 +122050,11 @@ Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 8298925029637945467}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &2062562611 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 8298925029637945467}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &2071785558
GameObject:
m_ObjectHideFlags: 0
@@ -121773,7 +122224,7 @@ TilemapCollider2D:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
- m_UsedByComposite: 0
+ m_UsedByComposite: 1
m_Offset: {x: 0, y: 0}
m_MaximumTileChangeCount: 1000
m_ExtrusionFactor: 0.00001
@@ -121782,6 +122233,65 @@ Tilemap:
m_CorrespondingSourceObject: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
m_PrefabInstance: {fileID: 1698585129}
m_PrefabAsset: {fileID: 0}
+--- !u!19719996 &2110004378 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 1698585129}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &2130975948 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8298925029098438477, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 8298925029637945467}
+ m_PrefabAsset: {fileID: 0}
+--- !u!66 &2130975951
+CompositeCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2130975948}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_GeometryType: 0
+ m_GenerationType: 0
+ m_EdgeRadius: 0
+ m_ColliderPaths:
+ - m_Collider: {fileID: 2062562611}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 1605655302}
+ m_ColliderPaths: []
+ - m_Collider: {fileID: 390939284}
+ m_ColliderPaths: []
+ m_CompositePaths:
+ m_Paths: []
+ m_VertexDistance: 0.0005
+ m_OffsetDistance: 0.00005
+--- !u!50 &2130975952
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2130975948}
+ m_BodyType: 2
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 0
--- !u!1001 &2131353724
PrefabInstance:
m_ObjectHideFlags: 0
@@ -121847,6 +122357,11 @@ PrefabInstance:
objectReference: {fileID: 1406204874}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 008ac26ba660ab94484970b17c589923, type: 3}
+--- !u!19719996 &2138035019 stripped
+TilemapCollider2D:
+ m_CorrespondingSourceObject: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ m_PrefabInstance: {fileID: 1698585129}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &2140204255
PrefabInstance:
m_ObjectHideFlags: 0
@@ -348202,6 +348717,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_2
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -352590,6 +353109,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_2_WallTop
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -366562,6 +367085,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_2_WallSide
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
--- !u!1001 &8298925029637945467
@@ -601647,6 +602174,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_1
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029280369993, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029280369994, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -606371,6 +606902,10 @@ PrefabInstance:
propertyPath: m_Name
value: Room_1_WallTop
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029612890526, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 8298925029612890527, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
propertyPath: m_Size.x
value: 0
@@ -620143,5 +620678,9 @@ PrefabInstance:
propertyPath: m_Name
value: Room_1_WallSide
objectReference: {fileID: 0}
+ - target: {fileID: 8298925029994248943, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
+ propertyPath: m_UsedByComposite
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9ad55898a5aa5e340ba56d310f32f741, type: 3}
diff --git a/MrBigsock/ProjectSettings/TagManager.asset b/MrBigsock/ProjectSettings/TagManager.asset
index 31a12849571026e5ca9bf16a7584f075bef6cb3f..7ae2110e3e9484fa52e6ee599da7aac9e3dec11a 100644
--- a/MrBigsock/ProjectSettings/TagManager.asset
+++ b/MrBigsock/ProjectSettings/TagManager.asset
@@ -11,6 +11,7 @@ TagManager:
- 4
- 5
- Boss
+ - Chest
layers:
- Default
- TransparentFX