Merge branch 'lmg' of http://175.209.66.186/capersunity/newbluewater into ntg

Assets/01.Scenes/01.Tycoon 1.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 87d39cc0c9a6dc94190c0142af39b7ea
+guid: b3bd0e553275cdf41bb34834813d5658
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/02.Scripts/SceneController.cs

@@ -46,12 +46,12 @@ namespace BlueWater
         private void MoveCombatScene()
         {
             _isMovedCombatScene = true;
-            SceneManager.LoadScene("02.Combat");
+            SceneManager.LoadScene("01.Tycoon");
         }
         
         private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
         {
-            if (scene.name == "02.Combat")
+            if (scene.name == "01.Tycoon")
             {
                 if (_isMovedCombatScene)
                 {

Assets/02.Scripts/ScriptableObject/CardDataTable.asset

@@ -158,4 +158,4 @@ MonoBehaviour:
         \uCD08\uAE30\uD654"
       <Max>k__BackingField: 0
       <Ratio>k__BackingField: 5
-      <Sprite>k__BackingField: {fileID: 0}
+      <Sprite>k__BackingField: {fileID: 21300000, guid: 1d6e6fd96eb499f42b79f04f3510af87, type: 3}

Assets/02.Scripts/TycoonTitle.cs

@@ -0,0 +1,90 @@
+using BlueWater.Audios;
+using Sirenix.OdinInspector;
+using TMPro;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.InputSystem;
+using UnityEngine.UI;
+
+namespace BlueWater.Titles
+{
+    public class TycoonTitle : MonoBehaviour
+    {
+        [SerializeField]
+        private PlayerInput _playerInput;
+
+        [SerializeField]
+        private Button _startGameButton;
+        
+        [SerializeField]
+        private TMP_Text _versionText;
+
+        [SerializeField]
+        private string _dailyBgm = "DailyBgm1"; 
+
+        private bool _isQuitting; 
+
+        private void Awake()
+        {
+            InitializeComponents();
+        }
+
+        private void Start()
+        {
+            AudioManager.Instance.PlayBgm(_dailyBgm);
+            _startGameButton.onClick.AddListener(SceneController.Instance.FadeIn);
+        }
+
+        private void OnApplicationQuit()
+        {
+            _isQuitting = true;
+        }
+
+        private void OnDestroy()
+        {
+            if (_isQuitting) return;
+            
+            _startGameButton.onClick.RemoveListener(SceneController.Instance.FadeIn);
+        }
+
+        [Button("컴포넌트 초기화")]
+        private void InitializeComponents()
+        {
+            _playerInput = GetComponent<PlayerInput>();
+            _startGameButton = transform.Find("TitleMenuUi/ButtonPanel/StartGameButton").GetComponent<Button>();
+            _versionText = transform.Find("VersionText").GetComponent<TMP_Text>();
+            _versionText.text = GetVersion();
+        }
+        
+        private string GetVersion()
+        {
+#if UNITY_EDITOR
+            return PlayerSettings.bundleVersion;
+#else
+            return Application.version;
+#endif
+        }
+        
+        public void OnMenuInteraction(InputAction.CallbackContext context)
+        {
+            if (context.performed)
+            {
+                var current = EventSystem.current.currentSelectedGameObject;
+                if (!current) return;
+
+                var currenButton = current.GetComponent<Button>();
+                currenButton.onClick.Invoke();
+            }
+        }
+
+        public void QuitGame()
+        {
+#if UNITY_EDITOR
+            UnityEditor.EditorApplication.isPlaying = false;
+#else
+            Application.Quit();
+#endif
+        }
+    }
+}

Assets/02.Scripts/TycoonTitle.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5f67e17c55ef1124a8467115dc6ea072

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

@@ -98,7 +98,6 @@ public class TycoonCard : MonoBehaviour
         
         _currentRotationCoroutine = StartCoroutine(RotateOverTime());
         
-        
         // Resources.Load()
     }
 

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

@@ -41,7 +41,7 @@ namespace BlueWater.Uis
         {
             if (!Application.isPlaying) return; 
             
-            GameTimeManager.Instance.PauseGameTime();
+            VisualFeedbackManager.Instance.SetBaseTimeScale(0f);
             
             // 기존 카드가 있으면 삭제
             if (_currentCard01 != null)
@@ -117,11 +117,10 @@ namespace BlueWater.Uis
         public void SelectedCard(TycoonCard currTycoonCard)
         {
             
-            GameTimeManager.Instance.ResumeGameTime();
+            VisualFeedbackManager.Instance.ResetTimeScale();
             
             switch (currTycoonCard.CardDataForIdx.Idx) //탐색 후 행동...
             {
-                //TycoonManager.Instance.TycoonStatus.CurrentExp += 10; 이런거 넣어주자...
                 case "HeartPlus": 
                     TycoonManager.Instance.TycoonStatus.MaxPlayerHealth += 1 ;break;
                 case "HeartHeal": 
@@ -143,15 +142,15 @@ namespace BlueWater.Uis
                 case "AddAllLiquid": 
                     TycoonManager.Instance.TycoonStatus.CurrentGarnishAmount1 += 1000; 
                     TycoonManager.Instance.TycoonStatus.CurrentGarnishAmount2 += 1000;break;
-                case "ServerNpc": return; break;
+              // case "ServerNpc": return; break;
-                case "CleanerNpc": return; break;
+               // case "CleanerNpc": return; break;
-                case "ChefNpc": return; break;
+               // case "ChefNpc": return; break;
                 case "SpeedUp": 
                     TycoonManager.Instance.TycoonStatus.PlayerMoveSpeedMultiplier += 0.05f; break;
-                case "ExpGetUp":  return; break;
+                //case "ExpGetUp":  return; break;
-                case "GoldGetUp": return; break;
+               // case "GoldGetUp": return; break;
-                case "CleanUp": return; break;
+               // case "CleanUp": return; break;
-                case "GaugeReset": return; break;
+               // case "GaugeReset": return; break;
                 default: Debug.Log("Not Found Card : IDX" + currTycoonCard.CardDataForIdx.Idx); return; break;
             }
 

Assets/03.Images/Ui/Tycoon/Loglike/GameOver.png.meta

@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 80bc51f72ddffd44f9f7b10443f5323e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 1024
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/EditorBuildSettings.asset

@@ -6,11 +6,11 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/01.Scenes/00.CombatTitle.unity
+    path: Assets/01.Scenes/00.TycoonTitle.unity
-    guid: c4209f239a4699340a9a8b4c44be69ad
+    guid: 6acccfdd4694531468dac7f6a77c3c1e
   - enabled: 1
-    path: Assets/01.Scenes/02.Combat.unity
+    path: Assets/01.Scenes/01.Tycoon.unity
-    guid: d4d297edf223adf4cb07955b48f82498
+    guid: b2b07a151b44ee849a1d12d9dc5bc87a
   m_configObjects:
     com.unity.input.settings: {fileID: 11400000, guid: c779df660591ce64c983341df1e4c85c, type: 2}
     com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}