Update

Update

RPG/Assets/Animations/Player.controller

@@ -12,7 +12,7 @@ AnimatorController:
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
-    m_StateMachine: {fileID: 1107671732632918594}
+    m_StateMachine: {fileID: 1107585502310294650}
     m_Mask: {fileID: 0}
     m_Motions: []
     m_Behaviours: []
@@ -22,22 +22,51 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1107 &1107671732632918594
+--- !u!1102 &1102762673259445930
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Player_Idle
+  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: 72e75614c5c0ee84fa6ca251b0446d95, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &1107585502310294650
 AnimatorStateMachine:
   serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Base Layer
-  m_ChildStates: []
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102762673259445930}
+    m_Position: {x: 200, y: 0, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 12, y: 84, z: 0}
-  m_EntryPosition: {x: -240, y: 120, z: 0}
+  m_AnyStatePosition: {x: 50, y: 20, 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: 0}
+  m_DefaultState: {fileID: 1102762673259445930}

RPG/Assets/Animations/Player_Idle.anim

@@ -17,21 +17,63 @@ AnimationClip:
   m_PositionCurves: []
   m_ScaleCurves: []
   m_FloatCurves: []
-  m_PPtrCurves: []
-  m_SampleRate: 60
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: 1d74867836965d3469a56134f847923b, type: 3}
+    - time: 0.083333336
+      value: {fileID: 21300000, guid: fc2ded30a0ccd974bafa8d9e8c0eeb7e, type: 3}
+    - time: 0.16666667
+      value: {fileID: 21300000, guid: d4efd91c6d4b3de499e39e4ab7b13df3, type: 3}
+    - time: 0.25
+      value: {fileID: 21300000, guid: ab22828c375e376499c401613c20aad6, type: 3}
+    - time: 0.33333334
+      value: {fileID: 21300000, guid: 9dde7a52aa6fd2a4299acb14dab6c422, type: 3}
+    - time: 0.41666666
+      value: {fileID: 21300000, guid: 207efd9c898252841a79e57b78a97dc7, type: 3}
+    - time: 0.5
+      value: {fileID: 21300000, guid: 3241747d976332b42925b61b2ce12208, type: 3}
+    - time: 0.5833333
+      value: {fileID: 21300000, guid: 022c8bd79a7dcfa4f997deecb8688e72, type: 3}
+    - time: 0.6666667
+      value: {fileID: 21300000, guid: 3416b2b3cf7adbb438e80c9081d31c5a, type: 3}
+    - time: 0.75
+      value: {fileID: 21300000, guid: 3e23c0de9f1711d4ca396d8660d97a35, 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: []
-    pptrCurveMapping: []
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: 1d74867836965d3469a56134f847923b, type: 3}
+    - {fileID: 21300000, guid: fc2ded30a0ccd974bafa8d9e8c0eeb7e, type: 3}
+    - {fileID: 21300000, guid: d4efd91c6d4b3de499e39e4ab7b13df3, type: 3}
+    - {fileID: 21300000, guid: ab22828c375e376499c401613c20aad6, type: 3}
+    - {fileID: 21300000, guid: 9dde7a52aa6fd2a4299acb14dab6c422, type: 3}
+    - {fileID: 21300000, guid: 207efd9c898252841a79e57b78a97dc7, type: 3}
+    - {fileID: 21300000, guid: 3241747d976332b42925b61b2ce12208, type: 3}
+    - {fileID: 21300000, guid: 022c8bd79a7dcfa4f997deecb8688e72, type: 3}
+    - {fileID: 21300000, guid: 3416b2b3cf7adbb438e80c9081d31c5a, type: 3}
+    - {fileID: 21300000, guid: 3e23c0de9f1711d4ca396d8660d97a35, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 0.8333333
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

RPG/Assets/Prefabs/Player.prefab

@@ -10,6 +10,8 @@ GameObject:
   m_Component:
   - component: {fileID: 2666099993442899523}
   - component: {fileID: 783430623250358917}
+  - component: {fileID: 3599188608928752076}
+  - component: {fileID: 843947306393242286}
   m_Layer: 0
   m_Name: Player
   m_TagString: Untagged
@@ -25,8 +27,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1991335222145836323}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -16.28, y: -5.73, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalPosition: {x: -3.5, y: -2.8, z: 0}
+  m_LocalScale: {x: 2.5, y: 2.5, z: 1}
   m_Children:
   - {fileID: 4911436068105550623}
   m_Father: {fileID: 0}
@@ -44,12 +46,80 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2daded3814e565c4f901c5b1aaee1ecb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  animator: {fileID: 3599188608928752076}
   unitName: Player
   unitLevel: 999
   damage: 10
   damage2: 0
   maxHP: 25
   currentHP: 25
+--- !u!95 &3599188608928752076
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1991335222145836323}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 481b0ce1225dd744eb2765eccc53808b, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!212 &843947306393242286
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1991335222145836323}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  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_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  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: 0
+  m_Sprite: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1.28, y: 1.28}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 0
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &2178229977575004885
 GameObject:
   m_ObjectHideFlags: 0
@@ -74,9 +144,9 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2178229977575004885}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 12.89, y: 2.93, z: 0}
-  m_LocalScale: {x: 2.5, y: 2.5, z: 1}
+  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_Children: []
   m_Father: {fileID: 2666099993442899523}
   m_RootOrder: 0
@@ -118,14 +188,14 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: b2a056eebccf5e741ad242c3eea51dd7, type: 3}
+  m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
   m_Size: {x: 1.28, y: 1.28}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0

RPG/Assets/Scenes/Main.unity

@@ -2628,6 +2628,8 @@ MonoBehaviour:
     type: 3}
   playerBattleStation: {fileID: 0}
   enemyBattleStation: {fileID: 0}
+  animator: {fileID: 3599188608928752076, guid: b775ee847150e754580ab2ba977a7cdf,
+    type: 3}
   dialogueText: {fileID: 1527616797}
   playerHUD: {fileID: 788420864}
   enemyHUD: {fileID: 530814537}

RPG/Assets/Scripts/BattleSystem.cs

@@ -8,6 +8,7 @@ using UnityEngine.UI;
 public enum BattleState { START, PLAYERTURN, ENEMYTURN, WON, LOST }
 public class BattleSystem : MonoBehaviour
 {
+
     public GameObject playerPrefab;
     public GameObject enemyPrefab;
 
@@ -17,6 +18,9 @@ public class BattleSystem : MonoBehaviour
     Unit playerUnit;
     Unit enemyUnit;
 
+    public Animator animator;
+
+
     public Text dialogueText;
 
     public BattleHUD playerHUD;
@@ -43,18 +47,18 @@ public class BattleSystem : MonoBehaviour
         playerHUD.SetHUD(playerUnit);
         enemyHUD.SetHUD(enemyUnit);
 
-        yield return new WaitForSeconds(2f);
+        yield return new WaitForSeconds(.5f);
 
         state = BattleState.PLAYERTURN;
-        PlayerTurn();
+        StartCoroutine(PlayerTurn());
     }
 
     IEnumerator PlayerAttack()
     {
         //Damage enemy
         bool isDead = enemyUnit.TakeDamage(playerUnit.damage);
         enemyHUD.SetHP(enemyUnit.currentHP);
-        yield return new WaitForSeconds(.01f);
+        yield return new WaitForSeconds(1.0f);
         dialogueText.text = "The attack is successful!";
         state = BattleState.ENEMYTURN;
 
@@ -81,6 +85,7 @@ public class BattleSystem : MonoBehaviour
         yield return new WaitForSeconds(1.5f);
 
         dialogueText.text = enemyUnit.unitName + " attacks!";
+
         yield return new WaitForSeconds(2f);
 
         bool isDead = playerUnit.TakeDamage(enemyUnit.damage);
@@ -95,6 +100,7 @@ public class BattleSystem : MonoBehaviour
         else
         {
             state = BattleState.PLAYERTURN;
+
             PlayerTurn();
         }
     }

RPG/Assets/Scripts/Unit.cs

@@ -17,7 +17,6 @@ public class Unit : MonoBehaviour
     public bool TakeDamage(int dmg)
     {
         currentHP -= dmg;
-
         if (currentHP <= 0)
             return true;