diff --git a/Assets/Scripts/UI/Popup/FirstBbugPopup.cs b/Assets/Scripts/UI/Popup/FirstBbugPopup.cs index d756736..62110d6 100644 --- a/Assets/Scripts/UI/Popup/FirstBbugPopup.cs +++ b/Assets/Scripts/UI/Popup/FirstBbugPopup.cs @@ -7,14 +7,15 @@ public class FirstBbugPopup : PopupBase public void SetData(bool isPlayer) { resultGold = GamePanel.Instance.Stake * 5; + var str_gold = CodeJay.CodeJayUtility.Converter.MoneyToString_withOutline(resultGold); if (isPlayer) { - tmp.text = $"첫 뻑이네요!\n{CodeJay.CodeJayUtility.Converter.MoneyToString(resultGold)} 획득!"; + tmp.text = $"첫 뻑이네요!\n{str_gold} 획득!"; GameManager.DB.AddGold(resultGold, this.name); } else { - tmp.text = $"상대가 첫 뻑이네요!\n{CodeJay.CodeJayUtility.Converter.MoneyToString(resultGold)} 뺏김!"; + tmp.text = $"상대가 첫 뻑이네요!\n{str_gold} 뺏김!"; GameManager.DB.SubGold(resultGold, this.name); } diff --git a/Assets/Scripts/UI/Popup/GoStopPopup.cs b/Assets/Scripts/UI/Popup/GoStopPopup.cs index a2da0bc..2bc5237 100644 --- a/Assets/Scripts/UI/Popup/GoStopPopup.cs +++ b/Assets/Scripts/UI/Popup/GoStopPopup.cs @@ -50,7 +50,7 @@ public class GoStopPopup : PopupBase long resultMoney = resultScore * GamePanel.Instance.Stake; - tmp.text = "스톱 시,+" + CodeJay.CodeJayUtility.Converter.MoneyToString(resultMoney) + ""; + tmp.text = "스톱 시,+" + CodeJay.CodeJayUtility.Converter.MoneyToString_withOutline(resultMoney); goTMP.text = (GamePanel.Instance.Player_Go + 1).ToString() + "고"; @@ -66,7 +66,7 @@ public class GoStopPopup : PopupBase if (remaining - resultMoney < 0) { - tmp.text = "스톱 시,+" + CodeJay.CodeJayUtility.Converter.MoneyToString(remaining) + ""; + tmp.text = "스톱 시,+" + CodeJay.CodeJayUtility.Converter.MoneyToString_withOutline(remaining); } } else @@ -75,7 +75,7 @@ public class GoStopPopup : PopupBase EndLabelGO.SetActive(remaining - resultMoney <= 0); if (remaining - resultMoney < 0) - tmp.text = "스톱 시,+" + CodeJay.CodeJayUtility.Converter.MoneyToString(remaining) + ""; + tmp.text = "스톱 시,+" + CodeJay.CodeJayUtility.Converter.MoneyToString(remaining); } } diff --git a/Assets/Scripts/Utilities/Utility.cs b/Assets/Scripts/Utilities/Utility.cs index ed505ec..faa7ef8 100644 --- a/Assets/Scripts/Utilities/Utility.cs +++ b/Assets/Scripts/Utilities/Utility.cs @@ -226,7 +226,10 @@ namespace CodeJay stringBuilder.Append("냥"); return stringBuilder.ToString(); } - + public static string MoneyToString_withOutline(long money) + { + return $"{Converter.MoneyToString(money)} "; + } public static ECardScoreType CardTypeToScoreType(ECardType cardType) diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/NotoSansKR-Regular - BoldOutline Y.mat b/Assets/TextMesh Pro/Resources/Fonts & Materials/NotoSansKR-Regular - BoldOutline Y.mat new file mode 100644 index 0000000..70844ba --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/NotoSansKR-Regular - BoldOutline Y.mat @@ -0,0 +1,111 @@ +%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: NotoSansKR-Regular - BoldOutline Y + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 656917452037345304, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _CullMode: 0 + - _Diffuse: 0.5 + - _FaceDilate: 0.3 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 5 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0.2 + - _PerspectiveFilter: 0.875 + - _Reflectivity: 10 + - _ScaleRatioA: 0.8 + - _ScaleRatioB: 0.41 + - _ScaleRatioC: 0.41 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _SpecularPower: 2 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 4096 + - _TextureWidth: 4096 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.75 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _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.08235294, g: 0.050980393, b: 0.039215688, 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} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/NotoSansKR-Regular - BoldOutline Y.mat.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/NotoSansKR-Regular - BoldOutline Y.mat.meta new file mode 100644 index 0000000..20e23a8 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/NotoSansKR-Regular - BoldOutline Y.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b884e6e9a910f5f419636495cf413a3c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: