From 3f8f50a0e5a5955a98ff6cdfc243600e1cf32ee2 Mon Sep 17 00:00:00 2001 From: Ino Date: Tue, 16 Sep 2025 12:19:51 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=B8=EC=85=98=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EB=B0=8F=20=EC=95=A8=EB=B2=94=20=EB=93=9C=EB=9E=98=EA=B7=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Main.unity | 1205 ++++------------- Assets/Scripts/UI/GamePanel/GamePanel.cs | 23 +- .../UI/GamePanel/GamePanel_FlipCenterCard.cs | 44 +- Assets/Scripts/UI/Popup/MissionOpenPopup.cs | 4 +- Assets/UI/ShowAlbum/CameraDragMove.cs | 2 - Assets/UI/ShowAlbum/ShowPanel.cs | 7 +- 6 files changed, 313 insertions(+), 972 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 0b6775e..3f0b284 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -194,6 +194,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 13707858} m_CullTransparentMesh: 1 +--- !u!1 &24211588 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 24211589} + - component: {fileID: 24211592} + - component: {fileID: 24211591} + - component: {fileID: 24211590} + m_Layer: 5 + m_Name: btn_mission + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &24211589 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24211588} + 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: 855832802} + m_Father: {fileID: 2078817707} + 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: -411, y: 80} + m_SizeDelta: {x: 200, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &24211590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24211588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 24211591} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 771770703} + m_TargetAssemblyTypeName: GamePanel, Assembly-CSharp + m_MethodName: OnClick_Mission + 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!114 &24211591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24211588} + 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: 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: 6facc842ead05744184e7db7ba064b48, 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 &24211592 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24211588} + m_CullTransparentMesh: 1 --- !u!1 &30593272 GameObject: m_ObjectHideFlags: 0 @@ -451,101 +584,6 @@ 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 &56333176 GameObject: m_ObjectHideFlags: 0 @@ -1804,142 +1842,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71182d4f46b120048b0b05c13189fcf3, type: 3} m_Name: m_EditorClassIdentifier: ---- !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 @@ -10320,8 +10222,6 @@ 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} @@ -23833,68 +23733,6 @@ 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 @@ -32187,13 +32025,12 @@ MonoBehaviour: CardSlotPrefab: {fileID: 8311175157444695672, guid: 35d59081fc3bc2a418fe56d3e0969df1, type: 3} go_toppanel: {fileID: 302272076} go_previewbtn: {fileID: 663523003} + go_missionbtn: {fileID: 24211588} cg: {fileID: 771770705} i_ai: {fileID: 1632661773} 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} @@ -33277,6 +33114,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 853378250} m_CullTransparentMesh: 1 +--- !u!1 &855832801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 855832802} + - component: {fileID: 855832804} + - component: {fileID: 855832803} + m_Layer: 5 + m_Name: btnName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &855832802 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855832801} + 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: 24211589} + 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!114 &855832803 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855832801} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uBBF8\uC158\uBCF4\uAE30" + 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: 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: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &855832804 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855832801} + m_CullTransparentMesh: 1 --- !u!1 &858961991 GameObject: m_ObjectHideFlags: 0 @@ -51792,142 +51765,6 @@ 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 @@ -52362,99 +52199,6 @@ 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 @@ -54480,142 +54224,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1196810985} 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 @@ -71548,142 +71156,6 @@ 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 &1396096142 GameObject: m_ObjectHideFlags: 0 @@ -91812,142 +91284,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1741261285} m_CullTransparentMesh: 1 ---- !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 &1762333582 GameObject: m_ObjectHideFlags: 0 @@ -115602,6 +114938,7 @@ RectTransform: m_Children: - {fileID: 1046502943} - {fileID: 1069600974} + - {fileID: 24211589} m_Father: {fileID: 330455276} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} diff --git a/Assets/Scripts/UI/GamePanel/GamePanel.cs b/Assets/Scripts/UI/GamePanel/GamePanel.cs index 4eeee7c..b2a32ae 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs @@ -1,5 +1,4 @@ using CodeJay.Enum; -using NUnit.Framework; using System.Collections.Generic; using System.Linq; using UnityEngine; @@ -18,14 +17,12 @@ public partial class GamePanel : MonoBehaviour public static float GameSpeed = 1f; public static GamePanel Instance; - public GameObject CardSlotPrefab, go_toppanel, go_previewbtn; + public GameObject CardSlotPrefab, go_toppanel, go_previewbtn, go_missionbtn; public CanvasGroup cg; public Image i_ai; 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; @@ -393,7 +390,7 @@ public partial class GamePanel : MonoBehaviour void Set_Mission() { if (DSUtil.RandomTrue(0.1f + GameManager.DB.MissionAddRate)) - //if (true) // 테스트 : 미션 100% + //if (true) // 테스트 : 미션 100% { GameManager.DB.Set_Mission(false); @@ -415,29 +412,33 @@ public partial class GamePanel : MonoBehaviour CurSubMission = keys[rand.Next(keys.Count)]; } + MissionOpenPopup.NeedBtn = true; GameManager.UI.ShowNStackPopup(EPopupType.MissionOpenPopup); - - // TODO 정인호 : 승우님이 변경한다고 하셔서 일단 미션 UI 끔 - //m_MissionOpenPopup_Main.gameObject.SetActive(true); - //m_MissionOpenPopup_Sub.gameObject.SetActive(true); + go_missionbtn.SetActive(true); } else { CurMission = eMainMission.Max; CurSubMission = eSubMission.Max; GameManager.DB.Set_Mission(true); + go_missionbtn.SetActive(false); } go_previewbtn.SetActive(true); } + public void OnClick_Mission() + { + MissionOpenPopup.NeedBtn = false; + GameManager.UI.ShowNStackPopup(EPopupType.MissionOpenPopup); + } + #region Core private void Initialize() { GameManager.Sound.PlayBGM(EBGMType.BGM_2); go_previewbtn.SetActive(false); - m_MissionOpenPopup_Main.gameObject.SetActive(false); - m_MissionOpenPopup_Sub.gameObject.SetActive(false); + go_missionbtn.SetActive(false); ShowMainMissionPopup = ShowSubMissionPopup = false; IsPreview = UseSepYulgget_To_Pee = false; this.GamePanelEnabled(true); diff --git a/Assets/Scripts/UI/GamePanel/GamePanel_FlipCenterCard.cs b/Assets/Scripts/UI/GamePanel/GamePanel_FlipCenterCard.cs index f870013..a9c3d9a 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel_FlipCenterCard.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel_FlipCenterCard.cs @@ -36,7 +36,7 @@ public partial class GamePanel : MonoBehaviour { switch (_flipCenterState) { - // ī带 ´. + // ī�带 �����´�. case EFlipCenterState.FlipCenterCard: { for (int i = 0; i < _lstCardSlots.Count; i++) @@ -48,7 +48,7 @@ public partial class GamePanel : MonoBehaviour } } - // ʽ ī + // ���ʽ� ī���� if (_flipedCardSlot.CardType == ECardType.Bonus_1 || _flipedCardSlot.CardType == ECardType.Bonus_2 || _flipedCardSlot.CardType == ECardType.Bonus_3) { RectTransform rt = null; @@ -68,12 +68,12 @@ public partial class GamePanel : MonoBehaviour _lstAvailableCardTypes.Add(_flipedCardSlot.CardType); _delay = CardSlot.TWEEN_FROM_CENTER_TO_FLOOR; } - // ߾ ī嵦 ī尡 '' ī + // �߾� ī�嵦���� ������ ī�尡 '������' ī���� else if (_flipedCardSlot.CardType == ECardType.FlipCard_1 || _flipedCardSlot.CardType == ECardType.FlipCard_2) { LogicalError($"{nameof(FlipCenterStateMachine)} Fliped Card Can't be FlipCard_1 or FlipCard_2"); } - // ī ߾ ī嵦 ī '' ġѴٸ + // ������ ī��� �߾� ī�嵦���� ������ ī���� '��'�� ��ġ�Ѵٸ� else if (_discardSlot != null && _discardSlot.MonthType == _flipedCardSlot.MonthType) { GameManager.Sound.ReserveSFX(ESFXType.FlipCard_Hit, CardSlot.TWEEN_DURATION); @@ -82,7 +82,7 @@ public partial class GamePanel : MonoBehaviour _flipCenterState = EFlipCenterState.MatchedWithDiscardType; _delay = CardSlot.TWEEN_FROM_CENTER_TO_FLOOR; } - // + // �� �� else { GameManager.Sound.ReserveSFX(ESFXType.Card_NoHit, CardSlot.TWEEN_DURATION); @@ -97,7 +97,7 @@ public partial class GamePanel : MonoBehaviour { var matchedFloorCards = GetMatchedCardSlots(ECardLocationType.Floor, _flipedCardSlot.MonthType); - // Ա + // �� �Ա� if (matchedFloorCards.Count == 4) { EEffectDirectType effectType = EEffectDirectType.Max; @@ -127,7 +127,7 @@ public partial class GamePanel : MonoBehaviour for (int i = 0; i < matchedFloorCards.Count; i++) _lstAvailableCardTypes.Add(matchedFloorCards[i].CardType); - // ִ ʽī嵵 ´. + // ���� �ִ� ���ʽ�ī�嵵 �����´�. if (_dicReservedBonusCard.ContainsKey(ECardType.Bonus_1)) { if (_dicReservedBonusCard[ECardType.Bonus_1] == _flipedCardSlot.MonthType) @@ -149,13 +149,13 @@ public partial class GamePanel : MonoBehaviour _flipCenterIndex = 0; _flipCenterState = EFlipCenterState.Complete; } - // ִ. + // ������ �� �ִ�. else if (matchedFloorCards.Count == 3) { ECardType leftCard = ECardType.Max; ECardType rightCard = ECardType.Max; - // ī + // ������ ī�� ���� for (int i = 0; i < matchedFloorCards.Count; i++) { if (matchedFloorCards[i].CardType == _flipedCardSlot.CardType) @@ -176,7 +176,7 @@ public partial class GamePanel : MonoBehaviour bool isDoublePee_left = CodeJay.CodeJayUtility.Utility.IsDoublePee(leftCard, UseSepYulgget_To_Pee); bool isDoublePee_right = CodeJay.CodeJayUtility.Utility.IsDoublePee(rightCard, UseSepYulgget_To_Pee); - // ǰ ƴϰ ī尡 '' + // ���ǰ� �ƴϰ� ��� ī�尡 �� �� '��' �� �� if (isDoublePee_left == false && isDoublePee_right == false && leftScoreType == ECardScoreType.Pee && rightScoreType == ECardScoreType.Pee) { CardSelectCallback_Flip(Random.Range(0, 2) == 0 ? leftCard : rightCard); @@ -201,14 +201,14 @@ public partial class GamePanel : MonoBehaviour } } } - // ٴп ġ + // �ٴ��п� ��ġ�� else if (matchedFloorCards.Count == 2) { _lstAvailableCardTypes.Add(matchedFloorCards[0].CardType); _lstAvailableCardTypes.Add(matchedFloorCards[1].CardType); _flipCenterState = EFlipCenterState.Complete; } - // ġ . + // ��ġ���� ����. else if (matchedFloorCards.Count == 1) { _flipCenterState = EFlipCenterState.Complete; @@ -219,19 +219,19 @@ public partial class GamePanel : MonoBehaviour } } break; - // ī '' ̶ + // ������ ī��� ������ '��' �̶�� case EFlipCenterState.MatchedWithDiscardType: { int matchedCardNumber = GetMatchedCardSlotNumber(ECardLocationType.Floor, _flipedCardSlot.MonthType); - // ! + // ����! if (matchedCardNumber == 4) { EffectPanel.Direct(EEffectDirectType.Ddadak, PlayerTurn); _delay = EffectPanel.GetEffectDuration(EEffectDirectType.Ddadak); _dicBbug_State.Remove(_flipedCardSlot.MonthType); - // ߺ ʵ ش. + // �ߺ����� �ʵ��� ����ش�. _lstAvailableCardTypes.Clear(); for (int i = 0; i < _lstCardSlots.Count; i++) @@ -239,7 +239,7 @@ public partial class GamePanel : MonoBehaviour if (_lstCardSlots[i].MonthType == _flipedCardSlot.MonthType) _lstAvailableCardTypes.Add(_lstCardSlots[i].CardType); - // ٴ п ִ ڻߴ Ÿ ī鿡 ʽī尡 ִٸ ֵ ߰Ѵ. + // �ٴ� �п� �ִ� �ڻ��ߴ� �� Ÿ�� ī��鿡 ���ʽ�ī�尡 �ִٸ� ������ �� �ֵ��� �߰��Ѵ�. if (_dicReservedBonusCard.ContainsKey(_lstCardSlots[i].CardType) && _dicReservedBonusCard[_lstCardSlots[i].CardType] == _flipedCardSlot.MonthType) { @@ -250,7 +250,7 @@ public partial class GamePanel : MonoBehaviour _flipCenterState = EFlipCenterState.Complete; } - // + // �� else if (matchedCardNumber == 3) { if (PlayerTurn) @@ -270,7 +270,7 @@ public partial class GamePanel : MonoBehaviour GameManager.Event.InvokeEvent(EEventType.OnSynchronizeGameData); - // ֵ Ƴ Ʈ ش. + // ������ �� �ֵ��� ��Ƴ��� ����Ʈ�� ����ش�. _lstAvailableCardTypes.Clear(); _flipCenterState = EFlipCenterState.WaitforBbugDirect; @@ -305,7 +305,7 @@ public partial class GamePanel : MonoBehaviour } } break; - // '' ٸ. + // '��'������ ��ٸ���. case EFlipCenterState.WaitforBbugDirect: if (PlayerTurn) { @@ -332,14 +332,14 @@ public partial class GamePanel : MonoBehaviour } break; - // ùϰ ˾ ٸ. + // ù���ϰ�� �˾��� ������ ������ ��ٸ���. case EFlipCenterState.WaitforBbugPopupClose: if (GameManager.UI.IsAnyPopupOpened() == false) { _flipCenterState = EFlipCenterState.Complete; } break; - // ī ٸ. + // ī�� ������ ��ٸ���. case EFlipCenterState.WaitForCardSelect: if (GameManager.UI.IsAnyPopupOpened() == false) { @@ -353,7 +353,7 @@ public partial class GamePanel : MonoBehaviour _flipCenterState = EFlipCenterState.Complete; } break; - // Ϸ + // �Ϸ� case EFlipCenterState.Complete: { this._flipCenterIndex = 0; diff --git a/Assets/Scripts/UI/Popup/MissionOpenPopup.cs b/Assets/Scripts/UI/Popup/MissionOpenPopup.cs index 7fd9c5d..3641270 100644 --- a/Assets/Scripts/UI/Popup/MissionOpenPopup.cs +++ b/Assets/Scripts/UI/Popup/MissionOpenPopup.cs @@ -3,6 +3,7 @@ using UnityEngine; public class MissionOpenPopup : PopupBase { + public static bool NeedBtn; public GameObject go_btn; public override void ShowPopup(int drawOrder) @@ -16,7 +17,8 @@ public class MissionOpenPopup : PopupBase { go_btn.SetActive(false); yield return new WaitForSeconds(2.5f); - go_btn.SetActive(true); + if (NeedBtn) go_btn.SetActive(true); + else OnClick_OK(); } public void OnClick_OK() diff --git a/Assets/UI/ShowAlbum/CameraDragMove.cs b/Assets/UI/ShowAlbum/CameraDragMove.cs index b9f8758..d0da267 100644 --- a/Assets/UI/ShowAlbum/CameraDragMove.cs +++ b/Assets/UI/ShowAlbum/CameraDragMove.cs @@ -45,8 +45,6 @@ public class CameraDragMove : MonoBehaviour void ProcessInput(bool began, bool moved, bool ended, Vector3 position) { - if (!m_ShowPanel.isFull) return; - if (began) { lastTouchPos = position; diff --git a/Assets/UI/ShowAlbum/ShowPanel.cs b/Assets/UI/ShowAlbum/ShowPanel.cs index 4ee1415..0ff4dbf 100644 --- a/Assets/UI/ShowAlbum/ShowPanel.cs +++ b/Assets/UI/ShowAlbum/ShowPanel.cs @@ -71,8 +71,11 @@ public class ShowPanel : MonoBehaviour m_Cam.transform.position = new Vector3(0f, 0f, -10f); break; case 4: // UI 다시 보이기 - isFull = false; - go_btns.SetActive(true); + if (isFull) + { + isFull = false; + go_btns.SetActive(true); + } break; } }