Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg

Assets/01.Scenes/_A.LMG.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 67af4a65b1f578b4b9fa609cd12df71b
+guid: 96dece0244fff8e4b9662917d4827a9e
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/02.Scripts/Tycoon/TycoonGameOver.cs

@@ -117,11 +117,11 @@ public class TycoonGameOver : MonoBehaviour
             ShakeObject();
             timer += Time.unscaledDeltaTime;
             
-            ResultUi.StartResult();
-            
             yield return null;  // 다음 프레임까지 대기
         }
         
+        ResultUi.StartResult();
+        
         // 최종적으로 알파값을 1로 설정 (완전히 불투명하게)
         imageColor.a = 1f;
         _text.color = imageColor;

Assets/02.Scripts/Ui/Tycoon/TycoonResultCard.cs

@@ -17,6 +17,11 @@ public class TycoonResultCard : MonoBehaviour
     public void SetText(string str)
     {
         text.text = str;
+        
+        //우선 임시로... 색을 0으로...
+        var color = text.color;
+        color.a = 0.0f;
+        text.color = color;
     }
     
     public void SetImage(Sprite spr)

Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs

@@ -5,6 +5,7 @@ using UnityEngine;
 using Sirenix.OdinInspector;
 using TMPro;
 using Unity.VisualScripting;
+using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using UnityEngine.UIElements;
 
@@ -24,9 +25,6 @@ namespace BlueWater.Uis
         [field: SerializeField, CLabel("카드목록(Cards)")]
         private GameObject cards;
         
-        [field: SerializeField, CLabel("스크롤렉트")]
-        private ScrollRect cardScrollRect;
-        
         [field: SerializeField, CLabel("라운드수TextMesh")]
         private TextMeshProUGUI roundTextMesh;
 
@@ -74,13 +72,11 @@ namespace BlueWater.Uis
                 newObject.transform.localRotation = Quaternion.identity;
                 newObject.transform.localScale = new Vector3(1.0f,1.0f,1.0f);
             }
-            
+        }
-            // float newHeight = (selectedCard.Count / 5.0f - 2) * 250;
+
-            //
+        public void ButtonContinue()
-            // var sizeDelta = cardScrollRect.content.sizeDelta;
+        {
-            // sizeDelta.y = newHeight;
+            SceneManager.LoadScene("00.TycoonTitle");
-            // cardScrollRect.content.sizeDelta = sizeDelta;
-            
         }
     }
 }

Assets/05.Prefabs/Uis/Tycoons/Card.prefab

@@ -263,8 +263,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4279250235
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColor: {r: 0.23137257, g: 0.1764706, b: 0.0627451, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -287,7 +287,7 @@ MonoBehaviour:
   m_enableAutoSizing: 1
   m_fontSizeMin: 18
   m_fontSizeMax: 36
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535

Assets/05.Prefabs/Uis/Tycoons/ResultCard.prefab

@@ -303,7 +303,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4539851198141028537
 RectTransform:
   m_ObjectHideFlags: 0
@@ -448,7 +448,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9184018256795220473}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.00004459893}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -456,7 +456,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 75}
   m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3704132316340448211