diff --git a/MrBigsock/Assets/Code/Character.cs b/MrBigsock/Assets/Code/Character.cs
index 75120bfb210fa3f8f124b0e374222f6ceb2059e4..cbed6e51c1926918ef5d0bf72d9373503ddcc1b5 100644
--- a/MrBigsock/Assets/Code/Character.cs
+++ b/MrBigsock/Assets/Code/Character.cs
@@ -88,6 +88,9 @@ namespace BigSock {
// The direction the character last moved.
protected Vector2 moveDir;
+ // trigger for in knockback.
+ protected bool inKnockBack = false;
+
/*
The inventory of the character.
@@ -178,20 +181,30 @@ namespace BigSock {
MovementDir = moveDir,
};
}
-
-
+ /*
+ Using a courutine to set trigger in knockback.
+ */
+ IEnumerator knockBackTimer()
+ {
+ inKnockBack = true;
+ yield return new WaitForSeconds(0.15F);
+ rb.velocity = Vector2.zero;
+ inKnockBack = false;
+ }
/*
- Add Knockback.
+ Add Knockback. (used only for dash ?)
*/
public void KnockBack(float force, Vector2 difference) {
rb.AddForce(difference * force, ForceMode2D.Impulse);
+ StartCoroutine(knockBackTimer());
+
+ //rb.MovePosition((Vector2)transform.position + (difference * force * Time.fixedDeltaTime));
}
public void KnockBack(IAttackStats attack) {
Vector2 difference = ((Vector2) transform.position - attack.Source).normalized;
- //KnockBack(attack.Knockback, difference);
rb.AddForce(difference * attack.Knockback, ForceMode2D.Impulse);
-
+ StartCoroutine(knockBackTimer());
}
/*
@@ -199,8 +212,11 @@ namespace BigSock {
*/
protected virtual bool TryMove(Vector2 direction) {
moveDir = direction;
- if(direction != Vector2.zero) {
- rb.AddForce(direction * (float) MovementSpeed * Time.fixedDeltaTime, ForceMode2D.Impulse);
+ if(direction != Vector2.zero && !inKnockBack) {
+ //Using movePosition to get a "snappy" movement.
+ //rb.AddForce(direction * (float) MovementSpeed * Time.fixedDeltaTime, ForceMode2D.Impulse);
+ rb.MovePosition((Vector2)transform.position + (direction * (float) MovementSpeed * Time.fixedDeltaTime));
+ //rb.velocity = (direction * (float) MovementSpeed);
return true;
}
return false;
@@ -299,6 +315,7 @@ namespace BigSock {
var res = HP + amount;
if(res > MaxHP) res = MaxHP;
HP = res;
+ AfterHeal();
return true;
}
@@ -310,6 +327,10 @@ namespace BigSock {
KnockBack(attack);
}
+
+ protected virtual void AfterHeal() {
+
+ }
/*
Method for what to do when the character dies.
*/
diff --git a/MrBigsock/Assets/Code/Core/Abilities/AbilityDodge.cs b/MrBigsock/Assets/Code/Core/Abilities/AbilityDodge.cs
index d3be2c1a5c405f3fd9f5415fda21837c3f90c019..cc57a2d438bbe01eed14a98d335ea23e16107947 100644
--- a/MrBigsock/Assets/Code/Core/Abilities/AbilityDodge.cs
+++ b/MrBigsock/Assets/Code/Core/Abilities/AbilityDodge.cs
@@ -13,7 +13,7 @@ namespace BigSock {
A basic dodge move that gives a push and a short invincibility.
*/
public class AbilityDodge : BaseAbility {
- public static readonly float BASE_FORCE = 0.5f;
+ public static readonly float BASE_FORCE = 1f;
public static readonly TimeSpan IFRAME_DURATION = new TimeSpan(0, 0, 0, 0, 500);
public override ulong Id => 201;
diff --git a/MrBigsock/Assets/Code/FollowPlayer.cs b/MrBigsock/Assets/Code/FollowPlayer.cs
index 89d4fe1efdecc0d0d6a6b9b3a6b9697ef787f59a..28c604e8ab58c20fb794efac2eba97ca3ef9a6e5 100644
--- a/MrBigsock/Assets/Code/FollowPlayer.cs
+++ b/MrBigsock/Assets/Code/FollowPlayer.cs
@@ -8,85 +8,61 @@ namespace Bigsock
{
public class FollowPlayer : MonoBehaviour
{
- [SerializeField]
- private NeighbourMapGenerator neighborMapGenerator;
- [SerializeField]
- private CinemachineConfiner2D cameraMap;
+ [SerializeField] NeighbourMapGenerator neighborMapGenerator;
+ [SerializeField] CinemachineConfiner2D cameraMap;
+ [SerializeField] GameObject victoryScreen;
- private int levels = 1;
+ //Unity varibles
+ private GameObject[] boss;
+ private GameObject player;
+ private GameObject[] enemies;
+ private GameObject[] Chest;
+ private List<GameObject> chests;
+ private GameObject stair;
-
- Vector3 offset = new Vector3(0, 0, -10);
- int i = 0;
-
- GameObject[] boss;
- GameObject player;
- GameObject[] enemies;
- GameObject[] Chest;
- List<GameObject> chests;
- GameObject stair;
+ //Normal variables
+ private int levels = 0;
+ private static int LEVEL_CAP = 2;
private int roomNr = 0;
- bool stairs_down;
+ private bool stairs_down;
+ private int victoryHold = 0;
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);
+ InitializeLevel();
}
void LateUpdate()
{
boss = GameObject.FindGameObjectsWithTag("Boss");
enemies = GameObject.FindGameObjectsWithTag((roomNr).ToString());
- if (boss.Length == 0 && levels <= 1)
+
+ if (boss.Length == 0 && levels < LEVEL_CAP)
{
+ if (!stair.activeInHierarchy)
+ {
+ levels++;
+ }
stair.SetActive(true);
stairs_down = stair.GetComponent<Stairs>().stairs_touch;
+
+ }
+ if (levels == LEVEL_CAP && victoryHold == 0)
+ {
+ VictoryScreen();
+ victoryHold++;
}
-
if (stairs_down)
{
- roomNr = 0;
- foreach(GameObject c in chests)
- {
- DestroyImmediate(c);
- }
- DestroyImmediate(stair);
- chests.Clear();
- TilemapGenerator.resetMaps();
- TilemapGenerator.SetRoomIDZero();
+ ClearScene();
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++;
+ InitializeLevel();
}
- int i = 0;
- if(i == 0) {
- cameraMap.InvalidateCache();
- }
+ cameraMap.InvalidateCache();
if (enemies.Length == 0)
{
@@ -103,16 +79,57 @@ namespace Bigsock
}
private void OnDestroy()
+ {
+ ClearScene();
+ }
+
+ /*
+ *Deletes all game objects from the scene that is not the player
+ *and also resets all arrays that have been made*/
+ private void ClearScene()
{
roomNr = 0;
foreach (GameObject c in chests)
{
DestroyImmediate(c);
}
+ chests.Clear();
DestroyImmediate(stair);
NeighbourMapGenerator.ClearRoomList();
TilemapGenerator.SetRoomIDZero();
TilemapGenerator.resetMaps();
}
+
+ /*
+ *Initializes the victory screen*/
+ private void VictoryScreen()
+ {
+ Time.timeScale = 0;
+ GameObject canvas = GameObject.Find("Canvas");
+ if (canvas != null)
+ {
+ Instantiate(victoryScreen, canvas.transform);
+ }
+ }
+
+ /*
+ *Creates a level and adds objects to the different arrays */
+ private void InitializeLevel()
+ {
+ 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);
+ }
+ }
+ stairs_down = stair.GetComponent<Stairs>().stairs_touch;
+ stair.SetActive(false);
+ }
}
}
diff --git a/MrBigsock/Assets/Code/Map/Data/NeigbourParameters_medium.asset b/MrBigsock/Assets/Code/Map/Data/NeigbourParameters_medium.asset
index beeec598bfa7edea1ca0672b2a5d16793b1ca70f..25dd83dc136d88dfd97a1d0f501f78a918215ec3 100644
--- a/MrBigsock/Assets/Code/Map/Data/NeigbourParameters_medium.asset
+++ b/MrBigsock/Assets/Code/Map/Data/NeigbourParameters_medium.asset
@@ -13,7 +13,7 @@ MonoBehaviour:
m_Name: NeigbourParameters_medium
m_EditorClassIdentifier:
width: 30
- height: 24
+ height: 17
smoothCount: 0
empty: 0
edgesAreWalls: 0
diff --git a/MrBigsock/Assets/Code/PlayerController.cs b/MrBigsock/Assets/Code/PlayerController.cs
index d423498a3763cb56be1333ef956ba4cb8f8b0da5..b3f633f0768031e4567843acdbb72f1d1198f8f8 100644
--- a/MrBigsock/Assets/Code/PlayerController.cs
+++ b/MrBigsock/Assets/Code/PlayerController.cs
@@ -395,6 +395,10 @@ namespace BigSock {
utilBar?.WithHealth(Convert.ToInt32(HP));
}
+ protected override void AfterHeal() {
+ utilBar?.WithHealth(Convert.ToInt32(HP));
+ }
+
public void GainXp(float xp) {
GiveXp(xp * XP_SCALE_RATE);
CheckXp();
diff --git a/MrBigsock/Assets/Code/Slime/SlimeController.cs b/MrBigsock/Assets/Code/Slime/SlimeController.cs
index 743445cbf21abd97c6aced09311cc6fe9a8dcd90..b12f7086ed796ea2cdcf2adbf39a37633cac068d 100644
--- a/MrBigsock/Assets/Code/Slime/SlimeController.cs
+++ b/MrBigsock/Assets/Code/Slime/SlimeController.cs
@@ -47,25 +47,25 @@ namespace BigSock {
/*
Minimum time the slime should idle before it can charge.
*/
- protected static readonly TimeSpan IDLE_WAIT_TIME = new TimeSpan(0, 0, 0, 1, 0);
+ protected static readonly TimeSpan IDLE_WAIT_TIME = new TimeSpan(0, 0, 0, 0, 5);
/*
Minimum time the slime should charge before it can leap.
*/
- protected static readonly TimeSpan CHARGE_WAIT_TIME = new TimeSpan(0, 0, 0, 2, 0);
+ protected static readonly TimeSpan CHARGE_WAIT_TIME = new TimeSpan(0, 0, 0, 1, 0);
/*
Maximum time the slime should leap before it can idle.
*/
- protected static readonly TimeSpan LEAP_WAIT_TIME = new TimeSpan(0, 0, 0, 4, 0);
+ protected static readonly TimeSpan LEAP_WAIT_TIME = new TimeSpan(0, 0, 0, 2, 0);
/*
The force the slime leaps at.
*/
- public double LeapForce => MovementSpeed * 4;
+ public double LeapForce => MovementSpeed * 10;
//void Start() {
// rb = GetComponent<Rigidbody2D>();
- // m_Animator = gameObject.GetComponent<Animator>();
+ // m_Animator = gameObject.GetComponent<Animator>();
// followCollider = transform.Find("followCollider").GetComponent<EmptyCollider>();
// followCollider.OnColliderEnter2D_Action += Move_OnColliderEnter2D;
// followCollider.OnColliderStay2D_Action += Move_OnColliderStay2D;
@@ -90,7 +90,7 @@ namespace BigSock {
// Update the state.
State = SlimeState.Charging;
NextTimeStateCanChange = DateTime.Now + CHARGE_WAIT_TIME;
- m_Animator.SetTrigger("walk");
+ m_Animator.SetTrigger("idle");
}
}
@@ -117,7 +117,7 @@ namespace BigSock {
// Update the state.
State = SlimeState.Idle;
NextTimeStateCanChange = DateTime.Now + IDLE_WAIT_TIME;
- m_Animator.SetTrigger("idle");
+ m_Animator.SetTrigger("walk");
}
}
diff --git a/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs b/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs
index 023fb2b17d29795fc67b7443be4074c4bdaf0e79..b542f4b3a04bd5ffe2572590a03499e5159b05d6 100644
--- a/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs
+++ b/MrBigsock/Assets/Code/orc/Enemy_orc_range.cs
@@ -29,15 +29,15 @@ namespace BigSock {
/*
Minimum idle time.
*/
- protected static readonly TimeSpan IDLE_WAIT_TIME = new TimeSpan(0, 0, 0, 1, 0);
+ protected static readonly TimeSpan IDLE_WAIT_TIME = new TimeSpan(0, 0, 0, 0, 400);
/*
Minimum animation time.
*/
- protected static readonly TimeSpan CHARGE_WAIT_TIME = new TimeSpan(0, 0, 0, 2, 0);
+ protected static readonly TimeSpan CHARGE_WAIT_TIME = new TimeSpan(0, 0, 0, 0, 400);
/*
Maximum time the slime should attack before it can idle.
*/
- protected static readonly TimeSpan ATTACK_WAIT_TIME = new TimeSpan(0, 0, 0, 4, 0);
+ protected static readonly TimeSpan ATTACK_WAIT_TIME = new TimeSpan(0, 0, 0, 1, 0);
protected Animator m_Animator_bow;
diff --git a/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab b/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab
index bcb42954b8e9e3258b13b2847f57e0e2fd0b6430..120d64008f039798ee05fb3e853a958385385cb5 100644
--- a/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab
+++ b/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab
@@ -79,7 +79,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 2
- m_Sprite: {fileID: 21300000, guid: dfb75b4c193e2994dabfcb50c3cf64e5, type: 3}
+ m_Sprite: {fileID: 1784894595, guid: 2bbb85d06a94d0d478b4c0707a9805c4, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -121,7 +121,7 @@ Animator:
m_GameObject: {fileID: 2996495149472241661}
m_Enabled: 1
m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: 87d00f377b8992e4092c2ea820422659, type: 2}
+ m_Controller: {fileID: 9100000, guid: 311b011bc4e42144abcc058ae333ad8d, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
@@ -148,7 +148,7 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 1, y: 1.25}
+ oldSize: {x: 1, y: 1}
newSize: {x: 0.16, y: 0.2}
adaptiveTilingThreshold: 0.5
drawMode: 0
@@ -176,8 +176,8 @@ MonoBehaviour:
baseMovementSpeed: 2
baseDamage: 1
knockbackForce: 3
- baseHP: 20
- baseMaxHP: 20
+ baseHP: 7
+ baseMaxHP: 7
dropXP: 20
xp: 0
maxXp: 0
@@ -285,7 +285,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8620845285361089561}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.04, y: 0, z: 0}
+ m_LocalPosition: {x: 0.04, y: -0.171, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -307,7 +307,7 @@ CircleCollider2D:
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
- m_Radius: 0.7
+ m_Radius: 0.4
--- !u!114 &6373942986610437007
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/MrBigsock/Assets/Resources/Prefabs/UI/VictoryScreen.prefab b/MrBigsock/Assets/Resources/Prefabs/UI/VictoryScreen.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..719cc90668dbe814f5a7268aeb1c43e94f2138e1
--- /dev/null
+++ b/MrBigsock/Assets/Resources/Prefabs/UI/VictoryScreen.prefab
@@ -0,0 +1,591 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3664230941147768457
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3664230941147768456}
+ - component: {fileID: 3664230941147768469}
+ - component: {fileID: 3664230941147768470}
+ - component: {fileID: 3664230941147768471}
+ m_Layer: 5
+ m_Name: GiveUp
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3664230941147768456
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941147768457}
+ 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: 3664230941994522434}
+ m_Father: {fileID: 3664230942784533809}
+ m_RootOrder: 1
+ 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: 170, y: 0}
+ m_SizeDelta: {x: 300, y: 300}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3664230941147768469
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941147768457}
+ m_CullTransparentMesh: 1
+--- !u!114 &3664230941147768470
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941147768457}
+ 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: 21300000, guid: 718e1dfed986e004287207b4cd6bbf5b, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 2.2
+--- !u!114 &3664230941147768471
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941147768457}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 3664230941147768470}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 3664230942784533808}
+ m_TargetAssemblyTypeName: EndScreen, Assembly-CSharp
+ m_MethodName: GiveUp
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!1 &3664230941382506396
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3664230941382506395}
+ - component: {fileID: 3664230941382506393}
+ - component: {fileID: 3664230941382506394}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3664230941382506395
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941382506396}
+ 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: 3664230941747501927}
+ 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 &3664230941382506393
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941382506396}
+ m_CullTransparentMesh: 1
+--- !u!114 &3664230941382506394
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941382506396}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: Return to main menu
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: e857f237b99c94446ac9245ad3c63278, type: 2}
+ m_sharedMaterial: {fileID: -7229789301584090785, guid: e857f237b99c94446ac9245ad3c63278, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4281479730
+ m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 70
+ m_fontSizeBase: 70
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &3664230941747501848
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3664230941747501927}
+ - component: {fileID: 3664230941747501924}
+ - component: {fileID: 3664230941747501925}
+ - component: {fileID: 3664230941747501926}
+ m_Layer: 5
+ m_Name: TryAgain
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3664230941747501927
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941747501848}
+ 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: 3664230941382506395}
+ m_Father: {fileID: 3664230942784533809}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -170, y: 0.000030517}
+ m_SizeDelta: {x: 300, y: 300}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3664230941747501924
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941747501848}
+ m_CullTransparentMesh: 1
+--- !u!114 &3664230941747501925
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941747501848}
+ 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: 21300000, guid: 718e1dfed986e004287207b4cd6bbf5b, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 2.2
+--- !u!114 &3664230941747501926
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941747501848}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 3664230941747501925}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 3664230942784533808}
+ m_TargetAssemblyTypeName: EndScreen, Assembly-CSharp
+ m_MethodName: TryAgain
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!1 &3664230941994522435
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3664230941994522434}
+ - component: {fileID: 3664230941994522432}
+ - component: {fileID: 3664230941994522433}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3664230941994522434
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941994522435}
+ 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: 3664230941147768456}
+ 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 &3664230941994522432
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941994522435}
+ m_CullTransparentMesh: 1
+--- !u!114 &3664230941994522433
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230941994522435}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: Give Up
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: e857f237b99c94446ac9245ad3c63278, type: 2}
+ m_sharedMaterial: {fileID: -7229789301584090785, guid: e857f237b99c94446ac9245ad3c63278, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4281479730
+ m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 70
+ m_fontSizeBase: 70
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &3664230942784533810
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3664230942784533809}
+ - component: {fileID: 3664230942784533808}
+ m_Layer: 5
+ m_Name: VictoryScreen
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3664230942784533809
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230942784533810}
+ 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: 3664230941747501927}
+ - {fileID: 3664230941147768456}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 640, y: 300}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3664230942784533808
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3664230942784533810}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 09b160d5c1f3bb04681d7f8eacd40980, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/MrBigsock/Assets/Resources/Prefabs/UI/VictoryScreen.prefab.meta b/MrBigsock/Assets/Resources/Prefabs/UI/VictoryScreen.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c54159f1c401cf95f84e135bff188b9dc22875ce
--- /dev/null
+++ b/MrBigsock/Assets/Resources/Prefabs/UI/VictoryScreen.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 916226a2770b3b644af1a5e55c09915a
+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 16f16233be453563253b159247dfac44e8212b2f..005f53298e32988fb5415bd8538c3608afa5e807 100644
--- a/MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab
+++ b/MrBigsock/Assets/Resources/Prefabs/enemy_orc_range.prefab
@@ -170,7 +170,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e5613a049bf8e2c4cbae8505b526107e, type: 3}
m_Name:
m_EditorClassIdentifier:
- baseAttackSpeed: 1
+ baseAttackSpeed: 8
source: []
TakeDamageAudio: {fileID: 8300000, guid: 0d78a0205a770454c86c53710a0b4ff1, type: 3}
baseMovementSpeed: 1
diff --git a/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim b/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim
new file mode 100644
index 0000000000000000000000000000000000000000..ee612cd6586eb63fe5c072893704f15de34f6bf5
--- /dev/null
+++ b/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: jumpingEnemy
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -19692615, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - time: 0.083333336
+ value: {fileID: -1152038991, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - time: 0.16666667
+ value: {fileID: 229421652, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - time: 0.25
+ value: {fileID: -556319578, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - time: 0.33333334
+ value: {fileID: -99956278, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - time: 0.41666666
+ value: {fileID: -1010177793, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - time: 0.5
+ value: {fileID: 844625333, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 12
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: -19692615, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - {fileID: -1152038991, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - {fileID: 229421652, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - {fileID: -556319578, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - {fileID: -99956278, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - {fileID: -1010177793, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ - {fileID: 844625333, guid: 93b51a3f2b608b7478fe0c2d5b0696a8, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.5833333
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim.meta b/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..087c4f4e93956d736f7de5ac2bcab002dcbf3eeb
--- /dev/null
+++ b/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a3303a7e171cb20489f9ba90bf0cc149
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/small_demon/small_demon.controller b/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/small_demon/small_demon.controller
index 755780d9fadcf25b2090c0d47f430cea2577396a..6f63f4a57970e47e29e33c2610a9c820e9d59ca2 100644
--- a/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/small_demon/small_demon.controller
+++ b/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/small_demon/small_demon.controller
@@ -11,52 +11,72 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -1254065779151509365}
- m_Position: {x: 200, y: 0, z: 0}
+ m_Position: {x: 30, y: 230, z: 0}
- serializedVersion: 1
m_State: {fileID: 1463682993273557408}
- m_Position: {x: 235, y: 65, z: 0}
- - serializedVersion: 1
- m_State: {fileID: -7420391728588106811}
- m_Position: {x: 270, y: 130, z: 0}
- - serializedVersion: 1
- m_State: {fileID: 7984536487173489433}
- m_Position: {x: 305, y: 195, z: 0}
+ m_Position: {x: 260, y: 230, z: 0}
m_ChildStateMachines: []
- m_AnyStateTransitions: []
+ m_AnyStateTransitions:
+ - {fileID: -2933291412557598399}
+ - {fileID: -7517664299219211991}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_AnyStatePosition: {x: 280, y: 120, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -1254065779151509365}
---- !u!1102 &-7420391728588106811
-AnimatorState:
- serializedVersion: 6
+--- !u!1101 &-7517664299219211991
+AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: small_demon_idle 0
- m_Speed: 1
- m_CycleOffset: 0
- m_Transitions: []
- m_StateMachineBehaviours: []
- m_Position: {x: 50, y: 50, z: 0}
- m_IKOnFeet: 0
- m_WriteDefaultValues: 1
- m_Mirror: 0
- m_SpeedParameterActive: 0
- m_MirrorParameterActive: 0
- m_CycleOffsetParameterActive: 0
- m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 4ab456eb6eb74b2479546b8e02a94752, type: 2}
- m_Tag:
- m_SpeedParameter:
- m_MirrorParameter:
- m_CycleOffsetParameter:
- m_TimeParameter:
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: idle
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -1254065779151509365}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-2933291412557598399
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: attack
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1463682993273557408}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &-1254065779151509365
AnimatorState:
serializedVersion: 6
@@ -91,7 +111,19 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: small_demon
serializedVersion: 5
- m_AnimatorParameters: []
+ m_AnimatorParameters:
+ - m_Name: idle
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: attack
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -131,29 +163,3 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
---- !u!1102 &7984536487173489433
-AnimatorState:
- serializedVersion: 6
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: small_demon_run 0
- m_Speed: 1
- m_CycleOffset: 0
- m_Transitions: []
- m_StateMachineBehaviours: []
- m_Position: {x: 50, y: 50, z: 0}
- m_IKOnFeet: 0
- m_WriteDefaultValues: 1
- m_Mirror: 0
- m_SpeedParameterActive: 0
- m_MirrorParameterActive: 0
- m_CycleOffsetParameterActive: 0
- m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 45dff512faa05f041a8aa18f1cf18a78, type: 2}
- m_Tag:
- m_SpeedParameter:
- m_MirrorParameter:
- m_CycleOffsetParameter:
- m_TimeParameter:
diff --git a/Submission.md b/Submission.md
index 98a5b88321765b14482b3d783886264dd050705f..f6b7269313f2ddb46f3c2c40208835f3742c2c21 100644
--- a/Submission.md
+++ b/Submission.md
@@ -49,4 +49,46 @@ If you claim “Half†then others cannot claim “All†or “Mostâ€, but on
| Touched | N || 1 | 1 | 2 | N | N |
+# The Adventures of BigSock Submission
+
+## Members
+
+* Julius Fredrik Einum
+* Robin Ruud Kristensen
+* Robin Sandvik
+* Alexander Gatland
+* Gard Furre
+
+## Gameplay Video
+
+## Code Video
+
+
+
+## Work Distribution Matrix
+
+| Category| Julius |Robin R|Robin S|Alexander|Gard|
+|----|----|----|----|----|----|
+| Physics| - | - | - | - | - |
+| UI | - | - | - | - | - |
+| Audio | - | - | - | - | - |
+| Procedural generation | - | - | - | - | - |
+| Sprites | - | - | - | - | - |
+| Items | - | - | - | - | - |
+| Enemies | - | - | - | - | - |
+| Abilities | - | - | - | - | - |
+| Bosses | - | - | - | - | - |
+| Gameplay mechanics | - | - | - | - | - |
+| Design| - | - | - | - | - |
+
+## Group discussion
+
+### The engine
+
+### Process and Comunication during development
+
+### Use of Version Controll
+
+
+