diff --git a/Assets/Memo.txt b/Assets/Memo.txt index 20b2f5c..3a879c7 100644 --- a/Assets/Memo.txt +++ b/Assets/Memo.txt @@ -26,3 +26,6 @@ 9. 바닥 카드가 없고 내가 점수를 낸 상태면 스톱으로 내 승리 + +//////////////////////////////////////////////////////////////////////////////////////////////////// +멍박 구현 필요 (동물 7마리 이상, 상대는 동물 없을 때 2배) \ No newline at end of file diff --git a/Assets/Resources/Prefabs/Popups/ResultPopup.prefab b/Assets/Resources/Prefabs/Popups/ResultPopup.prefab index 2cdc6a8..3117e40 100644 --- a/Assets/Resources/Prefabs/Popups/ResultPopup.prefab +++ b/Assets/Resources/Prefabs/Popups/ResultPopup.prefab @@ -136,6 +136,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &594733398366878764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6869533203550106202} + - component: {fileID: 7873412396966690244} + - component: {fileID: 6276496939796621357} + m_Layer: 5 + m_Name: Label (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6869533203550106202 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594733398366878764} + 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: 7571584143837663398} + m_Father: {fileID: 8762591750797321994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 496.51648} + m_SizeDelta: {x: 440, y: 133} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7873412396966690244 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594733398366878764} + m_CullTransparentMesh: 1 +--- !u!114 &6276496939796621357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594733398366878764} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9924e7681288fa742af955890c43c4f1, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 0.7 --- !u!1 &710497735635010267 GameObject: m_ObjectHideFlags: 0 @@ -272,6 +348,179 @@ MonoBehaviour: m_Spacing: {x: 10, y: 365.4} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!1 &895592614743575010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8762591750797321994} + m_Layer: 5 + m_Name: Lose + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8762591750797321994 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895592614743575010} + 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: 1327761081970033363} + - {fileID: 6869533203550106202} + m_Father: {fileID: 1123193433995363195} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1189209408057327982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7571584143837663398} + - component: {fileID: 2857121505910876532} + - component: {fileID: 4884367928322261951} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7571584143837663398 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189209408057327982} + 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: 6869533203550106202} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2857121505910876532 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189209408057327982} + m_CullTransparentMesh: 1 +--- !u!114 &4884367928322261951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189209408057327982} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uACB0\uACFC" + 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: 72 + m_fontSizeBase: 65 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 0 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 0 + 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: 0 + 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 &1225335414551462063 GameObject: m_ObjectHideFlags: 0 @@ -876,6 +1125,43 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &2103453644085863414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1123193433995363195} + m_Layer: 5 + m_Name: Result + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1123193433995363195 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2103453644085863414} + 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: 4172082240056523117} + - {fileID: 8762591750797321994} + m_Father: {fileID: 3770223040128328972} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2419608789201950742 GameObject: m_ObjectHideFlags: 0 @@ -901,16 +1187,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2419608789201950742} - 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 m_Children: [] - m_Father: {fileID: 7620317501339891315} + m_Father: {fileID: 8762591750797321994} 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: -183, y: 27} + m_AnchoredPosition: {x: -178.90283, y: 86.45325} m_SizeDelta: {x: 256, y: 256} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6167578486531132024 @@ -1550,8 +1836,8 @@ MonoBehaviour: - {fileID: 1807920661781396425} - {fileID: 710497735635010267} gos_result: - - {fileID: 3788670759781906275} - - {fileID: 2419608789201950742} + - {fileID: 3876955094299640258} + - {fileID: 895592614743575010} t_Cal: {fileID: 1125310054947287745} GoldTMP: {fileID: 5839602813791282389} t_enemygold: {fileID: 3814719461235254228} @@ -1741,17 +2027,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3770223039693593036} - 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 m_Children: - {fileID: 3770223039725544698} - m_Father: {fileID: 3770223040128328972} + m_Father: {fileID: 4172082240056523117} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -8} + m_AnchoredPosition: {x: 0, y: 496.51648} m_SizeDelta: {x: 440, y: 133} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3770223039693593041 @@ -1782,7 +2068,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9924e7681288fa742af955890c43c4f1, type: 3} + m_Sprite: {fileID: 21300000, guid: 588b8a91a1f910b43a44b34b70468919, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2065,7 +2351,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2425993672956391868} - - {fileID: 3770223039693593043} - {fileID: 4237530592884811438} - {fileID: 7711292162024890666} - {fileID: 1448176182425009464} @@ -2074,6 +2359,7 @@ RectTransform: - {fileID: 3770223039897269368} - {fileID: 3770223039583398179} - {fileID: 2959421175606567884} + - {fileID: 1123193433995363195} m_Father: {fileID: 3284139348423762691} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2416,16 +2702,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3788670759781906275} - 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 m_Children: [] - m_Father: {fileID: 7620317501339891315} + m_Father: {fileID: 4172082240056523117} 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: -183, y: 27} + m_AnchoredPosition: {x: -178.90283, y: 86.45325} m_SizeDelta: {x: 256, y: 256} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6138743438163937739 @@ -2466,6 +2752,43 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3876955094299640258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4172082240056523117} + m_Layer: 5 + m_Name: Win + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4172082240056523117 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3876955094299640258} + 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: 4149625135647557284} + - {fileID: 3770223039693593043} + m_Father: {fileID: 1123193433995363195} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3992513543693321807 GameObject: m_ObjectHideFlags: 0 @@ -2846,8 +3169,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5774499557985027248} - - {fileID: 4149625135647557284} - - {fileID: 1327761081970033363} - {fileID: 5230557969959556997} - {fileID: 7068876715753499912} m_Father: {fileID: 3770223040128328972} diff --git a/Assets/Scripts/UI/Popup/ResultPopup.cs b/Assets/Scripts/UI/Popup/ResultPopup.cs index aad93fa..07bc9e4 100644 --- a/Assets/Scripts/UI/Popup/ResultPopup.cs +++ b/Assets/Scripts/UI/Popup/ResultPopup.cs @@ -18,7 +18,7 @@ public class ResultPopup : PopupBase public GameObject go_milgiad; [SerializeField] private TextMeshProUGUI ButtonlabelTMP; // 밀기 버튼 - [SerializeField] private GameObject[] NormalGameObjects; + [SerializeField] private GameObject[] NormalGameObjects; // 0 다음게임, 1 밀기 private CanvasGroup canvasGroup; @@ -85,8 +85,11 @@ public class ResultPopup : PopupBase { _gameResult = gameResult; DSUtil.InActivateGameObjects(gos_bankrupt); + DSUtil.InActivateGameObjects(gos_result, _gameResult ? 0 : 1); + GoldTMP.enabled = true; + if (GamePanel.Instance.Player_Milgi > 0) NormalGameObjects[1].SetActive(false); ButtonlabelTMP.text = _gameResult ? "밀기 2배\n이번 판 무효" : "밀기 4배\n이번 판 무효"; list_xinfo.ForEach(f => f.mul = 0); // 초기화 go_milgiad.SetActive(false); @@ -176,7 +179,6 @@ public class ResultPopup : PopupBase else { GameManager.Sound.PlaySFX(ESFXType.Win); - DSUtil.InActivateGameObjects(gos_result, 0); for (int i = 0; i < NormalGameObjects.Length; i++) NormalGameObjects[i].SetActive(true); @@ -202,7 +204,6 @@ public class ResultPopup : PopupBase else { GameManager.Sound.PlaySFX(ESFXType.Win); - DSUtil.InActivateGameObjects(gos_result, 0); for (int i = 0; i < NormalGameObjects.Length; i++) NormalGameObjects[i].SetActive(true); @@ -219,7 +220,6 @@ public class ResultPopup : PopupBase go_milgiad.SetActive(true); GameManager.Sound.PlaySFX(ESFXType.Lose); - DSUtil.InActivateGameObjects(gos_result, 1); if (fixedScore <= 0) { @@ -316,6 +316,7 @@ public class ResultPopup : PopupBase public void WinWithFirstBbug(long resultGold) { _gameResult = true; + if (GamePanel.Instance.Player_Milgi > 0) NormalGameObjects[1].SetActive(false); ButtonlabelTMP.text = _gameResult ? "밀기 4배\n이번 판 무효" : "밀기 2배\n이번 판 무효"; GoldTMP.enabled = true; GameManager.Sound.PlaySFX(ESFXType.Win);