diff --git a/Assets/Resources/Prefabs/Popups/MissionSuccessPopup.prefab b/Assets/Resources/Prefabs/Popups/MissionSuccessPopup.prefab index 62cd2e2..fcb4170 100644 --- a/Assets/Resources/Prefabs/Popups/MissionSuccessPopup.prefab +++ b/Assets/Resources/Prefabs/Popups/MissionSuccessPopup.prefab @@ -298,6 +298,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5349872405586130481} + - component: {fileID: 978417483280642607} + - component: {fileID: 5311391927235214503} - component: {fileID: 5349872405586130483} - component: {fileID: 5349872405586130492} - component: {fileID: 5349872405586130493} @@ -329,6 +331,34 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &978417483280642607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5349872405586130486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2afb405be3672534ba3006b07de45563, type: 3} + m_Name: + m_EditorClassIdentifier: + t_mission: {fileID: 8643226524284132482} +--- !u!114 &5311391927235214503 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5349872405586130486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13838897d1263dc4fac5200f1ca5878d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 0} + m_Content: {fileID: 4559414874285890658} + go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} --- !u!222 &5349872405586130483 CanvasRenderer: m_ObjectHideFlags: 0 @@ -715,7 +745,7 @@ GameObject: - component: {fileID: 8643226524284132493} - component: {fileID: 8643226524284132482} m_Layer: 5 - m_Name: t_rate + m_Name: t_mission m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 7151583..60c6286 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -5403,6 +5403,101 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 37784572} m_CullTransparentMesh: 1 +--- !u!1 &41425608 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 41425609} + - component: {fileID: 41425612} + - component: {fileID: 41425611} + - component: {fileID: 41425610} + m_Layer: 5 + m_Name: Main + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &41425609 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 41425608} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1755414562} + - {fileID: 1079028114} + - {fileID: 609965260} + m_Father: {fileID: 330455276} + 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: 385, y: -37} + m_SizeDelta: {x: 472.0013, y: 225.176} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &41425610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 41425608} + 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 &41425611 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 41425608} + m_CullTransparentMesh: 1 +--- !u!114 &41425612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 41425608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 20c1b070134a6d246bc05b8f385d7cec, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 0} + m_Content: {fileID: 609965259} + go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} + t_rate: {fileID: 1079028115} --- !u!1 &48177639 GameObject: m_ObjectHideFlags: 0 @@ -6786,6 +6881,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 143139204} m_CullTransparentMesh: 1 +--- !u!1 &152940103 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 152940104} + - component: {fileID: 152940106} + - component: {fileID: 152940105} + m_Layer: 5 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &152940104 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152940103} + 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: 1096121546} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -28} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &152940105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152940103} + 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: "\uC544\uBB34 \uC30D\uD53C 2\uAC1C \uD68D\uB4DD" + 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: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 50 + m_fontSizeBase: 50 + 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: 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: 1 + 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: 14.84407, y: 0, z: 13.194702, 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 &152940106 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152940103} + m_CullTransparentMesh: 1 --- !u!1 &152989454 GameObject: m_ObjectHideFlags: 0 @@ -20029,6 +20260,8 @@ RectTransform: - {fileID: 1655609077} - {fileID: 1129600970} - {fileID: 1846390544} + - {fileID: 41425609} + - {fileID: 1096121546} m_Father: {fileID: 771770700} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -43648,6 +43881,68 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &609965259 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 609965260} + - component: {fileID: 609965261} + m_Layer: 5 + m_Name: layout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &609965260 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 609965259} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.39999998, y: 0.39999998, z: 0.39999998} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 41425609} + 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: -135.9, y: -25} + m_SizeDelta: {x: 438, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &609965261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 609965259} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 5 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &612821333 GameObject: m_ObjectHideFlags: 0 @@ -56520,6 +56815,8 @@ MonoBehaviour: AINameTMP: {fileID: 1889396053} t_PointMoney: {fileID: 1964419925} AIGoldTMP: {fileID: 632370172} + m_MissionOpenPopup_Main: {fileID: 41425612} + m_MissionOpenPopup_Sub: {fileID: 1096121549} CurMission: 18 CurSubMission: 5 CenterDeckRT: {fileID: 936323066} @@ -72195,6 +72492,142 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1079028113 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1079028114} + - component: {fileID: 1079028116} + - component: {fileID: 1079028115} + m_Layer: 5 + m_Name: t_rate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1079028114 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079028113} + 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: 41425609} + 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: 161.5, y: -137.6} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1079028115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079028113} + 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: x0 + 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: 4282701311 + m_fontColor: {r: 1, g: 0.8352941, b: 0.26666668, 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: 45 + m_fontSizeBase: 45 + 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: 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: + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + 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: 30.803467, y: 0, z: 26.952942, 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 &1079028116 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079028113} + m_CullTransparentMesh: 1 --- !u!1 &1080531573 GameObject: m_ObjectHideFlags: 0 @@ -72554,6 +72987,99 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1095392798} m_CullTransparentMesh: 1 +--- !u!1 &1096121545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1096121546} + - component: {fileID: 1096121549} + - component: {fileID: 1096121548} + - component: {fileID: 1096121547} + m_Layer: 5 + m_Name: Sub + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1096121546 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096121545} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1394567363} + - {fileID: 152940104} + - {fileID: 1207190516} + m_Father: {fileID: 330455276} + 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: 385, y: -166} + m_SizeDelta: {x: 472.0013, y: 225.176} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1096121547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096121545} + 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 &1096121548 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096121545} + m_CullTransparentMesh: 1 +--- !u!114 &1096121549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096121545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 529f9157a92578d4cad65a2ad6dfd66a, type: 3} + m_Name: + m_EditorClassIdentifier: + t_msg: {fileID: 152940105} + t_rate: {fileID: 1207190517} --- !u!1 &1100177467 GameObject: m_ObjectHideFlags: 0 @@ -73136,7 +73662,7 @@ RectTransform: 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_AnchoredPosition: {x: -122.00001, y: 0} m_SizeDelta: {x: 0, y: -311.3} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1129600972 @@ -74735,6 +75261,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1186339962} m_CullTransparentMesh: 1 +--- !u!1 &1207190515 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1207190516} + - component: {fileID: 1207190518} + - component: {fileID: 1207190517} + m_Layer: 5 + m_Name: t_rate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1207190516 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1207190515} + 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: 1096121546} + 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: 161.5, y: -37.2} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1207190517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1207190515} + 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: x0 + 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: 4282701311 + m_fontColor: {r: 1, g: 0.8352941, b: 0.26666668, 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: 45 + m_fontSizeBase: 45 + 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: 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: + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + 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: 30.803467, y: 0, z: 26.952942, 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 &1207190518 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1207190515} + m_CullTransparentMesh: 1 --- !u!1 &1217728024 GameObject: m_ObjectHideFlags: 0 @@ -92226,6 +92888,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1385227915} m_CullTransparentMesh: 1 +--- !u!1 &1394567362 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1394567363} + - component: {fileID: 1394567365} + - component: {fileID: 1394567364} + 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 &1394567363 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1394567362} + 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: 1096121546} + 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: -35, y: -37.2} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1394567364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1394567362} + 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: "\uC11C\uBE0C\uBBF8\uC158" + 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: 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: 8 + 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: + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + 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: 30.803467, y: 0, z: 26.952942, 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 &1394567365 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1394567362} + m_CullTransparentMesh: 1 --- !u!1 &1399415998 GameObject: m_ObjectHideFlags: 0 @@ -115253,7 +116051,7 @@ RectTransform: 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: 200} + m_AnchoredPosition: {x: -122, y: 200} m_SizeDelta: {x: 0, y: -311.3} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1655609078 @@ -126167,6 +126965,142 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &1755414561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1755414562} + - component: {fileID: 1755414564} + - component: {fileID: 1755414563} + 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 &1755414562 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755414561} + 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: 41425609} + 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: -35, y: -37.2} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1755414563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755414561} + 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: "\uBA54\uC778\uBBF8\uC158" + 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: 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: 8 + 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: + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + 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: 30.803467, y: 0, z: 26.952942, 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 &1755414564 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755414561} + m_CullTransparentMesh: 1 --- !u!1 &1762484555 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/SingletonManagers/Managers/UIManager.cs b/Assets/Scripts/SingletonManagers/Managers/UIManager.cs index 112521e..0e615dc 100644 --- a/Assets/Scripts/SingletonManagers/Managers/UIManager.cs +++ b/Assets/Scripts/SingletonManagers/Managers/UIManager.cs @@ -44,7 +44,6 @@ public enum EPopupType PreViewPopup, PreViewUIPopup, MissionOpenPopup, - MissionSuccessPopup, } public enum EGraphicRaycasterType @@ -112,8 +111,8 @@ public class UIManager : MonoBehaviour } } } - else - HideTopPopup(); + //else + // HideTopPopup(); } } #endregion @@ -397,8 +396,6 @@ public class UIManager : MonoBehaviour return Instantiate(Resources.Load(path + "PreViewUIPopup"), PopupCanvasTransform); case EPopupType.MissionOpenPopup: return Instantiate(Resources.Load(path + "MissionOpenPopup"), PopupCanvasTransform); - case EPopupType.MissionSuccessPopup: - return Instantiate(Resources.Load(path + "MissionSuccessPopup"), PopupCanvasTransform); default: return null; } diff --git a/Assets/Scripts/UI/GamePanel/GamePanel.cs b/Assets/Scripts/UI/GamePanel/GamePanel.cs index b003e83..999da33 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs @@ -23,6 +23,8 @@ public partial class GamePanel : MonoBehaviour public TMPro.TextMeshProUGUI AINameTMP, t_PointMoney; public TMPro.TextMeshProUGUI AIGoldTMP; private List _lstCardSlots; + public MissionOpenPopup_Main m_MissionOpenPopup_Main; + public MissionOpenPopup_Sub m_MissionOpenPopup_Sub; private int _prevScore_Player = 0; private int _prevScore_AI = 0; @@ -77,7 +79,9 @@ public partial class GamePanel : MonoBehaviour { eSubMission.Be3Gwang, 2 } }; public eMainMission CurMission = eMainMission.Max; + bool ShowMainMissionPopup = false; public eSubMission CurSubMission = eSubMission.Max; + bool ShowSubMissionPopup = false; #region MonoBehaviour private void Awake() @@ -289,6 +293,8 @@ public partial class GamePanel : MonoBehaviour case EScoreMutiplyType.Nagari: case EScoreMutiplyType.ClickedFromResultPopup: case EScoreMutiplyType.MeongTeonguri: + case EScoreMutiplyType.MainMission: + case EScoreMutiplyType.SubMission: _hashScoreMultiplyTypes.Add(type); break; case EScoreMutiplyType.Max: @@ -400,6 +406,9 @@ public partial class GamePanel : MonoBehaviour } GameManager.UI.ShowNStackPopup(EPopupType.MissionOpenPopup); + + m_MissionOpenPopup_Main.gameObject.SetActive(true); + m_MissionOpenPopup_Sub.gameObject.SetActive(true); } else { @@ -413,6 +422,9 @@ public partial class GamePanel : MonoBehaviour private void Initialize() { GameManager.Sound.PlayBGM(EBGMType.BGM_2); + m_MissionOpenPopup_Main.gameObject.SetActive(false); + m_MissionOpenPopup_Sub.gameObject.SetActive(false); + ShowMainMissionPopup = ShowSubMissionPopup = false; IsPreview = UseSepYulgget_To_Pee = false; this.GamePanelEnabled(true); go_toppanel.SetActive(false); diff --git a/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs b/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs index 79e04e0..2469371 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs @@ -3,6 +3,7 @@ using CodeJay.Enum; using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using System.Runtime.InteropServices; using UnityEngine; @@ -21,7 +22,7 @@ public class CardTypeComparer : IComparer public partial class GamePanel : MonoBehaviour { private const int FLOOR_CARD_STACK = 6; - + MissionSuccessPopup m_MissionSuccessPopup; public static void ListInitialize(ref List list, int length) { @@ -575,6 +576,28 @@ public partial class GamePanel : MonoBehaviour { ECardScoreType scoreType = Converter.CardTypeToScoreType(type); _lstPlayerScoreCards.Add(type); + + // 메인 미션 체크 + if (CurMission != eMainMission.Max) + { + if (!ShowMainMissionPopup && + MissionOpenPopup_Main.MissionCards.All(card => _lstPlayerScoreCards.Contains(card))) + { + AddMultiplyType(EScoreMutiplyType.MainMission); + ShowMainMissionPopup = MissionSuccessPopup.isMain = true; + if (m_MissionSuccessPopup == null) + { + string path = ResourceManager.PREFAB_PATH + "Popups/"; + m_MissionSuccessPopup = Instantiate(Resources.Load(path + "MissionSuccessPopup"), GameManager.UI.PopupCanvasTransform); + } + m_MissionSuccessPopup.Set(); + } + } + // 서브 미션 체크 + if (CurSubMission != eSubMission.Max) + { + } + switch (scoreType) { case ECardScoreType.Ghwang: diff --git a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs index 980c5eb..46d9f9b 100644 --- a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs +++ b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs @@ -6,13 +6,16 @@ public class MissionOpenPopup_Main : uScrollViewMgr { public TextMeshProUGUI t_rate; + public static List MissionCards; + private void OnEnable() { t_rate.text = $"x{GamePanel.Instance.dic_missionRate[GamePanel.Instance.CurMission]}"; - Set_ScrollView(Get_ShowUICards(GamePanel.Instance.CurMission)); + MissionCards = Get_ShowUICards(GamePanel.Instance.CurMission); + Set_ScrollView(MissionCards); } - List Get_ShowUICards(eMainMission mission) + public List Get_ShowUICards(eMainMission mission) { List lst = new List(); switch (mission) diff --git a/Assets/Scripts/UI/Popup/Mission/MissionSuccessPopup_Set.cs b/Assets/Scripts/UI/Popup/Mission/MissionSuccessPopup_Set.cs new file mode 100644 index 0000000..5cd17c6 --- /dev/null +++ b/Assets/Scripts/UI/Popup/Mission/MissionSuccessPopup_Set.cs @@ -0,0 +1,14 @@ +public class MissionSuccessPopup_Set : uScrollViewMgr +{ + private void OnEnable() + { + if (MissionSuccessPopup.isMain) + { + Set_ScrollView(MissionOpenPopup_Main.MissionCards); + } + else + { + CardBase_AllOff(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/Mission/MissionSuccessPopup_Set.cs.meta b/Assets/Scripts/UI/Popup/Mission/MissionSuccessPopup_Set.cs.meta new file mode 100644 index 0000000..5701561 --- /dev/null +++ b/Assets/Scripts/UI/Popup/Mission/MissionSuccessPopup_Set.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 13838897d1263dc4fac5200f1ca5878d \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/MissionSuccessPopup.cs b/Assets/Scripts/UI/Popup/MissionSuccessPopup.cs new file mode 100644 index 0000000..3435c68 --- /dev/null +++ b/Assets/Scripts/UI/Popup/MissionSuccessPopup.cs @@ -0,0 +1,26 @@ +using System.Collections; +using TMPro; +using UnityEngine; + +public class MissionSuccessPopup : MonoBehaviour +{ + public static bool isMain; + + public TextMeshProUGUI t_mission; + + public void Set() + { + gameObject.SetActive(true); + GameManager.Sound.PlaySFX(ESFXType.Open_Popup); + StartCoroutine(Co_Off()); + + t_mission.text = isMain ? $"메인미션 x{GamePanel.Instance.dic_missionRate[GamePanel.Instance.CurMission]}" : + $"서브미션 x{GamePanel.Instance.dic_submisstionRate[GamePanel.Instance.CurSubMission]}"; + } + + IEnumerator Co_Off() + { + yield return new WaitForSeconds(2.5f); + gameObject.SetActive(false); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/MissionSuccessPopup.cs.meta b/Assets/Scripts/UI/Popup/MissionSuccessPopup.cs.meta new file mode 100644 index 0000000..e34a4b3 --- /dev/null +++ b/Assets/Scripts/UI/Popup/MissionSuccessPopup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2afb405be3672534ba3006b07de45563 \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/ResultPopup.cs b/Assets/Scripts/UI/Popup/ResultPopup.cs index fefeffb..cb83b6c 100644 --- a/Assets/Scripts/UI/Popup/ResultPopup.cs +++ b/Assets/Scripts/UI/Popup/ResultPopup.cs @@ -103,15 +103,16 @@ public class ResultPopup : PopupBase int goNumer = GamePanel.Instance.Player_Go; string str = $"{score}점"; int multiply = 0; + int mission_mul = 0; if (goNumer == 1) { - str += " + 1고(1점) "; + str += " + 1고(1점)"; score += 1; } else if (goNumer == 2) { - str += " + 2고(2점) "; + str += " + 2고(2점)"; score += 2; } else if (goNumer >= 3) @@ -135,16 +136,35 @@ public class ResultPopup : PopupBase val *= GamePanel.Instance.Player_Milgi; else if (multipleType[i] == EScoreMutiplyType.Go) val *= goNumer - 2; - multiply *= val; - list_xinfo.Find(f => f.type == multipleType[i]).mul = val; + + if (multipleType[i] == EScoreMutiplyType.MainMission || multipleType[i] == EScoreMutiplyType.SubMission) + { + if (mission_mul == 0) mission_mul = val; + else mission_mul *= val; + } + else + { + multiply *= val; + list_xinfo.Find(f => f.type == multipleType[i]).mul = val; + } } } - if (multiply > 0) + if (multiply > 0 && mission_mul > 0) + { + t_Cal.text = str + $" x {multiply}배\nx {mission_mul}배(미션) = 총 {score * multiply * mission_mul}점\n"; + _resultTotalGold = score * multiply * mission_mul * GamePanel.Instance.Stake; + } + else if (multiply > 0) { t_Cal.text = str + $" x {multiply}배\n= 총 {score * multiply}점\n"; _resultTotalGold = score * multiply * GamePanel.Instance.Stake; } + else if (mission_mul > 0) + { + t_Cal.text = str + $" x {mission_mul}배(미션)\n= 총 {score * mission_mul}점\n"; + _resultTotalGold = score * mission_mul * GamePanel.Instance.Stake; + } else { t_Cal.text = str + $" \n= 총 {score}점\n"; @@ -254,13 +274,15 @@ public class ResultPopup : PopupBase var val = CodeJay.CodeJayUtility.Utility.GetScoreMultiplyValue(multipleType[i]); if (multipleType[i] == EScoreMutiplyType.Shake) - val *= GamePanel.Instance.Player_Bell; + val *= GamePanel.Instance.AI_Bell; else if (multipleType[i] == EScoreMutiplyType.ClickedFromResultPopup) val *= GamePanel.Instance.Player_Milgi; else if (multipleType[i] == EScoreMutiplyType.Go) val *= goNumer - 2; multiply *= val; - list_xinfo.Find(f => f.type == multipleType[i]).mul = val; + + if (multipleType[i] == EScoreMutiplyType.MainMission || multipleType[i] == EScoreMutiplyType.SubMission) { } + else list_xinfo.Find(f => f.type == multipleType[i]).mul = val; } } diff --git a/Assets/Scripts/Utilities/Enumerations.cs b/Assets/Scripts/Utilities/Enumerations.cs index 3786262..882fa9b 100644 --- a/Assets/Scripts/Utilities/Enumerations.cs +++ b/Assets/Scripts/Utilities/Enumerations.cs @@ -217,6 +217,10 @@ namespace CodeJay Nagari, ClickedFromResultPopup, // 밀기 MeongTeonguri, // 멍텅구리 + + MainMission, + SubMission, + Max } diff --git a/Assets/Scripts/Utilities/Utility.cs b/Assets/Scripts/Utilities/Utility.cs index 2adae13..00f94b2 100644 --- a/Assets/Scripts/Utilities/Utility.cs +++ b/Assets/Scripts/Utilities/Utility.cs @@ -124,6 +124,10 @@ namespace CodeJay return 2; case EScoreMutiplyType.MeongTeonguri: return 2; + case EScoreMutiplyType.MainMission: + return GamePanel.Instance.dic_missionRate[GamePanel.Instance.CurMission]; + case EScoreMutiplyType.SubMission: + return GamePanel.Instance.dic_submisstionRate[GamePanel.Instance.CurSubMission]; default: return 0; }