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

DEG-178-돌발이벤트패널-버그수정 #63

Closed
heain0122 wants to merge 7 commits from DEG-178-돌발이벤트패널-버그수정 into main
pull from: DEG-178-돌발이벤트패널-버그수정
merge into: Degulleo:main
Conversation 3 Commits 7 Files Changed 37 +30 -8
8 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7b6b24f702 - Show all commits

BIN
Assets/LIN/Prefabs/TutorialExamplePanel.prefab (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

7
Assets/LIN/Scripts/Tutorial/TutorialManager.prefab.meta Normal file
View File

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

BIN
Assets/LIN/Scripts/Tutorial/TutorialPanel.prefab (Stored with Git LFS) Normal file
View File

Binary file not shown.

0
Assets/LIN/Prefabs/TutorialExamplePanel.prefab.meta → Assets/LIN/Scripts/Tutorial/TutorialPanel.prefab.meta
View File

4
Assets/LIN/Scripts/Tutorial/TutorialStep1.asset
View File

@ -12,8 +12,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b22d834cf5e26e647be215074940d40e, type: 3}
m_Name: TutorialStep1
m_EditorClassIdentifier:
message: "\uC9D1\uC5D0\uC11C\uB3C4 \uC2AC\uB77C\uC774\uB354\uB97C \uC870\uC791\uD574
\uCE90\uB9AD\uD130\uB97C \uC6C0\uC9C1\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4."
message: "\uC2AC\uB77C\uC774\uB354\uB97C \uC870\uC791\uD574 \uCE90\uB9AD\uD130\uB97C
\uC6C0\uC9C1\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4."
timeout: 0
onStepBegin:
m_PersistentCalls:

4
Assets/LIN/Scripts/Tutorial/TutorialStep2.asset
View File

@ -13,8 +13,8 @@ MonoBehaviour:
m_Name: TutorialStep2
m_EditorClassIdentifier:
message: "\uCE68\uB300, \uB0C9\uC7A5\uACE0, \uD604\uAD00 \uADF8\uB9AC\uACE0 \uC8FC\uBC29\uC5D0
\uAC00\uAE4C\uC774 \uAC00\uBA74 \uADF8\uC5D0 \uC5B4\uC6B8\uB9AC\uB294 \uC0C1\uD638\uC791\uC6A9\uC744
\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4."
\uAC00\uAE4C\uC774 \uAC00\uBA74\n\uC0C1\uD638\uC791\uC6A9\uC744 \uD560 \uC218
\uC788\uC2B5\uB2C8\uB2E4."
timeout: 0
onStepBegin:
m_PersistentCalls:

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

@ -141,7 +141,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));
}
}