Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts: # Assets/XR/Settings/OpenXR Package Settings.asset
This commit is contained in:
BIN
Assets/01_Scenes/MyHouse.unity
LFS
BIN
Assets/01_Scenes/MyHouse.unity
LFS
Binary file not shown.
@@ -289,7 +289,7 @@ private void RefreshSlotTexts()
|
||||
}
|
||||
|
||||
int progress = ReadSlotMainProgress(slotPath);
|
||||
slotTexts[i].text = $"슬롯 {slotIndex}\n저장됨 · 진행도 {progress}%";
|
||||
slotTexts[i].text = $"저장됨 진행도 {progress}%";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
8
Assets/02_Scripts/UI/computer.meta
Normal file
8
Assets/02_Scripts/UI/computer.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8ffa758859803a3468015c5f1a6d06be
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
58
Assets/02_Scripts/UI/computer/StoryComputerStatusBinder.cs
Normal file
58
Assets/02_Scripts/UI/computer/StoryComputerStatusBinder.cs
Normal file
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 61a29f370bacd4b49b22aa78b73f3464
|
||||
29
Assets/02_Scripts/UI/computer/StoryTestButton.cs
Normal file
29
Assets/02_Scripts/UI/computer/StoryTestButton.cs
Normal file
@@ -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}");
|
||||
}
|
||||
}
|
||||
2
Assets/02_Scripts/UI/computer/StoryTestButton.cs.meta
Normal file
2
Assets/02_Scripts/UI/computer/StoryTestButton.cs.meta
Normal file
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 271cab50fc082884ab7277394c185474
|
||||
Binary file not shown.
8
Assets/_Recovery.meta
Normal file
8
Assets/_Recovery.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4c64534d664e262449e7d5d7205dccce
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/_Recovery/0.unity
LFS
Normal file
BIN
Assets/_Recovery/0.unity
LFS
Normal file
Binary file not shown.
7
Assets/_Recovery/0.unity.meta
Normal file
7
Assets/_Recovery/0.unity.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4607043068edc814b9799ca19bfe1fd9
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user