diff --git a/Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs b/Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs index bf2c2855..e6dd3036 100644 --- a/Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs +++ b/Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs @@ -52,6 +52,9 @@ public class UpgradeManager : Singleton EnsureCardListSize(3); + //오디오 재생 + GameManager.Instance.PlayLevelUpSound(); + //카드 생성 if (stats.Count == 0) { @@ -103,6 +106,9 @@ public class UpgradeManager : Singleton EnsureCardListSize(3); + //오디오 재생 + GameManager.Instance.PlayLevelUpSound(); + if(cards[0] == null) cards[0] = Instantiate(upgradeButton, backgroundRectTransform); @@ -161,6 +167,8 @@ public class UpgradeManager : Singleton /// public void DestroyUpgradeCard() { + GameManager.Instance.PlayButtonClickSound(); + // 카드 비활성화 if (stats.Count == 0|| isHome) { @@ -280,5 +288,4 @@ public class UpgradeManager : Singleton if(canvas == null) canvas = FindObjectOfType(); } - } diff --git a/Assets/KSH/PlayerStats.cs b/Assets/KSH/PlayerStats.cs index a5ef57bf..fb3bb12c 100644 --- a/Assets/KSH/PlayerStats.cs +++ b/Assets/KSH/PlayerStats.cs @@ -203,7 +203,7 @@ public class PlayerStats : MonoBehaviour,ISaveable } } - public void PerformAbsent() // 강제 결근 이벤트 + public void PerformAbsent() // 강제 결근 이벤트, 오류 발생 { _hasCheckedAbsenceToday = true; // 결근 체크 완료 표시 OnAbsent?.Invoke(); @@ -349,7 +349,7 @@ public class PlayerStats : MonoBehaviour,ISaveable EndDay(time, actionType); } - if (TimeStat >= 8.0f && TimeStat < 9.0f) + if (TimeStat is >= 8.0f and < 9.0f) { _hasWorkedToday = false; _hasCheckedAbsenceToday = false; @@ -384,6 +384,8 @@ public class PlayerStats : MonoBehaviour,ISaveable public void ModifyReputation(float reputation) { + if (reputation == 0f) return; + // float 연산 시 계산 오차가 발생할 수도 있기에 소수점 두 번째에서 반올림하도록 처리 if(ReputationStat > 0) { diff --git a/Assets/KSH/ReHousing.unity b/Assets/KSH/ReHousing.unity index e6fef1bb..774cbb12 100644 --- a/Assets/KSH/ReHousing.unity +++ b/Assets/KSH/ReHousing.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eca58836df63a0c4c8fa89c85e46e1e355b84f25e0cdca06017b09b77bd82b9d -size 57881 +oid sha256:54382934b59100b1828c3f35399abce32340abbe6a5f1d4744b203ebeda3a62a +size 53011 diff --git a/Assets/LIN/Prefabs/TutorialExamplePanel.prefab b/Assets/LIN/Prefabs/TutorialExamplePanel.prefab index a6045353..31436d63 100644 --- a/Assets/LIN/Prefabs/TutorialExamplePanel.prefab +++ b/Assets/LIN/Prefabs/TutorialExamplePanel.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a205b1cb1b77da6069cc6b50bf84b6dde468c7dec7fe424d001a0d0e21062fc -size 44760 +oid sha256:7c9b558942e0bc377741f888a21b1a9d8989a0946389d3801802d1ef83f32782 +size 44748 diff --git a/Assets/LIN/Scripts/DailyRoutine/InteractionController.cs b/Assets/LIN/Scripts/DailyRoutine/InteractionController.cs index affd6d91..59f959e1 100644 --- a/Assets/LIN/Scripts/DailyRoutine/InteractionController.cs +++ b/Assets/LIN/Scripts/DailyRoutine/InteractionController.cs @@ -91,6 +91,12 @@ public class InteractionController : MonoBehaviour if (interactionType == ActionType.Dungeon) { + if (GameManager.Instance.StageLevel > 2) + { + PlayerStats.Instance.ShowAndHideBubble("던전을 다깼어!"); + return; + } + GameManager.Instance.ChangeToGameScene(); } else diff --git a/Assets/LIN/Scripts/Tutorial/TutorialStep1.asset b/Assets/LIN/Scripts/Tutorial/TutorialStep1.asset index c0ef50ce..75e35f24 100644 --- a/Assets/LIN/Scripts/Tutorial/TutorialStep1.asset +++ b/Assets/LIN/Scripts/Tutorial/TutorialStep1.asset @@ -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 \n\uCE90\uB9AD\uD130\uB97C + \uC6C0\uC9C1\uC77C \uC218 \uC788\uC2B5\uB2C8\uB2E4." timeout: 0 onStepBegin: m_PersistentCalls: diff --git a/Assets/LIN/Scripts/Tutorial/TutorialStep2.asset b/Assets/LIN/Scripts/Tutorial/TutorialStep2.asset index 9dd10882..58d40758 100644 --- a/Assets/LIN/Scripts/Tutorial/TutorialStep2.asset +++ b/Assets/LIN/Scripts/Tutorial/TutorialStep2.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b22d834cf5e26e647be215074940d40e, type: 3} 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 + message: "\uCE68\uB300, \uB0C9\uC7A5\uACE0, \uD604\uAD00 \uADF8\uB9AC\uACE0\n\uC8FC\uBC29\uC5D0 + \uAC00\uAE4C\uC774 \uAC00\uBA74 \n\uADF8\uC5D0 \uC5B4\uC6B8\uB9AC\uB294 \uC0C1\uD638\uC791\uC6A9\uC744 \uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4." timeout: 0 onStepBegin: diff --git a/Assets/LIN/Scripts/Tutorial/TutorialStep5.asset b/Assets/LIN/Scripts/Tutorial/TutorialStep5.asset index dc7e68ad..236d98f8 100644 --- a/Assets/LIN/Scripts/Tutorial/TutorialStep5.asset +++ b/Assets/LIN/Scripts/Tutorial/TutorialStep5.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b22d834cf5e26e647be215074940d40e, type: 3} m_Name: TutorialStep5 m_EditorClassIdentifier: - message: "\uB2E4\uC591\uD55C \uC0C1\uD638\uC791\uC6A9\uC744 \uD1B5\uD574 \uB2A5\uB825\uCE58\uB97C + message: "\uB2E4\uC591\uD55C \uC0C1\uD638\uC791\uC6A9\uC744 \uD1B5\uD574\n\uB2A5\uB825\uCE58\uB97C \uC62C\uB9AC\uACE0 \uB358\uC804\uC744 \uACF5\uB7B5\uD574\uBCF4\uC138\uC694." timeout: 0 onStepBegin: diff --git a/Assets/LIN/Scripts/UI/InteractionAnimationPanelController.cs b/Assets/LIN/Scripts/UI/InteractionAnimationPanelController.cs index ab58f281..4256477e 100644 --- a/Assets/LIN/Scripts/UI/InteractionAnimationPanelController.cs +++ b/Assets/LIN/Scripts/UI/InteractionAnimationPanelController.cs @@ -140,6 +140,7 @@ public class InteractionAnimationPanelController : MonoBehaviour if (_isAbsenceToday) // 결근한 경우 { PlayerStats.Instance.PerformAbsent(); + _isAbsenceToday = false; return; } diff --git a/Assets/LYM/Fonts/Galmuri9 SDF new.asset b/Assets/LYM/Fonts/Galmuri9 SDF new.asset index 12b4f95a..6aec67fd 100644 --- a/Assets/LYM/Fonts/Galmuri9 SDF new.asset +++ b/Assets/LYM/Fonts/Galmuri9 SDF new.asset @@ -70,7 +70,7 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.3 + - _OutlineWidth: 0.05 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.8 @@ -99,7 +99,7 @@ Material: m_Colors: - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _FaceColor: {r: 0, g: 0, b: 0, a: 1} - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Resources/Prefabs/Panels/SwitchingPanel.prefab b/Assets/Resources/Prefabs/Panels/SwitchingPanel.prefab index 53122568..b5a675fc 100644 --- a/Assets/Resources/Prefabs/Panels/SwitchingPanel.prefab +++ b/Assets/Resources/Prefabs/Panels/SwitchingPanel.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a21ed3e409b502e0530cd1beba832e4a443774ab36476287ce7b44df9be7b006 +oid sha256:5cb9a6c54525d4e529d5719cb69917be4934f543572b3f62b2d09c8eff62950f size 18186 diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs index e692cf6a..cdb5df15 100644 --- a/Assets/Scripts/Common/GameManager.cs +++ b/Assets/Scripts/Common/GameManager.cs @@ -48,7 +48,7 @@ public partial class GameManager : Singleton,ISaveable { if (chatWindowController == null) { - yield return new WaitForSeconds(4f); // 씬 전환 대기 + yield return new WaitForSeconds(4.0f); // 씬 전환 대기 chatWindowController = FindObjectOfType(); } @@ -118,7 +118,7 @@ public partial class GameManager : Singleton,ISaveable HandleSceneAudio("Housing"); if(isNewStart) // 아예 메인에서 시작 시 튜토리얼 출력 - StartNPCDialogue(GamePhase.Intro); // StartCoroutine(StartTutorialCoroutine()); + StartNPCDialogue(GamePhase.Intro); if (tryStageCount >= 3) FailEnd(); // 엔딩 }