From 00312495fdf9b5e3ad27963f6df5fc7df8b4026c Mon Sep 17 00:00:00 2001 From: Ino Date: Mon, 14 Apr 2025 08:17:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=A5=EB=B9=84=20=EC=84=BC=ED=84=B0=20?= =?UTF-8?q?=EC=95=84=EB=9E=98=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Equipment/EquipmentCenterInfoCard.prefab | 325 +++++++++++++ .../EquipmentCenterInfoCard.prefab.meta | 7 + Assets/Res_Addr/MainUI/NewGameUI.prefab | 454 ++++++++++++++---- .../UI/Eqiupment/EquipmentCenterInfoCard.cs | 15 + .../Eqiupment/EquipmentCenterInfoCard.cs.meta | 11 + .../Script/UI/Eqiupment/EquipmentItemPopup.cs | 11 +- .../Script/UI/Eqiupment/EquipmentMakePopup.cs | 4 +- Assets/Script/UI/Eqiupment/EquipmentUI.cs | 6 +- Assets/Script/UI/PC/Info/PCInfoStatCard.cs | 2 - 9 files changed, 741 insertions(+), 94 deletions(-) create mode 100644 Assets/ResWork/UIPrefabs/Equipment/EquipmentCenterInfoCard.prefab create mode 100644 Assets/ResWork/UIPrefabs/Equipment/EquipmentCenterInfoCard.prefab.meta create mode 100644 Assets/Script/UI/Eqiupment/EquipmentCenterInfoCard.cs create mode 100644 Assets/Script/UI/Eqiupment/EquipmentCenterInfoCard.cs.meta diff --git a/Assets/ResWork/UIPrefabs/Equipment/EquipmentCenterInfoCard.prefab b/Assets/ResWork/UIPrefabs/Equipment/EquipmentCenterInfoCard.prefab new file mode 100644 index 000000000..f311e7549 --- /dev/null +++ b/Assets/ResWork/UIPrefabs/Equipment/EquipmentCenterInfoCard.prefab @@ -0,0 +1,325 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1144424295860598403 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5039075241228265221} + - component: {fileID: 120496849695218543} + m_Layer: 5 + m_Name: EquipmentCenterInfoCard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5039075241228265221 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1144424295860598403} + 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: 2590563592189853691} + - {fileID: 3101854535332889800} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 435.75, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &120496849695218543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1144424295860598403} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f32abcacb298e845ba9d7916faa07ac, type: 3} + m_Name: + m_EditorClassIdentifier: + texts: + - {fileID: 2938206654599341173} + - {fileID: 4946239666889302094} +--- !u!1 &1478770304597741103 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2590563592189853691} + - component: {fileID: 7052648339460791290} + - component: {fileID: 2938206654599341173} + m_Layer: 5 + m_Name: statname + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2590563592189853691 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478770304597741103} + 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: 5039075241228265221} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 79, y: 0} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7052648339460791290 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478770304597741103} + m_CullTransparentMesh: 1 +--- !u!114 &2938206654599341173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478770304597741103} + 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: STR + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + 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: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: -7 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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!1 &3836449074961627294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3101854535332889800} + - component: {fileID: 6926219985494388135} + - component: {fileID: 4946239666889302094} + m_Layer: 5 + m_Name: statval + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3101854535332889800 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836449074961627294} + 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: 5039075241228265221} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -89.7, y: 0} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6926219985494388135 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836449074961627294} + m_CullTransparentMesh: 1 +--- !u!114 &4946239666889302094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3836449074961627294} + 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: 00 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: -10 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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} diff --git a/Assets/ResWork/UIPrefabs/Equipment/EquipmentCenterInfoCard.prefab.meta b/Assets/ResWork/UIPrefabs/Equipment/EquipmentCenterInfoCard.prefab.meta new file mode 100644 index 000000000..2b4eef3d1 --- /dev/null +++ b/Assets/ResWork/UIPrefabs/Equipment/EquipmentCenterInfoCard.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4db5dac61e2b02b4e89ec4e422fc06b9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 236ac8e7d..f1225669f 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -1829,81 +1829,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 186 ---- !u!1 &104619399030244040 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3409269328062845066} - - component: {fileID: 1606635957414427815} - - component: {fileID: 4301893575571891414} - m_Layer: 5 - m_Name: no - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3409269328062845066 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 104619399030244040} - 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: 2579632502600516791} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1606635957414427815 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 104619399030244040} - m_CullTransparentMesh: 1 ---- !u!114 &4301893575571891414 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 104619399030244040} - 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: 65f581562538e304cbbfe8ee3beab09c, 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: 1 --- !u!1 &110401718919070336 GameObject: m_ObjectHideFlags: 0 @@ -21922,8 +21847,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 05e5b8437e6808845bdfabe5845a36e7, type: 3} m_Name: m_EditorClassIdentifier: - gos_onoff: - - {fileID: 5869502722959881428} m_Card: {fileID: 2597386034399228464} texts_iteminfo: - {fileID: 4314144591713291840} @@ -21955,6 +21878,8 @@ MonoBehaviour: - {fileID: 6693831424728331374} images: - {fileID: 5773786231538357732} + gos_offwhenmoveleft: + - {fileID: 8382453564522224256} --- !u!1 &1778465763048506142 GameObject: m_ObjectHideFlags: 0 @@ -28984,7 +28909,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8888671814135876509 RectTransform: m_ObjectHideFlags: 0 @@ -53681,6 +53606,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &4035798403762654818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 698774278449114548} + - component: {fileID: 3297704190616889401} + - component: {fileID: 6195277681952310588} + m_Layer: 5 + m_Name: New Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &698774278449114548 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4035798403762654818} + 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: 5889366547353068073} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3297704190616889401 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4035798403762654818} + m_CullTransparentMesh: 1 +--- !u!114 &6195277681952310588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4035798403762654818} + 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: 1f4213f1679e640478b781d492e2283d, 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!1 &4036465928966521536 GameObject: m_ObjectHideFlags: 0 @@ -55408,8 +55408,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0e7432bdd1349ae4195d4effcba24e49, type: 3} m_Name: m_EditorClassIdentifier: - gos_onoff: - - {fileID: 8382453564522224256} m_Card: {fileID: 7762068634648654609} texts_iteminfo: - {fileID: 986883333296786315} @@ -55431,6 +55429,8 @@ MonoBehaviour: - {fileID: 3436880251663162829} - {fileID: 862163268484093724} text_equipstatus: {fileID: 7213501934687188887} + gos_onoff: + - {fileID: 8382453564522224256} --- !u!1 &4171149036910023589 GameObject: m_ObjectHideFlags: 0 @@ -73714,6 +73714,83 @@ MonoBehaviour: m_EquipmentItemPopup: {fileID: 3045496747550351632} m_EquipmentPopup: {fileID: 2424877493288058929} m_EquipmentMakePopup: {fileID: 5551366820280862753} +--- !u!1 &5675808042128231397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7625906451708143768} + - component: {fileID: 8244024931474882996} + - component: {fileID: 6076037071343055164} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7625906451708143768 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5675808042128231397} + 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: 4234133346483837442} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &8244024931474882996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5675808042128231397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &6076037071343055164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5675808042128231397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 20 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &5679207674724077063 GameObject: m_ObjectHideFlags: 0 @@ -82876,7 +82953,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1402876061955995860 RectTransform: m_ObjectHideFlags: 0 @@ -83211,7 +83288,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3409269328062845066} - {fileID: 6919743896501049083} - {fileID: 7913127528999160525} - {fileID: 1434535871065357016} @@ -83238,9 +83314,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bcc7972e3134afb488956f69acaeb04d, type: 3} m_Name: m_EditorClassIdentifier: - m_ScrollRect: {fileID: 0} + m_ScrollRect: {fileID: 2311116784344097376} m_Content: {fileID: 0} - go_card: {fileID: 0} + go_card: {fileID: 1144424295860598403, guid: 4db5dac61e2b02b4e89ec4e422fc06b9, type: 3} moneyForms: - {fileID: 136349717601221262} - {fileID: 431095153826774951} @@ -84192,7 +84268,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 78af945fa942be249b5a5d3a82c30de6, type: 3} + m_Sprite: {fileID: 21300000, guid: 28e72c4db9020b044931b075277b3dca, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -100241,7 +100317,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -100632,6 +100708,96 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 354 +--- !u!1 &7925683993314735404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4234133346483837442} + - component: {fileID: 6940030420878526101} + - component: {fileID: 8177825538769122008} + - component: {fileID: 9125558158866294180} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4234133346483837442 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7925683993314735404} + 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: 7625906451708143768} + m_Father: {fileID: 8712890530666661954} + 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, y: 1} +--- !u!222 &6940030420878526101 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7925683993314735404} + m_CullTransparentMesh: 1 +--- !u!114 &8177825538769122008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7925683993314735404} + 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: 65f581562538e304cbbfe8ee3beab09c, 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: 1 +--- !u!114 &9125558158866294180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7925683993314735404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &7941452666555329717 GameObject: m_ObjectHideFlags: 0 @@ -101455,7 +101621,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8534670524448106821 RectTransform: m_ObjectHideFlags: 0 @@ -106877,6 +107043,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2149851915978416675} + - {fileID: 5889366547353068073} m_Father: {fileID: 2579632502600516791} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -109486,6 +109653,43 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8567033565829529425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5889366547353068073} + m_Layer: 5 + m_Name: SimpleInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5889366547353068073 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8567033565829529425} + 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: 698774278449114548} + - {fileID: 8712890530666661954} + m_Father: {fileID: 1434535871065357016} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -64.72, y: 235.52} + m_SizeDelta: {x: 483.74, y: 394.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8568744135292609288 GameObject: m_ObjectHideFlags: 0 @@ -119388,6 +119592,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &9133239369270050718 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8712890530666661954} + - component: {fileID: 6321350948265213588} + - component: {fileID: 2311116784344097376} + m_Layer: 5 + m_Name: scrollview_ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8712890530666661954 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9133239369270050718} + 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: 4234133346483837442} + m_Father: {fileID: 5889366547353068073} + 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: -4.38, y: -10.38} + m_SizeDelta: {x: 422.89, y: 282.39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6321350948265213588 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9133239369270050718} + m_CullTransparentMesh: 1 +--- !u!114 &2311116784344097376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9133239369270050718} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 7625906451708143768} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 4234133346483837442} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &9133757427431203074 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/UI/Eqiupment/EquipmentCenterInfoCard.cs b/Assets/Script/UI/Eqiupment/EquipmentCenterInfoCard.cs new file mode 100644 index 000000000..1dd708287 --- /dev/null +++ b/Assets/Script/UI/Eqiupment/EquipmentCenterInfoCard.cs @@ -0,0 +1,15 @@ +using TMPro; + +public class EquipmentCenterInfoCard : CardBase +{ + public TextMeshProUGUI[] texts; // 0 스탯명, 1 스탯 + + public override void Set(T _base) + { + base.Set(_base); + var stat = DSUtil.StringToEnum(_base.ToString()); + var statinfo = MyValue.Get_ActorStatInfoorNull(eRole.PC); + texts[0].text = MyText.Get_StatName(stat); + texts[1].text = MyText.Get_StatValueText(stat, statinfo.Get_Stat(stat)); + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Eqiupment/EquipmentCenterInfoCard.cs.meta b/Assets/Script/UI/Eqiupment/EquipmentCenterInfoCard.cs.meta new file mode 100644 index 000000000..172b77626 --- /dev/null +++ b/Assets/Script/UI/Eqiupment/EquipmentCenterInfoCard.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6f32abcacb298e845ba9d7916faa07ac +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs b/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs index 266133928..14a1e2c56 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentItemPopup.cs @@ -1,3 +1,4 @@ +using MK.Toon; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -9,11 +10,13 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase // 0 숙련 보너스%, 1 주능력치 이름, 2 주능력치값, 3 숙련도 레벨, 4 숙련도 능력치 이름, 5 숙련도 전, 6 비용, 7 숙련도 후 public TextMeshProUGUI[] texts; public Image[] images; // 0 인챈트 스크롤 + public GameObject[] gos_offwhenmoveleft; EquipmentSlotUpgradeTableData m_ESUTD; EquipItemData m_EquipItemData = new EquipItemData(); Vector2 v3_childpos; + bool bRight = true; protected override void Awake() { @@ -32,7 +35,8 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase Set_UI(); - NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(false); + bRight = true; + NewGameUI.Ins.m_EquipmentUI.Set_Scrollviews(false); } void Set_UI() @@ -87,11 +91,14 @@ public class EquipmentItemPopup : EquipmentPopupItemInfoBase { base.OnClick_Back(); NewGameUI.Ins.m_EquipmentUI.m_EquipmentUI_Enchant.Set_UI(); - NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(true); + NewGameUI.Ins.m_EquipmentUI.Set_Scrollviews(true); + if (!bRight) DSUtil.ActivateGameObjects(gos_offwhenmoveleft); } public void Set_Position(bool right) { // 위치 조절 (좌우) + bRight = right; m_childrect.anchoredPosition = right ? v3_childpos : new Vector2(v3_childpos.x - m_childrect.sizeDelta.x, v3_childpos.y); + if (!right) DSUtil.InActivateGameObjects(gos_offwhenmoveleft); } } \ No newline at end of file diff --git a/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs b/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs index 55dc30a9e..358adb3da 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentMakePopup.cs @@ -23,7 +23,7 @@ public class EquipmentMakePopup : uScrollViewMgr m_Data = data; SelectItem = list_itemdata.Find(f => f.n_ItemID == data.n_EquipID); Set_UI(); - NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(false); + NewGameUI.Ins.m_EquipmentUI.Set_Scrollviews(false); } public override void Set_UI() @@ -133,6 +133,6 @@ public class EquipmentMakePopup : uScrollViewMgr { base.OnClick_Back(); list_itemdata.Clear(); - NewGameUI.Ins.m_EquipmentUI.Set_Scrollview(true); + NewGameUI.Ins.m_EquipmentUI.Set_Scrollviews(true); } } \ No newline at end of file diff --git a/Assets/Script/UI/Eqiupment/EquipmentUI.cs b/Assets/Script/UI/Eqiupment/EquipmentUI.cs index 0174230cb..575012856 100644 --- a/Assets/Script/UI/Eqiupment/EquipmentUI.cs +++ b/Assets/Script/UI/Eqiupment/EquipmentUI.cs @@ -18,6 +18,8 @@ public class EquipmentUI : BotMenuBase new TabUIData{ btnImg_off = "menu tab icon 6", btnImg_on = "menu tab icon 6" }, }; + List list_infostat = new List { eStat.BaseDmg, eStat.MaxHP, eStat.STR, eStat.DEX, eStat.INT, eStat.LUK }; + public override void Set() { base.Set(); @@ -32,9 +34,11 @@ public class EquipmentUI : BotMenuBase if (m_Tab.Get_Index() == 0) m_Tab.Set_Index(1); // 최초 진입 시 인챈트라면 무기로 변경 OnClick_Button(); + + Set_ScrollView(list_infostat); } - public void Set_Scrollview(bool active) + public void Set_Scrollviews(bool active) { if (active) { diff --git a/Assets/Script/UI/PC/Info/PCInfoStatCard.cs b/Assets/Script/UI/PC/Info/PCInfoStatCard.cs index 10ba14d93..3043329f0 100644 --- a/Assets/Script/UI/PC/Info/PCInfoStatCard.cs +++ b/Assets/Script/UI/PC/Info/PCInfoStatCard.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using TMPro; using UnityEngine;