Degulleo/Degulleo3D
7
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

Merge pull request 'DEG-170 [Feat] 연출 연동' (!65) from DEG-170-연출-연동 into main

Browse Source 
Reviewed-on: #65
Reviewed-by: FioreFlower <cjsdlf44@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
This commit is contained in:
Sehyeon 2025-05-15 00:06:42 +00:00
commit 64136ee9ce
8 changed files with 84 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/KSH/TutorialManager.prefab (Stored with Git LFS) Normal file
View File

Binary file not shown.

7
Assets/KSH/TutorialManager.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: cb1b75d7494cad14fa95ac97aa0c8f74
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

15
Assets/LIN/Scripts/Tutorial/TutorialManager.cs
View File

@ -24,10 +24,6 @@ public class TutorialManager : MonoBehaviour
private Canvas overlayCanvas; // RectTransformUtility를 위한 Canvas
private Action onTutorialComplete;
public void Start( )
{
StartTutorial(null);
}
public void StartTutorial(Action onTutorialEnd, int panelIndex = 0)
{
if(parentCanvas == null)
@ -45,9 +41,9 @@ public class TutorialManager : MonoBehaviour
if (_tutorialPanelController != null)
{
onTutorialComplete = onTutorialEnd;
overlay.alpha = 1f;
overlay.blocksRaycasts = true;
RunStep(firstStep);
overlay.alpha = 1f;
overlay.blocksRaycasts = true;
RunStep(firstStep);
}
else Debug.Log("패널 생성 실패, 튜토리얼 진행이 불가능합니다.");
}
@ -97,15 +93,10 @@ public class TutorialManager : MonoBehaviour
if (RectTransformUtility.RectangleContainsScreenPoint(
targetRt, screenPos, overlayCanvas.worldCamera))
{
Debug.Log("타겟 터치");
targetRt = null;
_tutorialPanelController.HideTouchTarget(step.touchTargetIndex);
done = true;
}
else
{
Debug.Log("타겟이 아닌 곳 터치");
}
}
}

29
Assets/LIN/Scripts/UI/InteractionAnimationPanelController.cs
View File

@ -91,7 +91,7 @@ public class InteractionAnimationPanelController : MonoBehaviour
/// 패널이 2초후 자동으로 닫히거나 터치시 닫히도록 합니다.
/// </summary>
/// <returns></returns>
private IEnumerator AutoHidePanel(ActionType actionType)
private IEnumerator AutoHidePanel(ActionType actionType, bool isTutorial = false)
{
float startTime = Time.time;
while (Time.time - startTime < animationDuration)
@ -107,7 +107,7 @@ public class InteractionAnimationPanelController : MonoBehaviour
GameManager.Instance.StopInteractionSound(actionType);
//패널 닫고 애니메이션 null처리
HidePanel();
HidePanel(isTutorial);
_autoHideCoroutine = null;
if (actionType == ActionType.Housework)
@ -121,7 +121,7 @@ public class InteractionAnimationPanelController : MonoBehaviour
}
}
private void HidePanel()
private void HidePanel(bool isTutorial = false)
{
panel.SetActive(false);
@ -143,9 +143,12 @@ public class InteractionAnimationPanelController : MonoBehaviour
return;
}
// 패널 닫히고 결근 체크, 상호작용 패널과 결근 엔딩 채팅창이 겹치지 않기 위함
PlayerStats.Instance.CheckAbsent();
PlayerStats.Instance.ShowBubble();
if (!isTutorial) // 튜토리얼 시 결근과 말풍선 오류로 인해 조건문 추가
{
// 패널 닫히고 결근 체크, 상호작용 패널과 결근 엔딩 채팅창이 겹치지 않기 위함
PlayerStats.Instance.CheckAbsent();
PlayerStats.Instance.ShowBubble();
}
}
public void TutorialSleepAnimation()
@ -153,7 +156,19 @@ public class InteractionAnimationPanelController : MonoBehaviour
_parentCanvas = FindObjectOfType(typeof(Canvas)) as Canvas;
HousingConstants.interactions.TryGetValue(ActionType.Sleep, out var interactionTexts);
ShowAnimationPanel(ActionType.Sleep, interactionTexts.AnimationText);
// 1) 패널 활성화
panel.SetActive(true);
// 2) 기존 코루틴 정리
if (_textAnimCoroutine != null) StopCoroutine(_textAnimCoroutine);
if (_autoHideCoroutine != null) StopCoroutine(_autoHideCoroutine);
// 3) 텍스트 및 애니메이션 세팅
doingText.text = interactionTexts.AnimationText;
animator.Play("Sleep");
_textAnimCoroutine = StartCoroutine(TextDotsAnimation());
_autoHideCoroutine = StartCoroutine(AutoHidePanel(ActionType.Sleep, true));
}
}

2
Assets/LYM/Scripts/MainUIPanelController.cs
View File

@ -8,7 +8,7 @@ public class MainUIPanelController : MonoBehaviour
public void OnClickStartButton()
{
GameManager.Instance.ChangeToHomeScene();
GameManager.Instance.ChangeToHomeScene(true);
}
public void OnClickSettingsButton()

29
Assets/Scripts/Common/Dialogue/ChatWindowController.cs
View File

@ -54,6 +54,8 @@ public class ChatWindowController : MonoBehaviour, IPointerClickHandler
public delegate void OnComplete();
public OnComplete onComplete;
private bool isEnded;
private bool isTuto;
private FairyDialogueManager _dialogueManager;
@ -65,12 +67,21 @@ public class ChatWindowController : MonoBehaviour, IPointerClickHandler
private void Start()
{
isEnded = false;
isTuto = false;
_dialogueManager = new FairyDialogueManager(this);
/*onComplete = () => {
// 대화문 종료 call back
Debug.Log("대화가 완료되었습니다.");
};*/
onComplete = () => {
if (isTuto)
{
isTuto = false;
StartCoroutine(GameManager.Instance.StartTutorialCoroutine());
}
if (isEnded)
GameManager.Instance.ChangeToMainScene();
};
}
// 외부 호출용 함수 (대화 시작)
@ -78,6 +89,12 @@ public class ChatWindowController : MonoBehaviour, IPointerClickHandler
{
_dialogueManager.SetGamePhase(phase);
if (phase == GamePhase.End || phase == GamePhase.FailEnd || phase == GamePhase.ZeroEnd)
isEnded = true;
if (phase == GamePhase.Intro)
isTuto = true;
// Gameplay 상태라면 랜덤 대화 출력
if (phase == GamePhase.Gameplay) _dialogueManager.ShowRandomGameplayDialogue();
}
@ -139,7 +156,6 @@ public class ChatWindowController : MonoBehaviour, IPointerClickHandler
if (_inputQueue.Count == 0)
{
HideWindow();
onComplete?.Invoke();
return;
}
@ -200,6 +216,9 @@ public class ChatWindowController : MonoBehaviour, IPointerClickHandler
//대화창 클릭 시 호출 함수
public void OnPointerClick(PointerEventData eventData)
{
if (!chatWindowObject.activeSelf) // 실제론 대화창이 off 상태인데 호출되는 상황 방지
return;
if (_typingCoroutine != null)
{
StopCoroutine(_typingCoroutine);

23
Assets/Scripts/Common/GameManager.cs
View File

@ -26,6 +26,8 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
private PanelManager panelManager;
public PanelManager PanelManager => panelManager;
private TutorialManager tutorialManager;
private void Start()
{
// 오디오 초기화
@ -92,6 +94,11 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
}
}
public void ChangeToMainScene()
{
SceneManager.LoadScene("Main");
}
public void ChangeToGameScene()
{
tryStageCount++; // 던전 시도 횟수 증가
@ -99,14 +106,28 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
HandleSceneAudio("Dungeon");
}
public void ChangeToHomeScene()
public void ChangeToHomeScene(bool isNewStart = false)
{
SceneManager.LoadScene("ReHousing"); // Home Scene
HandleSceneAudio("Housing");
if(isNewStart) // 아예 메인에서 시작 시 튜토리얼 출력
StartNPCDialogue(GamePhase.Intro); // StartCoroutine(StartTutorialCoroutine());
if (tryStageCount >= 3) FailEnd(); // 엔딩
}
public IEnumerator StartTutorialCoroutine()
{
yield return new WaitForSeconds(0.5f);
if(tutorialManager == null)
tutorialManager = FindObjectOfType<TutorialManager>();
PlayerStats.Instance.HideBubble();
tutorialManager.StartTutorial(() => PlayerStats.Instance.ShowBubble());
}
// TODO: Open Setting Panel 등 Panel 처리
protected override void OnSceneLoaded(Scene scene, LoadSceneMode mode)

2
Assets/Scripts/Common/GameUtility/EndingLogic.cs
View File

@ -12,8 +12,6 @@ public enum EndingType
public partial class GameManager
{
private float happyEndReputation = 3.0f;
public void ClearStage()
{
tryStageCount = 0; // 시도 횟수 초기화