diff --git a/Assets/DogKnight/Animator/DogControl.controller b/Assets/DogKnight/Animator/DogControl.controller index e870e29..7877743 100644 --- a/Assets/DogKnight/Animator/DogControl.controller +++ b/Assets/DogKnight/Animator/DogControl.controller @@ -20,7 +20,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.75 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -42,7 +42,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.70000005 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -64,7 +64,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.70000005 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -89,7 +89,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.75 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -108,25 +108,25 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsSpecialAttack m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: GetHit m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsDead m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -160,7 +160,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.75 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -353,7 +353,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.70000005 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -378,7 +378,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.75 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs index 20e73df..0b30941 100644 --- a/Assets/Scripts/Character.cs +++ b/Assets/Scripts/Character.cs @@ -15,7 +15,7 @@ public class Character : MonoBehaviour, Observer public float _myDamage; protected int _gameRound; - protected int _whoseTurn; + protected string _whoseTurn; protected bool _isFinished; // 1. TurnUpdate: _gameRound, _whoseTurn update diff --git a/README.md b/README.md index e678493..2d2fa19 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # 3.28_DogKnight 3.28 Dev Junior Assignment Repository - DogKnight 스켈레톤 코드 -- 주석을 제외하고는 변형하지 말 것 -- 이 외의 추가적인 메소드나 변수는 추가 가능 +- 주석을 포함한 스켈레톤 코드는 변형하지 말 것 +- 이 외의 추가적인 메소드나 변수는 추가 가능 + 주석도 추가로 달아도 됨 - 구체적인 워크플로우는 스크립트 주석 및 notion 과제 설명란 참조 - Game 창에서 FullHD로 설정할 것 ![image](https://user-images.githubusercontent.com/95514277/160330756-4c0cb75b-c65a-4793-af37-318e90badb4c.png)