diff --git a/Assets/JAY/Scripts/PlayerController.cs b/Assets/JAY/Scripts/PlayerController.cs index 82a34e05..7c2e1c34 100644 --- a/Assets/JAY/Scripts/PlayerController.cs +++ b/Assets/JAY/Scripts/PlayerController.cs @@ -61,6 +61,9 @@ public class PlayerController : CharacterBase, IObserver public CharacterController CharacterController => _characterController; public bool IsBattle => _isBattle; public Transform DashEffectAnchor => dashEffectAnchor; + + [Header("대시, 어택 터치 연출용")] + [SerializeField] private DungeonPanelController dungeonPanelController; private void Awake() { @@ -114,6 +117,7 @@ public class PlayerController : CharacterBase, IObserver // 대시 우선 입력 처리 if (Input.GetKeyDown(KeyCode.Space)) { + dungeonPanelController.DashTouchMotion(); StartDashAction(); return; } @@ -122,6 +126,7 @@ public class PlayerController : CharacterBase, IObserver if (Input.GetKeyDown(KeyCode.X) && (_currentAction == null || !_currentAction.IsActive) && (CurrentState != PlayerState.Win && CurrentState != PlayerState.Dead)) { + dungeonPanelController.AttackTouchMotion(); GameManager.Instance.PlayPlayerAttackSound(); StartAttackAction(); } diff --git a/Assets/KSH/DungeonPanelController.cs b/Assets/KSH/DungeonPanelController.cs index 1d460ba3..c8b7850d 100644 --- a/Assets/KSH/DungeonPanelController.cs +++ b/Assets/KSH/DungeonPanelController.cs @@ -11,6 +11,11 @@ public class DungeonPanelController : MonoBehaviour private int _countHealth = 0; private int visibleHeartCount = 3; // 강화 레벨로 설정됨 + //PC 키보드 입력 시 버튼 색상 변경 + [SerializeField] private GameObject dashPressedImage; + [SerializeField] private GameObject attackPressedImage; + private float pressedTime = .1f; + private void Start() { int level = UpgradeManager.Instance.upgradeStat.CurrentUpgradeLevel(StatType.Heart); // 1~3 @@ -50,4 +55,36 @@ public class DungeonPanelController : MonoBehaviour { yield return new WaitForSeconds(1.0f); } + + + #region PC입력 동안 버튼 색상 변경 + + public void DashTouchMotion() + { + StopCoroutine(DashButtonColorChange()); + StartCoroutine(DashButtonColorChange()); + } + + public void AttackTouchMotion() + { + StopCoroutine(AttackButtonColorChange()); + StartCoroutine(AttackButtonColorChange()); + } + + private IEnumerator DashButtonColorChange() + { + dashPressedImage.SetActive(true); + yield return new WaitForSeconds(pressedTime); + dashPressedImage.SetActive(false); + + } + private IEnumerator AttackButtonColorChange() + { + attackPressedImage.SetActive(true); + yield return new WaitForSeconds(pressedTime); + attackPressedImage.SetActive(false); + } + + + #endregion } diff --git a/Assets/KSH/ReDungeon.unity b/Assets/KSH/ReDungeon.unity index 40c41a6d..7d82a7aa 100644 --- a/Assets/KSH/ReDungeon.unity +++ b/Assets/KSH/ReDungeon.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1d61074bbb8366ae290687ea6dc34c30266acc9273be837f634593b70b6d8c4 -size 45432 +oid sha256:9535e943d089e9be15febec194d20ea3f8ad07b559b9b8480c6757c4026d4a46 +size 55478 diff --git a/Assets/LIN/Prefabs/Attack Button Image.prefab b/Assets/LIN/Prefabs/Attack Button Image.prefab new file mode 100644 index 00000000..a468c022 --- /dev/null +++ b/Assets/LIN/Prefabs/Attack Button Image.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c912afdba841f22fdb697cf83dfc5b7eb413f162bd86a724d2b6ee5da220b2cd +size 2271 diff --git a/Assets/LIN/Prefabs/Attack Button Image.prefab.meta b/Assets/LIN/Prefabs/Attack Button Image.prefab.meta new file mode 100644 index 00000000..7f80312b --- /dev/null +++ b/Assets/LIN/Prefabs/Attack Button Image.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8822dc0c2e8b5bc498036a19194f8827 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/Prefabs/Dash Button Image.prefab b/Assets/LIN/Prefabs/Dash Button Image.prefab new file mode 100644 index 00000000..17477dc4 --- /dev/null +++ b/Assets/LIN/Prefabs/Dash Button Image.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91b8bc0c26e6e4bc83d86a12f61ff575065648ced935688a5dc1288ef3b89dab +size 2269 diff --git a/Assets/LIN/Prefabs/Dash Button Image.prefab.meta b/Assets/LIN/Prefabs/Dash Button Image.prefab.meta new file mode 100644 index 00000000..c122fb67 --- /dev/null +++ b/Assets/LIN/Prefabs/Dash Button Image.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 76f779210ea250641b4559dfc6d379b5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/ReDungeon UI Copy.unity b/Assets/LIN/ReDungeon UI Copy.unity new file mode 100644 index 00000000..53af3096 --- /dev/null +++ b/Assets/LIN/ReDungeon UI Copy.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:839747d3f7bbf87df93c0e15475efd1930ef320f44bd095babafc77082a424be +size 46876 diff --git a/Assets/LIN/ReDungeon UI Copy.unity.meta b/Assets/LIN/ReDungeon UI Copy.unity.meta new file mode 100644 index 00000000..dd80e8be --- /dev/null +++ b/Assets/LIN/ReDungeon UI Copy.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ce2ba637dd19c434fa2eb509c2ad4270 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/ReHousing Loding Anim.unity b/Assets/LIN/ReHousing Loding Anim.unity index dd9c8df1..b8b2dbc9 100644 --- a/Assets/LIN/ReHousing Loding Anim.unity +++ b/Assets/LIN/ReHousing Loding Anim.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32bdaa1c9fb8d6ce0e974107e2276b40a04e72af7d2223b95bbc86345c314394 -size 40696 +oid sha256:6c51af6e19fe290d921477bdc7038fc3ed395e951b4c2d1a1610345edc21ca3e +size 41256 diff --git a/Assets/LIN/Scripts/DailyRoutine/InteractionController.cs b/Assets/LIN/Scripts/DailyRoutine/InteractionController.cs index 951ad303..348dcd92 100644 --- a/Assets/LIN/Scripts/DailyRoutine/InteractionController.cs +++ b/Assets/LIN/Scripts/DailyRoutine/InteractionController.cs @@ -16,6 +16,7 @@ public class InteractionController : MonoBehaviour private void Start() { + PlayerStats.Instance.OnWorked -= SuddenAfterWorkEventHappen; PlayerStats.Instance.OnWorked += SuddenAfterWorkEventHappen; PlayerStats.Instance.SetInteractionPanelController(interactionAnimationPanelController); } diff --git a/Assets/LIN/Scripts/UI/HousingCanvasController.cs b/Assets/LIN/Scripts/UI/HousingCanvasController.cs index 1839b0ef..48df4f20 100644 --- a/Assets/LIN/Scripts/UI/HousingCanvasController.cs +++ b/Assets/LIN/Scripts/UI/HousingCanvasController.cs @@ -31,19 +31,6 @@ public class HousingCanvasController : MonoBehaviour interactionButton.SetActive(false); suddenPanel.SetActive(false); } - - /// - /// 씬전환 로딩 패널 테스트용 코드.던전에서도 씬전환 할 때 해당 코드 사용하시면 됩니다. - /// - private void Update() - { - if (Input.GetKeyDown(KeyCode.A)) - { - var _switchingPanel = Instantiate(switchingPanel,this.transform); - switchingPanelController = _switchingPanel.GetComponent(); - switchingPanelController.FadeAndSceneLoad("ReDungeon"); - } - } #region NPC 상호 작용 diff --git a/Assets/Prefabs/ReDungeon/Canvas.prefab b/Assets/Prefabs/ReDungeon/Canvas.prefab index 4f26dbe9..3c84062f 100644 --- a/Assets/Prefabs/ReDungeon/Canvas.prefab +++ b/Assets/Prefabs/ReDungeon/Canvas.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ac8334b7b5b5f841204f07248d67eccfed47fdc795c3c10689f7fafd054a68b -size 61754 +oid sha256:12bfd1654ba68b913d147f76a0818707673a8656e504ed472a03aaecd4335813 +size 61886 diff --git a/Assets/Prefabs/ReHousing/Canvas.prefab b/Assets/Prefabs/ReHousing/Canvas.prefab index f4b33ce0..7aac00e5 100644 --- a/Assets/Prefabs/ReHousing/Canvas.prefab +++ b/Assets/Prefabs/ReHousing/Canvas.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ed066109b1b4b1659317b6461fb716ef432184d8f3f583076183464d6dbcc1f -size 128312 +oid sha256:f3b32e1f6835b8d6756a89cd675555c8903586bcaab954e48b750305669ea000 +size 128310