From 00f7336572a72c349a4b14b1dc2aebacf77dee1c Mon Sep 17 00:00:00 2001 From: Ino Date: Tue, 22 Apr 2025 10:54:32 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=81=EC=A0=90=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EC=9E=91=EC=97=85=20=EC=A4=91...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ResWork/UIPrefabs/Shop.meta | 2 +- Assets/ResWork/UIPrefabs/Shop/ShopCard.prefab | 823 +++++++++++++++++ .../UIPrefabs/Shop/ShopCard.prefab.meta | 7 + Assets/ResWork/UIPrefabs/Shop_old.meta | 8 + .../UIPrefabs/{Shop => Shop_old}/Event.meta | 0 .../{Shop => Shop_old}/Event/Event1.prefab | 0 .../Event/Event1.prefab.meta | 0 .../{Shop => Shop_old}/Event/Event2.prefab | 0 .../Event/Event2.prefab.meta | 0 .../{Shop => Shop_old}/Event/Event3.prefab | 0 .../Event/Event3.prefab.meta | 0 .../Event/EventRewardCard.prefab | 0 .../Event/EventRewardCard.prefab.meta | 0 .../{Shop => Shop_old}/PackageItemCard.prefab | 0 .../PackageItemCard.prefab.meta | 0 .../{Shop => Shop_old}/ShopCloverCard.prefab | 0 .../ShopCloverCard.prefab.meta | 0 .../{Shop => Shop_old}/ShopCommonCard.prefab | 0 .../ShopCommonCard.prefab.meta | 0 .../{Shop => Shop_old}/ShopMoneyCard.prefab | 0 .../ShopMoneyCard.prefab.meta | 0 .../{Shop => Shop_old}/ShopPackageCard.prefab | 0 .../ShopPackageCard.prefab.meta | 0 Assets/Res_Addr/MainUI/NewGameUI.prefab | 869 +----------------- .../Script/Table/Shop/table_shopitemlist.cs | 2 +- Assets/Script/UI/Shop/ShopContentBase.cs | 7 + Assets/Script/UI/Shop/ShopContentBase.cs.meta | 11 + Assets/Script/UI/Shop/ShopContent_Package.cs | 21 + .../UI/Shop/ShopContent_Package.cs.meta | 11 + 29 files changed, 921 insertions(+), 840 deletions(-) create mode 100644 Assets/ResWork/UIPrefabs/Shop/ShopCard.prefab create mode 100644 Assets/ResWork/UIPrefabs/Shop/ShopCard.prefab.meta create mode 100644 Assets/ResWork/UIPrefabs/Shop_old.meta rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/Event.meta (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/Event/Event1.prefab (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/Event/Event1.prefab.meta (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/Event/Event2.prefab (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/Event/Event2.prefab.meta (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/Event/Event3.prefab (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/Event/Event3.prefab.meta (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/Event/EventRewardCard.prefab (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/Event/EventRewardCard.prefab.meta (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/PackageItemCard.prefab (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/PackageItemCard.prefab.meta (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/ShopCloverCard.prefab (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/ShopCloverCard.prefab.meta (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/ShopCommonCard.prefab (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/ShopCommonCard.prefab.meta (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/ShopMoneyCard.prefab (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/ShopMoneyCard.prefab.meta (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/ShopPackageCard.prefab (100%) rename Assets/ResWork/UIPrefabs/{Shop => Shop_old}/ShopPackageCard.prefab.meta (100%) create mode 100644 Assets/Script/UI/Shop/ShopContentBase.cs create mode 100644 Assets/Script/UI/Shop/ShopContentBase.cs.meta create mode 100644 Assets/Script/UI/Shop/ShopContent_Package.cs create mode 100644 Assets/Script/UI/Shop/ShopContent_Package.cs.meta diff --git a/Assets/ResWork/UIPrefabs/Shop.meta b/Assets/ResWork/UIPrefabs/Shop.meta index 4ef81275c..1f7b161a2 100644 --- a/Assets/ResWork/UIPrefabs/Shop.meta +++ b/Assets/ResWork/UIPrefabs/Shop.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 24246f0681bf7684fbf642156dcea4a7 +guid: 538c1b1c9d3aa6b42aabcb7514d05bcd folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ResWork/UIPrefabs/Shop/ShopCard.prefab b/Assets/ResWork/UIPrefabs/Shop/ShopCard.prefab new file mode 100644 index 000000000..31f42a43b --- /dev/null +++ b/Assets/ResWork/UIPrefabs/Shop/ShopCard.prefab @@ -0,0 +1,823 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &119862886949005768 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1200175685615469374} + m_Layer: 5 + m_Name: ShopCard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1200175685615469374 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119862886949005768} + 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: 445264801857668939} + - {fileID: 7531226569148187691} + - {fileID: 3368300502348584841} + - {fileID: 290950992642225545} + - {fileID: 1512552238113595276} + 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: 360, y: 410} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &238730587393955628 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3368300502348584841} + - component: {fileID: 5561676021342248280} + - component: {fileID: 4128646841872244779} + m_Layer: 5 + m_Name: t_name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3368300502348584841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 238730587393955628} + 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: 1200175685615469374} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 181} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5561676021342248280 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 238730587393955628} + m_CullTransparentMesh: 1 +--- !u!114 &4128646841872244779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 238730587393955628} + 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\uD488 \uC774\uB984" + 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: 15 + m_fontSizeMax: 60 + 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!1 &1938090051354489894 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 445264801857668939} + - component: {fileID: 7830184408436727605} + - component: {fileID: 7159114417921684647} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &445264801857668939 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1938090051354489894} + 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: 1200175685615469374} + 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 &7830184408436727605 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1938090051354489894} + m_CullTransparentMesh: 1 +--- !u!114 &7159114417921684647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1938090051354489894} + 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.24313727, g: 0.20392159, b: 0.17254902, 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: 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 &2127052601693987294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 290950992642225545} + - component: {fileID: 7829012234468710023} + - component: {fileID: 4953703298990325885} + m_Layer: 5 + m_Name: t_limit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &290950992642225545 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2127052601693987294} + 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: 1200175685615469374} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 144} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7829012234468710023 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2127052601693987294} + m_CullTransparentMesh: 1 +--- !u!114 &4953703298990325885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2127052601693987294} + 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: "\uAD6C\uB9E4 \uAC00\uB2A5 0 / 0" + 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: 25 + m_fontSizeBase: 25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 15 + m_fontSizeMax: 60 + 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!1 &4584091953962620348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7047108527698993517} + - component: {fileID: 285356732686322209} + - component: {fileID: 685764421944749238} + - component: {fileID: 2407755437473590137} + m_Layer: 5 + m_Name: i_money + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7047108527698993517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4584091953962620348} + 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: 1512552238113595276} + 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: -70.6, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &285356732686322209 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4584091953962620348} + m_CullTransparentMesh: 1 +--- !u!114 &685764421944749238 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4584091953962620348} + 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: b0180e387fd2ef741b7ea5b2f337b58e, 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 &2407755437473590137 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4584091953962620348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97415e267398d774fa151d3ca4d4189d, type: 3} + m_Name: + m_EditorClassIdentifier: + textMeshPro: {fileID: 6400121722687552697} + icon: {fileID: 7047108527698993517} + LeftOffset: 0.25 +--- !u!1 &7037000857001869168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7531226569148187691} + - component: {fileID: 1121218152156449983} + - component: {fileID: 8468924518769424004} + m_Layer: 5 + m_Name: i_icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7531226569148187691 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7037000857001869168} + 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: 1200175685615469374} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 225, y: 225} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1121218152156449983 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7037000857001869168} + m_CullTransparentMesh: 1 +--- !u!114 &8468924518769424004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7037000857001869168} + 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: 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 &8004543967289431013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2592935339173286436} + - component: {fileID: 963919422470019536} + - component: {fileID: 6400121722687552697} + m_Layer: 5 + m_Name: t_price + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2592935339173286436 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004543967289431013} + 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: 1512552238113595276} + 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 &963919422470019536 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004543967289431013} + m_CullTransparentMesh: 1 +--- !u!114 &6400121722687552697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8004543967289431013} + 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: 0000 + 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: 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 15 + m_fontSizeMax: 60 + 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!1 &8930848740434290930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1512552238113595276} + - component: {fileID: 7067553947030399535} + - component: {fileID: 5071320058446606719} + - component: {fileID: 1386869408468204546} + - component: {fileID: 8949643378893975221} + m_Layer: 5 + m_Name: btn_ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1512552238113595276 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8930848740434290930} + 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: 7047108527698993517} + - {fileID: 2592935339173286436} + m_Father: {fileID: 1200175685615469374} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 35} + m_SizeDelta: {x: 0, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7067553947030399535 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8930848740434290930} + m_CullTransparentMesh: 1 +--- !u!114 &5071320058446606719 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8930848740434290930} + 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.87843144, g: 0.8313726, b: 0.77647066, 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 &1386869408468204546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8930848740434290930} + 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: 5071320058446606719} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &8949643378893975221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8930848740434290930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/ResWork/UIPrefabs/Shop/ShopCard.prefab.meta b/Assets/ResWork/UIPrefabs/Shop/ShopCard.prefab.meta new file mode 100644 index 000000000..b1d9a82fe --- /dev/null +++ b/Assets/ResWork/UIPrefabs/Shop/ShopCard.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 51c8989da5791a448a4f0d3986a6c8cc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UIPrefabs/Shop_old.meta b/Assets/ResWork/UIPrefabs/Shop_old.meta new file mode 100644 index 000000000..4ef81275c --- /dev/null +++ b/Assets/ResWork/UIPrefabs/Shop_old.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 24246f0681bf7684fbf642156dcea4a7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/UIPrefabs/Shop/Event.meta b/Assets/ResWork/UIPrefabs/Shop_old/Event.meta similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/Event.meta rename to Assets/ResWork/UIPrefabs/Shop_old/Event.meta diff --git a/Assets/ResWork/UIPrefabs/Shop/Event/Event1.prefab b/Assets/ResWork/UIPrefabs/Shop_old/Event/Event1.prefab similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/Event/Event1.prefab rename to Assets/ResWork/UIPrefabs/Shop_old/Event/Event1.prefab diff --git a/Assets/ResWork/UIPrefabs/Shop/Event/Event1.prefab.meta b/Assets/ResWork/UIPrefabs/Shop_old/Event/Event1.prefab.meta similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/Event/Event1.prefab.meta rename to Assets/ResWork/UIPrefabs/Shop_old/Event/Event1.prefab.meta diff --git a/Assets/ResWork/UIPrefabs/Shop/Event/Event2.prefab b/Assets/ResWork/UIPrefabs/Shop_old/Event/Event2.prefab similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/Event/Event2.prefab rename to Assets/ResWork/UIPrefabs/Shop_old/Event/Event2.prefab diff --git a/Assets/ResWork/UIPrefabs/Shop/Event/Event2.prefab.meta b/Assets/ResWork/UIPrefabs/Shop_old/Event/Event2.prefab.meta similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/Event/Event2.prefab.meta rename to Assets/ResWork/UIPrefabs/Shop_old/Event/Event2.prefab.meta diff --git a/Assets/ResWork/UIPrefabs/Shop/Event/Event3.prefab b/Assets/ResWork/UIPrefabs/Shop_old/Event/Event3.prefab similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/Event/Event3.prefab rename to Assets/ResWork/UIPrefabs/Shop_old/Event/Event3.prefab diff --git a/Assets/ResWork/UIPrefabs/Shop/Event/Event3.prefab.meta b/Assets/ResWork/UIPrefabs/Shop_old/Event/Event3.prefab.meta similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/Event/Event3.prefab.meta rename to Assets/ResWork/UIPrefabs/Shop_old/Event/Event3.prefab.meta diff --git a/Assets/ResWork/UIPrefabs/Shop/Event/EventRewardCard.prefab b/Assets/ResWork/UIPrefabs/Shop_old/Event/EventRewardCard.prefab similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/Event/EventRewardCard.prefab rename to Assets/ResWork/UIPrefabs/Shop_old/Event/EventRewardCard.prefab diff --git a/Assets/ResWork/UIPrefabs/Shop/Event/EventRewardCard.prefab.meta b/Assets/ResWork/UIPrefabs/Shop_old/Event/EventRewardCard.prefab.meta similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/Event/EventRewardCard.prefab.meta rename to Assets/ResWork/UIPrefabs/Shop_old/Event/EventRewardCard.prefab.meta diff --git a/Assets/ResWork/UIPrefabs/Shop/PackageItemCard.prefab b/Assets/ResWork/UIPrefabs/Shop_old/PackageItemCard.prefab similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/PackageItemCard.prefab rename to Assets/ResWork/UIPrefabs/Shop_old/PackageItemCard.prefab diff --git a/Assets/ResWork/UIPrefabs/Shop/PackageItemCard.prefab.meta b/Assets/ResWork/UIPrefabs/Shop_old/PackageItemCard.prefab.meta similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/PackageItemCard.prefab.meta rename to Assets/ResWork/UIPrefabs/Shop_old/PackageItemCard.prefab.meta diff --git a/Assets/ResWork/UIPrefabs/Shop/ShopCloverCard.prefab b/Assets/ResWork/UIPrefabs/Shop_old/ShopCloverCard.prefab similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/ShopCloverCard.prefab rename to Assets/ResWork/UIPrefabs/Shop_old/ShopCloverCard.prefab diff --git a/Assets/ResWork/UIPrefabs/Shop/ShopCloverCard.prefab.meta b/Assets/ResWork/UIPrefabs/Shop_old/ShopCloverCard.prefab.meta similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/ShopCloverCard.prefab.meta rename to Assets/ResWork/UIPrefabs/Shop_old/ShopCloverCard.prefab.meta diff --git a/Assets/ResWork/UIPrefabs/Shop/ShopCommonCard.prefab b/Assets/ResWork/UIPrefabs/Shop_old/ShopCommonCard.prefab similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/ShopCommonCard.prefab rename to Assets/ResWork/UIPrefabs/Shop_old/ShopCommonCard.prefab diff --git a/Assets/ResWork/UIPrefabs/Shop/ShopCommonCard.prefab.meta b/Assets/ResWork/UIPrefabs/Shop_old/ShopCommonCard.prefab.meta similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/ShopCommonCard.prefab.meta rename to Assets/ResWork/UIPrefabs/Shop_old/ShopCommonCard.prefab.meta diff --git a/Assets/ResWork/UIPrefabs/Shop/ShopMoneyCard.prefab b/Assets/ResWork/UIPrefabs/Shop_old/ShopMoneyCard.prefab similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/ShopMoneyCard.prefab rename to Assets/ResWork/UIPrefabs/Shop_old/ShopMoneyCard.prefab diff --git a/Assets/ResWork/UIPrefabs/Shop/ShopMoneyCard.prefab.meta b/Assets/ResWork/UIPrefabs/Shop_old/ShopMoneyCard.prefab.meta similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/ShopMoneyCard.prefab.meta rename to Assets/ResWork/UIPrefabs/Shop_old/ShopMoneyCard.prefab.meta diff --git a/Assets/ResWork/UIPrefabs/Shop/ShopPackageCard.prefab b/Assets/ResWork/UIPrefabs/Shop_old/ShopPackageCard.prefab similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/ShopPackageCard.prefab rename to Assets/ResWork/UIPrefabs/Shop_old/ShopPackageCard.prefab diff --git a/Assets/ResWork/UIPrefabs/Shop/ShopPackageCard.prefab.meta b/Assets/ResWork/UIPrefabs/Shop_old/ShopPackageCard.prefab.meta similarity index 100% rename from Assets/ResWork/UIPrefabs/Shop/ShopPackageCard.prefab.meta rename to Assets/ResWork/UIPrefabs/Shop_old/ShopPackageCard.prefab.meta diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 7882eb93e..6ab466e94 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -1890,46 +1890,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 186 ---- !u!1 &94921656713293925 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1179676445343079059} - m_Layer: 5 - m_Name: ShopCard - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1179676445343079059 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 94921656713293925} - 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: 492310648215838438} - - {fileID: 7529076015968411014} - - {fileID: 3334483839203135012} - - {fileID: 356143316293037092} - - {fileID: 1442636394785768993} - m_Father: {fileID: 365388527707727590} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -247} - m_SizeDelta: {x: 500, y: 490} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &110401718919070336 GameObject: m_ObjectHideFlags: 0 @@ -4054,141 +4014,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 344 ---- !u!1 &263680631405874817 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3334483839203135012} - - component: {fileID: 5609205610338026741} - - component: {fileID: 4157678404112447878} - m_Layer: 5 - m_Name: t_name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3334483839203135012 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 263680631405874817} - 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: 1179676445343079059} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 213} - m_SizeDelta: {x: 150, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5609205610338026741 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 263680631405874817} - m_CullTransparentMesh: 1 ---- !u!114 &4157678404112447878 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 263680631405874817} - 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\uD488 \uC774\uB984" - 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: 15 - m_fontSizeMax: 60 - 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!1 &273781269140966971 GameObject: m_ObjectHideFlags: 0 @@ -22917,7 +22742,7 @@ GameObject: m_Component: - component: {fileID: 365388527707727590} - component: {fileID: 2897687209949523125} - - component: {fileID: 2795434999011328507} + - component: {fileID: 4292157169937556996} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -22936,14 +22761,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1179676445343079059} + m_Children: [] m_Father: {fileID: 7415835643697445184} 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: -1056.7, y: 0} + m_SizeDelta: {x: -1561.7, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2897687209949523125 MonoBehaviour: @@ -22959,7 +22783,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 ---- !u!114 &2795434999011328507 +--- !u!114 &4292157169937556996 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -22968,7 +22792,7 @@ MonoBehaviour: m_GameObject: {fileID: 1708297075324637377} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -22977,14 +22801,12 @@ MonoBehaviour: m_Top: 2 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 360, y: 410} + m_Spacing: {x: 10, y: 10} + m_Constraint: 2 + m_ConstraintCount: 1 --- !u!1 &1708353982413998723 GameObject: m_ObjectHideFlags: 0 @@ -26454,81 +26276,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1881825925290126731 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 492310648215838438} - - component: {fileID: 7805454128722101912} - - component: {fileID: 7179481860142230794} - m_Layer: 5 - m_Name: bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &492310648215838438 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1881825925290126731} - 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: 1179676445343079059} - 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 &7805454128722101912 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1881825925290126731} - m_CullTransparentMesh: 1 ---- !u!114 &7179481860142230794 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1881825925290126731} - 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.24313727, g: 0.20392159, b: 0.17254902, 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: 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 &1883455160247802286 GameObject: m_ObjectHideFlags: 0 @@ -31193,141 +30940,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 240 ---- !u!1 &2124611629217773683 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 356143316293037092} - - component: {fileID: 7808908819975360298} - - component: {fileID: 4920177030404102608} - m_Layer: 5 - m_Name: t_limit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &356143316293037092 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2124611629217773683} - 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: 1179676445343079059} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 176} - m_SizeDelta: {x: 150, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7808908819975360298 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2124611629217773683} - m_CullTransparentMesh: 1 ---- !u!114 &4920177030404102608 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2124611629217773683} - 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: "\uAD6C\uB9E4 \uAC00\uB2A5 0 / 0" - 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: 25 - m_fontSizeBase: 25 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 15 - m_fontSizeMax: 60 - 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!1 &2137352571350344490 GameObject: m_ObjectHideFlags: 0 @@ -39348,10 +38960,11 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8346797560638034965} + - component: {fileID: 4751763833754436815} - component: {fileID: 5445136990847351717} - component: {fileID: 2388847190547292184} m_Layer: 5 - m_Name: shop1 + m_Name: shop_package m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -39378,6 +38991,22 @@ RectTransform: m_AnchoredPosition: {x: -780.86, y: -114.999954} m_SizeDelta: {x: 1561.72, y: 850} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4751763833754436815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2737452870110784747} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc25b799421fdf3499b703ebb528b682, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ScrollRect: {fileID: 9184815440441036218} + m_Content: {fileID: 0} + go_card: {fileID: 119862886949005768, guid: 51c8989da5791a448a4f0d3986a6c8cc, type: 3} + ri_banner: {fileID: 414879904619606227} --- !u!222 &5445136990847351717 CanvasRenderer: m_ObjectHideFlags: 0 @@ -41053,8 +40682,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.0024109, y: -177.07} - m_SizeDelta: {x: 1561.7, y: 495.86} + m_AnchoredPosition: {x: 0, y: -197.51} + m_SizeDelta: {x: 1561.7, y: 454.98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7853552146248886256 CanvasRenderer: @@ -65855,97 +65484,6 @@ MonoBehaviour: textMeshPro: {fileID: 7332695021037812577} icon: {fileID: 1264739296334899851} RightOffset: 1.15 ---- !u!1 &4568087424329124881 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7004425394730694848} - - component: {fileID: 219874257100002188} - - component: {fileID: 683631304702702875} - - component: {fileID: 2419273882404582100} - m_Layer: 5 - m_Name: i_money - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7004425394730694848 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4568087424329124881} - 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: 1442636394785768993} - 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: -70.6, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &219874257100002188 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4568087424329124881} - m_CullTransparentMesh: 1 ---- !u!114 &683631304702702875 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4568087424329124881} - 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: b0180e387fd2ef741b7ea5b2f337b58e, 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 &2419273882404582100 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4568087424329124881} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97415e267398d774fa151d3ca4d4189d, type: 3} - m_Name: - m_EditorClassIdentifier: - textMeshPro: {fileID: 6352644875891467540} - icon: {fileID: 7004425394730694848} - LeftOffset: 0.25 --- !u!1 &4569225388110773966 GameObject: m_ObjectHideFlags: 0 @@ -96059,81 +95597,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7012279346032092893 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7529076015968411014} - - component: {fileID: 1114555074878330130} - - component: {fileID: 8466562711665438505} - m_Layer: 5 - m_Name: i_icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7529076015968411014 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7012279346032092893} - 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: 1179676445343079059} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 300} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1114555074878330130 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7012279346032092893} - m_CullTransparentMesh: 1 ---- !u!114 &8466562711665438505 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7012279346032092893} - 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: 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 &7016074127620006996 GameObject: m_ObjectHideFlags: 0 @@ -110606,141 +110069,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8065162171177388616 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2522887586125515657} - - component: {fileID: 979651171815178365} - - component: {fileID: 6352644875891467540} - m_Layer: 5 - m_Name: t_price - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2522887586125515657 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8065162171177388616} - 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: 1442636394785768993} - 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 &979651171815178365 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8065162171177388616} - m_CullTransparentMesh: 1 ---- !u!114 &6352644875891467540 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8065162171177388616} - 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: 0000 - 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: 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: 30 - m_fontSizeBase: 30 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 15 - m_fontSizeMax: 60 - 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!1 &8076571290125810410 GameObject: m_ObjectHideFlags: 0 @@ -122561,141 +121889,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8865427726969778527 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1442636394785768993} - - component: {fileID: 7128092968880321410} - - component: {fileID: 5086849512085907666} - - component: {fileID: 1425330417289946543} - - component: {fileID: 8992396714696308504} - m_Layer: 5 - m_Name: btn_ - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1442636394785768993 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8865427726969778527} - 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: 7004425394730694848} - - {fileID: 2522887586125515657} - m_Father: {fileID: 1179676445343079059} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 40} - m_SizeDelta: {x: 0, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7128092968880321410 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8865427726969778527} - m_CullTransparentMesh: 1 ---- !u!114 &5086849512085907666 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8865427726969778527} - 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.87843144, g: 0.8313726, b: 0.77647066, 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 &1425330417289946543 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8865427726969778527} - 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: 5086849512085907666} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &8992396714696308504 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8865427726969778527} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &8867836544454216521 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Table/Shop/table_shopitemlist.cs b/Assets/Script/Table/Shop/table_shopitemlist.cs index a22500241..a8a78436e 100644 --- a/Assets/Script/Table/Shop/table_shopitemlist.cs +++ b/Assets/Script/Table/Shop/table_shopitemlist.cs @@ -133,7 +133,7 @@ public class table_shopitemlist : table_missionbase //public ShopItemListTableData Get_Data() { } public List Get_DataList() { return tableDatas; } - //public List Get_DataList(eStat stat) { return dic_StatList[stat]; } + public List Get_DataList(int maintab, int subtab) { return dic_shop[(maintab, subtab)]; } public List Get_MainTabDatas() { return MainTabDatas; } public List Get_SubTabDatas(int index) { return SubTabDatas[index]; } diff --git a/Assets/Script/UI/Shop/ShopContentBase.cs b/Assets/Script/UI/Shop/ShopContentBase.cs new file mode 100644 index 000000000..c0c410dcf --- /dev/null +++ b/Assets/Script/UI/Shop/ShopContentBase.cs @@ -0,0 +1,7 @@ +public class ShopContentBase : uScrollViewMgr +{ + public virtual void Set(int maintab, int subtab) + { + gameObject.SetActive(true); + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Shop/ShopContentBase.cs.meta b/Assets/Script/UI/Shop/ShopContentBase.cs.meta new file mode 100644 index 000000000..5315e1328 --- /dev/null +++ b/Assets/Script/UI/Shop/ShopContentBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e4ccd00fcfbf7c04291805504687cc39 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/UI/Shop/ShopContent_Package.cs b/Assets/Script/UI/Shop/ShopContent_Package.cs new file mode 100644 index 000000000..98887d496 --- /dev/null +++ b/Assets/Script/UI/Shop/ShopContent_Package.cs @@ -0,0 +1,21 @@ +using UnityEngine.UI; + +public class ShopContent_Package : ShopContentBase +{ + public RawImage ri_banner; + + public override void Set(int maintab, int subtab) + { + base.Set(maintab, subtab); + + var lst = table_shopitemlist.Ins.Get_DataList(maintab, subtab); + if (!string.IsNullOrEmpty(lst[0].s_Banner)) + { // 배너가 있는 경우 + ri_banner.enabled = true; + } + else + { // 배너가 없는 경우 + ri_banner.enabled = false; + } + } +} \ No newline at end of file diff --git a/Assets/Script/UI/Shop/ShopContent_Package.cs.meta b/Assets/Script/UI/Shop/ShopContent_Package.cs.meta new file mode 100644 index 000000000..83babca17 --- /dev/null +++ b/Assets/Script/UI/Shop/ShopContent_Package.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dc25b799421fdf3499b703ebb528b682 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: