diff --git a/Assets/Resources/Prefabs/Popups/MissionOpenPopup.prefab b/Assets/Resources/Prefabs/Popups/MissionOpenPopup.prefab index 762cce4..9c290a6 100644 --- a/Assets/Resources/Prefabs/Popups/MissionOpenPopup.prefab +++ b/Assets/Resources/Prefabs/Popups/MissionOpenPopup.prefab @@ -77,7 +77,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1012157057992778245 +--- !u!1 &1491925983948497098 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -85,60 +85,104 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2664724291090246819} - - component: {fileID: 840194826554123140} + - component: {fileID: 775031624223466327} + - component: {fileID: 6673567992270329682} + - component: {fileID: 1894224665978943817} + - component: {fileID: 174243877354345722} m_Layer: 5 - m_Name: layout + m_Name: CloseButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2664724291090246819 +--- !u!224 &775031624223466327 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012157057992778245} + m_GameObject: {fileID: 1491925983948497098} 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: 6431746156954127508} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 983587562965887783} + m_Father: {fileID: 8643226523064314600} 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_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 105} + m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &840194826554123140 +--- !u!222 &6673567992270329682 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491925983948497098} + m_CullTransparentMesh: 1 +--- !u!114 &1894224665978943817 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1012157057992778245} + m_GameObject: {fileID: 1491925983948497098} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1c01f2ab08fa29249b1abe0a7243c0c0, 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: 2 +--- !u!114 &174243877354345722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491925983948497098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 14a02640485dabf4d8eeab6b8d0e1f37, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 940095816910355583} + m_TargetAssemblyTypeName: MissionOpenPopup, Assembly-CSharp + m_MethodName: OnClick_OK + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1782169882163037944 GameObject: m_ObjectHideFlags: 0 @@ -173,7 +217,7 @@ RectTransform: 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: 116.1, y: -590.7} + m_AnchoredPosition: {x: 130, y: -606} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8871998945237383189 @@ -570,6 +614,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6431746156954127508} + - component: {fileID: 2993704686656765972} - component: {fileID: 6428149049076151399} - component: {fileID: 5890939258284452875} m_Layer: 5 @@ -592,15 +637,29 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1229759001028992918} + - {fileID: 7015505304877359416} - {fileID: 5038919765706507626} - - {fileID: 2664724291090246819} m_Father: {fileID: 8643226523064314600} 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: -1.763, y: -86} + m_AnchoredPosition: {x: -1.763, y: -20.265991} m_SizeDelta: {x: 472.0013, y: 225.176} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2993704686656765972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3592817914765117302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 529f9157a92578d4cad65a2ad6dfd66a, type: 3} + m_Name: + m_EditorClassIdentifier: + t_msg: {fileID: 2036964112977784320} + t_rate: {fileID: 7849878220754656391} --- !u!222 &6428149049076151399 CanvasRenderer: m_ObjectHideFlags: 0 @@ -735,7 +794,7 @@ RectTransform: 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: 93.3, y: -255} + m_AnchoredPosition: {x: 93.3, y: -189.26599} m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1012925037956551277 @@ -921,6 +980,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5349872405586130481} + - component: {fileID: 940095816910355583} - component: {fileID: 5349872405586130483} - component: {fileID: 5349872405586130492} - component: {fileID: 5349872405586130493} @@ -952,6 +1012,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &940095816910355583 +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: a668217923044aa4bafa553ecccf7dcb, type: 3} + m_Name: + m_EditorClassIdentifier: + go_btn: {fileID: 1491925983948497098} --- !u!222 &5349872405586130483 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1000,6 +1073,142 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &5366751209083916477 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 983587562965887783} + - component: {fileID: 9099650834911731444} + - component: {fileID: 6135476328274134374} + 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 &983587562965887783 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5366751209083916477} + 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: 775031624223466327} + 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: 5} + m_SizeDelta: {x: 0, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9099650834911731444 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5366751209083916477} + m_CullTransparentMesh: 1 +--- !u!114 &6135476328274134374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5366751209083916477} + 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: "\uB2EB\uAE30\n" + 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: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + 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: 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: 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 &6433537263986147596 GameObject: m_ObjectHideFlags: 0 @@ -1306,7 +1515,7 @@ RectTransform: 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: -60.8, y: -262.2} + m_AnchoredPosition: {x: -60.8, y: -196.466} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1045765259349280234 @@ -1417,6 +1626,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2217657234056708561} + - component: {fileID: 2988494459868109256} - component: {fileID: 2736505656579067103} - component: {fileID: 5318717774208858435} m_Layer: 5 @@ -1445,9 +1655,25 @@ RectTransform: 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: -1.763, y: 154.266} + m_AnchoredPosition: {x: -1.763, y: 220} m_SizeDelta: {x: 472.0013, y: 225.176} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2988494459868109256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7574841724744484379} + 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: 4559414874285890658} + go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3} + t_rate: {fileID: 5584150423876022131} --- !u!222 &2736505656579067103 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1598,12 +1824,13 @@ RectTransform: - {fileID: 3295704106133152775} - {fileID: 3402287013493230324} - {fileID: 4926961712814490584} + - {fileID: 775031624223466327} m_Father: {fileID: 5349872405586130481} 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: 529.9343, y: 666.2563} + m_SizeDelta: {x: 529.9343, y: 831.5045} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8643226523064314602 CanvasRenderer: @@ -1779,3 +2006,139 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8726963307754555158 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7015505304877359416} + - component: {fileID: 3108639020859397245} + - component: {fileID: 2036964112977784320} + 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 &7015505304877359416 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8726963307754555158} + 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: 6431746156954127508} + 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: -234, y: -137} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3108639020859397245 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8726963307754555158} + m_CullTransparentMesh: 1 +--- !u!114 &2036964112977784320 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8726963307754555158} + 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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} diff --git a/Assets/Scripts/SingletonManagers/Managers/UIManager.cs b/Assets/Scripts/SingletonManagers/Managers/UIManager.cs index b6b2651..6d917b4 100644 --- a/Assets/Scripts/SingletonManagers/Managers/UIManager.cs +++ b/Assets/Scripts/SingletonManagers/Managers/UIManager.cs @@ -43,6 +43,8 @@ public enum EPopupType AlbumOpenPopup, PreViewPopup, PreViewUIPopup, + MissionOpenPopup, + MissionSuccessPopup, } public enum EGraphicRaycasterType @@ -393,6 +395,10 @@ public class UIManager : MonoBehaviour return Instantiate(Resources.Load(path + "PreViewPopup"), PopupCanvasTransform); case EPopupType.PreViewUIPopup: 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 1453b25..430ad50 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs @@ -1,5 +1,6 @@ using CodeJay.Enum; using System.Collections.Generic; +using System.Linq; using UnityEngine; using Image = UnityEngine.UI.Image; @@ -46,7 +47,7 @@ public partial class GamePanel : MonoBehaviour public int Stake { get; set; } = 100; public bool IsPreview { get; set; } = false; - Dictionary dic_missionRate = new Dictionary + public Dictionary dic_missionRate = new Dictionary { { eMainMission.Godori, 5 }, { eMainMission.Chodan, 3 }, @@ -67,7 +68,7 @@ public partial class GamePanel : MonoBehaviour { eMainMission.All_11, 4 }, { eMainMission.All_12, 4 } }; - Dictionary dic_submisstionRate = new Dictionary + public Dictionary dic_submisstionRate = new Dictionary { { eSubMission.Dobule3, 3 }, { eSubMission.YulGgeut3, 3 }, @@ -75,6 +76,8 @@ public partial class GamePanel : MonoBehaviour { eSubMission.Gwang3, 3 }, { eSubMission.Be3Gwang, 2 } }; + public eMainMission CurMission = eMainMission.Max; + public eSubMission CurSubMission = eSubMission.Max; #region MonoBehaviour private void Awake() @@ -203,7 +206,6 @@ public partial class GamePanel : MonoBehaviour this.FrontBonusCard(); this.SetGuideData(false); this.EnabledPlayerHandRaycast(false); - Set_Mission(); _delay = 0.2f; GameOver = false; CurrentCoroutineType = EGameWorkFlowType.DistributeCard; @@ -379,12 +381,31 @@ public partial class GamePanel : MonoBehaviour void Set_Mission() { - if (DSUtil.RandomTrue(0.1f + GameManager.DB.MissionAddRate)) + //if (DSUtil.RandomTrue(0.1f + GameManager.DB.MissionAddRate)) + if (true) { GameManager.DB.Set_Mission(false); + + { + System.Random rand = new System.Random(); + var keys = dic_missionRate.Keys.ToList(); + CurMission = keys[rand.Next(keys.Count)]; + } + + { + System.Random rand = new System.Random(); + var keys = dic_submisstionRate.Keys.ToList(); + CurSubMission = keys[rand.Next(keys.Count)]; + } + + GameManager.UI.ShowNStackPopup(EPopupType.MissionOpenPopup); } else + { + CurMission = eMainMission.Max; + CurSubMission = eSubMission.Max; GameManager.DB.Set_Mission(true); + } } #region Core diff --git a/Assets/Scripts/UI/GamePanel/GamePanel_DistributeCards.cs b/Assets/Scripts/UI/GamePanel/GamePanel_DistributeCards.cs index 89c20a1..ccea11d 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel_DistributeCards.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel_DistributeCards.cs @@ -226,6 +226,7 @@ public partial class GamePanel : MonoBehaviour this.InitDistributeData(); this.CheckFloorBonus(); _currentCoroutineType = EGameWorkFlowType.DiscardNEffectBeforeDiscard; + if (!GameOver) Set_Mission(); } break; } diff --git a/Assets/Scripts/UI/Popup/Mission.meta b/Assets/Scripts/UI/Popup/Mission.meta new file mode 100644 index 0000000..82682b0 --- /dev/null +++ b/Assets/Scripts/UI/Popup/Mission.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 957e798a8a2520c46bc6ade71c48d262 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs new file mode 100644 index 0000000..980c5eb --- /dev/null +++ b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs @@ -0,0 +1,126 @@ +using CodeJay.Enum; +using System.Collections.Generic; +using TMPro; + +public class MissionOpenPopup_Main : uScrollViewMgr +{ + public TextMeshProUGUI t_rate; + + private void OnEnable() + { + t_rate.text = $"x{GamePanel.Instance.dic_missionRate[GamePanel.Instance.CurMission]}"; + Set_ScrollView(Get_ShowUICards(GamePanel.Instance.CurMission)); + } + + List Get_ShowUICards(eMainMission mission) + { + List lst = new List(); + switch (mission) + { + case eMainMission.Godori: + lst.Add(ECardType.Apr_Bird); + lst.Add(ECardType.Aug_Bird); + lst.Add(ECardType.Feb_Bird); + break; + case eMainMission.Chodan: + lst.Add(ECardType.Apr_Chodan); + lst.Add(ECardType.Jul_Chodan); + lst.Add(ECardType.May_Chodan); + break; + case eMainMission.Hongdan: + lst.Add(ECardType.Feb_Hongdan); + lst.Add(ECardType.Jan_Hongdan); + lst.Add(ECardType.Mar_Hongdan); + break; + case eMainMission.Chungdan: + lst.Add(ECardType.Jun_Chungdan); + lst.Add(ECardType.Oct_Chungdan); + lst.Add(ECardType.Sep_Chungdan); + break; + case eMainMission.Gwang5: + case eMainMission.Gwang4: + lst.Add(ECardType.Aug_Ghwang); + lst.Add(ECardType.Dec_Ghwang); + lst.Add(ECardType.Jan_Ghwang); + lst.Add(ECardType.Nov_Ghwang); + lst.Add(ECardType.Mar_Ghwang); + break; + case eMainMission.All_1: + lst.Add(ECardType.Jan_Ghwang); + lst.Add(ECardType.Jan_Hongdan); + lst.Add(ECardType.Jan_Normal_1); + lst.Add(ECardType.Jan_Normal_2); + break; + case eMainMission.All_2: + lst.Add(ECardType.Feb_Bird); + lst.Add(ECardType.Feb_Hongdan); + lst.Add(ECardType.Feb_Normal_1); + lst.Add(ECardType.Feb_Normal_2); + break; + case eMainMission.All_3: + lst.Add(ECardType.Mar_Ghwang); + lst.Add(ECardType.Mar_Hongdan); + lst.Add(ECardType.Mar_Normal_1); + lst.Add(ECardType.Mar_Normal_2); + break; + case eMainMission.All_4: + lst.Add(ECardType.Apr_Bird); + lst.Add(ECardType.Apr_Chodan); + lst.Add(ECardType.Apr_Normal_1); + lst.Add(ECardType.Apr_Normal_2); + break; + case eMainMission.All_5: + lst.Add(ECardType.May_Yulkkeut); + lst.Add(ECardType.May_Chodan); + lst.Add(ECardType.May_Normal_1); + lst.Add(ECardType.May_Normal_2); + break; + case eMainMission.All_6: + lst.Add(ECardType.Jun_Yulkkeut); + lst.Add(ECardType.Jun_Chungdan); + lst.Add(ECardType.Jun_Normal_1); + lst.Add(ECardType.Jun_Normal_2); + break; + case eMainMission.All_7: + lst.Add(ECardType.Jul_Yulkkeut); + lst.Add(ECardType.Jul_Chodan); + lst.Add(ECardType.Jul_Normal_1); + lst.Add(ECardType.Jul_Normal_2); + break; + case eMainMission.All_8: + lst.Add(ECardType.Aug_Ghwang); + lst.Add(ECardType.Aug_Bird); + lst.Add(ECardType.Aug_Normal_1); + lst.Add(ECardType.Aug_Normal_2); + break; + case eMainMission.All_9: + lst.Add(ECardType.Sep_Yulkkeut); + lst.Add(ECardType.Sep_Chungdan); + lst.Add(ECardType.Sep_Normal_1); + lst.Add(ECardType.Sep_Normal_2); + break; + case eMainMission.All_10: + lst.Add(ECardType.Oct_Yulkkeut); + lst.Add(ECardType.Oct_Chungdan); + lst.Add(ECardType.Oct_Normal_1); + lst.Add(ECardType.Oct_Normal_2); + break; + case eMainMission.All_11: + lst.Add(ECardType.Nov_Ghwang); + lst.Add(ECardType.Nov_Yulgget); + lst.Add(ECardType.Nov_Tee); + lst.Add(ECardType.Nov_Double); + break; + case eMainMission.All_12: + lst.Add(ECardType.Dec_Ghwang); + lst.Add(ECardType.Dec_Double); + lst.Add(ECardType.Dec_Pee_1); + lst.Add(ECardType.Dec_Pee_2); + break; + + case eMainMission.Max: + break; + } + return lst; + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs.meta b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs.meta new file mode 100644 index 0000000..4e8560c --- /dev/null +++ b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 20c1b070134a6d246bc05b8f385d7cec \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs new file mode 100644 index 0000000..e187264 --- /dev/null +++ b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs @@ -0,0 +1,33 @@ +using CodeJay.Enum; +using TMPro; +using UnityEngine; + +public class MissionOpenPopup_Sub : MonoBehaviour +{ + public TextMeshProUGUI t_msg, t_rate; + + private void OnEnable() + { + t_rate.text = $"x{GamePanel.Instance.dic_submisstionRate[GamePanel.Instance.CurSubMission]}"; + t_msg.text = Get_ShowUIText(GamePanel.Instance.CurSubMission); + } + + string Get_ShowUIText(eSubMission mission) + { + switch (mission) + { + case eSubMission.Dobule3: + return "쌍피 3개 수집"; + case eSubMission.YulGgeut3: + return "랜덤 열끗 3종 수집"; + case eSubMission.Ddee3: + return "랜덤 띠 3종 수집"; + case eSubMission.Gwang3: + return "랜덤 삼광 수집"; + case eSubMission.Be3Gwang: + return "랜덤 비삼광 수집"; + } + + return ""; + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs.meta b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs.meta new file mode 100644 index 0000000..e3e383d --- /dev/null +++ b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 529f9157a92578d4cad65a2ad6dfd66a \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/MissionOpenPopup.cs b/Assets/Scripts/UI/Popup/MissionOpenPopup.cs new file mode 100644 index 0000000..7fd9c5d --- /dev/null +++ b/Assets/Scripts/UI/Popup/MissionOpenPopup.cs @@ -0,0 +1,26 @@ +using System.Collections; +using UnityEngine; + +public class MissionOpenPopup : PopupBase +{ + public GameObject go_btn; + + public override void ShowPopup(int drawOrder) + { + base.ShowPopup(drawOrder); + GameManager.Sound.PlaySFX(ESFXType.Open_Popup); + StartCoroutine(Co_Off()); + } + + IEnumerator Co_Off() + { + go_btn.SetActive(false); + yield return new WaitForSeconds(2.5f); + go_btn.SetActive(true); + } + + public void OnClick_OK() + { + GameManager.UI.HideTopPopup(); + } +} \ No newline at end of file diff --git a/Assets/Scripts/UI/Popup/MissionOpenPopup.cs.meta b/Assets/Scripts/UI/Popup/MissionOpenPopup.cs.meta new file mode 100644 index 0000000..ee6d743 --- /dev/null +++ b/Assets/Scripts/UI/Popup/MissionOpenPopup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a668217923044aa4bafa553ecccf7dcb \ No newline at end of file diff --git a/Assets/UI/고스톱 미션 팝업 스샷.png b/Assets/UI/고스톱 미션 팝업 스샷.png deleted file mode 100644 index 63bbcad..0000000 Binary files a/Assets/UI/고스톱 미션 팝업 스샷.png and /dev/null differ diff --git a/Assets/UI/고스톱 미션 팝업 스샷.png.meta b/Assets/UI/고스톱 미션 팝업 스샷.png.meta deleted file mode 100644 index 1e660c6..0000000 --- a/Assets/UI/고스톱 미션 팝업 스샷.png.meta +++ /dev/null @@ -1,156 +0,0 @@ -fileFormatVersion: 2 -guid: 6af58ed7359098848aeb5f44362d1b78 -TextureImporter: - internalIDToNameTable: - - first: - 213: -1591001477051366837 - second: "\uACE0\uC2A4\uD1B1 \uBBF8\uC158 \uD31D\uC5C5 \uC2A4\uC0F7_0" - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: "\uACE0\uC2A4\uD1B1 \uBBF8\uC158 \uD31D\uC5C5 \uC2A4\uC0F7_0" - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1100 - height: 1920 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: b424b3b0690abe9e0800000000000000 - internalID: -1591001477051366837 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - "\uACE0\uC2A4\uD1B1 \uBBF8\uC158 \uD31D\uC5C5 \uC2A4\uC0F7_0": -1591001477051366837 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: