fgb_ino
/
RandomGFGoStop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

메인 미션도 조건을 텍스트로 제공

This commit is contained in:
Ino 2025-09-18 03:45:21 +09:00
parent 9b7b0c2fe4
commit 15388414a8
2 changed files with 156 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
Assets/Resources/Prefabs/Popups/MissionOpenPopup.prefab
View File

@ -1711,6 +1711,142 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &5940786366492257838
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4811658709864950729}
- component: {fileID: 2921491372298425229}
- component: {fileID: 6165625473146580651}
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 &4811658709864950729
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5940786366492257838}
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: 2217657234056708561}
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: -18.9, y: -30.5}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2921491372298425229
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5940786366492257838}
m_CullTransparentMesh: 1
--- !u!114 &6165625473146580651
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5940786366492257838}
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: 4281808700
m_fontColor: {r: 0.23529412, g: 0.21568628, b: 0.21568628, 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: -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:
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: 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
@ -2226,6 +2362,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8643226524284132483}
- {fileID: 4811658709864950729}
- {fileID: 5559087630162874095}
- {fileID: 3548041208066617114}
- {fileID: 6614862268398327597}
@ -2253,6 +2390,7 @@ MonoBehaviour:
m_Content: {fileID: 4559414874285890658}
go_card: {fileID: 8311175157444695672, guid: 663e18f98f297f547a0729aca0f70b7e, type: 3}
t_rate: {fileID: 5584150423876022131}
t_desc: {fileID: 6165625473146580651}
--- !u!222 &2736505656579067103
CanvasRenderer:
m_ObjectHideFlags: 0

19
Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs
View File

@ -4,7 +4,7 @@ using TMPro;
public class MissionOpenPopup_Main : uScrollViewMgr
{
public TextMeshProUGUI t_rate;
public TextMeshProUGUI t_rate, t_desc;
public static List<ECardType> MissionCards;
@ -30,21 +30,25 @@ public class MissionOpenPopup_Main : uScrollViewMgr
lst.Add(ECardType.Apr_Bird);
lst.Add(ECardType.Aug_Bird);
lst.Add(ECardType.Feb_Bird);
t_desc.text = "고도리 수집";
break;
case eMainMission.Chodan:
lst.Add(ECardType.Apr_Chodan);
lst.Add(ECardType.Jul_Chodan);
lst.Add(ECardType.May_Chodan);
t_desc.text = "초단 수집";
break;
case eMainMission.Hongdan:
lst.Add(ECardType.Feb_Hongdan);
lst.Add(ECardType.Jan_Hongdan);
lst.Add(ECardType.Mar_Hongdan);
t_desc.text = "홍단 수집";
break;
case eMainMission.Chungdan:
lst.Add(ECardType.Jun_Chungdan);
lst.Add(ECardType.Oct_Chungdan);
lst.Add(ECardType.Sep_Chungdan);
t_desc.text = "청단 수집";
break;
case eMainMission.Gwang5:
case eMainMission.Gwang4:
@ -53,78 +57,91 @@ public class MissionOpenPopup_Main : uScrollViewMgr
lst.Add(ECardType.Jan_Ghwang);
lst.Add(ECardType.Nov_Ghwang);
lst.Add(ECardType.Mar_Ghwang);
t_desc.text = mission == eMainMission.Gwang4 ? "4광 수집" : "5광 수집";
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);
t_desc.text = "송학 수집";
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);
t_desc.text = "매화 수집";
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);
t_desc.text = "벚꽃 수집";
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);
t_desc.text = "흑싸리 수집";
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);
t_desc.text = "난초 수집";
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);
t_desc.text = "모란 수집";
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);
t_desc.text = "홍싸리 수집";
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);
t_desc.text = "공산 수집";
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);
t_desc.text = "국화 수집";
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);
t_desc.text = "단풍 수집";
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);
t_desc.text = "오동 수집";
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);
t_desc.text = "비 수집";
break;
case eMainMission.Max: