From 1330cc35f1f761fc290156bb465944930cf6c069 Mon Sep 17 00:00:00 2001 From: Ino Date: Fri, 14 Feb 2025 13:54:23 +0900 Subject: [PATCH] =?UTF-8?q?pc=20ui=20=EC=9E=91=EC=97=85=20=EC=A4=91...=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{frame.png => statinfo_frame.png} | Bin ...frame.png.meta => statinfo_frame.png.meta} | 4 +- .../tab menu selected.png.meta | 4 +- .../Image/Hero Management/tab menu.png.meta | 4 +- Assets/Res_Addr/MainUI/NewGameUI.prefab | 1115 ++++++++--------- Assets/Script/UI/Base/TabCardBase.cs | 14 +- Assets/Script/UI/Base/TabUIBase.cs | 2 - Assets/Script/UI/PC/Info/PCInfoUI_Center.cs | 8 +- Assets/Script/UI/PC/Info/PCInfoUI_Left.cs | 30 +- Assets/Script/UI/PC/PCUI.cs | 3 - 10 files changed, 550 insertions(+), 634 deletions(-) rename Assets/ResWork/UI/Image/Hero Management/{frame.png => statinfo_frame.png} (100%) rename Assets/ResWork/UI/Image/Hero Management/{frame.png.meta => statinfo_frame.png.meta} (98%) diff --git a/Assets/ResWork/UI/Image/Hero Management/frame.png b/Assets/ResWork/UI/Image/Hero Management/statinfo_frame.png similarity index 100% rename from Assets/ResWork/UI/Image/Hero Management/frame.png rename to Assets/ResWork/UI/Image/Hero Management/statinfo_frame.png diff --git a/Assets/ResWork/UI/Image/Hero Management/frame.png.meta b/Assets/ResWork/UI/Image/Hero Management/statinfo_frame.png.meta similarity index 98% rename from Assets/ResWork/UI/Image/Hero Management/frame.png.meta rename to Assets/ResWork/UI/Image/Hero Management/statinfo_frame.png.meta index b45b645d0..9c0e1591c 100644 --- a/Assets/ResWork/UI/Image/Hero Management/frame.png.meta +++ b/Assets/ResWork/UI/Image/Hero Management/statinfo_frame.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 36, y: 34, z: 36, w: 35} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -139,7 +139,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/ResWork/UI/Image/Hero Management/tab menu selected.png.meta b/Assets/ResWork/UI/Image/Hero Management/tab menu selected.png.meta index a5576cb0a..6cb60156e 100644 --- a/Assets/ResWork/UI/Image/Hero Management/tab menu selected.png.meta +++ b/Assets/ResWork/UI/Image/Hero Management/tab menu selected.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 29, y: 0, z: 31, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -139,7 +139,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/ResWork/UI/Image/Hero Management/tab menu.png.meta b/Assets/ResWork/UI/Image/Hero Management/tab menu.png.meta index 70af902ad..c00a1e6c8 100644 --- a/Assets/ResWork/UI/Image/Hero Management/tab menu.png.meta +++ b/Assets/ResWork/UI/Image/Hero Management/tab menu.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 28, y: 0, z: 30, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -139,7 +139,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 1aabc4d21..a405fabcb 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -978,7 +978,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &42553751937855882 RectTransform: m_ObjectHideFlags: 0 @@ -1627,6 +1627,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5b90565ce35523545a46489568526eab, type: 3} m_Name: m_EditorClassIdentifier: + m_TabType: 1 + BGImage_on: menu button selected + BGImage_off: menu button m_btn: {fileID: 5070920712555401613} images: - {fileID: 514891671830049397} @@ -2483,6 +2486,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5b90565ce35523545a46489568526eab, type: 3} m_Name: m_EditorClassIdentifier: + m_TabType: 0 + BGImage_on: + BGImage_off: m_btn: {fileID: 2473267414752911389} images: - {fileID: 3328441855691890286} @@ -9044,12 +9050,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 888160102046605469} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 7404742651207184332} + m_Father: {fileID: 8112082934472033055} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -9966,14 +9972,14 @@ RectTransform: m_GameObject: {fileID: 960534204794333225} 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 351039660577574170} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 113, y: -116} + m_AnchoredPosition: {x: -12, y: -474} m_SizeDelta: {x: -1344, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5977996914865968978 @@ -9991,7 +9997,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 960534204794333225} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: @@ -12399,6 +12405,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1153663284684282688 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 364746322244566119} + - component: {fileID: 9193815072639050993} + - component: {fileID: 291279145226532724} + m_Layer: 5 + m_Name: btnName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &364746322244566119 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153663284684282688} + 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: 6701916581349014572} + 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 &9193815072639050993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153663284684282688} + m_CullTransparentMesh: 1 +--- !u!114 &291279145226532724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153663284684282688} + 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: "\uC2A4\uD0EF \uAD00\uB9AC" + 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: 4279707977 + m_fontColor: {r: 0.28627452, g: 0.16078432, b: 0.09019608, 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: 2 + 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 &1161924939343951558 GameObject: m_ObjectHideFlags: 0 @@ -14057,6 +14198,64 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1283868943132233366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6701916581349014572} + - component: {fileID: 4725012850620387773} + m_Layer: 5 + m_Name: tab_ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6701916581349014572 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283868943132233366} + 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: 5410445780674710691} + - {fileID: 364746322244566119} + m_Father: {fileID: 1881378857997459856} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 102.5, y: -26.5} + m_SizeDelta: {x: 205, y: 53} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4725012850620387773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1283868943132233366} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b90565ce35523545a46489568526eab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TabType: 1 + BGImage_on: tab menu selected + BGImage_off: tab menu + m_btn: {fileID: 3125023690833370922} + images: + - {fileID: 426787249762074932} + texts: + - {fileID: 291279145226532724} --- !u!1 &1284395662681480267 GameObject: m_ObjectHideFlags: 0 @@ -15138,152 +15337,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1370675557937153591 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6940267129018086088} - - component: {fileID: 8699336895034128334} - - component: {fileID: 5116874666277410684} - - component: {fileID: 2395750183120806647} - - component: {fileID: 8826646269459916480} - m_Layer: 5 - m_Name: btn_detail - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6940267129018086088 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1370675557937153591} - 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: 4015511907231506332} - m_Father: {fileID: 178244858961045637} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 252, y: -115} - m_SizeDelta: {x: 150, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8699336895034128334 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1370675557937153591} - m_CullTransparentMesh: 1 ---- !u!114 &5116874666277410684 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1370675557937153591} - 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: 0.08627451, g: 0.37647063, b: 0.50980395, 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 &2395750183120806647 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1370675557937153591} - 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: 5116874666277410684} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3451567074462517527} - m_TargetAssemblyTypeName: PCInfoUI_Left, Assembly-CSharp - m_MethodName: OnClick_StatDetail - 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 &8826646269459916480 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1370675557937153591} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1371584072430674520 GameObject: m_ObjectHideFlags: 0 @@ -16881,8 +16934,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2232217277227844371} - - {fileID: 6940267129018086088} + - {fileID: 7370952257262604639} + - {fileID: 1881378857997459856} - {fileID: 1781722594843096213} - {fileID: 1471302394527256632} m_Father: {fileID: 8112082934472033055} @@ -16904,6 +16957,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4ea9ed1a346ae244d95ee160faf436f7, type: 3} m_Name: m_EditorClassIdentifier: + m_Tab: {fileID: 7398239855194209367} m_PCInfoStatMgrUI: {fileID: 162439239102077876} m_PCInfoDetailUI: {fileID: 497880288310858816} --- !u!1 &1547257654570005762 @@ -21425,6 +21479,139 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1899868317064299920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5410445780674710691} + - component: {fileID: 7353158098133105792} + - component: {fileID: 426787249762074932} + - component: {fileID: 3125023690833370922} + - component: {fileID: 4162396968364461648} + m_Layer: 5 + m_Name: i_bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5410445780674710691 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899868317064299920} + 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: 6701916581349014572} + 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 &7353158098133105792 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899868317064299920} + m_CullTransparentMesh: 1 +--- !u!114 &426787249762074932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899868317064299920} + 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: dd90e66f8e2c28e4ea2a7d7af3546124, 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!114 &3125023690833370922 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899868317064299920} + 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: 426787249762074932} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4162396968364461648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899868317064299920} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1900524196777491955 GameObject: m_ObjectHideFlags: 0 @@ -27119,6 +27306,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2340613365567970350 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7370952257262604639} + - component: {fileID: 1890450661350658329} + - component: {fileID: 8529484727205264406} + m_Layer: 5 + m_Name: statbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7370952257262604639 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340613365567970350} + 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: 178244858961045637} + 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: -688.91, y: 21.680006} + m_SizeDelta: {x: 481.67, y: 766.64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1890450661350658329 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340613365567970350} + m_CullTransparentMesh: 1 +--- !u!114 &8529484727205264406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2340613365567970350} + 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 &2341139587173359023 GameObject: m_ObjectHideFlags: 0 @@ -32575,6 +32837,85 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2761466607782713826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1881378857997459856} + - component: {fileID: 5018961891243658400} + - component: {fileID: 7398239855194209367} + m_Layer: 5 + m_Name: tab_layout_h + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1881378857997459856 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2761466607782713826} + 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: 6701916581349014572} + m_Father: {fileID: 178244858961045637} + 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: -901.6, y: 372.6} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5018961891243658400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2761466607782713826} + 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: 0 + m_Spacing: 14 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &7398239855194209367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2761466607782713826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c59c676661fa80a4d96e1cb19e6a0fb0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 0} + m_Content: {fileID: 2761466607782713826} + go_card: {fileID: 1283868943132233366} --- !u!1 &2777380561094224204 GameObject: m_ObjectHideFlags: 0 @@ -37447,152 +37788,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &3174948268132876425 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2232217277227844371} - - component: {fileID: 4579064373925469369} - - component: {fileID: 5629777960279937206} - - component: {fileID: 4740632292683095008} - - component: {fileID: 4728778458353835217} - m_Layer: 5 - m_Name: btn_statmgr - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2232217277227844371 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3174948268132876425} - 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: 8669786897901128560} - m_Father: {fileID: 178244858961045637} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -115} - m_SizeDelta: {x: 150, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4579064373925469369 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3174948268132876425} - m_CullTransparentMesh: 1 ---- !u!114 &5629777960279937206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3174948268132876425} - 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: 0.24705884, g: 0.28235295, b: 0.34901962, 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 &4740632292683095008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3174948268132876425} - 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: 5629777960279937206} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3451567074462517527} - m_TargetAssemblyTypeName: PCInfoUI_Left, Assembly-CSharp - m_MethodName: OnClick_StatMgr - 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 &4728778458353835217 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3174948268132876425} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &3190332918548827196 GameObject: m_ObjectHideFlags: 0 @@ -42596,7 +42791,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8112082934472033055 RectTransform: m_ObjectHideFlags: 0 @@ -42609,8 +42804,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 178244858961045637} - {fileID: 351039660577574170} + - {fileID: 6402432877941551947} + - {fileID: 178244858961045637} - {fileID: 2547393748655425458} - {fileID: 7671102248493653917} m_Father: {fileID: 7404742651207184332} @@ -46306,155 +46502,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3942820559909776197 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8669786897901128560} - - component: {fileID: 5491120608644495001} - - component: {fileID: 4872372775087883825} - - component: {fileID: 4014493483162194140} - m_Layer: 5 - m_Name: btnName - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8669786897901128560 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3942820559909776197} - 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: 2232217277227844371} - 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 &5491120608644495001 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3942820559909776197} - m_CullTransparentMesh: 1 ---- !u!114 &4872372775087883825 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3942820559909776197} - 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: "\uC2A4\uD0EF \uAD00\uB9AC" - 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: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - 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_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!114 &4014493483162194140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3942820559909776197} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} - m_Name: - m_EditorClassIdentifier: - m_localtextKey: 223 --- !u!1 &3947504116920073556 GameObject: m_ObjectHideFlags: 0 @@ -60607,6 +60654,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5b90565ce35523545a46489568526eab, type: 3} m_Name: m_EditorClassIdentifier: + m_TabType: 0 + BGImage_on: + BGImage_off: m_btn: {fileID: 6948103403669587872} images: - {fileID: 8117955083415674744} @@ -69489,16 +69539,15 @@ RectTransform: m_Children: - {fileID: 8477929361545760819} - {fileID: 7574968341214861179} - - {fileID: 6402432877941551947} - {fileID: 9063358590688059112} - {fileID: 1620082044207482911} - - {fileID: 6810771494914655753} - - {fileID: 2338593281362575877} - {fileID: 8112082934472033055} - {fileID: 8440377234816627102} - {fileID: 8547974209574747076} - {fileID: 492927554481134939} - {fileID: 5925801604119827395} + - {fileID: 6810771494914655753} + - {fileID: 2338593281362575877} m_Father: {fileID: 6291925347982253742} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -81473,155 +81522,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &7177238476854215488 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4015511907231506332} - - component: {fileID: 4840284530435444036} - - component: {fileID: 5195968808822813434} - - component: {fileID: 811641691077868944} - m_Layer: 5 - m_Name: btnName - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4015511907231506332 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7177238476854215488} - 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: 6940267129018086088} - 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 &4840284530435444036 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7177238476854215488} - m_CullTransparentMesh: 1 ---- !u!114 &5195968808822813434 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7177238476854215488} - 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: "\uC0C1\uC138 \uC815\uBCF4" - 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: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 40 - 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_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!114 &811641691077868944 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7177238476854215488} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} - m_Name: - m_EditorClassIdentifier: - m_localtextKey: 224 --- !u!1 &7196476603832806421 GameObject: m_ObjectHideFlags: 0 @@ -81750,6 +81650,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5b90565ce35523545a46489568526eab, type: 3} m_Name: m_EditorClassIdentifier: + m_TabType: 0 + BGImage_on: + BGImage_off: m_btn: {fileID: 7640799175654763153} images: - {fileID: 4191371566319455640} @@ -93163,6 +93066,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5b90565ce35523545a46489568526eab, type: 3} m_Name: m_EditorClassIdentifier: + m_TabType: 0 + BGImage_on: + BGImage_off: m_btn: {fileID: 3294540704275044910} images: - {fileID: 5447828835731407312} @@ -95531,6 +95437,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5b90565ce35523545a46489568526eab, type: 3} m_Name: m_EditorClassIdentifier: + m_TabType: 0 + BGImage_on: + BGImage_off: m_btn: {fileID: 2801007874307772184} images: - {fileID: 425044372302317641} diff --git a/Assets/Script/UI/Base/TabCardBase.cs b/Assets/Script/UI/Base/TabCardBase.cs index 297e06f06..97e392b9a 100644 --- a/Assets/Script/UI/Base/TabCardBase.cs +++ b/Assets/Script/UI/Base/TabCardBase.cs @@ -3,6 +3,8 @@ using UnityEngine.UI; public class TabCardBase : CardBase { + public eTabType m_TabType; + public string BGImage_on, BGImage_off; public Button m_btn; public Image[] images; // 0 bg, 1 이미지 public TextMeshProUGUI[] texts; // 0 탭 이름 @@ -22,19 +24,19 @@ public class TabCardBase : CardBase { if (_type == eUICardType.UI) { - if (m_Data.m_TabType == eTabType.BGColorChange) + if (m_TabType == eTabType.BGColorChange) images[0].color = m_Data.color_bg_on; - else if (m_Data.m_TabType == eTabType.BGImageChange) - images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.btnBGImg_on); + else if (m_TabType == eTabType.BGImageChange) + images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(BGImage_on); if (images.Length > 1) images[1].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.btnImg_on); } else { - if (m_Data.m_TabType == eTabType.BGColorChange) + if (m_TabType == eTabType.BGColorChange) images[0].color = m_Data.color_bg_off; - else if (m_Data.m_TabType == eTabType.BGImageChange) - images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.btnBGImg_off); + else if (m_TabType == eTabType.BGImageChange) + images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(BGImage_off); if (images.Length > 1) images[1].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.btnImg_off); } diff --git a/Assets/Script/UI/Base/TabUIBase.cs b/Assets/Script/UI/Base/TabUIBase.cs index 8b02ce37a..bd62383d4 100644 --- a/Assets/Script/UI/Base/TabUIBase.cs +++ b/Assets/Script/UI/Base/TabUIBase.cs @@ -11,8 +11,6 @@ public class TabUIData /// public int m_Index; - public eTabType m_TabType = eTabType.BGColorChange; - public string btnBGImg_on, btnBGImg_off; public string btnImg_on, btnImg_off; public string btnNameImage_on, btnNameImage_off; public int n_btnName = 0; diff --git a/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs b/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs index 4322a19cd..052e61f09 100644 --- a/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs +++ b/Assets/Script/UI/PC/Info/PCInfoUI_Center.cs @@ -43,10 +43,10 @@ public class PCInfoUI_Center : UI3DModel RawImage_costume.texture = handle.Result; }); - Set_3DModel($"Assets/Res_Addr/PC/{costumeData.s_Prefab}.prefab", tr => - { - tr.GetComponent().Set_Obj(); - }); + //Set_3DModel($"Assets/Res_Addr/PC/{costumeData.s_Prefab}.prefab", tr => + //{ + // tr.GetComponent().Set_Obj(); + //}); } gos[0].SetActive(CanEquip()); diff --git a/Assets/Script/UI/PC/Info/PCInfoUI_Left.cs b/Assets/Script/UI/PC/Info/PCInfoUI_Left.cs index 11ee6c855..87cd594a8 100644 --- a/Assets/Script/UI/PC/Info/PCInfoUI_Left.cs +++ b/Assets/Script/UI/PC/Info/PCInfoUI_Left.cs @@ -4,23 +4,33 @@ using UnityEngine; public class PCInfoUI_Left : MonoBehaviour { + public TabUIBase m_Tab; public PCInfoStatMgrUI m_PCInfoStatMgrUI; public PCInfoDetailUI m_PCInfoDetailUI; + List list_tabData = new List { new TabUIData{ n_btnName = 223 }, new TabUIData{ n_btnName = 224 } }; + public void Set() { - OnClick_StatMgr(); + for (int i = 0; i < list_tabData.Count; i++) + { + list_tabData[i].onClick = OnClick_Tab; + } + m_Tab.Set(list_tabData); + OnClick_Tab(); } - public void OnClick_StatMgr() + public void OnClick_Tab() { - m_PCInfoStatMgrUI.Set(); - m_PCInfoDetailUI.gameObject.SetActive(false); - } - - public void OnClick_StatDetail() - { - m_PCInfoStatMgrUI.gameObject.SetActive(false); - m_PCInfoDetailUI.Set(); + if (m_Tab.Get_Index() == 0) + { + m_PCInfoStatMgrUI.Set(); + m_PCInfoDetailUI.gameObject.SetActive(false); + } + else + { + m_PCInfoStatMgrUI.gameObject.SetActive(false); + m_PCInfoDetailUI.Set(); + } } } \ No newline at end of file diff --git a/Assets/Script/UI/PC/PCUI.cs b/Assets/Script/UI/PC/PCUI.cs index 62fd359b6..0b85a7f4e 100644 --- a/Assets/Script/UI/PC/PCUI.cs +++ b/Assets/Script/UI/PC/PCUI.cs @@ -17,9 +17,6 @@ public class PCUI : BotMenuBase for (int i = 0; i < list_TabData.Count; i++) { list_TabData[i].onClick = OnClick_Tab; - list_TabData[i].m_TabType = eTabType.BGImageChange; - list_TabData[i].btnBGImg_off = "menu button"; - list_TabData[i].btnBGImg_on = "menu button selected"; list_TabData[i].btnImg_on = $"menu icon {i + 1}"; list_TabData[i].btnImg_off = $"menu icon {i + 1}"; }