Compare commits
No commits in common. "main" and "DEG-172-일상UI-색상변경-던전UI-눌림표시" have entirely different histories.
main
...
DEG-172-일상
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 319ea561ecf14f24a8c397dcf3384433
|
guid: a0ba1963fb7ce5041be57eb9074619f8
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 22739671240a4e8489ad2f1f4395a48b
|
guid: a9e0606fbb9eff542926cf31a71db1ec
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
BIN
Assets/JAY/Character Test Scene.unity
(Stored with Git LFS)
Normal file
BIN
Assets/JAY/Character Test Scene.unity
(Stored with Git LFS)
Normal file
Binary file not shown.
7
Assets/JAY/Character Test Scene.unity.meta
Normal file
7
Assets/JAY/Character Test Scene.unity.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 96b35fd950759c34895ff811b76af3c3
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 89e0773700b5aa84ca02bd5e9974c2fa
|
guid: 815e81ef8b9bcab49bf3ab57cd0a44ff
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
@ -5,7 +5,6 @@ using System.Runtime.CompilerServices;
|
|||||||
using UnityEditor.TextCore.Text;
|
using UnityEditor.TextCore.Text;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.SceneManagement;
|
using UnityEngine.SceneManagement;
|
||||||
using UnityEngine.UI;
|
|
||||||
|
|
||||||
public enum PlayerState { None, Idle, Move, Win, Hit, Dead }
|
public enum PlayerState { None, Idle, Move, Win, Hit, Dead }
|
||||||
|
|
||||||
@ -18,7 +17,6 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
|
|||||||
[SerializeField] private GameObject normalModel; // char_body : 일상복
|
[SerializeField] private GameObject normalModel; // char_body : 일상복
|
||||||
[SerializeField] private GameObject battleModel; // warrior_1 : 전투복
|
[SerializeField] private GameObject battleModel; // warrior_1 : 전투복
|
||||||
[SerializeField] private Transform dashEffectAnchor; // 대시 이펙트 위치
|
[SerializeField] private Transform dashEffectAnchor; // 대시 이펙트 위치
|
||||||
[SerializeField] private Image dashCooldownFillImage; //대시 쿨다운 이미지
|
|
||||||
|
|
||||||
// 내부에서만 사용하는 변수
|
// 내부에서만 사용하는 변수
|
||||||
private PlayerHitEffectController hitEffectController;
|
private PlayerHitEffectController hitEffectController;
|
||||||
@ -110,16 +108,7 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
|
|||||||
|
|
||||||
//대시 쿨타임 진행
|
//대시 쿨타임 진행
|
||||||
if (dashCooldownTimer > 0f)
|
if (dashCooldownTimer > 0f)
|
||||||
{
|
|
||||||
dashCooldownTimer -= Time.deltaTime;
|
dashCooldownTimer -= Time.deltaTime;
|
||||||
if(dashCooldownFillImage != null)
|
|
||||||
dashCooldownFillImage.fillAmount = DashCooldownRatio;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if(dashCooldownFillImage != null)
|
|
||||||
dashCooldownFillImage.fillAmount = 0f;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hit 상태거나 게임 끝났을 땐 땐 입력 무시
|
// Hit 상태거나 게임 끝났을 땐 땐 입력 무시
|
||||||
if (CurrentState == PlayerState.Hit || CurrentState == PlayerState.Dead || CurrentState == PlayerState.Win)
|
if (CurrentState == PlayerState.Hit || CurrentState == PlayerState.Dead || CurrentState == PlayerState.Win)
|
||||||
8
Assets/JYY.meta
Normal file
8
Assets/JYY.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1b5aeb9ba846be447b6d45e182831f68
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user