diff --git a/Assets/Memo.txt b/Assets/Memo.txt index f50d4a2..45bd2f3 100644 --- a/Assets/Memo.txt +++ b/Assets/Memo.txt @@ -31,6 +31,14 @@ 앨범 열리면 현재 레벨(판돈)도 같이 올라가게 팝업 배경 변경 +내 돈이 - 가 됨 + +흔들기? 총통? +IndexOutOfRangeException: Index was outside the bounds of the array. +ShakePopup.SetData (CodeJay.Enum.ECardType[] cardTypes, System.Boolean fourCard) (at Assets/Scripts/UI/Popup/ShakePopup.cs:25) +ShakeSelectPopup_AI+d__4.MoveNext () (at Assets/Scripts/UI/Popup/ShakeSelectPopup_AI.cs:32) +UnityEngine.SetupCoroutine.InvokeMoveNext (System.Collections.IEnumerator enumerator, System.IntPtr returnValueAddress) (at <435b7303fa1046c7aefb885a0b7d525b>:0) + 신규 이펙트 적용 (계속) 구글 및 원스토어 이미지 분기 처리 구글 및 원스토어 아이콘 분기 처리 \ No newline at end of file diff --git a/Assets/Resources/Prefabs/Popups/ResultPopup.prefab b/Assets/Resources/Prefabs/Popups/ResultPopup.prefab index c7d46b4..bc921b8 100644 --- a/Assets/Resources/Prefabs/Popups/ResultPopup.prefab +++ b/Assets/Resources/Prefabs/Popups/ResultPopup.prefab @@ -3206,7 +3206,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9a4e02c6e5890d64a8a84d7c268fe66a, type: 3} + m_Sprite: {fileID: 21300000, guid: 8fc032a52ac58f345b86d6dd58fff5a5, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/Prefabs/resultxinfocard.prefab b/Assets/Resources/Prefabs/resultxinfocard.prefab index e90992c..cef1383 100644 --- a/Assets/Resources/Prefabs/resultxinfocard.prefab +++ b/Assets/Resources/Prefabs/resultxinfocard.prefab @@ -434,7 +434,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5582549817130953831} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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: 0 @@ -495,7 +495,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8fc032a52ac58f345b86d6dd58fff5a5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9a4e02c6e5890d64a8a84d7c268fe66a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scripts/UI/Popup/ResultPopup.cs b/Assets/Scripts/UI/Popup/ResultPopup.cs index 250434a..6fea77d 100644 --- a/Assets/Scripts/UI/Popup/ResultPopup.cs +++ b/Assets/Scripts/UI/Popup/ResultPopup.cs @@ -229,7 +229,7 @@ public class ResultPopup : PopupBase } } - GoldTMP.text = "+" + CodeJay.CodeJayUtility.Converter.MoneyToString(_resultTotalGold); + GoldTMP.text = "+" + CodeJay.CodeJayUtility.Converter.MoneyToString_withOutline(_resultTotalGold); GameManager.DB.AddGold(_resultTotalGold, this.name); //ForcedMoveButtonGO.SetActive(false); @@ -306,7 +306,7 @@ public class ResultPopup : PopupBase t_Cal.text += $"x {GamePanel.Instance.Stake}냥"; - GoldTMP.text = "-" + CodeJay.CodeJayUtility.Converter.MoneyToString(_resultTotalGold); + GoldTMP.text = "-" + CodeJay.CodeJayUtility.Converter.MoneyToString_withOutline(_resultTotalGold); GameManager.DB.SubGold(_resultTotalGold, this.name); GameManager.DB.AddGoldToAI(GamePanel.Instance.IsChallengeMode, _resultTotalGold); @@ -375,7 +375,7 @@ public class ResultPopup : PopupBase else t_Cal.text = $"{lastPoint}점\n= 총 {lastPoint}점\nx {GamePanel.Instance.Stake}냥"; - GoldTMP.text = "+" + CodeJay.CodeJayUtility.Converter.MoneyToString(_resultTotalGold); + GoldTMP.text = "+" + CodeJay.CodeJayUtility.Converter.MoneyToString_withOutline(_resultTotalGold); if (GamePanel.Instance.IsChallengeMode) { diff --git a/Assets/UI/Image/window 5.png.meta b/Assets/UI/Image/window 5.png.meta index b29d740..567e703 100644 --- a/Assets/UI/Image/window 5.png.meta +++ b/Assets/UI/Image/window 5.png.meta @@ -52,7 +52,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 20, y: 20, z: 20, w: 20} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -121,7 +121,7 @@ TextureImporter: width: 128 height: 128 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -139,7 +139,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: []