0.4.0.2

2025-01-02 20:24:45 +09:00 · 2025-01-02 20:24:45 +09:00 · 76193ed596
commit 76193ed596
parent 3b09252818
10 changed files with 13580 additions and 48369 deletions
--- a/Assets/01.Scenes/00.TycoonTitle.unity
+++ b/Assets/01.Scenes/00.TycoonTitle.unity
@ -277,6 +277,10 @@ PrefabInstance:
      propertyPath: 'm_Materials.Array.data[2]'
      value: 
      objectReference: {fileID: 2100000, guid: cc610b9acc31ccb41befa5093f0db428, type: 2}
+    - target: {fileID: 2588384133887034894, guid: b692f61d994a0b94cb92cf0f2d47cfb2, type: 3}
+      propertyPath: 'm_Materials.Array.data[3]'
+      value: 
+      objectReference: {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2}
    - target: {fileID: 2615952973387112450, guid: b692f61d994a0b94cb92cf0f2d47cfb2, type: 3}
      propertyPath: m_Enabled
      value: 0
@ -5844,7 +5848,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7619382185280325527, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 43.2
+      value: 43.21
      objectReference: {fileID: 0}
    - target: {fileID: 7619382185280325527, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
      propertyPath: m_LocalPosition.x
@ -5856,7 +5860,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7619382185280325527, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 76.6
+      value: 76.604996
      objectReference: {fileID: 0}
    - target: {fileID: 7619382185280325527, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
      propertyPath: m_AnchoredPosition.y
@ -6092,34 +6096,6 @@ PrefabInstance:
      propertyPath: m_Name
      value: SceneController
      objectReference: {fileID: 0}
-    - target: {fileID: 4841526513753854054, guid: 4adbdb8a3e6e56a48bda3ac6f71ca7d6, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4841526513753854054, guid: 4adbdb8a3e6e56a48bda3ac6f71ca7d6, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4841526513753854054, guid: 4adbdb8a3e6e56a48bda3ac6f71ca7d6, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4841526513753854054, guid: 4adbdb8a3e6e56a48bda3ac6f71ca7d6, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4841526513753854054, guid: 4adbdb8a3e6e56a48bda3ac6f71ca7d6, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4841526513753854054, guid: 4adbdb8a3e6e56a48bda3ac6f71ca7d6, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4841526513753854054, guid: 4adbdb8a3e6e56a48bda3ac6f71ca7d6, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 4841526513753854054, guid: 4adbdb8a3e6e56a48bda3ac6f71ca7d6, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
--- a/Assets/01.Scenes/01.Tycoon
+++ b/Assets/01.Scenes/01.Tycoon
--- a/Assets/01.Scenes/01.Tycoon
+++ b/Assets/01.Scenes/01.Tycoon
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1c68dd53cadcda54e83f8dcb02e4daf8
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/01.Scenes/01.Tycoon.unity
+++ b/Assets/01.Scenes/01.Tycoon.unity
--- a/Assets/02.Scripts/SceneController.cs
+++ b/Assets/02.Scripts/SceneController.cs
@ -63,6 +63,13 @@ namespace BlueWater
            _loadingPanelFadeOut?.Kill();
        }

+        protected override void OnApplicationQuit()
+        {
+            base.OnApplicationQuit();
+            
+            _loadingPanelCanvasGroup.alpha = 0f;
+        }
+
        public void RestartCurrentScene()
        {
            LoadScene(SceneManager.GetActiveScene().name);
--- a/Assets/02.Scripts/Ui/Tycoon/RankUi.cs
+++ b/Assets/02.Scripts/Ui/Tycoon/RankUi.cs
@ -22,8 +22,6 @@ namespace BlueWater

        [SerializeField] private GameObject rankRow;

-        [SerializeField] private FirebaseManager firebaseManager;
-
        [SerializeField] private GameObject rankContents;

        [SerializeField] private TextMeshProUGUI yourRank;
@ -39,10 +37,12 @@ namespace BlueWater
        [SerializeField]
        private Button _restartButton;
        
+        private FirebaseManager _firebaseManager;
        private bool _rankOpen = false;
        
        private void Start()
        {
+            _firebaseManager = FirebaseManager.Instance;
            _panel.SetActive(false);
            
            _mainMenuButton.onClick.AddListener(() => SceneController.Instance.LoadScene(SceneName.TycoonTile));
@ -79,18 +79,18 @@ namespace BlueWater
                Destroy(child.gameObject); // 자식의 GameObject를 제거
            }
            
-            firebaseManager.CreateRank(() =>
+            _firebaseManager.CreateRank(() =>
            {
-                for (int i = 1 ; i < firebaseManager.UserDatas.Count ; i++) //Root제외 1부터 시작
+                for (int i = 1 ; i < _firebaseManager.UserDatas.Count ; i++) //Root제외 1부터 시작
                {
                    var newObject = Instantiate(rankRow, rankContents.transform);
                    newObject.name = $"{i}";
-                    newObject.GetComponent<RankRow>().SetValue(i.ToString() , firebaseManager.UserDatas[i].Name, firebaseManager.UserDatas[i].Round.ToString()
-                        ,firebaseManager.UserDatas[i].Gold.ToString()
-                        ,$"{firebaseManager.UserDatas[i].Time / 3600:D2}:{(firebaseManager.UserDatas[i].Time % 3600) / 60:D2}:{firebaseManager.UserDatas[i].Time % 60:D2}"
-                        ,firebaseManager.UserDatas[i].Tries.ToString());
+                    newObject.GetComponent<RankRow>().SetValue(i.ToString() , _firebaseManager.UserDatas[i].Name, _firebaseManager.UserDatas[i].Round.ToString()
+                        ,_firebaseManager.UserDatas[i].Gold.ToString()
+                        ,$"{_firebaseManager.UserDatas[i].Time / 3600:D2}:{(_firebaseManager.UserDatas[i].Time % 3600) / 60:D2}:{_firebaseManager.UserDatas[i].Time % 60:D2}"
+                        ,_firebaseManager.UserDatas[i].Tries.ToString());
                    
-                    if (firebaseManager.UserDatas[i] == firebaseManager.thisUser) yourRank.SetText(i.ToString());
+                    if (_firebaseManager.UserDatas[i] == _firebaseManager.thisUser) yourRank.SetText(i.ToString());
                }

                _rankOpen = true;
@ -104,7 +104,7 @@ namespace BlueWater
        {
            if (_rankOpen)
            {
-                firebaseManager.WirteUserDataName(nameTextField.text);
+                _firebaseManager.WirteUserDataName(nameTextField.text);
            }
        }
        
--- a/Assets/05.Prefabs/Managers/SceneController.prefab
+++ b/Assets/05.Prefabs/Managers/SceneController.prefab
@ -120,7 +120,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &510409880402970474
 RectTransform:
  m_ObjectHideFlags: 0
--- a/Assets/10.Fonts/Korean/GodoM
+++ b/Assets/10.Fonts/Korean/GodoM
--- a/Assets/StreamingAssets/google-services-desktop.json.meta
+++ b/Assets/StreamingAssets/google-services-desktop.json.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1691a7f8a8ddbc5458018a84090ec26e
+guid: d74977719e1c474489779143fbc5089b
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -140,7 +140,7 @@ PlayerSettings:
  loadStoreDebugModeEnabled: 0
  visionOSBundleVersion: 1.0
  tvOSBundleVersion: 1.0
-  bundleVersion: 0.4.0.0
+  bundleVersion: 0.4.0.2
  preloadedAssets:
  - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
  - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}