diff --git a/Assets/Bundles/Prefabs/ProductSlot.prefab b/Assets/Bundles/Prefabs/ProductSlot.prefab index 3a8e3f4..f9aaef7 100644 --- a/Assets/Bundles/Prefabs/ProductSlot.prefab +++ b/Assets/Bundles/Prefabs/ProductSlot.prefab @@ -75,6 +75,142 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &793756200984924525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1652074881468443557} + - component: {fileID: 1169464376447901172} + - component: {fileID: 251424033995536282} + m_Layer: 5 + m_Name: t_cashrewardamount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1652074881468443557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 793756200984924525} + 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 + m_Children: [] + m_Father: {fileID: 8098959202226931251} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -110.9, y: 41.8} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1169464376447901172 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 793756200984924525} + m_CullTransparentMesh: 1 +--- !u!114 &251424033995536282 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 793756200984924525} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: x000 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 1cd9f54883d04fa4a8273aaf06ef64e9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1405666000267715006 GameObject: m_ObjectHideFlags: 0 @@ -1802,6 +1938,7 @@ MonoBehaviour: NameTMP: {fileID: 8098959201705279919} ProductTMP: {fileID: 8098959200682203376} PriceTMP: {fileID: 2042061424473936128} + t_cashrewardamount: {fileID: 251424033995536282} AdButton: {fileID: 4313384857828416161} AdNumberTMP: {fileID: 3514367351994779444} PurchaseButton: {fileID: 8098959201987389603} @@ -2087,6 +2224,7 @@ RectTransform: - {fileID: 8669934545985297084} - {fileID: 324260038501175733} - {fileID: 8098959200428602549} + - {fileID: 1652074881468443557} m_Father: {fileID: 8098959201550950962} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/UI/ProductSlot.cs b/Assets/Scripts/UI/ProductSlot.cs index 7a5c9b2..3f660ab 100644 --- a/Assets/Scripts/UI/ProductSlot.cs +++ b/Assets/Scripts/UI/ProductSlot.cs @@ -13,6 +13,7 @@ public class ProductSlot : CardBase [SerializeField] private TMPro.TextMeshProUGUI NameTMP; [SerializeField] private TMPro.TextMeshProUGUI ProductTMP; [SerializeField] private TMPro.TextMeshProUGUI PriceTMP; + [SerializeField] private TMPro.TextMeshProUGUI t_cashrewardamount; [Space(20)] [SerializeField] private GameObject AdButton; @@ -109,6 +110,7 @@ public class ProductSlot : CardBase NameTMP.text = _data.productName; ProductTMP.text = _data.productDescription; PriceTMP.text = _data.price.ToString("c", new System.Globalization.CultureInfo("ko-KR", false)); + t_cashrewardamount.text = ""; BuyWithCashBtn.SetActive(false); DSUtil.InActivateGameObjects(gos_glow, data.rewardType == CodeJay.Enum.EProductReward.Key ? 0 : 1); @@ -300,7 +302,10 @@ public class ProductSlot : CardBase } if (data.type == CodeJay.Enum.EProductType.IAP) + { PriceTMP.text = $"\\{data.price}"; + t_cashrewardamount.text = $"x{data.rewardAmount}"; + } } private void SetADSButton()