From 35dfe1a0805e2ea7e7955d081cc36a90f66574c3 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 21 Jul 2025 16:53:39 +0900 Subject: [PATCH 1/6] =?UTF-8?q?Ui=20=EA=B8=B0=EB=B3=B8=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scripts/GameUi/BaseUi.cs | 26 ++++ Assets/_DDD/_Scripts/GameUi/FadeUi.cs | 51 +++++++ .../_DDD/_Scripts/GameUi/GlobalMessageUi.cs | 68 +++++++++ Assets/_DDD/_Scripts/GameUi/PopupUi.cs | 7 + Assets/_DDD/_Scripts/GameUi/ScreenUi.cs | 7 + Assets/_DDD/_Scripts/GameUi/UiManager.cs | 140 ++++++++++++++++++ 6 files changed, 299 insertions(+) create mode 100644 Assets/_DDD/_Scripts/GameUi/BaseUi.cs create mode 100644 Assets/_DDD/_Scripts/GameUi/FadeUi.cs create mode 100644 Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs create mode 100644 Assets/_DDD/_Scripts/GameUi/PopupUi.cs create mode 100644 Assets/_DDD/_Scripts/GameUi/ScreenUi.cs create mode 100644 Assets/_DDD/_Scripts/GameUi/UiManager.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi.cs new file mode 100644 index 000000000..da48fc1dd --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi.cs @@ -0,0 +1,26 @@ +using UnityEngine; + +namespace DDD +{ + public abstract class BaseUi : MonoBehaviour + { + public virtual bool IsBlockingTime => false; + public virtual bool IsOpen => gameObject.activeSelf; + + protected virtual void Start() + { + TryRegister(); + } + + protected virtual void OnDestroy() + { + TryUnregister(); + } + + protected virtual void TryRegister() { } + protected virtual void TryUnregister() { } + + public virtual void Open() => gameObject.SetActive(true); + public virtual void Close() => gameObject.SetActive(false); + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/FadeUi.cs b/Assets/_DDD/_Scripts/GameUi/FadeUi.cs new file mode 100644 index 000000000..4469828d9 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/FadeUi.cs @@ -0,0 +1,51 @@ +using DG.Tweening; +using UnityEngine; + +namespace DDD +{ + public class FadeUi : MonoBehaviour, IEventHandler, IEventHandler + { + private CanvasGroup _canvasGroup; + + private void Awake() + { + _canvasGroup = GetComponent(); + + _canvasGroup.alpha = 0f; + _canvasGroup.gameObject.SetActive(false); + + EventBus.Register(this); + EventBus.Register(this); + } + + private void OnDestroy() + { + EventBus.Unregister(this); + EventBus.Unregister(this); + } + + public async void Invoke(FadeInEvent evt) + { + await _canvasGroup.DOFade(0f, evt.Duration) + .SetUpdate(true) + .AsyncWaitForCompletion(); + + _canvasGroup.blocksRaycasts = false; + _canvasGroup.gameObject.SetActive(false); + + evt.CompletionSource.SetResult(true); + } + + public async void Invoke(FadeOutEvent evt) + { + _canvasGroup.gameObject.SetActive(true); + _canvasGroup.blocksRaycasts = true; + + await _canvasGroup.DOFade(1f, evt.Duration) + .SetUpdate(true) + .AsyncWaitForCompletion(); + + evt.CompletionSource.SetResult(true); + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs b/Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs new file mode 100644 index 000000000..7d08b9621 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs @@ -0,0 +1,68 @@ +using System.Collections.Generic; +using DG.Tweening; +using TMPro; +using UnityEngine; + +namespace DDD +{ + public class GlobalMessageUi : BaseUi, IEventHandler + { + private CanvasGroup _canvasGroup; + private TextMeshProUGUI _messageText; + private Tween _fadeTween; + + private readonly Queue _messageQueue = new(); + private bool _isDisplayingMessage = false; + + private void Awake() + { + _canvasGroup = GetComponent(); + _messageText = GetComponentInChildren(); + + _canvasGroup.alpha = 0; + _messageText.text = null; + + EventBus.Register(this); + } + + protected override void OnDestroy() + { + base.OnDestroy(); + + EventBus.Unregister(this); + _fadeTween?.Kill(); + } + + public void Invoke(ShowGlobalMessageEvent evt) + { + _messageQueue.Enqueue(evt); + TryDisplayNext(); + } + + private void TryDisplayNext() + { + if (_isDisplayingMessage || _messageQueue.Count == 0) return; + + var evt = _messageQueue.Dequeue(); + _isDisplayingMessage = true; + + _messageText.text = LocalizationManager.GetString(TableName.Global_Message, evt.NewMessageKey); + Open(); + + _fadeTween?.Kill(); + _fadeTween = DOTween.Sequence() + .Append(_canvasGroup.DOFade(1f, evt.FadeDuration)) + .AppendInterval(evt.ShowDuration) + .Append(_canvasGroup.DOFade(0f, evt.FadeDuration)) + .OnComplete(() => + { + Close(); + _fadeTween = null; + _isDisplayingMessage = false; + + // 다음 메시지 처리 + TryDisplayNext(); + }); + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi.cs new file mode 100644 index 000000000..830988d16 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/PopupUi.cs @@ -0,0 +1,7 @@ +namespace DDD +{ + public class PopupUi : BaseUi + { + + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/ScreenUi.cs b/Assets/_DDD/_Scripts/GameUi/ScreenUi.cs new file mode 100644 index 000000000..c4ab9b222 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/ScreenUi.cs @@ -0,0 +1,7 @@ +namespace DDD +{ + public class ScreenUi : BaseUi + { + + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/UiManager.cs b/Assets/_DDD/_Scripts/GameUi/UiManager.cs new file mode 100644 index 000000000..6867b93d2 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/UiManager.cs @@ -0,0 +1,140 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace DDD +{ + public class UiManager : Singleton, IManager, IEventHandler, IEventHandler, + IEventHandler, IEventHandler + { + private readonly Dictionary _screenUIs = new(); + private readonly Dictionary _popupUIs = new(); + + private readonly object _uiPauseRequester = new(); + + public void PreInit() + { + EventBus.Register(this); + EventBus.Register(this); + EventBus.Register(this); + EventBus.Register(this); + } + + public Task Init() + { + return Task.CompletedTask; + } + + public void PostInit() + { + + } + + private void OnDestroy() + { + EventBus.Unregister(this); + EventBus.Unregister(this); + EventBus.Unregister(this); + EventBus.Unregister(this); + } + + public void RegisterScreenUI(ScreenUi ui) + { + var type = ui.GetType(); + _screenUIs.TryAdd(type, ui); + } + + public void UnregisterScreenUI(ScreenUi ui) + { + var type = ui.GetType(); + if (_screenUIs.TryGetValue(type, out var value) && value == ui) + { + _screenUIs.Remove(type); + } + } + + public void RegisterPopupUI(PopupUi ui) + { + var type = ui.GetType(); + _popupUIs.TryAdd(type, ui); + } + + public void UnregisterPopupUI(PopupUi ui) + { + var type = ui.GetType(); + if (_popupUIs.TryGetValue(type, out var registered) && registered == ui) + { + _popupUIs.Remove(type); + } + } + + private void CloseAllScreenUIs() + { + foreach (var screen in _screenUIs.Values) + { + if (screen.IsOpen) + { + screen.Close(); + + if (screen.IsBlockingTime) + { + EventBus.Broadcast(new TimeScaleChangeEvent(_uiPauseRequester, 1f)); + } + } + } + } + + public void Invoke(OpenScreenUiEvent evt) + { + if (_screenUIs.TryGetValue(evt.UiType, out var screen)) + { + CloseAllScreenUIs(); + screen.Open(); + + if (screen.IsBlockingTime) + { + EventBus.Broadcast(new TimeScaleChangeEvent(screen, 0f)); + } + } + } + + public void Invoke(CloseScreenUiEvent evt) + { + if (_screenUIs.TryGetValue(evt.UiType, out var screen)) + { + screen.Close(); + + if (screen.IsBlockingTime) + { + EventBus.Broadcast(new TimeScaleChangeEvent(screen, 1f)); + } + } + } + + public void Invoke(OpenPopupUiEvent evt) + { + if (_popupUIs.TryGetValue(evt.UiType, out var popup)) + { + popup.Open(); + + if (popup.IsBlockingTime) + { + EventBus.Broadcast(new TimeScaleChangeEvent(popup, 0f)); + } + } + } + + public void Invoke(ClosePopupUiEvent evt) + { + if (_screenUIs.TryGetValue(evt.UiType, out var popUp)) + { + popUp.Close(); + + if (popUp.IsBlockingTime) + { + EventBus.Broadcast(new TimeScaleChangeEvent(popUp, 1f)); + } + } + } + } +} \ No newline at end of file From 173944f0875ff909be294d2b3ca8a36411fd0346 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 21 Jul 2025 16:54:58 +0900 Subject: [PATCH 2/6] =?UTF-8?q?FadeManager=20=EC=A0=9C=EA=B1=B0=20->=20Fad?= =?UTF-8?q?eUi=20=EB=8B=A8=EC=9D=BC=20Ui=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_ScriptAssets/Prefabs/FadeManager.prefab | 206 ------------------ .../Prefabs/FadeManager.prefab.meta | 7 - .../_Scripts/GameFramework/FadeManager.cs | 59 ----- .../GameFramework/FadeManager.cs.meta | 2 - .../Scene/FadeSceneTransitionHandlerSo.cs | 18 +- 5 files changed, 15 insertions(+), 277 deletions(-) delete mode 100644 Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab delete mode 100644 Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab.meta delete mode 100644 Assets/_DDD/_Scripts/GameFramework/FadeManager.cs delete mode 100644 Assets/_DDD/_Scripts/GameFramework/FadeManager.cs.meta diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab deleted file mode 100644 index 69f67755e..000000000 --- a/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab +++ /dev/null @@ -1,206 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &645007492175346922 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8625885928614466139} - - component: {fileID: 5533625503660040844} - - component: {fileID: 2068856588424138268} - - component: {fileID: 827366504865157138} - - component: {fileID: 8205940526588409056} - - component: {fileID: 5136368050551183548} - m_Layer: 5 - m_Name: FadeManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8625885928614466139 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 2840604718763097518} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!223 &5533625503660040844 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 6 - m_TargetDisplay: 0 ---- !u!114 &2068856588424138268 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 1 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &827366504865157138 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 55 ---- !u!225 &8205940526588409056 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &5136368050551183548 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41f0ee0aabb2f954d918caa8d484f646, type: 3} - m_Name: - m_EditorClassIdentifier: - _persistent: 1 ---- !u!1 &6954525544416039378 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2840604718763097518} - - component: {fileID: 8274624108829164416} - - component: {fileID: 4134486114940038904} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2840604718763097518 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6954525544416039378} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 8625885928614466139} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8274624108829164416 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6954525544416039378} - m_CullTransparentMesh: 1 ---- !u!114 &4134486114940038904 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6954525544416039378} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab.meta deleted file mode 100644 index 64474a920..000000000 --- a/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0aa6654feb91ef040b8b99d4f64688fc -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs b/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs deleted file mode 100644 index 288b8f1ce..000000000 --- a/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Threading.Tasks; -using DG.Tweening; -using UnityEngine; - -namespace DDD -{ - public class FadeManager : Singleton, IManager - { - [SerializeField] - private float _fadeOutDuration = 0.5f; - - [SerializeField] - private float _fadeInDuration = 1f; - - private CanvasGroup _canvasGroup; - - public void PreInit() - { - _canvasGroup = GetComponent(); - } - - public Task Init() - { - return Task.CompletedTask;; - } - - public void PostInit() - { - _canvasGroup.alpha = 0f; - _canvasGroup.gameObject.SetActive(false); - } - - public async Task FadeOut() - { - _canvasGroup.gameObject.SetActive(true); - _canvasGroup.blocksRaycasts = true; - - await _canvasGroup.DOFade(1f, _fadeOutDuration) - .SetUpdate(true) - .AsyncWaitForCompletion(); - } - - public async Task FadeIn() - { - await _canvasGroup.DOFade(0f, _fadeInDuration) - .SetUpdate(true) - .AsyncWaitForCompletion(); - - _canvasGroup.blocksRaycasts = false; - _canvasGroup.gameObject.SetActive(false); - } - - public async Task FadeOutIn() - { - await FadeOut(); - await FadeIn(); - } - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs.meta b/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs.meta deleted file mode 100644 index 8c526c9c7..000000000 --- a/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 41f0ee0aabb2f954d918caa8d484f646 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs b/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs index ed8a033cb..1d2e1a428 100644 --- a/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs +++ b/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs @@ -9,15 +9,27 @@ public class FadeSceneTransitionHandlerSo : SceneTransitionHandler [SerializeField] private float _delayBeforeFadeIn = 1f; + [SerializeField] + private float _fadeOutDuration = 1f; + + [SerializeField] + private float _fadeInDuration = 0.5f; + public override async Task OnBeforeSceneActivate(SceneType sceneType) { - await FadeManager.Instance.FadeOut(); + var evt = new FadeOutEvent(_fadeOutDuration); + EventBus.Broadcast(evt); + await evt.WaitAsync(); } public override async Task OnAfterSceneActivate(SceneType sceneType) { - await Task.Delay((int)(_delayBeforeFadeIn * 1000)); - await FadeManager.Instance.FadeIn(); + float seconds = _delayBeforeFadeIn * 1000; + await Task.Delay((int)(seconds)); + + var evt = new FadeInEvent(_fadeInDuration); + EventBus.Broadcast(evt); + await evt.WaitAsync(); } } } \ No newline at end of file From 5323cccaaf71a221e0eb3c5ddd669b1387922c22 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 21 Jul 2025 16:55:51 +0900 Subject: [PATCH 3/6] =?UTF-8?q?TimeManager=20=EC=B6=94=EA=B0=80=20(Ui?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EB=93=B1=20=EC=97=B0=EA=B2=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Scripts/GameFramework/TimeManager.cs | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 Assets/_DDD/_Scripts/GameFramework/TimeManager.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/TimeManager.cs b/Assets/_DDD/_Scripts/GameFramework/TimeManager.cs new file mode 100644 index 000000000..536e4bcb0 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/TimeManager.cs @@ -0,0 +1,85 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using UnityEngine; + +namespace DDD +{ + public class TimeManager : Singleton, IManager, IEventHandler + { + private readonly Dictionary _timeScaleRequests = new(); + public float CurrentTimeScale { get; private set; } = 1f; + + private float _baseFixedDeltaTime; + + public void PreInit() + { + _baseFixedDeltaTime = Time.fixedDeltaTime; + EventBus.Register(this); + } + + public Task Init() + { + return Task.CompletedTask; + } + + public void PostInit() + { + + } + + private void OnDestroy() + { + EventBus.Unregister(this); +#if UNITY_EDITOR + Time.fixedDeltaTime = _baseFixedDeltaTime; // 재실행 시 값 복원 (Editor용 안전장치) +#endif + } + + protected override void OnApplicationQuit() + { + base.OnApplicationQuit(); + + Time.fixedDeltaTime = _baseFixedDeltaTime; + } + + private void UpdateTimeScale() + { + // 우선순위: 0이 하나라도 있으면 무조건 정지, 그 외엔 최소값 적용 + float newTimeScale = 1f; + + if (_timeScaleRequests.ContainsValue(0f)) + { + newTimeScale = 0f; + } + else if (_timeScaleRequests.Count > 0) + { + newTimeScale = Mathf.Min(1f, Mathf.Min(float.MaxValue, GetMinTimeScale())); + } + + if (Mathf.Approximately(newTimeScale, CurrentTimeScale)) return; + + CurrentTimeScale = newTimeScale; + Time.timeScale = CurrentTimeScale; + Time.fixedDeltaTime = _baseFixedDeltaTime * CurrentTimeScale; + } + + private float GetMinTimeScale() => _timeScaleRequests.Values.Prepend(1f).Min(); + + public bool IsPaused => Mathf.Approximately(CurrentTimeScale, 0f); + + public void Invoke(TimeScaleChangeEvent evt) + { + if (evt.NewTimeScale < 1f) + { + _timeScaleRequests[evt.Requester] = evt.NewTimeScale; + } + else + { + _timeScaleRequests.Remove(evt.Requester); + } + + UpdateTimeScale(); + } + } +} \ No newline at end of file From 5bd780214ad4c0cc96b543a97745ad7b03739422 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 21 Jul 2025 16:56:12 +0900 Subject: [PATCH 4/6] =?UTF-8?q?Ui=EA=B4=80=EB=A0=A8=20=EA=B2=8C=EC=9E=84?= =?UTF-8?q?=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scripts/GameEvent/GameEvents.cs | 94 ++++++++++++++++++-- 1 file changed, 88 insertions(+), 6 deletions(-) diff --git a/Assets/_DDD/_Scripts/GameEvent/GameEvents.cs b/Assets/_DDD/_Scripts/GameEvent/GameEvents.cs index 9f26685c4..bea45909c 100644 --- a/Assets/_DDD/_Scripts/GameEvent/GameEvents.cs +++ b/Assets/_DDD/_Scripts/GameEvent/GameEvents.cs @@ -1,18 +1,100 @@ +using System; +using System.Threading.Tasks; using UnityEngine; namespace DDD { - public static class GameEvents + // public static class GameEvents + // { + // public static RequestTimeScaleChangeEvent RequestTimeScaleChangeEvent = new(); + // public static RequestShowGlobalMessageEvent RequestShowGlobalMessageEvent = new(); + // public static InteractionEvent Interaction = new InteractionEvent(); + // } + // public static class RestaurantEvents + // { + // // Some events... + // } + // public static class VoyageEvents + // { + // // Some events... + // } + + public class TimeScaleChangeEvent : IEvent { - public static InteractionEvent Interaction = new InteractionEvent(); + public readonly object Requester; + public readonly float NewTimeScale; + + public TimeScaleChangeEvent(object requester, float newTimeScale) + { + Requester = requester; + NewTimeScale = newTimeScale; + } } - public static class RestaurantEvents + + public class FadeInEvent : IEvent { - // Some events... + public readonly float Duration; + public readonly TaskCompletionSource CompletionSource; + + public FadeInEvent(float duration) + { + Duration = duration; + CompletionSource = new TaskCompletionSource(); + } + + public Task WaitAsync() => CompletionSource.Task; } - public static class VoyageEvents + + public class FadeOutEvent : IEvent { - // Some events... + public readonly float Duration; + public readonly TaskCompletionSource CompletionSource; + + public FadeOutEvent(float duration) + { + Duration = duration; + CompletionSource = new TaskCompletionSource(); + } + + public Task WaitAsync() => CompletionSource.Task; + } + + public class ShowGlobalMessageEvent : IEvent + { + public readonly string NewMessageKey; + public readonly float ShowDuration; + public readonly float FadeDuration; + + public ShowGlobalMessageEvent(string newMessageKey, float showDuration = 3f, float fadeDuration = 0.3f) + { + NewMessageKey = newMessageKey; + ShowDuration = showDuration; + FadeDuration = fadeDuration; + } + } + + public class OpenScreenUiEvent : IEvent + { + public readonly Type UiType; + public OpenScreenUiEvent(Type uiType) => UiType = uiType; + } + + public class CloseScreenUiEvent : IEvent + { + public readonly Type UiType; + public CloseScreenUiEvent(Type uiType) => UiType = uiType; + } + + public class OpenPopupUiEvent : IEvent + { + public readonly Type UiType; + public OpenPopupUiEvent(Type uiType) => UiType = uiType; + } + + public class ClosePopupUiEvent : IEvent + { + public readonly Type UiType; + public ClosePopupUiEvent(Type uiType) => UiType = uiType; } public class InteractionEvent : IEvent From d02af591007287933cc677df1f898e9c4d37b734 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 21 Jul 2025 16:56:58 +0900 Subject: [PATCH 5/6] =?UTF-8?q?Message=20Ui=EC=97=90=EC=84=9C=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EB=90=A0=20=ED=98=84=EC=A7=80=ED=99=94=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20Importer?= =?UTF-8?q?=20=EC=A0=80=EC=9E=A5=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Localization/LocalizationImporter.cs | 31 ++++++++++++++----- .../Localization/LocalizationManager.cs | 1 + 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationImporter.cs b/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationImporter.cs index 9d8a212da..5432f7c85 100644 --- a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationImporter.cs +++ b/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationImporter.cs @@ -13,9 +13,19 @@ public static class LocalizationImporter public static async void ImportAllFromSheet(string webAppUrl) { string json = await GoogleSheetWebClient.Get(webAppUrl); - if (string.IsNullOrEmpty(json)) return; + if (string.IsNullOrEmpty(json)) + { + Debug.LogError("[Localization Import] Google Sheet로부터 데이터를 가져오지 못했습니다."); + return; + } var payload = JsonConvert.DeserializeObject(json); + if (payload == null || payload.Tables == null || payload.Tables.Count == 0) + { + Debug.LogWarning("[Localization Import] 불러온 데이터가 비어있습니다."); + return; + } + foreach (var kv in payload.Tables) { string tableName = kv.Key; @@ -29,27 +39,34 @@ public static async void ImportAllFromSheet(string webAppUrl) } var shared = collection.SharedData; + EditorUtility.SetDirty(shared); // ✅ SharedData 저장 대상 표시 foreach (var row in rows) { - if (!row.TryGetValue("Key", out var key)) continue; + if (!row.TryGetValue("Key", out var key) || string.IsNullOrEmpty(key)) continue; + var sharedEntry = shared.GetEntry(key) ?? shared.AddKey(key); foreach (var localeCode in row.Keys) { if (localeCode == "Key") continue; + var table = collection.GetTable(localeCode) as StringTable; - if (table == null) continue; + if (table == null) + { + Debug.LogWarning($"[Localization] Table '{tableName}'의 로케일 '{localeCode}' 테이블이 존재하지 않습니다."); + continue; + } table.AddEntry(sharedEntry.Id, row[localeCode]); - EditorUtility.SetDirty(table); + EditorUtility.SetDirty(table); // ✅ StringTable 저장 대상 표시 } } - - AssetDatabase.SaveAssets(); } - Debug.Log("[Localization Import] 완료"); + AssetDatabase.SaveAssets(); // ✅ 변경사항 저장 + + Debug.Log("[Localization Import] 완료: Google Sheet → Unity"); } } } diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationManager.cs b/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationManager.cs index eccd25c8d..4ada9b995 100644 --- a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationManager.cs +++ b/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationManager.cs @@ -8,6 +8,7 @@ public enum TableName None = 0, Item_Name, Item_Description, + Global_Message, } public static class LocalizationManager From 6d1776cf20f9e29e2d95939e6ab7165694be3afc Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 21 Jul 2025 16:57:09 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EC=97=90=EC=85=8B=20=EB=B0=8F=20=EB=A9=94?= =?UTF-8?q?=ED=83=80=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddressableAssetGroupSortSettings.asset | 5 + .../Localization-Assets-Shared.asset | 6 + ...alization-String-Tables-English (en).asset | 6 + ...lization-String-Tables-Japanese (ja).asset | 6 + ...calization-String-Tables-Korean (ko).asset | 6 + .../Localization/Global_Message.meta | 8 + .../Global_Message Shared Data.asset | 40 ++ .../Global_Message Shared Data.asset.meta | 8 + .../Global_Message/Global_Message.asset | 24 + .../Global_Message/Global_Message.asset.meta | 8 + .../Global_Message/Global_Message_en.asset | 71 +++ .../Global_Message_en.asset.meta | 8 + .../Global_Message/Global_Message_ja.asset | 71 +++ .../Global_Message_ja.asset.meta | 8 + .../Global_Message/Global_Message_ko.asset | 71 +++ .../Global_Message_ko.asset.meta | 8 + .../Item_Description Shared Data.asset | 8 + .../Item_Description_en.asset | 32 ++ .../Item_Description_ja.asset | 32 ++ .../Item_Description_ko.asset | 32 ++ .../Localization/Item_Name/Item_Name_en.asset | 4 + .../Localization/Item_Name/Item_Name_ja.asset | 4 + .../Localization/Item_Name/Item_Name_ko.asset | 4 + .../Prefabs/RestaurantController.prefab | 2 +- .../_ScriptAssets/Prefabs/TimeManager.prefab | 47 ++ .../Prefabs/TimeManager.prefab.meta | 7 + .../_ScriptAssets/Prefabs/UiManager.prefab | 467 ++++++++++++++++++ .../Prefabs/UiManager.prefab.meta | 7 + .../So/ManagerDefinitionSo.asset | 3 +- .../GameFramework/TimeManager.cs.meta | 2 + Assets/_DDD/_Scripts/GameUi.meta | 8 + Assets/_DDD/_Scripts/GameUi/BaseUi.cs.meta | 2 + Assets/_DDD/_Scripts/GameUi/FadeUi.cs.meta | 2 + .../_Scripts/GameUi/GlobalMessageUi.cs.meta | 2 + Assets/_DDD/_Scripts/GameUi/PopupUi.cs.meta | 2 + Assets/_DDD/_Scripts/GameUi/ScreenUi.cs.meta | 2 + Assets/_DDD/_Scripts/GameUi/UiManager.cs.meta | 2 + 37 files changed, 1023 insertions(+), 2 deletions(-) create mode 100644 Assets/_DDD/_ScriptAssets/Localization/Global_Message.meta create mode 100644 Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset create mode 100644 Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset.meta create mode 100644 Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message.asset create mode 100644 Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message.asset.meta create mode 100644 Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset create mode 100644 Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset.meta create mode 100644 Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset create mode 100644 Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset.meta create mode 100644 Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset create mode 100644 Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset.meta create mode 100644 Assets/_DDD/_ScriptAssets/Prefabs/TimeManager.prefab create mode 100644 Assets/_DDD/_ScriptAssets/Prefabs/TimeManager.prefab.meta create mode 100644 Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab create mode 100644 Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab.meta create mode 100644 Assets/_DDD/_Scripts/GameFramework/TimeManager.cs.meta create mode 100644 Assets/_DDD/_Scripts/GameUi.meta create mode 100644 Assets/_DDD/_Scripts/GameUi/BaseUi.cs.meta create mode 100644 Assets/_DDD/_Scripts/GameUi/FadeUi.cs.meta create mode 100644 Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs.meta create mode 100644 Assets/_DDD/_Scripts/GameUi/PopupUi.cs.meta create mode 100644 Assets/_DDD/_Scripts/GameUi/ScreenUi.cs.meta create mode 100644 Assets/_DDD/_Scripts/GameUi/UiManager.cs.meta diff --git a/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset b/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset index 62a17acf3..8e6225a68 100644 --- a/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset @@ -13,5 +13,10 @@ MonoBehaviour: m_Name: AddressableAssetGroupSortSettings m_EditorClassIdentifier: sortOrder: + - fd6e789ea039d544692729b952eba73f + - e05c277fe5b7e264798fbe5a7c9239dc + - 28053bf0e188c634ca1f55c8f2767069 + - af2825561e428e54ba49956c3b989420 + - ecfcfda897c703f42a3e712e800a04bf - 30e7f67fe9aaa7849a34c9b6e2bc53ae - 7fe0c33d351391a45a0ea3c93ecef42e diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset index 4fbe18bcb..b982dcd78 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset @@ -25,6 +25,12 @@ MonoBehaviour: m_ReadOnly: 1 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: d49dd382fc6ad83479443c229092aaa5 + m_Address: Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message + Shared Data.asset + m_ReadOnly: 1 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: d12ffbb6f886d48418efb0b6d15ccb88, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset index 0a8969369..fd321a903 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset @@ -27,6 +27,12 @@ MonoBehaviour: m_SerializedLabels: - Locale-en FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 9693f4924a4737c47999c647fa717b5f + m_Address: Global_Message_en + m_ReadOnly: 1 + m_SerializedLabels: + - Locale-en + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: d12ffbb6f886d48418efb0b6d15ccb88, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset index ecaddba5a..024f3c32e 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset @@ -21,6 +21,12 @@ MonoBehaviour: m_SerializedLabels: - Locale-ja FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 99a51138544ab6347ab4160b20de9c00 + m_Address: Global_Message_ja + m_ReadOnly: 1 + m_SerializedLabels: + - Locale-ja + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 9a79f84fff1ffd544bfe25d4ca113cf8 m_Address: Item_Name_ja m_ReadOnly: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset index dacd9ff50..f86217a90 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset @@ -15,6 +15,12 @@ MonoBehaviour: m_GroupName: Localization-String-Tables-Korean (ko) m_GUID: ecfcfda897c703f42a3e712e800a04bf m_SerializeEntries: + - m_GUID: 7702cc2653c9dd440affa8484a2ac07e + m_Address: Global_Message_ko + m_ReadOnly: 1 + m_SerializedLabels: + - Locale-ko + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: c04c3cfa9e0213d46850ff7ada3c6405 m_Address: Item_Name_ko m_ReadOnly: 1 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message.meta b/Assets/_DDD/_ScriptAssets/Localization/Global_Message.meta new file mode 100644 index 000000000..d661fd06b --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e6d94d28c010d84bb22f1ecc6af9a00 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset new file mode 100644 index 000000000..17abcc3b2 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b11a58205ec3474ca216360e9fa74a8, type: 3} + m_Name: Global_Message Shared Data + m_EditorClassIdentifier: + m_TableCollectionName: Global_Message + m_TableCollectionNameGuidString: d49dd382fc6ad83479443c229092aaa5 + m_Entries: + - m_Id: 3178830299136 + m_Key: Global_Message_001 + m_Metadata: + m_Items: [] + - m_Id: 3178838687744 + m_Key: Global_Message_002 + m_Metadata: + m_Items: [] + - m_Id: 3178838687745 + m_Key: Global_Message_003 + m_Metadata: + m_Items: [] + m_Metadata: + m_Items: [] + m_KeyGenerator: + rid: 2568234241117913208 + references: + version: 2 + RefIds: + - rid: 2568234241117913208 + type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization} + data: + m_CustomEpoch: 1753083455105 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset.meta b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset.meta new file mode 100644 index 000000000..900742684 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d49dd382fc6ad83479443c229092aaa5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message.asset new file mode 100644 index 000000000..98746b5a7 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message.asset @@ -0,0 +1,24 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5be51871efa6c3e4eae1703925c8f5ac, type: 3} + m_Name: Global_Message + m_EditorClassIdentifier: + m_SharedTableData: {fileID: 11400000, guid: d49dd382fc6ad83479443c229092aaa5, type: 2} + m_Tables: + - {fileID: 11400000, guid: 7702cc2653c9dd440affa8484a2ac07e, type: 2} + - {fileID: 11400000, guid: 9693f4924a4737c47999c647fa717b5f, type: 2} + - {fileID: 11400000, guid: 99a51138544ab6347ab4160b20de9c00, type: 2} + m_Extensions: [] + m_Group: String Table + references: + version: 2 + RefIds: [] diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message.asset.meta b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message.asset.meta new file mode 100644 index 000000000..d25a20b29 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8aaf7fb7f40e3564b95ec2180253a55b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset new file mode 100644 index 000000000..253c5fde2 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} + m_Name: Global_Message_en + m_EditorClassIdentifier: + m_LocaleId: + m_Code: en + m_SharedData: {fileID: 11400000, guid: d49dd382fc6ad83479443c229092aaa5, type: 2} + m_Metadata: + m_Items: [] + m_TableData: + - m_Id: 76907610112 + m_Localized: Global Message Test1 + m_Metadata: + m_Items: [] + - m_Id: 76915998720 + m_Localized: Global Message Test2 + m_Metadata: + m_Items: [] + - m_Id: 76915998721 + m_Localized: Global Message Test3 + m_Metadata: + m_Items: [] + - m_Id: 1843808501760 + m_Localized: Global Message Test1 + m_Metadata: + m_Items: [] + - m_Id: 1843816890368 + m_Localized: Global Message Test2 + m_Metadata: + m_Items: [] + - m_Id: 1843816890369 + m_Localized: Global Message Test3 + m_Metadata: + m_Items: [] + - m_Id: 1990143574016 + m_Localized: Global Message Test1 + m_Metadata: + m_Items: [] + - m_Id: 1990156156928 + m_Localized: Global Message Test2 + m_Metadata: + m_Items: [] + - m_Id: 1990156156929 + m_Localized: Global Message Test3 + m_Metadata: + m_Items: [] + - m_Id: 3178830299136 + m_Localized: Global Message Test1 + m_Metadata: + m_Items: [] + - m_Id: 3178838687744 + m_Localized: Global Message Test2 + m_Metadata: + m_Items: [] + - m_Id: 3178838687745 + m_Localized: Global Message Test3 + m_Metadata: + m_Items: [] + references: + version: 2 + RefIds: [] diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset.meta b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset.meta new file mode 100644 index 000000000..12580f4b7 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9693f4924a4737c47999c647fa717b5f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset new file mode 100644 index 000000000..3f32a9ca3 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} + m_Name: Global_Message_ja + m_EditorClassIdentifier: + m_LocaleId: + m_Code: ja + m_SharedData: {fileID: 11400000, guid: d49dd382fc6ad83479443c229092aaa5, type: 2} + m_Metadata: + m_Items: [] + m_TableData: + - m_Id: 76907610112 + m_Localized: 1 + m_Metadata: + m_Items: [] + - m_Id: 76915998720 + m_Localized: 2 + m_Metadata: + m_Items: [] + - m_Id: 76915998721 + m_Localized: 3 + m_Metadata: + m_Items: [] + - m_Id: 1843808501760 + m_Localized: 1 + m_Metadata: + m_Items: [] + - m_Id: 1843816890368 + m_Localized: 2 + m_Metadata: + m_Items: [] + - m_Id: 1843816890369 + m_Localized: 3 + m_Metadata: + m_Items: [] + - m_Id: 1990143574016 + m_Localized: 1 + m_Metadata: + m_Items: [] + - m_Id: 1990156156928 + m_Localized: 2 + m_Metadata: + m_Items: [] + - m_Id: 1990156156929 + m_Localized: 3 + m_Metadata: + m_Items: [] + - m_Id: 3178830299136 + m_Localized: 1 + m_Metadata: + m_Items: [] + - m_Id: 3178838687744 + m_Localized: 2 + m_Metadata: + m_Items: [] + - m_Id: 3178838687745 + m_Localized: 3 + m_Metadata: + m_Items: [] + references: + version: 2 + RefIds: [] diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset.meta b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset.meta new file mode 100644 index 000000000..02201c4b6 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99a51138544ab6347ab4160b20de9c00 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset new file mode 100644 index 000000000..6e4487ba4 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} + m_Name: Global_Message_ko + m_EditorClassIdentifier: + m_LocaleId: + m_Code: ko + m_SharedData: {fileID: 11400000, guid: d49dd382fc6ad83479443c229092aaa5, type: 2} + m_Metadata: + m_Items: [] + m_TableData: + - m_Id: 76907610112 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B81" + m_Metadata: + m_Items: [] + - m_Id: 76915998720 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B82" + m_Metadata: + m_Items: [] + - m_Id: 76915998721 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B83" + m_Metadata: + m_Items: [] + - m_Id: 1843808501760 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B81" + m_Metadata: + m_Items: [] + - m_Id: 1843816890368 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B82" + m_Metadata: + m_Items: [] + - m_Id: 1843816890369 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B83" + m_Metadata: + m_Items: [] + - m_Id: 1990143574016 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B81" + m_Metadata: + m_Items: [] + - m_Id: 1990156156928 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B82" + m_Metadata: + m_Items: [] + - m_Id: 1990156156929 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B83" + m_Metadata: + m_Items: [] + - m_Id: 3178830299136 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B81" + m_Metadata: + m_Items: [] + - m_Id: 3178838687744 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B82" + m_Metadata: + m_Items: [] + - m_Id: 3178838687745 + m_Localized: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uD14C\uC2A4\uD2B83" + m_Metadata: + m_Items: [] + references: + version: 2 + RefIds: [] diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset.meta b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset.meta new file mode 100644 index 000000000..560912a0d --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7702cc2653c9dd440affa8484a2ac07e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset index 83bdc20a5..31bd05b7e 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset @@ -19,6 +19,14 @@ MonoBehaviour: m_Key: Test m_Metadata: m_Items: [] + - m_Id: 1779478507094016 + m_Key: Test2 + m_Metadata: + m_Items: [] + - m_Id: 1779478523871232 + m_Key: Test3 + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset index df61d8666..1266d58b6 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset @@ -30,6 +30,38 @@ MonoBehaviour: m_Localized: m_Metadata: m_Items: [] + - m_Id: 1774981886050304 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1774981907021824 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1778143279775744 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1778143300747264 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1778289619042304 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1778289640013824 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1779478507094016 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1779478523871232 + m_Localized: + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset index 1c6063428..347855c6a 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset @@ -30,6 +30,38 @@ MonoBehaviour: m_Localized: m_Metadata: m_Items: [] + - m_Id: 1774981886050304 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1774981907021824 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1778143279775744 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1778143300747264 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1778289619042304 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1778289640013824 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1779478507094016 + m_Localized: + m_Metadata: + m_Items: [] + - m_Id: 1779478523871232 + m_Localized: + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset index 6ada4491e..fa151e49e 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset @@ -30,6 +30,38 @@ MonoBehaviour: m_Localized: 343 m_Metadata: m_Items: [] + - m_Id: 1774981886050304 + m_Localized: 436 + m_Metadata: + m_Items: [] + - m_Id: 1774981907021824 + m_Localized: 343 + m_Metadata: + m_Items: [] + - m_Id: 1778143279775744 + m_Localized: 436 + m_Metadata: + m_Items: [] + - m_Id: 1778143300747264 + m_Localized: 343 + m_Metadata: + m_Items: [] + - m_Id: 1778289619042304 + m_Localized: 436 + m_Metadata: + m_Items: [] + - m_Id: 1778289640013824 + m_Localized: 343 + m_Metadata: + m_Items: [] + - m_Id: 1779478507094016 + m_Localized: 436 + m_Metadata: + m_Items: [] + - m_Id: 1779478523871232 + m_Localized: 343 + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset index e70cfe1d6..c2b19918a 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset @@ -34,6 +34,10 @@ MonoBehaviour: m_Localized: m_Metadata: m_Items: [] + - m_Id: 362572734595072 + m_Localized: + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset index bfe97ff3e..22b1c74e8 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset @@ -34,6 +34,10 @@ MonoBehaviour: m_Localized: 63 m_Metadata: m_Items: [] + - m_Id: 362572734595072 + m_Localized: + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset index e1cd1977f..98a29f521 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset @@ -34,6 +34,10 @@ MonoBehaviour: m_Localized: m_Metadata: m_Items: [] + - m_Id: 362572734595072 + m_Localized: + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/RestaurantController.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/RestaurantController.prefab index 786cdcddf..922f1da23 100644 --- a/Assets/_DDD/_ScriptAssets/Prefabs/RestaurantController.prefab +++ b/Assets/_DDD/_ScriptAssets/Prefabs/RestaurantController.prefab @@ -44,4 +44,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e51cd804b1464fb282ba2729ddffae69, type: 3} m_Name: m_EditorClassIdentifier: - _persistent: 0 + _persistent: 1 diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/TimeManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/TimeManager.prefab new file mode 100644 index 000000000..e7433f555 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Prefabs/TimeManager.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &228863477237939133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6978953626911606714} + - component: {fileID: 1192296378469776514} + m_Layer: 0 + m_Name: TimeManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6978953626911606714 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228863477237939133} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1192296378469776514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228863477237939133} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b280399b1bf315f4194156a155e52dd8, type: 3} + m_Name: + m_EditorClassIdentifier: + _persistent: 1 diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/TimeManager.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/TimeManager.prefab.meta new file mode 100644 index 000000000..34f553b3e --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Prefabs/TimeManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a2de3c6e01c751e49bbd307cbfe04406 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab new file mode 100644 index 000000000..1f4ab7e8a --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab @@ -0,0 +1,467 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3727951609312695740 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5781276071116979515} + - component: {fileID: 1808479125223994106} + - component: {fileID: 6951273427019322824} + m_Layer: 5 + m_Name: FadeUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5781276071116979515 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3727951609312695740} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 3187384646402155854} + m_Father: {fileID: 5760169274063006291} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &1808479125223994106 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3727951609312695740} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &6951273427019322824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3727951609312695740} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41f0ee0aabb2f954d918caa8d484f646, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &5774831677185062216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2588022039611725067} + - component: {fileID: 392386156374200558} + - component: {fileID: 562126945177245125} + m_Layer: 5 + m_Name: GlobalMessageUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2588022039611725067 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5774831677185062216} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 4012699428012401594} + m_Father: {fileID: 5760169274063006291} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &392386156374200558 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5774831677185062216} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &562126945177245125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5774831677185062216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 828648aab79941544bf8ceb7b25b586c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6838253471355869082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5760169274063006291} + - component: {fileID: 5653479305246604394} + - component: {fileID: 5249935483498645627} + - component: {fileID: 2647790641548010206} + - component: {fileID: 4718043364038031157} + - component: {fileID: 7976048221308114627} + m_Layer: 5 + m_Name: UiManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5760169274063006291 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838253471355869082} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 2588022039611725067} + - {fileID: 5781276071116979515} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &5653479305246604394 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838253471355869082} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &5249935483498645627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838253471355869082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 1 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &2647790641548010206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838253471355869082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 63 +--- !u!225 &4718043364038031157 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838253471355869082} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &7976048221308114627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838253471355869082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49724d17d38194347a186ddd6eae2dfa, type: 3} + m_Name: + m_EditorClassIdentifier: + _persistent: 1 +--- !u!1 &7861996272676595012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3187384646402155854} + - component: {fileID: 9054261768064403118} + - component: {fileID: 3910130586879672158} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3187384646402155854 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7861996272676595012} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 5781276071116979515} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9054261768064403118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7861996272676595012} + m_CullTransparentMesh: 1 +--- !u!114 &3910130586879672158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7861996272676595012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &9005765406935029031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4012699428012401594} + - component: {fileID: 3961463923322895782} + - component: {fileID: 6669513246269291693} + m_Layer: 5 + m_Name: MessageText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4012699428012401594 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9005765406935029031} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2588022039611725067} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -200} + m_SizeDelta: {x: 1000, y: 300} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3961463923322895782 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9005765406935029031} + m_CullTransparentMesh: 1 +--- !u!114 &6669513246269291693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9005765406935029031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uAE00\uB85C\uBC8C \uBA54\uC138\uC9C0 \uC548\uB0B4\uC785\uB2C8\uB2E4." + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 44 + m_fontSizeBase: 44 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab.meta new file mode 100644 index 000000000..0e7af4c49 --- /dev/null +++ b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 14906596fa615704fb8fa4ac3111fc3b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset b/Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset index dbf7c842c..434ff19c9 100644 --- a/Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset +++ b/Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset @@ -15,8 +15,9 @@ MonoBehaviour: ManagerClasses: - {fileID: 2098954470556750352, guid: 95aca5968f190f24eab9bd122ab241bc, type: 3} - {fileID: 4889131746858770208, guid: d90fdb17f0162334daadc6fc93e9a0e3, type: 3} + - {fileID: 1192296378469776514, guid: a2de3c6e01c751e49bbd307cbfe04406, type: 3} + - {fileID: 7976048221308114627, guid: 14906596fa615704fb8fa4ac3111fc3b, type: 3} - {fileID: 6471498998539637564, guid: fa2ad62c75b1549f09597e47ed5f7cfb, type: 3} - {fileID: 7665229218737596710, guid: 71b177c2a18314c588da30429451666a, type: 3} - {fileID: 622422277636247943, guid: d95124918e5a4a246abb0d378b14d3fa, type: 3} - - {fileID: 5136368050551183548, guid: 0aa6654feb91ef040b8b99d4f64688fc, type: 3} - {fileID: 8500549904376788358, guid: d81cf4649bf54485a8b0da7a235f3817, type: 3} diff --git a/Assets/_DDD/_Scripts/GameFramework/TimeManager.cs.meta b/Assets/_DDD/_Scripts/GameFramework/TimeManager.cs.meta new file mode 100644 index 000000000..6198fac7f --- /dev/null +++ b/Assets/_DDD/_Scripts/GameFramework/TimeManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b280399b1bf315f4194156a155e52dd8 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi.meta b/Assets/_DDD/_Scripts/GameUi.meta new file mode 100644 index 000000000..b249ffe9b --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 690dabfe6f5770140b335059b1c4c93b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi.cs.meta new file mode 100644 index 000000000..d66c7d821 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2e19f0d6256018148b00a8af03ccc864 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/FadeUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/FadeUi.cs.meta new file mode 100644 index 000000000..8c526c9c7 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/FadeUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 41f0ee0aabb2f954d918caa8d484f646 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs.meta new file mode 100644 index 000000000..b051f9e1e --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 828648aab79941544bf8ceb7b25b586c \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi.cs.meta new file mode 100644 index 000000000..6fc05fbeb --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/PopupUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b880d5095617cbf4289539c72d5e84ff \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/ScreenUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/ScreenUi.cs.meta new file mode 100644 index 000000000..489a8f553 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/ScreenUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 069097acb1fbcd046bddc4ee946c9e47 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/UiManager.cs.meta b/Assets/_DDD/_Scripts/GameUi/UiManager.cs.meta new file mode 100644 index 000000000..1c00fdf90 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/UiManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 49724d17d38194347a186ddd6eae2dfa \ No newline at end of file