diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 40faddb..3f4439b 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -14541,6 +14541,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: go_AlbumPanel: {fileID: 1535761048} + go_GamePanel: {fileID: 771770699} go_MainPanel: {fileID: 1166114707} go_ShopPanel: {fileID: 833499340} go_TopPanel: {fileID: 302272076} @@ -44862,6 +44863,82 @@ RectTransform: m_AnchoredPosition: {x: -65, y: 0} m_SizeDelta: {x: 105, y: 105} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &650392519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 650392520} + - component: {fileID: 650392522} + - component: {fileID: 650392521} + m_Layer: 5 + m_Name: pointmoney + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &650392520 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650392519} + 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: + - {fileID: 1964419924} + m_Father: {fileID: 771770700} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -7.53, y: -55} + m_SizeDelta: {x: 150.63, y: 111.63} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &650392521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650392519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 9a4e02c6e5890d64a8a84d7c268fe66a, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &650392522 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650392519} + m_CullTransparentMesh: 1 --- !u!1 &663256576 GameObject: m_ObjectHideFlags: 0 @@ -56195,6 +56272,7 @@ RectTransform: - {fileID: 441594202} - {fileID: 1230258420} - {fileID: 330455276} + - {fileID: 650392520} - {fileID: 152989455} - {fileID: 1454045775} m_Father: {fileID: 301590531} @@ -56229,6 +56307,7 @@ MonoBehaviour: cg: {fileID: 771770705} i_ai: {fileID: 1632661773} AINameTMP: {fileID: 1889396053} + t_PointMoney: {fileID: 1964419925} AIGoldTMP: {fileID: 632370172} CenterDeckRT: {fileID: 936323066} FloorRTs: @@ -147818,6 +147897,142 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ccacf8a867ea9a941ae48389ec8e96b0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1964419923 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1964419924} + - component: {fileID: 1964419926} + - component: {fileID: 1964419925} + m_Layer: 5 + m_Name: t_pointmoney + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1964419924 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1964419923} + 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: 650392520} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1964419925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1964419923} + 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: "\uD310\uB3C8\n000\uB0E5" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} + m_sharedMaterial: {fileID: -6508382273668546854, guid: cf1ae75e65a967946b23286a5ffbb812, 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: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: -5 + 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!222 &1964419926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1964419923} + m_CullTransparentMesh: 1 --- !u!1 &1966126668 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/CanvasControl.cs b/Assets/Scripts/UI/CanvasControl.cs index 37b2dde..2dffca0 100644 --- a/Assets/Scripts/UI/CanvasControl.cs +++ b/Assets/Scripts/UI/CanvasControl.cs @@ -8,12 +8,13 @@ public class CanvasControl : MonoBehaviour Ins = this; } - [SerializeField] private GameObject go_AlbumPanel, go_MainPanel, go_ShopPanel, go_TopPanel, go_BottomPanel; + [SerializeField] private GameObject go_AlbumPanel, go_GamePanel, go_MainPanel, go_ShopPanel, go_TopPanel, go_BottomPanel; [SerializeField] private GameObject go_Top_Moneys, go_Top_x, go_Bottom_LB, go_Bottom_RB; public void Go_Shop() { go_AlbumPanel.SetActive(false); + go_GamePanel.SetActive(false); go_MainPanel.SetActive(false); go_ShopPanel.SetActive(true); @@ -28,6 +29,7 @@ public class CanvasControl : MonoBehaviour public void Go_Album() { go_AlbumPanel.SetActive(true); + go_GamePanel.SetActive(false); go_MainPanel.SetActive(false); go_ShopPanel.SetActive(false); @@ -42,6 +44,7 @@ public class CanvasControl : MonoBehaviour public void Go_Main() { go_AlbumPanel.SetActive(false); + go_GamePanel.SetActive(true); go_MainPanel.SetActive(true); go_ShopPanel.SetActive(false); diff --git a/Assets/Scripts/UI/GamePanel/GamePanel.cs b/Assets/Scripts/UI/GamePanel/GamePanel.cs index aede8e6..0831c18 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs @@ -19,7 +19,7 @@ public partial class GamePanel : MonoBehaviour public GameObject CardSlotPrefab, go_toppanel; public CanvasGroup cg; public Image i_ai; - public TMPro.TextMeshProUGUI AINameTMP; + public TMPro.TextMeshProUGUI AINameTMP, t_PointMoney; public TMPro.TextMeshProUGUI AIGoldTMP; private List _lstCardSlots; @@ -348,6 +348,7 @@ public partial class GamePanel : MonoBehaviour this.GamePanelEnabled(true); go_toppanel.SetActive(false); i_ai.sprite = DB_HuntingData.GetEntity(GameManager.DB.GetUnlockTargetIndex(true) << 1).DBF_UnlockImage; + t_PointMoney.text = $"판돈\n{Stake}냥"; GameManager.Event.InvokeEvent(EEventType.OnInitializeGame); GameManager.Event.InvokeEvent(EEventType.OnSynchronizeGold); diff --git a/Assets/Scripts/UI/Popup/ResultPopup.cs b/Assets/Scripts/UI/Popup/ResultPopup.cs index 67cc2c8..c33c997 100644 --- a/Assets/Scripts/UI/Popup/ResultPopup.cs +++ b/Assets/Scripts/UI/Popup/ResultPopup.cs @@ -266,12 +266,12 @@ public class ResultPopup : PopupBase if (multiply > 0) { - t_Cal.text = str + $" x {multiply}배\n= 총 {score * multiply}점"; + t_Cal.text = str + $" x {multiply}배\n= 총 {score * multiply}점\n"; _resultTotalGold = score * multiply * GamePanel.Instance.Stake; } else { - t_Cal.text = str + $"\n= 총 {score}점"; + t_Cal.text = str + $"\n= 총 {score}점\n"; _resultTotalGold = score * GamePanel.Instance.Stake; } @@ -279,7 +279,7 @@ public class ResultPopup : PopupBase else { _resultTotalGold = GamePanel.Instance.Stake * fixedScore; - t_Cal.text = $"{fixedScore}점\n= 총 {fixedScore}점"; + t_Cal.text = $"{fixedScore}점\n= 총 {fixedScore}점\n"; } t_Cal.text += $"x {GamePanel.Instance.Stake}냥"; @@ -407,8 +407,8 @@ public class ResultPopup : PopupBase { GamePanel.Instance.Player_Milgi = 0; GameManager.Sound.PlaySFX(ESFXType.Button_Hit); - CanvasControl.Ins.Go_Shop(); GameManager.UI.HideTopPopup(); + CanvasControl.Ins.Go_Shop(); } public void ClickMilgi() @@ -444,6 +444,7 @@ public class ResultPopup : PopupBase } GameManager.UI.HideTopPopup(); GamePanel.Instance.Player_Milgi = 0; + CanvasControl.Ins.Go_Main(); } public void ClickNext()