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

Assets/01.Scenes/99.LMG_Tycoon.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e7a1af91eedbae34b95b935f45e2ea93
+guid: b833bcae75f3f004684676cf4de35160
 DefaultImporter:
   externalObjects: {}
   userData: 

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

@@ -1,8 +1,11 @@
 using System.Collections;
 using BlueWater.Items;
+using BlueWater.Tycoons;
 using UnityEngine;
 using UnityEngine.UI;
 using Sirenix.OdinInspector;
+using Spine.Unity;
+using Unity.VisualScripting;
 
 namespace BlueWater.Uis
 {
@@ -12,14 +15,23 @@ namespace BlueWater.Uis
         private GameObject _panel;
 
         [SerializeField]
-        private AnimationController _animationController;
+        private GameObject information; //정보를 알려주는 이미지
 
         [SerializeField]
-        private Image information; //정보를 알려주는 이미지
-
+        private Image informationTabel; //정보를 알려주는 이미지
+        
         [SerializeField]
-        private Image liqueurImage; //리큐르 팝업창에 뜰 이미지
-
+        private Image informationIngredient; //정보를 알려주는 이미지
+        
+        [SerializeField]
+        private Image ingredientImage; //재료 이미지
+        
+        [SerializeField]
+        private SkeletonGraphic paperAnimation;
+        
+        [SerializeField]
+        private Button closeButton;
+        
         private void Start()
         {
             EventManager.OnLevelUp += StartUpgradePopup;
@@ -39,6 +51,8 @@ namespace BlueWater.Uis
             IsOpened = true;
         }
 
+        
+        
         public override void Close()
         {
             _panel.SetActive(false);
@@ -50,9 +64,10 @@ namespace BlueWater.Uis
 
         private void StartUpgradePopup(LevelData currentLevelData)
         {
+            
             if (string.IsNullOrEmpty(currentLevelData.OpenUpgrade)) return;
 
-            liqueurImage.sprite = int.Parse(currentLevelData.Idx) switch
+            ingredientImage.sprite = int.Parse(currentLevelData.Idx) switch
             {
                 5 => ItemManager.Instance.LiquidDataSo.GetDataByIdx("LiquidB").Sprite,
                 10 => ItemManager.Instance.LiquidDataSo.GetDataByIdx("LiquidC").Sprite,
@@ -60,27 +75,55 @@ namespace BlueWater.Uis
                 20 => ItemManager.Instance.LiquidDataSo.GetDataByIdx("LiquidE").Sprite,
                 25 => ItemManager.Instance.LiquidDataSo.GetDataByIdx("Garnish1").Sprite,
                 30 => ItemManager.Instance.LiquidDataSo.GetDataByIdx("Garnish2").Sprite,
-                _ => liqueurImage.sprite
+                _ => ingredientImage.sprite
             };
+            
+            informationIngredient.enabled = int.Parse(currentLevelData.Idx) != 35;
 
-            liqueurImage.enabled = int.Parse(currentLevelData.Idx) != 35;
-
-            StartCoroutine(StartUpgradePopupCoroutine(currentLevelData));
+            if (int.Parse(currentLevelData.Idx) <= 35)
+            {
+                informationIngredient.rectTransform.anchoredPosition  = new Vector3(-250f,0f,0f);
+                informationTabel.rectTransform.anchoredPosition = new Vector3(250f,0f,0f);
+            }
+            
+            Open();
+            var trackEntry = paperAnimation.AnimationState.SetAnimation(0, "Idle", false);
+            //trackEntry.TimeScale = Time.unscaledDeltaTime * 15f;
+            trackEntry.Complete += (track) =>
+            {
+                StartCoroutine(StartUpgradePopupCoroutine(currentLevelData));
+                closeButton.GameObject().SetActive(true);
+            };
+            
         }
 
         // ReSharper disable Unity.PerformanceAnalysis
         private IEnumerator StartUpgradePopupCoroutine(LevelData currentLevelData)
         {
-            Open();
             float timer = 0f;
 
-            while (timer < 1.0f)
+            while (timer < 0.5)
             {
                 timer += Time.unscaledDeltaTime;
+
+                float t = timer / 0.5f;
+                float easedT = EaseEffect.BounceOut(t);
+
+                information.transform.localScale =
+                    Vector3.Lerp(new Vector3(0.0f, 0.0f, 1.0f), new Vector3(1.0f, 1.0f, 1.0f), easedT);
                 yield return null;
             }
+        }
 
-            timer = 0f;
+        public void OnCloseButton()
+        {
+            StartCoroutine(CloseUpgradePopupCoroutine());
+            closeButton.GameObject().SetActive(false);
+        }
+        
+        private IEnumerator CloseUpgradePopupCoroutine()
+        {
+            float timer = 0f;
 
             while (timer < 0.5)
             {
@@ -90,44 +133,15 @@ namespace BlueWater.Uis
                 float easedT = EaseEffect.BounceOut(t);
 
                 information.transform.localScale =
-                    Vector3.Lerp(new Vector3(0.0f, 0.0f, 0.0f), new Vector3(1.0f, 1.0f, 1.0f), easedT);
+                    Vector3.Lerp(new Vector3(1.0f, 1.0f, 1.0f), new Vector3(0.0f, 0.0f, 1.0f), easedT);
                 yield return null;
             }
 
-
-            timer = 0f;
-
-            while (timer < 2.0)
+            paperAnimation.AnimationState.SetAnimation(0, "Back", false).Complete += (trackEntry) =>
             {
-                timer += Time.unscaledDeltaTime;
-                yield return null;
-            }
-
-            timer = 0f;
-
-            while (timer < 0.5)
-            {
-                timer += Time.unscaledDeltaTime;
-
-                float t = timer / 0.5f;
-                float easedT = EaseEffect.BounceOut(t);
-
-                information.transform.localScale =
-                    Vector3.Lerp(new Vector3(1.0f, 1.0f, 1.0f), new Vector3(0.0f, 0.0f, 0.0f), easedT);
-                yield return null;
-            }
-
-            _animationController.PlayAnimation("CardUpgrade_Reverse");
-
-            timer = 0f;
-
-            while (timer < 1.0f)
-            {
-                timer += Time.unscaledDeltaTime;
-                yield return null;
-            }
-
-            Close();
+                Close();
+            };
+            
         }
     }
 }

Assets/03.Images/Ui/Tycoon/Card/UpgradePopup_Ingredient.png.meta

@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 8b43090e5243e92408da5ffedd32dfe3
+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: 

Assets/03.Images/Ui/Tycoon/Card/UpgradePopup_Table.png.meta

@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 9f10baad63076844598623a19af21349
+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: 

Assets/08.Spines/Uis/UpgradePopup.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 05cd71bb7c6e5b44fb122e5efb4e2c1f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine.atlas.txt

@@ -0,0 +1,66 @@
+CardUpgradeSpine.png
+size:2034,1903
+filter:Linear,Linear
+1
+bounds:2,1133,287,353
+rotate:90
+10
+bounds:433,1675,485,226
+11
+bounds:846,1379,500,280
+12
+bounds:1525,665,372,359
+13
+bounds:2,1686,215,429
+rotate:90
+14
+bounds:1448,1648,253,372
+rotate:90
+15
+bounds:1724,1026,335,308
+rotate:90
+16
+bounds:2,1422,370,262
+17
+bounds:2,799,356,306
+18
+bounds:775,760,331,393
+rotate:90
+19
+bounds:812,1093,284,490
+rotate:90
+2
+bounds:360,785,320,413
+rotate:90
+20
+bounds:477,90,642,712
+rotate:90
+21
+bounds:1191,2,701,661
+3
+bounds:1304,1068,293,418
+rotate:90
+4
+bounds:374,1396,277,470
+rotate:90
+5
+bounds:1170,734,332,353
+rotate:90
+6
+bounds:1348,1363,573,283
+7
+bounds:2,314,473,469
+8
+bounds:357,1107,453,287
+9
+bounds:920,1661,526,240
+
+CardUpgradeSpine_2.png
+size:1950,1460
+filter:Linear,Linear
+22
+bounds:1077,415,1043,871
+rotate:90
+23
+bounds:2,2,1456,1073
+rotate:90

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine.atlas.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a8103fc98f9c9b44cbdb91c3d9c167de
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine.png.meta

@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 80071ddbd9e4dfe4fb171107be5f84e5
+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: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine.skel.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 49541c498d3c8a8499fae3272e7ae999
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine.spine.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 62658ca9eff8110468368ecb89d78f37
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_2.png.meta

@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: b70937ac65d6d0b4fb4814d70039e667
+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: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_Atlas.asset

@@ -0,0 +1,20 @@
+%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: a6b194f808b1af6499c93410e504af42, type: 3}
+  m_Name: CardUpgradeSpine_Atlas
+  m_EditorClassIdentifier: 
+  textureLoadingMode: 0
+  onDemandTextureLoader: {fileID: 0}
+  atlasFile: {fileID: 4900000, guid: a8103fc98f9c9b44cbdb91c3d9c167de, type: 3}
+  materials:
+  - {fileID: 2100000, guid: 2b9f28d9febc4c24ab9e2877e45b172b, type: 2}
+  - {fileID: 2100000, guid: bd8c95c254f144f419b3818bad37c2ef, type: 2}

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_Atlas.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0b2df3907a8386b48b677cd3f38d7556
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_CardUpgradeSpine.mat

@@ -0,0 +1,46 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: CardUpgradeSpine_CardUpgradeSpine
+  m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 80071ddbd9e4dfe4fb171107be5f84e5, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Cutoff: 0.1
+    - _DoubleSidedLighting: 0
+    - _LightAffectsAdditive: 0
+    - _ReceiveShadows: 0
+    - _StencilComp: 8
+    - _StencilRef: 1
+    - _StraightAlphaInput: 1
+    - _TintBlack: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Black: {r: 0, g: 0, b: 0, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_CardUpgradeSpine.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2b9f28d9febc4c24ab9e2877e45b172b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_CardUpgradeSpine_2.mat

@@ -0,0 +1,46 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: CardUpgradeSpine_CardUpgradeSpine_2
+  m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: b70937ac65d6d0b4fb4814d70039e667, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Cutoff: 0.1
+    - _DoubleSidedLighting: 0
+    - _LightAffectsAdditive: 0
+    - _ReceiveShadows: 0
+    - _StencilComp: 8
+    - _StencilRef: 1
+    - _StraightAlphaInput: 1
+    - _TintBlack: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Black: {r: 0, g: 0, b: 0, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_CardUpgradeSpine_2.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd8c95c254f144f419b3818bad37c2ef
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_SkeletonData.asset

@@ -0,0 +1,31 @@
+%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: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
+  m_Name: CardUpgradeSpine_SkeletonData
+  m_EditorClassIdentifier: 
+  atlasAssets:
+  - {fileID: 11400000, guid: 0b2df3907a8386b48b677cd3f38d7556, type: 2}
+  scale: 0.01
+  skeletonJSON: {fileID: 4900000, guid: 49541c498d3c8a8499fae3272e7ae999, type: 3}
+  isUpgradingBlendModeMaterials: 0
+  blendModeMaterials:
+    requiresBlendModeMaterials: 0
+    applyAdditiveMaterial: 1
+    additiveMaterials: []
+    multiplyMaterials: []
+    screenMaterials: []
+  skeletonDataModifiers: []
+  fromAnimation: []
+  toAnimation: []
+  duration: []
+  defaultMix: 0.2
+  controller: {fileID: 0}

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSpine_SkeletonData.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c171af6e71fb2984c8949c4f1b222e31
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/08.Spines/Uis/UpgradePopup/CardUpgradeSprite.png.meta

@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 16d2efea9711cd94192592bc67cdea13
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  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: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/10.Fonts/Korean/GodoM SDF.asset

@@ -238726,7 +238726,7 @@ Material:
     - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
     - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
     - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
-    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
+    - _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
     - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
     - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}