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/Resources/Prefabs/Enemy_Slime.prefab b/MrBigsock/Assets/Resources/Prefabs/Enemy_Slime.prefab
index bcb42954b8e9e3258b13b2847f57e0e2fd0b6430..813c795aaf676256a3ca78b241e4739c354d08ce 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
@@ -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/Sprites/Enemy/Animations/slime/jumpingEnemy.anim b/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim
new file mode 100644
index 0000000000000000000000000000000000000000..0ee4af7b72717cd85994472666384ae9d533fa8a
--- /dev/null
+++ b/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/slime/jumpingEnemy.anim
@@ -0,0 +1,53 @@
+%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: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings: []
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 1
+ 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: