diff --git a/Assets/KJM/KJM.unity b/Assets/KJM/KJM.unity index c0fd141b..1f6c84d0 100644 --- a/Assets/KJM/KJM.unity +++ b/Assets/KJM/KJM.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4246afb41d86d6a92c3bcf1325630d7871a5e59255be61a927c5994dfc1ea81 -size 75255 +oid sha256:37fc211c69de9c0d422fd90c9cc44437d015cfb19a6598ca1063b6a56b335ada +size 76745 diff --git a/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeTestObject.prefab b/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeTestObject.prefab new file mode 100644 index 00000000..013aaa3e --- /dev/null +++ b/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeTestObject.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f35cb2acb26a2809ebafa5f001d8297a00968f0c75a13ad3e2c144555bd8c42d +size 2003 diff --git a/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeTestObject.prefab.meta b/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeTestObject.prefab.meta new file mode 100644 index 00000000..77d19355 --- /dev/null +++ b/Assets/KJM/KJM_Test/Upgrade/Prefabs/UpgradeTestObject.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e3768143d1fc350408bf60fc9e748b56 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs b/Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs index a03e6510..7598fd85 100644 --- a/Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs +++ b/Assets/KJM/KJM_Test/Upgrade/UpgradeManager.cs @@ -156,8 +156,19 @@ public class UpgradeManager : Singleton //배경 패널 비활성화 StartCoroutine(CoFade(backgroundRectTransform.gameObject, 0.7f,0f,0.2f)); + + if (SceneManager.GetActiveScene().name == "ReDungeon") + { + StartCoroutine(DelayedSceneChange()); // n초 대기 후 전환 + } } + //씬 전환 대기 코루틴 + private IEnumerator DelayedSceneChange() + { + yield return new WaitForSeconds(2f); + GameManager.Instance.ChangeToHomeScene(); + } /// /// 페이드 애니메이션 코루틴 @@ -231,7 +242,8 @@ public class UpgradeManager : Singleton protected override void OnSceneLoaded(Scene scene, LoadSceneMode mode) { - + if(canvas == null) + canvas = FindObjectOfType(); } } diff --git a/Assets/KSH/DungeonLogic.cs b/Assets/KSH/DungeonLogic.cs index 2bdb84ec..9a1251c0 100644 --- a/Assets/KSH/DungeonLogic.cs +++ b/Assets/KSH/DungeonLogic.cs @@ -113,10 +113,7 @@ public class DungeonLogic : MonoBehaviour _player.SetState(PlayerState.Win); // TODO: 강화 시스템으로 넘어가고 일상 맵으로 이동 - UpgradeManager.Instance.StartUpgrade(); //강화 시스템 호출 GameManager.Instance.PanelManager.GetPanel("ClearPanelBG"); - - StartCoroutine(DelayedSceneChange()); // 5초 대기 후 전환 } } diff --git a/Assets/KSH/ReHousing.unity b/Assets/KSH/ReHousing.unity index dd9c8df1..d27eb51e 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:32bdaa1c9fb8d6ce0e974107e2276b40a04e72af7d2223b95bbc86345c314394 -size 40696 +oid sha256:3640ccb749b85dddd7e0d050698ae9585434dc23bc81be7ba0f6d3e999c30faa +size 45878 diff --git a/Assets/LYM/Scripts/ClearPanelController.cs b/Assets/LYM/Scripts/ClearPanelController.cs index e79991d5..8de3197a 100644 --- a/Assets/LYM/Scripts/ClearPanelController.cs +++ b/Assets/LYM/Scripts/ClearPanelController.cs @@ -61,5 +61,6 @@ public class ClearPanelController : PanelController, IPointerClickHandler { onCompleted?.Invoke(); Hide(); + UpgradeManager.Instance.StartUpgrade(); } } \ No newline at end of file