diff --git a/Assets/01_Scenes/MyHouse.unity b/Assets/01_Scenes/MyHouse.unity index 816b9dc2..0049eee5 100644 --- a/Assets/01_Scenes/MyHouse.unity +++ b/Assets/01_Scenes/MyHouse.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c84ef2eaa29b9db04a66177e157d829e8a1cf2b4382533c41d5e102e6741c6d -size 1291244 +oid sha256:689d280d68d871ea004ec4401fe7580cf6d9e080c180bff5d9b0d0b97f3db87a +size 1309975 diff --git a/Assets/02_Scripts/Managers/com/StoryComputerSystem.cs b/Assets/02_Scripts/Managers/com/StoryComputerSystem.cs index 83833c27..6c09b4a0 100644 --- a/Assets/02_Scripts/Managers/com/StoryComputerSystem.cs +++ b/Assets/02_Scripts/Managers/com/StoryComputerSystem.cs @@ -289,7 +289,7 @@ private void RefreshSlotTexts() } int progress = ReadSlotMainProgress(slotPath); - slotTexts[i].text = $"슬롯 {slotIndex}\n저장됨 · 진행도 {progress}%"; + slotTexts[i].text = $"저장됨 진행도 {progress}%"; } } diff --git a/Assets/02_Scripts/UI/computer.meta b/Assets/02_Scripts/UI/computer.meta new file mode 100644 index 00000000..c026e128 --- /dev/null +++ b/Assets/02_Scripts/UI/computer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ffa758859803a3468015c5f1a6d06be +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/UI/HeartAffectionUI.cs b/Assets/02_Scripts/UI/computer/HeartAffectionUI.cs similarity index 100% rename from Assets/02_Scripts/UI/HeartAffectionUI.cs rename to Assets/02_Scripts/UI/computer/HeartAffectionUI.cs diff --git a/Assets/02_Scripts/UI/HeartAffectionUI.cs.meta b/Assets/02_Scripts/UI/computer/HeartAffectionUI.cs.meta similarity index 100% rename from Assets/02_Scripts/UI/HeartAffectionUI.cs.meta rename to Assets/02_Scripts/UI/computer/HeartAffectionUI.cs.meta diff --git a/Assets/02_Scripts/UI/MainProgressUI.cs b/Assets/02_Scripts/UI/computer/MainProgressUI.cs similarity index 100% rename from Assets/02_Scripts/UI/MainProgressUI.cs rename to Assets/02_Scripts/UI/computer/MainProgressUI.cs diff --git a/Assets/02_Scripts/UI/MainProgressUI.cs.meta b/Assets/02_Scripts/UI/computer/MainProgressUI.cs.meta similarity index 100% rename from Assets/02_Scripts/UI/MainProgressUI.cs.meta rename to Assets/02_Scripts/UI/computer/MainProgressUI.cs.meta diff --git a/Assets/02_Scripts/UI/computer/StoryComputerStatusBinder.cs b/Assets/02_Scripts/UI/computer/StoryComputerStatusBinder.cs new file mode 100644 index 00000000..ab85c964 --- /dev/null +++ b/Assets/02_Scripts/UI/computer/StoryComputerStatusBinder.cs @@ -0,0 +1,58 @@ +using UnityEngine; + +public class StoryComputerStatusBinder : MonoBehaviour +{ + [Header("메인 진행도 UI")] + public MainProgressUI mainProgressUI; + + [Header("호감도 UI")] + public CharacterData character1; + public HeartAffectionUI heartUI1; + + public CharacterData character2; + public HeartAffectionUI heartUI2; + + public CharacterData character3; + public HeartAffectionUI heartUI3; + + private void OnEnable() + { + Refresh(); + } + + public void Refresh() + { + if (StoryManager.Instance == null) + { + Debug.LogWarning("[StoryComputerStatusBinder] StoryManager가 없습니다."); + return; + } + + // 메인 진행도 + if (mainProgressUI != null) + { + mainProgressUI.SetProgress(StoryManager.Instance.MainProgress); + } + + // 1번 캐릭터 호감도 + if (character1 != null && heartUI1 != null) + { + int affection = StoryManager.Instance.GetAffection(character1); + heartUI1.SetAffection(affection); + } + + // 2번 캐릭터 호감도 + if (character2 != null && heartUI2 != null) + { + int affection = StoryManager.Instance.GetAffection(character2); + heartUI2.SetAffection(affection); + } + + // 3번 캐릭터 호감도 + if (character3 != null && heartUI3 != null) + { + int affection = StoryManager.Instance.GetAffection(character3); + heartUI3.SetAffection(affection); + } + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/UI/computer/StoryComputerStatusBinder.cs.meta b/Assets/02_Scripts/UI/computer/StoryComputerStatusBinder.cs.meta new file mode 100644 index 00000000..530d985a --- /dev/null +++ b/Assets/02_Scripts/UI/computer/StoryComputerStatusBinder.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 61a29f370bacd4b49b22aa78b73f3464 \ No newline at end of file diff --git a/Assets/02_Scripts/UI/computer/StoryTestButton.cs b/Assets/02_Scripts/UI/computer/StoryTestButton.cs new file mode 100644 index 00000000..c65d0ee2 --- /dev/null +++ b/Assets/02_Scripts/UI/computer/StoryTestButton.cs @@ -0,0 +1,29 @@ +using UnityEngine; + +public class StoryTestButton : MonoBehaviour +{ + public CharacterData testCharacter; + public int addAmount = 10; + + [ContextMenu("TEST / Add Affection")] + public void TestAddAffection() + { + if (testCharacter == null) + { + Debug.LogWarning("테스트 캐릭터가 없습니다."); + return; + } + + StoryManager.Instance.AddAffection(testCharacter, addAmount); + + Debug.Log($"{testCharacter.name} 호감도 +{addAmount}"); + } + + [ContextMenu("TEST / Add Main Progress")] + public void TestAddMainProgress() + { + StoryManager.Instance.MainProgress += addAmount; + + Debug.Log($"메인 진행도 +{addAmount}"); + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/UI/computer/StoryTestButton.cs.meta b/Assets/02_Scripts/UI/computer/StoryTestButton.cs.meta new file mode 100644 index 00000000..4569a42f --- /dev/null +++ b/Assets/02_Scripts/UI/computer/StoryTestButton.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 271cab50fc082884ab7277394c185474 \ No newline at end of file diff --git a/Assets/04_Models/Monitor_LP.prefab b/Assets/04_Models/Monitor_LP.prefab index f45a64a4..747719d1 100644 --- a/Assets/04_Models/Monitor_LP.prefab +++ b/Assets/04_Models/Monitor_LP.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:450b4acd4d41e4fd468488bd31966791aad9a129a1463ed2bbc4b5489efe5281 -size 257558 +oid sha256:68832bc1b8be9f6cd09e2b0d5c653a5c4fb23f583a2aa72af4fd3c5cf72847c8 +size 274685 diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index ce70e690..1e829a7e 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f7daf5e5bfd7ee16d33ffb1f61c7640721ba381c01f01afa64f23d1a40f88c5 -size 133771 +oid sha256:335f0959823f80da17a89319980124ff24826358abc81f316f84cb03ed8b80e3 +size 138648 diff --git a/Assets/_Recovery.meta b/Assets/_Recovery.meta new file mode 100644 index 00000000..dd54f7c3 --- /dev/null +++ b/Assets/_Recovery.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c64534d664e262449e7d5d7205dccce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Recovery/0.unity b/Assets/_Recovery/0.unity new file mode 100644 index 00000000..d50bb278 --- /dev/null +++ b/Assets/_Recovery/0.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01f0c511a19855b3a258383d828db633c424edd04844a4bbd8fb85353132d149 +size 1293525 diff --git a/Assets/_Recovery/0.unity.meta b/Assets/_Recovery/0.unity.meta new file mode 100644 index 00000000..4a32fe03 --- /dev/null +++ b/Assets/_Recovery/0.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4607043068edc814b9799ca19bfe1fd9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: