From 3aff52b31f482e21f0f1fe105f52aab731874cb4 Mon Sep 17 00:00:00 2001 From: Osama Deep Date: Sun, 6 Mar 2022 15:06:08 +0300 Subject: [PATCH] v32 --- .../shop_refresh/shop_refresh.png.meta | 12 +- .../Resources/UI/Materials/UI_refresh.mat | 28 + .../UI/Materials/UI_refresh.mat.meta | 8 + .../UI/Prefabs/UI_RankingBoard.prefab | 448 +++++++++++++++- .../Resources/UI/Prefabs/UI_ShopBuy.prefab | 478 ++++++++++++++---- .../Resources/UI/Prefabs/UI_ShopSell.prefab | 404 ++++++++------- .../_PandoraBox/Prefabs/shop_refresh_Old.meta | 8 + .../Prefabs/shop_refresh_Old/Materials.meta | 8 + .../Materials/shop_refresh.mat | 28 + .../Materials/shop_refresh.mat.meta | 8 + .../shop_refresh_Old/ReferenceAssets.meta | 8 + .../ReferenceAssets/Appear.asset | 16 + .../ReferenceAssets/Appear.asset.meta | 8 + .../ReferenceAssets/Click.asset | 16 + .../ReferenceAssets/Click.asset.meta | 8 + .../ReferenceAssets/Idle.asset | 16 + .../ReferenceAssets/Idle.asset.meta | 8 + .../shop_refresh_Old/shop_refresh.atlas.txt | 83 +++ .../shop_refresh.atlas.txt.meta | 7 + .../shop_refresh_Old/shop_refresh.json | 1 + .../shop_refresh_Old/shop_refresh.json.meta | 7 + .../Prefabs/shop_refresh_Old/shop_refresh.png | Bin 0 -> 30396 bytes .../shop_refresh_Old/shop_refresh.png.meta | 96 ++++ .../shop_refresh_Old/shop_refresh_Atlas.asset | 17 + .../shop_refresh_Atlas.asset.meta | 8 + .../shop_refresh_Material.mat | 4 +- .../shop_refresh_Material.mat.meta | 2 +- .../shop_refresh_SkeletonData.asset | 24 + .../shop_refresh_SkeletonData.asset.meta | 8 + .../_PandoraBox/Scripts/PandoraBoxMaster.cs | 4 +- .../UI/Widget/Popup/FriendInfoPopupPandora.cs | 6 +- .../Assets/_Scripts/UI/Widget/RankingBoard.cs | 61 ++- nekoyume/Assets/_Scripts/UI/Widget/ShopBuy.cs | 57 +++ 33 files changed, 1580 insertions(+), 315 deletions(-) create mode 100644 nekoyume/Assets/Resources/UI/Materials/UI_refresh.mat create mode 100644 nekoyume/Assets/Resources/UI/Materials/UI_refresh.mat.meta create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old.meta create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials.meta create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials/shop_refresh.mat create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials/shop_refresh.mat.meta create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets.meta create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Appear.asset create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Appear.asset.meta create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Click.asset create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Click.asset.meta create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Idle.asset create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Idle.asset.meta create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.atlas.txt create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.atlas.txt.meta create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.json create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.json.meta create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.png create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.png.meta create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Atlas.asset create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Atlas.asset.meta rename nekoyume/Assets/{AddressableAssets/UI/Background/shop_refresh => _PandoraBox/Prefabs/shop_refresh_Old}/shop_refresh_Material.mat (90%) rename nekoyume/Assets/{AddressableAssets/UI/Background/shop_refresh => _PandoraBox/Prefabs/shop_refresh_Old}/shop_refresh_Material.mat.meta (79%) create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_SkeletonData.asset create mode 100644 nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_SkeletonData.asset.meta diff --git a/nekoyume/Assets/AddressableAssets/UI/Background/shop_refresh/shop_refresh.png.meta b/nekoyume/Assets/AddressableAssets/UI/Background/shop_refresh/shop_refresh.png.meta index dda3f10ee22..13df48eafe1 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Background/shop_refresh/shop_refresh.png.meta +++ b/nekoyume/Assets/AddressableAssets/UI/Background/shop_refresh/shop_refresh.png.meta @@ -3,7 +3,7 @@ guid: 62d02a8e1a444114695f9acd5e47e6fa TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -40,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -54,11 +55,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,6 +74,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/nekoyume/Assets/Resources/UI/Materials/UI_refresh.mat b/nekoyume/Assets/Resources/UI/Materials/UI_refresh.mat new file mode 100644 index 00000000000..af7c19fd471 --- /dev/null +++ b/nekoyume/Assets/Resources/UI/Materials/UI_refresh.mat @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI_refresh + m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: eea1d3da17e79e04795c19f0a487395b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/nekoyume/Assets/Resources/UI/Materials/UI_refresh.mat.meta b/nekoyume/Assets/Resources/UI/Materials/UI_refresh.mat.meta new file mode 100644 index 00000000000..67dff67f8e9 --- /dev/null +++ b/nekoyume/Assets/Resources/UI/Materials/UI_refresh.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fc4f388d88269f46bc1f34bd5eebebf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_RankingBoard.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_RankingBoard.prefab index eabde735c50..94a74f59960 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_RankingBoard.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_RankingBoard.prefab @@ -2536,6 +2536,141 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -8} m_SizeDelta: {x: 100, y: 40} m_Pivot: {x: 1, y: 0.5} +--- !u!1 &2326210418920034049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3736844540069702829} + - component: {fileID: 2124853922022984011} + - component: {fileID: 4175771666920276643} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3736844540069702829 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2326210418920034049} + 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_Children: [] + m_Father: {fileID: 6783673323933877047} + m_RootOrder: 7 + 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: -522.9, y: 8.5} + m_SizeDelta: {x: 65.4521, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2124853922022984011 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2326210418920034049} + m_CullTransparentMesh: 1 +--- !u!114 &4175771666920276643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2326210418920034049} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: test + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: -2364689171920820918, guid: 8a682b7747d4a664089b7b1065aa0035, + 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: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + 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: 1 + 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 &2356138132984797456 GameObject: m_ObjectHideFlags: 0 @@ -3300,6 +3435,7 @@ RectTransform: - {fileID: 2998178280324709627} - {fileID: 5034048311564626086} - {fileID: 5744618990060175523} + - {fileID: 3736844540069702829} m_Father: {fileID: 8577413098648199994} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4570,6 +4706,141 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4718332795647794369 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8950568903022644782} + - component: {fileID: 6101096855299465859} + - component: {fileID: 1903834413035030994} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8950568903022644782 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4718332795647794369} + 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_Children: [] + m_Father: {fileID: 1321505827544411556} + m_RootOrder: 0 + 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: 2.2021} + m_SizeDelta: {x: 0, y: -4.4042} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6101096855299465859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4718332795647794369} + m_CullTransparentMesh: 1 +--- !u!114 &1903834413035030994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4718332795647794369} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Refresh + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: -2364689171920820918, guid: 8a682b7747d4a664089b7b1065aa0035, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4289708789 + m_fontColor: {r: 0.9622642, g: 0.76109064, b: 0.6853863, 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: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + 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: 1 + 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 &4727292179551389318 GameObject: m_ObjectHideFlags: 0 @@ -8117,8 +8388,8 @@ MonoBehaviour: playerBanner: {fileID: 6682109708140952110} gainPointText: {fileID: 5399331943899935285} extraInfoText: {fileID: 5399331943899935285} - winRateText: {fileID: 5399331943899935285} - FavTarget: {fileID: 2231550629902766373} + winRateText: {fileID: 4175771666920276643} + FavTarget: {fileID: 2326210418920034049} backgroundImage: {fileID: 8145527941398008203} controlBackgroundImage: 0 rankImageContainer: {fileID: 5808117130881908513} @@ -9348,6 +9619,139 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8667398972122385850 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1321505827544411556} + - component: {fileID: 6186225118633097444} + - component: {fileID: 990459802225824879} + - component: {fileID: 6425986628089584979} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1321505827544411556 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8667398972122385850} + 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_Children: + - {fileID: 8950568903022644782} + m_Father: {fileID: 9112409923063545724} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -60, y: -30} + m_SizeDelta: {x: 122.24991, y: 35.0334} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6186225118633097444 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8667398972122385850} + m_CullTransparentMesh: 1 +--- !u!114 &990459802225824879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8667398972122385850} + 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: 3483b1826aa594389a7d7299dcab8151, 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 &6425986628089584979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8667398972122385850} + 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: 990459802225824879} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7503268317474358543} + m_TargetAssemblyTypeName: Nekoyume.UI.RankingBoard, Nekoyume + m_MethodName: RefreshBoard + 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!1 &8709308823662972629 GameObject: m_ObjectHideFlags: 0 @@ -10085,6 +10489,7 @@ MonoBehaviour: tutorialTargets: [] tutorialActions: FightCountTxt: {fileID: 86508328424692015} + RefreshButton: {fileID: 6425986628089584979} FightCountSldr: {fileID: 6112929276130042743} closeButton: {fileID: 4110205987266503427} arenaRankScroll: {fileID: 7257681375118065173} @@ -10399,6 +10804,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1321505827544411556} - {fileID: 2977126658834679030} - {fileID: 6159446749487290460} - {fileID: 6571575550378264888} @@ -10409,7 +10815,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -5} - m_SizeDelta: {x: 0, y: 60} + m_SizeDelta: {x: -194.84, y: 60} m_Pivot: {x: 0, y: 1} --- !u!225 &3763645163489488628 CanvasGroup: @@ -10430,7 +10836,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9112409923063545715} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} m_Name: @@ -10456,7 +10862,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9112409923063545715} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: @@ -11624,7 +12030,7 @@ PrefabInstance: - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} @@ -11694,7 +12100,7 @@ PrefabInstance: - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} propertyPath: m_AnchoredPosition.x - value: 151 + value: 432.16 objectReference: {fileID: 0} - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} @@ -12028,7 +12434,7 @@ PrefabInstance: - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} @@ -12098,7 +12504,7 @@ PrefabInstance: - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} propertyPath: m_AnchoredPosition.x - value: 422.16 + value: 432.16 objectReference: {fileID: 0} - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} @@ -12350,7 +12756,7 @@ PrefabInstance: - target: {fileID: 8799680884505899946, guid: 29c5c99555c2b5f40a6f757cea5554b3, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8799680884505899946, guid: 29c5c99555c2b5f40a6f757cea5554b3, type: 3} @@ -12360,7 +12766,7 @@ PrefabInstance: - target: {fileID: 8799680884505899946, guid: 29c5c99555c2b5f40a6f757cea5554b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8799680884505899946, guid: 29c5c99555c2b5f40a6f757cea5554b3, type: 3} @@ -12370,7 +12776,7 @@ PrefabInstance: - target: {fileID: 8799680884505899946, guid: 29c5c99555c2b5f40a6f757cea5554b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8799680884505899946, guid: 29c5c99555c2b5f40a6f757cea5554b3, type: 3} @@ -12425,7 +12831,7 @@ PrefabInstance: - target: {fileID: 8799680884505899946, guid: 29c5c99555c2b5f40a6f757cea5554b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8799680884505899946, guid: 29c5c99555c2b5f40a6f757cea5554b3, type: 3} @@ -12444,6 +12850,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 29c5c99555c2b5f40a6f757cea5554b3, type: 3} +--- !u!224 &2977126658834679030 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8799680884505899946, guid: 29c5c99555c2b5f40a6f757cea5554b3, + type: 3} + m_PrefabInstance: {fileID: 6002840668058892124} + m_PrefabAsset: {fileID: 0} --- !u!114 &4110205987266503427 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7657312722897278047, guid: 29c5c99555c2b5f40a6f757cea5554b3, @@ -12456,12 +12868,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &2977126658834679030 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8799680884505899946, guid: 29c5c99555c2b5f40a6f757cea5554b3, - type: 3} - m_PrefabInstance: {fileID: 6002840668058892124} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6898699812052004135 PrefabInstance: m_ObjectHideFlags: 0 @@ -12482,7 +12888,7 @@ PrefabInstance: - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} @@ -12552,7 +12958,7 @@ PrefabInstance: - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} propertyPath: m_AnchoredPosition.x - value: 285 + value: 432.16 objectReference: {fileID: 0} - target: {fileID: 328753739065828383, guid: f369b2e4b7b2243dc8c0bb82d1d4d0ae, type: 3} diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_ShopBuy.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_ShopBuy.prefab index fc0451f4c96..e2903699347 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_ShopBuy.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_ShopBuy.prefab @@ -3854,7 +3854,7 @@ RectTransform: - {fileID: 1618541409922644512} - {fileID: 4362466265297210305} m_Father: {fileID: 435426733139342454} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4277,6 +4277,7 @@ MonoBehaviour: m_EditorClassIdentifier: tutorialTargets: [] tutorialActions: + RefreshButton: {fileID: 5390303488314790072} shopItems: {fileID: 415615033908431628} shopBuyBoard: {fileID: 7015864977187178981} sellButton: {fileID: 48192411541509439} @@ -6266,6 +6267,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4655428173729430133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1669170839031155909} + - component: {fileID: 5394820650730435760} + - component: {fileID: 5073138787330053748} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1669170839031155909 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4655428173729430133} + 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_Children: [] + m_Father: {fileID: 6792248966483459443} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -6.3330994, y: -113.99591} + m_SizeDelta: {x: -12.6662, y: -227.9918} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5394820650730435760 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4655428173729430133} + m_CullTransparentMesh: 1 +--- !u!114 &5073138787330053748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4655428173729430133} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 60 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: -2364689171920820918, guid: 8a682b7747d4a664089b7b1065aa0035, + 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: 49.76 + m_fontSizeBase: 49.76 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + 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: 1 + 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 &4657621458283855414 GameObject: m_ObjectHideFlags: 0 @@ -7331,7 +7467,7 @@ RectTransform: - {fileID: 1575076098722417769} - {fileID: 3849205725746356101} m_Father: {fileID: 435426733139342454} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -10617,6 +10753,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6792248966483459443} - {fileID: 3430324503956899799} - {fileID: 8831348802732565899} m_Father: {fileID: 3092122340641966665} @@ -10845,6 +10982,127 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8753839181612650548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6792248966483459443} + - component: {fileID: 2237718621120311391} + - component: {fileID: 1657114328575954490} + - component: {fileID: 5390303488314790072} + m_Layer: 5 + m_Name: RefreshButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6792248966483459443 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8753839181612650548} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: + - {fileID: 1669170839031155909} + m_Father: {fileID: 435426733139342454} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -256.2, y: 246.9} + m_SizeDelta: {x: 86.3208, y: 299.2069} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2237718621120311391 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8753839181612650548} + m_CullTransparentMesh: 1 +--- !u!114 &1657114328575954490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8753839181612650548} + 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: eea1d3da17e79e04795c19f0a487395b, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5390303488314790072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8753839181612650548} + 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: 1657114328575954490} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &8810664590723238352 GameObject: m_ObjectHideFlags: 0 @@ -13264,6 +13522,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} +--- !u!224 &4527252001774807798 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, + type: 3} + m_PrefabInstance: {fileID: 81426196109121916} + m_PrefabAsset: {fileID: 0} --- !u!114 &2774483567114395410 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2855768882793006702, guid: 43d2972504511264c8090dbdd642a9cd, @@ -13276,12 +13540,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72ecc78e43f04008aaa061b510ffcb24, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &4527252001774807798 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, - type: 3} - m_PrefabInstance: {fileID: 81426196109121916} - m_PrefabAsset: {fileID: 0} --- !u!1001 &409586019620072557 PrefabInstance: m_ObjectHideFlags: 0 @@ -14669,18 +14927,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7fbf666150b81a4489573bebd8b3c266, type: 3} ---- !u!114 &8157483929807350764 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8948960296696933651, guid: 7fbf666150b81a4489573bebd8b3c266, - type: 3} - m_PrefabInstance: {fileID: 937913724062009087} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &4914908162941461969 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5274103836773262126, guid: 7fbf666150b81a4489573bebd8b3c266, @@ -14699,6 +14945,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b217564f74ec1c84ab95adbbc4573a70, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8157483929807350764 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8948960296696933651, guid: 7fbf666150b81a4489573bebd8b3c266, + type: 3} + m_PrefabInstance: {fileID: 937913724062009087} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1065297365331933506 PrefabInstance: m_ObjectHideFlags: 0 @@ -15452,18 +15710,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 19858599dbc2e42379cee2444fa9d644, type: 3} ---- !u!114 &5375483774244157052 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6297885093045376943, guid: 19858599dbc2e42379cee2444fa9d644, +--- !u!1 &7458541281013715529 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8826233779470775194, guid: 19858599dbc2e42379cee2444fa9d644, type: 3} m_PrefabInstance: {fileID: 2161476156530909651} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &872478288465689074 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1289350546963863585, guid: 19858599dbc2e42379cee2444fa9d644, @@ -15482,12 +15734,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2161476156530909651} m_PrefabAsset: {fileID: 0} ---- !u!1 &7458541281013715529 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8826233779470775194, guid: 19858599dbc2e42379cee2444fa9d644, +--- !u!114 &5375483774244157052 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6297885093045376943, guid: 19858599dbc2e42379cee2444fa9d644, type: 3} m_PrefabInstance: {fileID: 2161476156530909651} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2233566209133379814 PrefabInstance: m_ObjectHideFlags: 0 @@ -17314,6 +17572,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} +--- !u!224 &2367841405193024639 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, + type: 3} + m_PrefabInstance: {fileID: 2245339299601287157} + m_PrefabAsset: {fileID: 0} --- !u!114 &4073706632335868315 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2855768882793006702, guid: 43d2972504511264c8090dbdd642a9cd, @@ -17326,12 +17590,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72ecc78e43f04008aaa061b510ffcb24, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &2367841405193024639 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, - type: 3} - m_PrefabInstance: {fileID: 2245339299601287157} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2290036798983901587 PrefabInstance: m_ObjectHideFlags: 0 @@ -17867,12 +18125,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7fbf666150b81a4489573bebd8b3c266, type: 3} ---- !u!224 &7590010652466331702 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5274103836773262126, guid: 7fbf666150b81a4489573bebd8b3c266, - type: 3} - m_PrefabInstance: {fileID: 2334064202329285400} - m_PrefabAsset: {fileID: 0} --- !u!114 &6671109815369582817 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 9002915620730383353, guid: 7fbf666150b81a4489573bebd8b3c266, @@ -17885,6 +18137,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b217564f74ec1c84ab95adbbc4573a70, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &7590010652466331702 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5274103836773262126, guid: 7fbf666150b81a4489573bebd8b3c266, + type: 3} + m_PrefabInstance: {fileID: 2334064202329285400} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2635267177650540794 PrefabInstance: m_ObjectHideFlags: 0 @@ -18069,15 +18327,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 26f57b4cd6ade59448f086de7678075f, type: 3} ---- !u!1 &7764471157702905891 stripped +--- !u!1 &2925624941354442132 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 5715816593280106713, guid: 26f57b4cd6ade59448f086de7678075f, + m_CorrespondingSourceObject: {fileID: 867982976131992942, guid: 26f57b4cd6ade59448f086de7678075f, type: 3} m_PrefabInstance: {fileID: 2635267177650540794} m_PrefabAsset: {fileID: 0} ---- !u!1 &2925624941354442132 stripped +--- !u!1 &7764471157702905891 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 867982976131992942, guid: 26f57b4cd6ade59448f086de7678075f, + m_CorrespondingSourceObject: {fileID: 5715816593280106713, guid: 26f57b4cd6ade59448f086de7678075f, type: 3} m_PrefabInstance: {fileID: 2635267177650540794} m_PrefabAsset: {fileID: 0} @@ -21189,12 +21447,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} ---- !u!224 &1712275447497523079 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, - type: 3} - m_PrefabInstance: {fileID: 2897633662218406925} - m_PrefabAsset: {fileID: 0} --- !u!114 &1123591884812569187 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2855768882793006702, guid: 43d2972504511264c8090dbdd642a9cd, @@ -21207,6 +21459,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72ecc78e43f04008aaa061b510ffcb24, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &1712275447497523079 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, + type: 3} + m_PrefabInstance: {fileID: 2897633662218406925} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3122270126181876465 PrefabInstance: m_ObjectHideFlags: 0 @@ -22968,12 +23226,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} ---- !u!224 &1235380271784416990 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, - type: 3} - m_PrefabInstance: {fileID: 3373685180206425428} - m_PrefabAsset: {fileID: 0} --- !u!114 &680050556966396730 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2855768882793006702, guid: 43d2972504511264c8090dbdd642a9cd, @@ -22986,6 +23238,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72ecc78e43f04008aaa061b510ffcb24, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &1235380271784416990 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, + type: 3} + m_PrefabInstance: {fileID: 3373685180206425428} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3868211827254923094 PrefabInstance: m_ObjectHideFlags: 0 @@ -23508,12 +23766,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &9006025974217888277 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5274103836773262126, guid: 7fbf666150b81a4489573bebd8b3c266, - type: 3} - m_PrefabInstance: {fileID: 3876110090865471803} - m_PrefabAsset: {fileID: 0} --- !u!114 &5276668013396155074 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 9002915620730383353, guid: 7fbf666150b81a4489573bebd8b3c266, @@ -23526,6 +23778,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b217564f74ec1c84ab95adbbc4573a70, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &9006025974217888277 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5274103836773262126, guid: 7fbf666150b81a4489573bebd8b3c266, + type: 3} + m_PrefabInstance: {fileID: 3876110090865471803} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3925016610540751201 PrefabInstance: m_ObjectHideFlags: 0 @@ -23905,9 +24163,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ec3c95a861b3330439e701f8a43f3235, type: 3} ---- !u!224 &6658914387003788353 stripped +--- !u!224 &7151577860013867402 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 7642963250540397856, guid: ec3c95a861b3330439e701f8a43f3235, + m_CorrespondingSourceObject: {fileID: 6145152773070964971, guid: ec3c95a861b3330439e701f8a43f3235, type: 3} m_PrefabInstance: {fileID: 3925016610540751201} m_PrefabAsset: {fileID: 0} @@ -23923,9 +24181,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &7151577860013867402 stripped +--- !u!224 &6658914387003788353 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 6145152773070964971, guid: ec3c95a861b3330439e701f8a43f3235, + m_CorrespondingSourceObject: {fileID: 7642963250540397856, guid: ec3c95a861b3330439e701f8a43f3235, type: 3} m_PrefabInstance: {fileID: 3925016610540751201} m_PrefabAsset: {fileID: 0} @@ -24270,15 +24528,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 26f57b4cd6ade59448f086de7678075f, type: 3} ---- !u!1 &5189357151478527006 stripped +--- !u!1 &818905088391330217 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 867982976131992942, guid: 26f57b4cd6ade59448f086de7678075f, + m_CorrespondingSourceObject: {fileID: 5715816593280106713, guid: 26f57b4cd6ade59448f086de7678075f, type: 3} m_PrefabInstance: {fileID: 4904416965078923632} m_PrefabAsset: {fileID: 0} ---- !u!1 &818905088391330217 stripped +--- !u!1 &5189357151478527006 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 5715816593280106713, guid: 26f57b4cd6ade59448f086de7678075f, + m_CorrespondingSourceObject: {fileID: 867982976131992942, guid: 26f57b4cd6ade59448f086de7678075f, type: 3} m_PrefabInstance: {fileID: 4904416965078923632} m_PrefabAsset: {fileID: 0} @@ -26762,6 +27020,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} +--- !u!224 &7844974490447327629 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, + type: 3} + m_PrefabInstance: {fileID: 5993092327773913607} + m_PrefabAsset: {fileID: 0} --- !u!114 &8397532234384966761 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2855768882793006702, guid: 43d2972504511264c8090dbdd642a9cd, @@ -26774,12 +27038,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72ecc78e43f04008aaa061b510ffcb24, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &7844974490447327629 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, - type: 3} - m_PrefabInstance: {fileID: 5993092327773913607} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6119776233317139232 PrefabInstance: m_ObjectHideFlags: 0 @@ -28586,6 +28844,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} +--- !u!224 &7548092962375216665 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, + type: 3} + m_PrefabInstance: {fileID: 6284062492470042003} + m_PrefabAsset: {fileID: 0} --- !u!114 &8112323379487677437 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2855768882793006702, guid: 43d2972504511264c8090dbdd642a9cd, @@ -28598,12 +28862,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72ecc78e43f04008aaa061b510ffcb24, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &7548092962375216665 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, - type: 3} - m_PrefabInstance: {fileID: 6284062492470042003} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6286260907740595206 PrefabInstance: m_ObjectHideFlags: 0 @@ -28838,12 +29096,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7fbf666150b81a4489573bebd8b3c266, type: 3} ---- !u!224 &2165151160525694760 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5274103836773262126, guid: 7fbf666150b81a4489573bebd8b3c266, - type: 3} - m_PrefabInstance: {fileID: 6286260907740595206} - m_PrefabAsset: {fileID: 0} --- !u!114 &3156320699035856895 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 9002915620730383353, guid: 7fbf666150b81a4489573bebd8b3c266, @@ -28868,6 +29120,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &2165151160525694760 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5274103836773262126, guid: 7fbf666150b81a4489573bebd8b3c266, + type: 3} + m_PrefabInstance: {fileID: 6286260907740595206} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6293378942689286189 PrefabInstance: m_ObjectHideFlags: 0 @@ -31209,12 +31467,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} ---- !u!224 &6802360638624430123 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, - type: 3} - m_PrefabInstance: {fileID: 7031132707703131041} - m_PrefabAsset: {fileID: 0} --- !u!114 &5058144204840717775 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2855768882793006702, guid: 43d2972504511264c8090dbdd642a9cd, @@ -31227,6 +31479,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72ecc78e43f04008aaa061b510ffcb24, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &6802360638624430123 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, + type: 3} + m_PrefabInstance: {fileID: 7031132707703131041} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7254265523215508584 PrefabInstance: m_ObjectHideFlags: 0 @@ -31361,12 +31619,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, type: 3} ---- !u!224 &4844642847985894023 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, - type: 3} - m_PrefabInstance: {fileID: 7254265523215508584} - m_PrefabAsset: {fileID: 0} --- !u!114 &5881784103883195793 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3822464774271197689, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, @@ -31379,6 +31631,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f6cba938803cc94286b4a714de66fcd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &4844642847985894023 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, + type: 3} + m_PrefabInstance: {fileID: 7254265523215508584} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7922423628549421009 PrefabInstance: m_ObjectHideFlags: 0 @@ -32329,12 +32587,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, type: 3} ---- !u!224 &6581425496936689608 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, - type: 3} - m_PrefabInstance: {fileID: 8989781414519343399} - m_PrefabAsset: {fileID: 0} --- !u!114 &5318190291691595998 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3822464774271197689, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, @@ -32347,6 +32599,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f6cba938803cc94286b4a714de66fcd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &6581425496936689608 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, + type: 3} + m_PrefabInstance: {fileID: 8989781414519343399} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9033545800741648811 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_ShopSell.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_ShopSell.prefab index 62cc9f91b5a..c19c0d990e2 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_ShopSell.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_ShopSell.prefab @@ -6255,6 +6255,36 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1895011557152865557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 324737416161992127} + m_Layer: 0 + m_Name: shop_refresh (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &324737416161992127 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1895011557152865557} + 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_Children: [] + m_Father: {fileID: 1678567684359646793} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1964844608952136823 GameObject: m_ObjectHideFlags: 0 @@ -10683,7 +10713,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1678567684359646793 Transform: m_ObjectHideFlags: 0 @@ -10697,6 +10727,7 @@ Transform: m_Children: - {fileID: 6052909485621196386} - {fileID: 1974594902433172508} + - {fileID: 324737416161992127} m_Father: {fileID: 4260903306227567792} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13244,6 +13275,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7367418086147881421} m_CullTransparentMesh: 0 +--- !u!1 &7412814050500845889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1974594902433172508} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1974594902433172508 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 6401927441720409961, guid: 23e67551e7e82f84e95450b136e459cf, + type: 3} + m_PrefabInstance: {fileID: 4881651912862233461} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7412814050500845889} + 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_Children: [] + m_Father: {fileID: 1678567684359646793} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7435050874883928883 GameObject: m_ObjectHideFlags: 0 @@ -16146,6 +16208,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, type: 3} +--- !u!224 &2634022049860196781 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, + type: 3} + m_PrefabInstance: {fileID: 223517617837522754} + m_PrefabAsset: {fileID: 0} --- !u!114 &3897310651078401723 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3822464774271197689, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, @@ -16158,12 +16226,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f6cba938803cc94286b4a714de66fcd, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &2634022049860196781 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, - type: 3} - m_PrefabInstance: {fileID: 223517617837522754} - m_PrefabAsset: {fileID: 0} --- !u!1001 &267763801395152354 PrefabInstance: m_ObjectHideFlags: 0 @@ -16283,6 +16345,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, type: 3} +--- !u!224 &2603288176119538445 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, + type: 3} + m_PrefabInstance: {fileID: 267763801395152354} + m_PrefabAsset: {fileID: 0} --- !u!114 &3943841244907381787 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3822464774271197689, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, @@ -16295,12 +16363,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f6cba938803cc94286b4a714de66fcd, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &2603288176119538445 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, - type: 3} - m_PrefabInstance: {fileID: 267763801395152354} - m_PrefabAsset: {fileID: 0} --- !u!1001 &603882484257702312 PrefabInstance: m_ObjectHideFlags: 0 @@ -17861,9 +17923,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} ---- !u!114 &3371575703320513312 stripped +--- !u!114 &2281309374965434366 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2786415174779865736, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 1714109085405120086, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882484257702312} m_PrefabAsset: {fileID: 0} @@ -17873,9 +17935,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &4288887051898913322 stripped +--- !u!114 &6194719342742864081 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3739214639837725570, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 6744557708045500793, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882484257702312} m_PrefabAsset: {fileID: 0} @@ -17897,9 +17959,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2281309374965434366 stripped +--- !u!224 &4004866580378464802 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, + type: 3} + m_PrefabInstance: {fileID: 603882484257702312} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3371575703320513312 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1714109085405120086, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 2786415174779865736, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882484257702312} m_PrefabAsset: {fileID: 0} @@ -17909,15 +17977,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &4004866580378464802 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, - type: 3} - m_PrefabInstance: {fileID: 603882484257702312} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6194719342742864081 stripped +--- !u!114 &4288887051898913322 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6744557708045500793, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 3739214639837725570, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882484257702312} m_PrefabAsset: {fileID: 0} @@ -19487,9 +19549,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} ---- !u!114 &4288887052136220160 stripped +--- !u!114 &3371575703084388106 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3739214639837725570, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 2786415174779865736, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882485095187842} m_PrefabAsset: {fileID: 0} @@ -19499,9 +19561,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &3371575703084388106 stripped +--- !u!114 &6194719342970602747 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2786415174779865736, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 6744557708045500793, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882485095187842} m_PrefabAsset: {fileID: 0} @@ -19511,9 +19573,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2192731134343358795 stripped +--- !u!114 &2281309374737171412 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1589575723861175497, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 1714109085405120086, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882485095187842} m_PrefabAsset: {fileID: 0} @@ -19523,9 +19585,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &6194719342970602747 stripped +--- !u!114 &4288887052136220160 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6744557708045500793, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 3739214639837725570, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882485095187842} m_PrefabAsset: {fileID: 0} @@ -19535,9 +19597,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2281309374737171412 stripped +--- !u!114 &2192731134343358795 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1714109085405120086, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 1589575723861175497, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882485095187842} m_PrefabAsset: {fileID: 0} @@ -21233,9 +21295,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} ---- !u!114 &2192731133689331534 stripped +--- !u!114 &3371575704812165391 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1589575723861175497, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 2786415174779865736, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882485782778759} m_PrefabAsset: {fileID: 0} @@ -21245,9 +21307,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &3371575704812165391 stripped +--- !u!114 &4288887050408448005 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2786415174779865736, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 3739214639837725570, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882485782778759} m_PrefabAsset: {fileID: 0} @@ -21257,9 +21319,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &4288887050408448005 stripped +--- !u!114 &6194719341477712638 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3739214639837725570, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 6744557708045500793, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882485782778759} m_PrefabAsset: {fileID: 0} @@ -21269,6 +21331,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &4004866581634080781 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, + type: 3} + m_PrefabInstance: {fileID: 603882485782778759} + m_PrefabAsset: {fileID: 0} --- !u!114 &2281309376465475025 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1714109085405120086, guid: 43d2972504511264c8090dbdd642a9cd, @@ -21281,15 +21349,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &4004866581634080781 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, - type: 3} - m_PrefabInstance: {fileID: 603882485782778759} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6194719341477712638 stripped +--- !u!114 &2192731133689331534 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6744557708045500793, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 1589575723861175497, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 603882485782778759} m_PrefabAsset: {fileID: 0} @@ -21839,6 +21901,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, type: 3} +--- !u!224 &4420879151078355095 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, + type: 3} + m_PrefabInstance: {fileID: 1931458362893735544} + m_PrefabAsset: {fileID: 0} --- !u!114 &3441300216573982593 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3822464774271197689, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, @@ -21851,12 +21919,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f6cba938803cc94286b4a714de66fcd, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &4420879151078355095 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, - type: 3} - m_PrefabInstance: {fileID: 1931458362893735544} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2508630264743903190 PrefabInstance: m_ObjectHideFlags: 0 @@ -21976,12 +22038,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, type: 3} ---- !u!224 &380418794005403961 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, - type: 3} - m_PrefabInstance: {fileID: 2508630264743903190} - m_PrefabAsset: {fileID: 0} --- !u!114 &1719370767704677935 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3822464774271197689, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, @@ -21994,6 +22050,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f6cba938803cc94286b4a714de66fcd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &380418794005403961 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, + type: 3} + m_PrefabInstance: {fileID: 2508630264743903190} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2836098162281290153 PrefabInstance: m_ObjectHideFlags: 0 @@ -22293,12 +22355,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 53746e77bf093f04ab7301d07111ce65, type: 3} ---- !u!224 &1484383931328634776 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4214294061450366437, guid: 53746e77bf093f04ab7301d07111ce65, - type: 3} - m_PrefabInstance: {fileID: 3379310835622843005} - m_PrefabAsset: {fileID: 0} --- !u!114 &1484383931328634777 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4214294061450366436, guid: 53746e77bf093f04ab7301d07111ce65, @@ -22311,6 +22367,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e835dabe3178a8e499a531afcc274feb, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &1484383931328634776 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4214294061450366437, guid: 53746e77bf093f04ab7301d07111ce65, + type: 3} + m_PrefabInstance: {fileID: 3379310835622843005} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4575742624105091803 PrefabInstance: m_ObjectHideFlags: 0 @@ -23043,7 +23105,7 @@ PrefabInstance: - target: {fileID: 5739035064744993873, guid: a30f6d5b592354710aaf714b378249c2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 102 objectReference: {fileID: 0} - target: {fileID: 5739035064744993873, guid: a30f6d5b592354710aaf714b378249c2, type: 3} @@ -23208,7 +23270,7 @@ PrefabInstance: - target: {fileID: 7629436151797261047, guid: a30f6d5b592354710aaf714b378249c2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 34 objectReference: {fileID: 0} - target: {fileID: 7629436151797261047, guid: a30f6d5b592354710aaf714b378249c2, type: 3} @@ -23263,7 +23325,7 @@ PrefabInstance: - target: {fileID: 8454913057932834828, guid: a30f6d5b592354710aaf714b378249c2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 255.5 objectReference: {fileID: 0} - target: {fileID: 8454913057932834828, guid: a30f6d5b592354710aaf714b378249c2, type: 3} @@ -23298,7 +23360,7 @@ PrefabInstance: - target: {fileID: 8711921026644245071, guid: a30f6d5b592354710aaf714b378249c2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 169 objectReference: {fileID: 0} - target: {fileID: 8711921026644245071, guid: a30f6d5b592354710aaf714b378249c2, type: 3} @@ -23322,27 +23384,21 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a30f6d5b592354710aaf714b378249c2, type: 3} ---- !u!114 &850208981232472925 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3768599451817509254, guid: a30f6d5b592354710aaf714b378249c2, +--- !u!1 &6886037190221867480 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6922124966450723587, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3a76360b9f74215998a5505e3394f19, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &480303908548396681 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4119153670613341266, guid: a30f6d5b592354710aaf714b378249c2, +--- !u!1 &5018659512428795100 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8801601097976366599, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!224 &1706200264434163249 stripped +--- !u!224 &799799573093893322 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2895227101619899626, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 3790123049838220817, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} @@ -23352,93 +23408,93 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &9175269922714093697 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4671735629365041754, guid: a30f6d5b592354710aaf714b378249c2, +--- !u!114 &850208981232472925 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3768599451817509254, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &6221673794513809019 stripped + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3a76360b9f74215998a5505e3394f19, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &4576733933565725755 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7626739275307941024, guid: a30f6d5b592354710aaf714b378249c2, - type: 3} - m_PrefabInstance: {fileID: 4575742624105091803} - m_PrefabAsset: {fileID: 0} ---- !u!224 &799799573093893322 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3790123049838220817, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 1019177633357536, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!224 &1426813551019040586 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3192281314406550929, guid: a30f6d5b592354710aaf714b378249c2, +--- !u!1 &407846011444291143 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4190802197305865372, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &8279322301690022594 stripped +--- !u!1 &5663236480064647520 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 5577218206618212377, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 8149147246134076347, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!224 &2634285435415953748 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1949655157135496079, guid: a30f6d5b592354710aaf714b378249c2, +--- !u!1 &8076015606427478237 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5734077158464895494, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!224 &3857642458459462124 stripped +--- !u!224 &1426813551019040586 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 723202453735279415, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 3192281314406550929, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &8076015606427478237 stripped +--- !u!1 &6221673794513809019 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 5734077158464895494, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 7626739275307941024, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &5018659512428795100 stripped +--- !u!1 &7553607152381573062 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 8801601097976366599, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 6292513856617473309, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!224 &3596601645766695063 stripped +--- !u!224 &3857642458459462124 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 1038642150745016908, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 723202453735279415, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &6995216817628786789 stripped +--- !u!1 &7197255786990457466 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 6815156860673319614, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 6656750902140272801, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &6886037190221867480 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6922124966450723587, guid: a30f6d5b592354710aaf714b378249c2, +--- !u!224 &1706200264434163249 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2895227101619899626, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &5663236480064647520 stripped +--- !u!1 &9175269922714093697 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 8149147246134076347, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 4671735629365041754, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &7197255786990457466 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6656750902140272801, guid: a30f6d5b592354710aaf714b378249c2, +--- !u!224 &480303908548396681 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4119153670613341266, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &7553607152381573062 stripped +--- !u!1 &7829248499334853158 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 6292513856617473309, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 5991856421027242237, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} @@ -23448,27 +23504,33 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &407846011444291143 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4190802197305865372, guid: a30f6d5b592354710aaf714b378249c2, +--- !u!224 &2971751232373457687 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1638612815010255308, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &7829248499334853158 stripped +--- !u!224 &3596601645766695063 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1038642150745016908, guid: a30f6d5b592354710aaf714b378249c2, + type: 3} + m_PrefabInstance: {fileID: 4575742624105091803} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8279322301690022594 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 5991856421027242237, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 5577218206618212377, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!224 &2971751232373457687 stripped +--- !u!224 &2634285435415953748 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 1638612815010255308, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 1949655157135496079, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} ---- !u!1 &4576733933565725755 stripped +--- !u!1 &6995216817628786789 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 1019177633357536, guid: a30f6d5b592354710aaf714b378249c2, + m_CorrespondingSourceObject: {fileID: 6815156860673319614, guid: a30f6d5b592354710aaf714b378249c2, type: 3} m_PrefabInstance: {fileID: 4575742624105091803} m_PrefabAsset: {fileID: 0} @@ -23754,12 +23816,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 23e67551e7e82f84e95450b136e459cf, type: 3} ---- !u!4 &1974594902433172508 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6401927441720409961, guid: 23e67551e7e82f84e95450b136e459cf, - type: 3} - m_PrefabInstance: {fileID: 4881651912862233461} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5261110076280394992 PrefabInstance: m_ObjectHideFlags: 0 @@ -23879,6 +23935,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, type: 3} +--- !u!224 &7968207714589504031 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, + type: 3} + m_PrefabInstance: {fileID: 5261110076280394992} + m_PrefabAsset: {fileID: 0} --- !u!114 &8939408628436907273 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3822464774271197689, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, @@ -23891,12 +23953,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f6cba938803cc94286b4a714de66fcd, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &7968207714589504031 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, - type: 3} - m_PrefabInstance: {fileID: 5261110076280394992} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5424103373464839043 PrefabInstance: m_ObjectHideFlags: 0 @@ -25457,6 +25513,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} +--- !u!224 &8409071816619249673 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, + type: 3} + m_PrefabInstance: {fileID: 5424103373464839043} + m_PrefabAsset: {fileID: 0} --- !u!114 &1648091822736696058 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6744557708045500793, guid: 43d2972504511264c8090dbdd642a9cd, @@ -25469,15 +25531,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &8409071816619249673 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4608676672953676682, guid: 43d2972504511264c8090dbdd642a9cd, - type: 3} - m_PrefabInstance: {fileID: 5424103373464839043} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8692530713111126017 stripped +--- !u!114 &6669818292444145109 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3739214639837725570, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 1714109085405120086, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 5424103373464839043} m_PrefabAsset: {fileID: 0} @@ -25487,9 +25543,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &6721912669219770186 stripped +--- !u!114 &7921018729010145547 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1589575723861175497, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 2786415174779865736, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 5424103373464839043} m_PrefabAsset: {fileID: 0} @@ -25499,9 +25555,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &6669818292444145109 stripped +--- !u!114 &6721912669219770186 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1714109085405120086, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 1589575723861175497, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 5424103373464839043} m_PrefabAsset: {fileID: 0} @@ -25511,9 +25567,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0db6e305e7144b0083bee297f0b2d1d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &7921018729010145547 stripped +--- !u!114 &8692530713111126017 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2786415174779865736, guid: 43d2972504511264c8090dbdd642a9cd, + m_CorrespondingSourceObject: {fileID: 3739214639837725570, guid: 43d2972504511264c8090dbdd642a9cd, type: 3} m_PrefabInstance: {fileID: 5424103373464839043} m_PrefabAsset: {fileID: 0} @@ -25642,6 +25698,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, type: 3} +--- !u!224 &7661696426253566648 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, + type: 3} + m_PrefabInstance: {fileID: 5603644801618601047} + m_PrefabAsset: {fileID: 0} --- !u!114 &8703270276165535150 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3822464774271197689, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, @@ -25654,12 +25716,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f6cba938803cc94286b4a714de66fcd, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &7661696426253566648 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, - type: 3} - m_PrefabInstance: {fileID: 5603644801618601047} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7034582765410838370 PrefabInstance: m_ObjectHideFlags: 0 @@ -25730,7 +25786,7 @@ PrefabInstance: - target: {fileID: 7430616929449913940, guid: 29c5c99555c2b5f40a6f757cea5554b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 88 objectReference: {fileID: 0} - target: {fileID: 7430616929449913940, guid: 29c5c99555c2b5f40a6f757cea5554b3, type: 3} @@ -26236,12 +26292,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, type: 3} ---- !u!224 &5933077082816114861 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, - type: 3} - m_PrefabInstance: {fileID: 8485189769688143426} - m_PrefabAsset: {fileID: 0} --- !u!114 &4669507505928976315 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3822464774271197689, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, @@ -26254,3 +26304,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f6cba938803cc94286b4a714de66fcd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &5933077082816114861 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2853018336156559087, guid: eb4a796aa432f9b4190eb9e4c13cf1c1, + type: 3} + m_PrefabInstance: {fileID: 8485189769688143426} + m_PrefabAsset: {fileID: 0} diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old.meta new file mode 100644 index 00000000000..8fe06b6afda --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5dc2442e8b410cc43bbd77ff723d174c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials.meta new file mode 100644 index 00000000000..c555e819819 --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97618ec4f05a5b44ea658d2621695f7a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials/shop_refresh.mat b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials/shop_refresh.mat new file mode 100644 index 00000000000..f18af5de762 --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials/shop_refresh.mat @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: shop_refresh + m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7109b9dc8ccb84443b41067d5f46d142, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: [] + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials/shop_refresh.mat.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials/shop_refresh.mat.meta new file mode 100644 index 00000000000..817857bf07e --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/Materials/shop_refresh.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97b6695df27a41f46bc42e5cc54e5d4a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets.meta new file mode 100644 index 00000000000..8ad7dfbe9b4 --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e014b9adc66ac4b41954a0ebb5380df5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Appear.asset b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Appear.asset new file mode 100644 index 00000000000..aadc9d38a3b --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Appear.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3} + m_Name: Appear + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: f2ca8e2475b69a84980a2e668269f8cb, type: 2} + animationName: Appear diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Appear.asset.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Appear.asset.meta new file mode 100644 index 00000000000..372723b613e --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Appear.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97dca9c4b7f4703418e4f9304f579c49 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Click.asset b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Click.asset new file mode 100644 index 00000000000..6ea5ece4b2a --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Click.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3} + m_Name: Click + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: f2ca8e2475b69a84980a2e668269f8cb, type: 2} + animationName: Click diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Click.asset.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Click.asset.meta new file mode 100644 index 00000000000..00655a5c979 --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Click.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee4ca5594076a634cb00316f82e41473 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Idle.asset b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Idle.asset new file mode 100644 index 00000000000..f6ad7a1dd21 --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Idle.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3} + m_Name: Idle + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: f2ca8e2475b69a84980a2e668269f8cb, type: 2} + animationName: Idle diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Idle.asset.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Idle.asset.meta new file mode 100644 index 00000000000..4f78be527ec --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/ReferenceAssets/Idle.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: efa2e72d1fadc8249a1e9fe0d31654b1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.atlas.txt b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.atlas.txt new file mode 100644 index 00000000000..dbf575cd04f --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.atlas.txt @@ -0,0 +1,83 @@ + +shop_refresh.png +size: 256,256 +format: RGBA8888 +filter: Linear,Linear +repeat: none +bell_01-1 + rotate: false + xy: 96, 167 + size: 30, 31 + orig: 30, 31 + offset: 0, 0 + index: -1 +bell_01-2 + rotate: false + xy: 33, 47 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +bell_02-1 + rotate: false + xy: 2, 2 + size: 21, 25 + orig: 21, 25 + offset: 0, 0 + index: -1 +bell_02-2 + rotate: false + xy: 68, 93 + size: 6, 5 + orig: 6, 5 + offset: 0, 0 + index: -1 +bell_02-3 + rotate: false + xy: 134, 233 + size: 20, 12 + orig: 20, 12 + offset: 0, 0 + index: -1 +refresh_01 + rotate: false + xy: 33, 167 + size: 61, 78 + orig: 61, 78 + offset: 0, 0 + index: -1 +refresh_02 + rotate: false + xy: 33, 100 + size: 59, 65 + orig: 59, 65 + offset: 0, 0 + index: -1 +ribbon_00 + rotate: false + xy: 94, 144 + size: 21, 21 + orig: 21, 21 + offset: 0, 0 + index: -1 +ribbon_01 + rotate: false + xy: 96, 200 + size: 36, 45 + orig: 36, 45 + offset: 0, 0 + index: -1 +ribbon_02 + rotate: false + xy: 33, 57 + size: 33, 41 + orig: 33, 41 + offset: 0, 0 + index: -1 +rope + rotate: false + xy: 2, 29 + size: 29, 216 + orig: 29, 216 + offset: 0, 0 + index: -1 diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.atlas.txt.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.atlas.txt.meta new file mode 100644 index 00000000000..e9f8cf24350 --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3471352a65dbf6e4885ebfc1639fe088 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.json b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.json new file mode 100644 index 00000000000..f622ee2ef1a --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.json @@ -0,0 +1 @@ +{"skeleton":{"hash":"i6bXXGe7Eg0sbdI3306pJmShBkU","spine":"3.7.92","width":1139,"height":650.44,"images":"./images/","audio":"C:/Users/수진/Desktop/Animation/EffectUI/UI_refresh"},"bones":[{"name":"root"},{"name":"rope_01","parent":"root","length":38.09,"rotation":-93.15,"x":-0.25,"y":236.51},{"name":"rope_02","parent":"rope_01","length":50.8,"rotation":5.07,"x":38.09},{"name":"rope_03","parent":"rope_02","length":51.03,"rotation":0.5,"x":50.8},{"name":"rope_04","parent":"rope_03","length":35.85,"rotation":-6.08,"x":51.67,"y":0.25},{"name":"rope_05","parent":"rope_04","length":57.56,"x":44.74,"y":-0.16},{"name":"refresh_02","parent":"rope_05","rotation":3.62,"x":36.9,"y":3.42,"transform":"noScale"},{"name":"ribbon_01","parent":"rope_04","length":19.28,"rotation":83.99,"x":9.96,"y":7.11},{"name":"ribbon_02-1","parent":"rope_04","length":20.85,"rotation":24.64,"x":18.28,"y":11.89},{"name":"ribbon_02-2","parent":"ribbon_02-1","length":20.37,"rotation":-15.14,"x":20.85},{"name":"bell_01-1","parent":"rope_04","length":19.21,"rotation":-16.64,"x":19.49,"y":-5.92},{"name":"bell_01-2","parent":"bell_01-1","length":21.77,"rotation":2.82,"x":1.07,"y":-0.2},{"name":"bell_02-1","parent":"rope_04","length":15.25,"rotation":18.34,"x":15.11,"y":3.32},{"name":"bell_02-2","parent":"bell_02-1","length":9.53,"rotation":-2.68,"x":9.17,"y":-1.75},{"name":"bell_02-3","parent":"bell_02-1","x":13.28,"y":1.32}],"slots":[{"name":"rope","bone":"rope_01","attachment":"rope"},{"name":"ribbon_02","bone":"ribbon_02-1","attachment":"ribbon_02"},{"name":"ribbon_01","bone":"ribbon_01","attachment":"ribbon_01"},{"name":"ribbon_00","bone":"rope_04","attachment":"ribbon_00"},{"name":"refresh_02","bone":"refresh_02","attachment":"refresh_02"},{"name":"refresh_01","bone":"rope_05","attachment":"refresh_01"},{"name":"bell_02-3","bone":"bell_02-3","attachment":"bell_02-3"},{"name":"bell_02-2","bone":"bell_02-2","attachment":"bell_02-2"},{"name":"bell_02-1","bone":"bell_02-1","attachment":"bell_02-1"},{"name":"bell_01-2","bone":"bell_01-2","attachment":"bell_01-2"},{"name":"bell_01-1","bone":"bell_01-1","attachment":"bell_01-1"}],"skins":{"default":{"bell_01-1":{"bell_01-1":{"x":12.35,"y":0.93,"rotation":136.58,"width":30,"height":31}},"bell_01-2":{"bell_01-2":{"x":20.68,"y":0.98,"rotation":150.26,"width":8,"height":8}},"bell_02-1":{"bell_02-1":{"x":10.37,"y":2,"rotation":74.6,"width":21,"height":25}},"bell_02-2":{"bell_02-2":{"x":9.29,"y":1.32,"rotation":77.28,"width":6,"height":5}},"bell_02-3":{"bell_02-3":{"x":4.06,"y":0.01,"rotation":74.6,"width":20,"height":12}},"refresh_01":{"refresh_01":{"x":32.39,"y":2.65,"rotation":92.94,"width":61,"height":78}},"refresh_02":{"refresh_02":{"x":2.11,"y":3.57,"rotation":89.31,"width":59,"height":65}},"ribbon_00":{"ribbon_00":{"x":7.88,"y":-1.17,"rotation":92.94,"width":21,"height":21}},"ribbon_01":{"ribbon_01":{"x":14.12,"y":0.12,"rotation":8.95,"width":36,"height":45}},"ribbon_02":{"ribbon_02":{"type":"mesh","uvs":[0.525,0.15826,0.66964,0.29355,0.81037,0.44458,1,0.68685,1,0.82528,0.81037,0.93226,0.57564,0.9657,0.30605,0.96452,0.08328,0.92911,0.09892,0.63965,0.10674,0.47604,0.09501,0.38794,0,0.12365,0,0,0.25528,0,0.36865,0.5956,0.63837,0.53267,0.31001,0.43199,0.52892,0.35648,0.2201,0.31558,0.42728,0.20231],"triangles":[16,18,1,16,1,2,15,17,18,15,18,16,16,2,3,3,5,16,4,5,3,10,15,9,15,10,17,7,9,15,8,9,7,6,15,16,6,16,5,7,15,6,12,13,14,20,14,0,19,12,14,19,14,20,20,0,18,11,12,19,17,19,20,10,11,19,18,0,1,17,20,18,10,19,17],"vertices":[2,8,15.68,8.7,0.91524,9,-8.19,5.94,0.08476,2,8,22.93,9.72,0.4524,9,-1.94,9.75,0.5476,2,8,30.64,10.29,0.10671,9,4.92,13.33,0.89329,2,8,42.38,10.2,0.0111,9,15.74,17.89,0.9889,1,9,21.34,16.97,1,1,9,24.65,10.09,1,1,9,24.75,2.22,1,1,9,23.26,-6.55,1,1,9,20.64,-13.57,1,2,8,24.71,-13.79,0.12256,9,9.01,-11.14,0.87744,2,8,19.2,-9.96,0.4682,9,2.43,-9.79,0.5318,2,8,15.95,-8.33,0.76907,9,-1.2,-9.59,0.23093,1,8,5.14,-5.12,1,1,8,0.87,-2.39,1,1,8,5.41,4.7,1,2,8,27.99,-5.33,0.1263,9,8.67,-2.06,0.8737,2,8,30.62,3.56,0.11766,9,7.57,7.14,0.88234,2,8,21.3,-3.33,0.38898,9,1.74,-2.88,0.61102,2,8,22.59,4.42,0.41804,9,-0.15,4.75,0.58196,2,8,15.68,-3.26,0.93307,9,-3.45,-5.04,0.06693,2,8,15.46,5.01,0.91563,9,-6.93,2.46,0.08437],"hull":15,"edges":[26,28,28,0,0,2,2,4,4,6,6,8,8,10,24,26,24,22,22,20,20,18,18,16,14,16,10,12,12,14],"width":33,"height":41}},"rope":{"rope":{"type":"mesh","uvs":[0.68931,0.08641,0.64931,0.18379,0.62611,0.24026,0.62611,0.30136,0.62611,0.34804,0.62611,0.41692,0.62611,0.47508,0.66318,0.5269,0.70249,0.58187,0.752,0.65108,0.78511,0.69738,0.77694,0.74435,0.76906,0.78969,0.76152,0.83301,0.7577,0.855,0.92218,0.89548,0.98249,0.93891,0.81253,0.97498,0.43421,0.98897,0.12169,0.95584,0.15459,0.91756,0.37939,0.8653,0.38379,0.83798,0.392,0.78708,0.39908,0.74314,0.4068,0.69526,0.37257,0.65145,0.32074,0.58512,0.27249,0.52339,0.23135,0.47075,0.23484,0.42142,0.23978,0.35161,0.24349,0.29916,0.2478,0.23813,0.26365,0.18077,0.28945,0.08739,0.31359,0,0.7248,0,0.39584,0.91012,0.75221,0.89834,0.40132,0.95134],"triangles":[17,39,15,17,15,16,19,40,18,19,20,40,18,39,17,40,20,38,39,18,38,18,40,38,20,21,38,21,22,14,12,24,11,23,24,13,13,24,12,22,23,13,14,22,13,14,38,21,39,14,15,39,38,14,28,6,7,28,29,6,25,9,10,25,26,9,26,8,9,26,7,8,26,27,7,27,28,7,11,25,10,24,25,11,33,34,2,4,32,3,32,33,3,29,30,6,6,30,5,30,31,5,5,31,4,3,33,2,31,32,4,2,34,1,34,35,1,35,36,1,1,36,0,0,36,37],"vertices":[2,1,5.07,4.12,0.81387,2,-32.53,7.02,0.18613,2,1,26.13,4.83,0.65809,2,-11.49,5.86,0.34191,2,1,38.34,5.23,0.2891,2,0.7,5.19,0.7109,2,1,51.48,6.4,0.04597,2,13.9,5.19,0.95403,3,1,61.53,7.29,0.03946,2,23.99,5.19,0.94701,3,-26.19,7.74,0.01354,2,2,38.86,5.19,0.68102,3,-11.38,6.31,0.31898,2,2,51.43,5.19,0.47952,3,1.12,5.11,0.52048,2,2,62.62,6.27,0.1903,3,12.37,5.1,0.8097,2,3,24.3,5.1,0.94773,4,-27.79,0.78,0.05227,2,3,39.32,5.09,0.7833,4,-12.93,2.98,0.2167,2,3,49.36,5.09,0.67561,4,-2.99,4.45,0.32439,2,3,59.44,3.88,0.43001,4,7.15,4.74,0.56999,3,3,69.16,2.71,0.00253,4,16.94,5.01,0.99549,5,-27.8,5.17,0.00197,1,4,26.3,5.27,1,2,4,31.05,5.4,0.9336,5,-13.7,5.56,0.0664,2,4,39.54,10.61,0.41361,5,-5.21,10.77,0.58639,2,4,48.82,12.84,0.06695,5,4.07,13,0.93305,2,4,56.85,8.32,0.0047,5,12.11,8.47,0.9953,2,4,60.43,-2.48,0.0101,5,15.69,-2.33,0.9899,2,4,53.75,-11.9,0.08671,5,9,-11.75,0.91329,2,4,45.44,-11.37,0.22495,5,0.7,-11.22,0.77505,2,4,33.83,-5.44,0.75712,5,-10.91,-5.28,0.24288,1,4,27.93,-5.62,1,1,4,16.94,-5.94,1,2,3,58.13,-7,0.41451,4,7.45,-6.22,0.58549,2,3,47.85,-5.79,0.68258,4,-2.89,-6.53,0.31742,2,3,38.34,-5.87,0.76,4,-12.29,-8,0.24,2,3,23.94,-5.99,0.93144,4,-26.52,-10.24,0.06856,2,2,61.86,-5.06,0.22159,3,10.53,-6.1,0.77841,2,2,50.49,-6.26,0.51055,3,-0.91,-6.2,0.48945,2,2,39.84,-6.16,0.66685,3,-11.5,-5.08,0.33315,3,1,63.28,-3.8,0.03904,2,24.76,-6.01,0.93685,3,-26.5,-3.49,0.02411,2,1,51.99,-4.7,0.05178,2,13.43,-5.91,0.94822,2,1,38.85,-5.74,0.35692,2,0.25,-5.78,0.64308,2,1,26.46,-6.37,0.69959,2,-12.15,-5.32,0.30041,2,1,6.31,-7.41,0.8231,2,-32.32,-4.57,0.1769,1,1,-12.56,-8.38,1,1,1,-13.61,3.5,1,2,4,43.48,-4.47,0.28,5,-1.27,-4.31,0.72,2,4,40.41,5.72,0.33691,5,-4.34,5.88,0.66309,2,4,52.36,-3.85,0.15,5,7.62,-3.7,0.85],"hull":38,"edges":[42,40,40,38,38,36,36,34,34,32,32,30,30,28,72,74,68,66,2,4,66,64,6,4,58,60,12,10,58,56,14,12,50,52,20,18,50,48,22,20,50,20,52,18,48,22,58,12,56,14,60,10,66,4,68,2,64,6,42,28,42,44,28,26,44,26,52,54,54,56,14,16,16,18,60,62,62,64,6,8,8,10,68,70,70,72,2,0,0,74,44,46,46,48,22,24,24,26],"width":29,"height":216}}}},"animations":{"Appear":{"bones":{"rope_01":{"rotate":[{"time":0,"angle":16.43},{"time":0.1333,"angle":-7.61},{"time":0.2333,"angle":-6.6},{"time":0.4333,"angle":-1.05},{"time":0.7333,"angle":8.25},{"time":1,"angle":-0.04},{"time":1.2333,"angle":0}]},"rope_02":{"rotate":[{"time":0,"angle":11.75},{"time":0.1333,"angle":16.64},{"time":0.2333,"angle":2.48,"curve":[0.25,0,0.75,1]},{"time":0.4333,"angle":-11.67,"curve":[0.25,0,0.75,1]},{"time":0.7333,"angle":-2.42,"curve":[0.25,0,0.75,1]},{"time":1,"angle":-5.26,"curve":[0.25,0,0.75,1]},{"time":1.2333,"angle":0.33,"curve":[0.25,0,0.75,1]},{"time":1.5,"angle":0}]},"rope_03":{"rotate":[{"time":0,"angle":12.93},{"time":0.1333,"angle":19.39},{"time":0.2333,"angle":9.43},{"time":0.4333,"angle":-11.74,"curve":[0.25,0,0.75,1]},{"time":0.7333,"angle":2.36,"curve":[0.25,0,0.75,1]},{"time":1,"angle":-0.75,"curve":[0.25,0,0.75,1]},{"time":1.2333,"angle":1.83,"curve":[0.25,0,0.75,1]},{"time":1.5,"angle":0}]},"rope_04":{"rotate":[{"time":0,"angle":25.45},{"time":0.2333,"angle":30.37},{"time":0.4333,"angle":-9.55},{"time":0.6333,"angle":3.61},{"time":0.8333,"angle":9.45,"curve":[0.25,0,0.75,1]},{"time":1.0333,"angle":1.54,"curve":[0.25,0,0.75,1]},{"time":1.3,"angle":0.93,"curve":[0.25,0,0.75,1]},{"time":1.5,"angle":0}]},"rope_05":{"rotate":[{"time":0,"angle":8.08},{"time":0.1,"angle":40.84},{"time":0.2333,"angle":26.33},{"time":0.3333,"angle":-14.17},{"time":0.8333,"angle":8.88,"curve":[0.25,0,0.75,1]},{"time":1.0333,"angle":-4.95,"curve":[0.25,0,0.75,1]},{"time":1.3,"angle":5.96,"curve":[0.25,0,0.75,1]},{"time":1.5,"angle":0}],"scale":[{"time":0,"x":1,"y":1.075,"curve":[0.25,0,0.75,1]},{"time":0.6,"x":1,"y":0.805},{"time":0.9333,"x":1,"y":1.075,"curve":[0.25,0,0.75,1]},{"time":1.2667,"x":1,"y":0.805},{"time":1.5,"x":1,"y":1}]},"refresh_02":{"translate":[{"time":0,"x":0,"y":-1.07},{"time":0.6,"x":0,"y":-0.26},{"time":0.9333,"x":0,"y":-1.07},{"time":1.2667,"x":0,"y":0.91},{"time":1.5,"x":0,"y":0}],"scale":[{"time":0,"x":1,"y":1},{"time":0.6,"x":1,"y":0.86},{"time":0.9333,"x":1,"y":1},{"time":1.2667,"x":1,"y":0.86},{"time":1.5,"x":1,"y":1}]},"ribbon_01":{"rotate":[{"time":0,"angle":22.62},{"time":0.3,"angle":50.1},{"time":0.6,"angle":-45.49},{"time":0.7667,"angle":10.28},{"time":1,"angle":-8.56},{"time":1.2333,"angle":0}]},"ribbon_02-1":{"rotate":[{"time":0,"angle":22.62},{"time":0.3,"angle":42.6},{"time":0.6,"angle":-31.39},{"time":0.7667,"angle":3.08},{"time":1,"angle":-27.16},{"time":1.3333,"angle":5.7},{"time":1.5,"angle":0}]},"ribbon_02-2":{"rotate":[{"time":0,"angle":10.94},{"time":0.3333,"angle":34.71},{"time":0.6667,"angle":6.98},{"time":0.9,"angle":30.28},{"time":1.1,"angle":0.81},{"time":1.3333,"angle":0}]},"bell_01-1":{"rotate":[{"time":0,"angle":8.08},{"time":0.2333,"angle":40.84},{"time":0.4333,"angle":26.33},{"time":0.6333,"angle":-33.37},{"time":0.8333,"angle":31.98,"curve":[0.25,0,0.75,1]},{"time":1.0333,"angle":-4.95,"curve":[0.25,0,0.75,1]},{"time":1.3,"angle":5.96,"curve":[0.25,0,0.75,1]},{"time":1.5,"angle":0}]},"bell_01-2":{"rotate":[{"time":0,"angle":8.08},{"time":0.2333,"angle":40.84},{"time":0.4333,"angle":26.33},{"time":0.6333,"angle":-24.07},{"time":0.8333,"angle":21.48,"curve":[0.25,0,0.75,1]},{"time":1.0333,"angle":-4.95,"curve":[0.25,0,0.75,1]},{"time":1.3,"angle":5.96,"curve":[0.25,0,0.75,1]},{"time":1.5,"angle":0}]},"bell_02-1":{"rotate":[{"time":0,"angle":8.08},{"time":0.2333,"angle":40.84},{"time":0.4333,"angle":26.33},{"time":0.6333,"angle":-24.07},{"time":0.8333,"angle":21.48,"curve":[0.25,0,0.75,1]},{"time":1.0333,"angle":-4.95,"curve":[0.25,0,0.75,1]},{"time":1.3,"angle":5.96,"curve":[0.25,0,0.75,1]},{"time":1.5,"angle":0}]},"bell_02-2":{"rotate":[{"time":0,"angle":8.08},{"time":0.2333,"angle":40.84},{"time":0.4333,"angle":26.33},{"time":0.6333,"angle":-24.07},{"time":0.8333,"angle":21.48,"curve":[0.25,0,0.75,1]},{"time":1.0333,"angle":-4.95,"curve":[0.25,0,0.75,1]},{"time":1.3,"angle":5.96,"curve":[0.25,0,0.75,1]},{"time":1.5,"angle":0}]}}},"Click":{"bones":{"ribbon_01":{"rotate":[{"time":0.1333,"angle":0},{"time":0.3333,"angle":22.8},{"time":0.5,"angle":10.5},{"time":0.6667,"angle":-16.03},{"time":0.8667,"angle":12.6},{"time":1.0333,"angle":-5.7},{"time":1.2,"angle":0}]},"rope_01":{"rotate":[{"time":0,"angle":0},{"time":0.1333,"angle":8.77},{"time":0.3333,"angle":5.49},{"time":0.5,"angle":-2.02},{"time":0.7,"angle":3.03},{"time":1,"angle":0}]},"rope_02":{"rotate":[{"time":0,"angle":0},{"time":0.1333,"angle":-8.02},{"time":0.3333,"angle":-1.44},{"time":0.5,"angle":-10.37},{"time":0.7,"angle":-8.64},{"time":1,"angle":0}],"translate":[{"time":0,"x":0,"y":0},{"time":0.2667,"x":-11.33,"y":-0.62},{"time":0.5,"x":0,"y":0}]},"rope_03":{"rotate":[{"time":0,"angle":0},{"time":0.1333,"angle":-13.82},{"time":0.3333,"angle":2.14},{"time":0.5,"angle":0.44},{"time":0.7,"angle":-4.39},{"time":1,"angle":-1.64},{"time":1.2,"angle":0}],"translate":[{"time":0,"x":0,"y":0},{"time":0.2667,"x":-6.58,"y":0.22},{"time":0.5,"x":15.83,"y":0},{"time":0.7,"x":0,"y":0}]},"rope_04":{"rotate":[{"time":0,"angle":0},{"time":0.1,"angle":-2.06},{"time":0.2,"angle":7.5},{"time":0.4333,"angle":14.79},{"time":0.6,"angle":-2.99},{"time":0.8333,"angle":1.87},{"time":1,"angle":0.98},{"time":1.2,"angle":0}],"translate":[{"time":0,"x":0,"y":0},{"time":0.2667,"x":-8.71,"y":1.14},{"time":0.5,"x":9.08,"y":0},{"time":0.7,"x":0,"y":0}]},"rope_05":{"rotate":[{"time":0,"angle":0},{"time":0.1,"angle":6.55},{"time":0.2,"angle":3.23},{"time":0.4333,"angle":33.97},{"time":0.6,"angle":-15.58},{"time":0.8333,"angle":3.67},{"time":0.9667,"angle":-3.99},{"time":1.2,"angle":0}],"translate":[{"time":0,"x":0,"y":0},{"time":0.2667,"x":-8.05,"y":-0.14},{"time":0.6333,"x":0,"y":0}],"scale":[{"time":0.3,"x":1,"y":1},{"time":0.6,"x":1,"y":0.77},{"time":0.9667,"x":1,"y":1}]},"bell_02-3":{"translate":[{"time":0.3333,"x":0,"y":0},{"time":0.5,"x":-1.53,"y":0},{"time":0.9,"x":1,"y":-1.13},{"time":1.2,"x":0,"y":0}]},"ribbon_02-1":{"rotate":[{"time":0,"angle":0},{"time":0.1333,"angle":-23.22},{"time":0.3,"angle":3.81},{"time":0.5333,"angle":-14.77},{"time":0.7,"angle":-24.55},{"time":0.9333,"angle":4.35},{"time":1.0667,"angle":-1.61},{"time":1.2,"angle":0}]},"ribbon_02-2":{"rotate":[{"time":0,"angle":0},{"time":0.1333,"angle":2.62},{"time":0.3,"angle":-3.3},{"time":0.5333,"angle":34.86},{"time":0.7,"angle":10.11},{"time":0.9333,"angle":-2.35},{"time":1.0667,"angle":18.11},{"time":1.2,"angle":0}]},"bell_01-1":{"rotate":[{"time":0,"angle":0},{"time":0.4333,"angle":-1.65},{"time":0.7,"angle":-19.96},{"time":0.9667,"angle":24.88},{"time":1.2,"angle":1.65}]},"bell_01-2":{"rotate":[{"time":0,"angle":0},{"time":0.1333,"angle":8.7},{"time":0.3333,"angle":-19.8},{"time":0.4667,"angle":11.58},{"time":0.6333,"angle":-22.34},{"time":0.7667,"angle":16.2},{"time":0.9667,"angle":-0.18},{"time":1.2,"angle":0}]},"bell_02-2":{"rotate":[{"time":0.1,"angle":0},{"time":0.3,"angle":-3.6},{"time":0.4667,"angle":21.13},{"time":0.6333,"angle":-15.17},{"time":0.8,"angle":20.9},{"time":0.9667,"angle":-10.6},{"time":1.0667,"angle":4.76},{"time":1.2,"angle":0}],"translate":[{"time":0.3,"x":0,"y":0},{"time":0.4667,"x":0,"y":1.73,"curve":"stepped"},{"time":0.6333,"x":0,"y":1.73},{"time":1.2,"x":0,"y":0}]},"bell_02-1":{"rotate":[{"time":0,"angle":0},{"time":0.1333,"angle":19.94},{"time":0.3667,"angle":16.2},{"time":0.5333,"angle":-13.8},{"time":0.6667,"angle":21.44},{"time":0.8333,"angle":26.4},{"time":1,"angle":-10.8},{"time":1.2,"angle":0}]},"refresh_02":{"translate":[{"time":0,"x":0,"y":0},{"time":0.3,"x":0,"y":-2.36},{"time":0.5,"x":0,"y":0},{"time":0.9,"x":0,"y":-1.16},{"time":1,"x":0,"y":0}]}}},"Idle":{"bones":{"rope_01":{"rotate":[{"time":0,"angle":0.16},{"time":1,"angle":1.78},{"time":2,"angle":0.16}]},"rope_02":{"rotate":[{"time":0,"angle":-4.46},{"time":1,"angle":-1.11},{"time":2,"angle":-4.46}]},"rope_03":{"rotate":[{"time":0,"angle":-3.2,"curve":[0.021,0.06,0.818,0.96]},{"time":1,"angle":1.32,"curve":[0.047,0.04,0.75,1]},{"time":2,"angle":-3.2}]},"rope_04":{"rotate":[{"time":0,"angle":7.95},{"time":0.3,"angle":4.84},{"time":1.4667,"angle":12.53},{"time":2,"angle":7.95}]},"rope_05":{"rotate":[{"time":0,"angle":6.14},{"time":0.3,"angle":-3.93},{"time":1.3333,"angle":3.23},{"time":2,"angle":6.14}],"scale":[{"time":0,"x":1,"y":1},{"time":1,"x":1,"y":0.955},{"time":2,"x":1,"y":1}]},"ribbon_01":{"rotate":[{"time":0,"angle":0},{"time":0.4667,"angle":-5.88},{"time":1.5,"angle":5.59},{"time":2,"angle":0}]},"ribbon_02-1":{"rotate":[{"time":0,"angle":0},{"time":1,"angle":10.2},{"time":2,"angle":0}]},"ribbon_02-2":{"rotate":[{"time":0,"angle":0},{"time":0.8,"angle":-15.9},{"time":1.5333,"angle":3.24},{"time":2,"angle":0}]},"bell_01-2":{"rotate":[{"time":0,"angle":0},{"time":0.2667,"angle":-4.5},{"time":1.3,"angle":14.4},{"time":2,"angle":0}],"scale":[{"time":0,"x":1,"y":1},{"time":1.3,"x":1,"y":0.785},{"time":2,"x":1,"y":1}]},"bell_02-1":{"rotate":[{"time":0,"angle":0},{"time":1,"angle":7.5},{"time":2,"angle":0}]},"bell_02-2":{"rotate":[{"time":0,"angle":0},{"time":1.0333,"angle":17.69},{"time":2,"angle":0}]},"bell_01-1":{"rotate":[{"time":0,"angle":0},{"time":0.8333,"angle":11.4},{"time":2,"angle":0}]}}}}} \ No newline at end of file diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.json.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.json.meta new file mode 100644 index 00000000000..d168e0b8d1a --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d0ae964ef28941c4a81ff1ce00107430 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.png b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..efe9f185d570848b9416129e26b2a4083f655ce7 GIT binary patch literal 30396 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 z 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 KDAz06MEwtfVj 2) + int maxCount = 2; + if (PandoraBoxMaster.CurrentPanPlayer.PremiumEndBlock > Game.Game.instance.Agent.BlockIndex) + maxCount = 9; + + if (PandoraBoxMaster.ArenaFavTargets.Count > maxCount) OneLineSystem.Push(MailType.System, "Pandora Box: You reach Maximum number of nemesis, please remove some!" , NotificationCell.NotificationType.Information); else diff --git a/nekoyume/Assets/_Scripts/UI/Widget/RankingBoard.cs b/nekoyume/Assets/_Scripts/UI/Widget/RankingBoard.cs index 06cc51b38cd..0bd63043720 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/RankingBoard.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/RankingBoard.cs @@ -27,6 +27,7 @@ public class RankingBoard : Widget //|||||||||||||| PANDORA START CODE ||||||||||||||||||| [Header("PANDORA CUSTOM FIELDS")] [SerializeField] private TextMeshProUGUI FightCountTxt = null; + [SerializeField] private Button RefreshButton = null; [SerializeField] private Slider FightCountSldr = null; [HideInInspector] public Dictionary avatarStatesPandora; [Space(50)] @@ -59,6 +60,60 @@ public void ChangeSliderArenaCount() FightCountTxt.text = FightCountSldr.value.ToString(); PandoraBoxMaster.ArenaTicketsToUse = int.Parse(FightCountTxt.text); } + + public async void RefreshBoard() + { + RefreshButton.interactable = false; + RefreshButton.GetComponentInChildren().text = "Update..."; + + //clear fav list, not optimal + PandoraBoxMaster.ArenaFavTargets.Clear(); + for (int i = 0; i < 10; i++) //fav max count + { + string key = "_PandoraBox_PVP_FavTarget0" + i + "_" + States.Instance.CurrentAvatarState.address; + if (PlayerPrefs.HasKey(key)) + PandoraBoxMaster.ArenaFavTargets.Add(PlayerPrefs.GetString(key)); + } + + WeeklyArenaState weeklyArenaState = null; + var agent = Game.Game.instance.Agent; + if (!_cachedBlockHash.Equals(agent.BlockTipHash)) + { + _cachedBlockHash = agent.BlockTipHash; + await UniTask.Run(async () => + { + var gameConfigState = States.Instance.GameConfigState; + var weeklyArenaIndex = (int)agent.BlockIndex / gameConfigState.WeeklyArenaInterval; + var weeklyArenaAddress = WeeklyArenaState.DeriveAddress(weeklyArenaIndex); + weeklyArenaState = + new WeeklyArenaState((Bencodex.Types.Dictionary)await agent.GetStateAsync(weeklyArenaAddress)); + States.Instance.SetWeeklyArenaState(weeklyArenaState); + await UpdateWeeklyCache(States.Instance.WeeklyArenaState); + }); + } + + UpdateArena(); + + StartCoroutine(RefreshCooldown()); + } + + System.Collections.IEnumerator RefreshCooldown() + { + RefreshButton.interactable = false; + int cooldown = 40; + PandoraBoxMaster.CurrentPanPlayer = PandoraBoxMaster.GetPanPlayer(States.Instance.CurrentAvatarState.agentAddress.ToString()); + if (PandoraBoxMaster.CurrentPanPlayer.PremiumEndBlock > Game.Game.instance.Agent.BlockIndex) + cooldown = 15; + TextMeshProUGUI buttonText = RefreshButton.GetComponentInChildren(); + + for (int i = 0; i < cooldown; i++) + { + buttonText.text = (cooldown - i).ToString(); + yield return new WaitForSeconds(1); + } + buttonText.text = "Refresh"; + RefreshButton.interactable = true; + } //|||||||||||||| PANDORA END CODE ||||||||||||||||||| protected override void Awake() @@ -97,7 +152,7 @@ private async void ShowAsync(WeeklyArenaState weeklyArenaState = null) { //|||||||||||||| PANDORA START CODE ||||||||||||||||||| PandoraBoxMaster.ArenaFavTargets.Clear(); - for (int i = 0; i < 3; i++) + for (int i = 0; i < 10; i++) //fav max count { string key = "_PandoraBox_PVP_FavTarget0" + i + "_" + States.Instance.CurrentAvatarState.address; if (PlayerPrefs.HasKey(key)) @@ -144,6 +199,8 @@ await UniTask.Run(async () => Find().Show(HeaderMenuStatic.AssetVisibleState.Battle); UpdateArena(); + + StartCoroutine(RefreshCooldown()); } public override void Close(bool ignoreCloseAnimation = false) @@ -308,7 +365,7 @@ public void GoToStage(BattleLog log) private async Task UpdateWeeklyCache(WeeklyArenaState state) { - var infos = state.GetArenaInfos(1, 3); + var infos = state.GetArenaInfos(1, 20); //3 //|||||||||||||| PANDORA START CODE ||||||||||||||||||| int upper = 50 + (PandoraBoxMaster.Instance.Settings.ArenaListUpper * PandoraBoxMaster.Instance.Settings.ArenaListStep); int lower = 20 + (PandoraBoxMaster.Instance.Settings.ArenaListLower * PandoraBoxMaster.Instance.Settings.ArenaListStep); diff --git a/nekoyume/Assets/_Scripts/UI/Widget/ShopBuy.cs b/nekoyume/Assets/_Scripts/UI/Widget/ShopBuy.cs index ecc11f025a0..7f0d49d4c28 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/ShopBuy.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/ShopBuy.cs @@ -12,6 +12,8 @@ using Nekoyume.UI.Model; using Nekoyume.UI.Module; using Nekoyume.UI.Scroller; +using PandoraBox; +using TMPro; using UniRx; using UnityEngine; using UnityEngine.UI; @@ -21,6 +23,12 @@ namespace Nekoyume.UI { public class ShopBuy : Widget { + //|||||||||||||| PANDORA START CODE ||||||||||||||||||| + [Header("PANDORA CUSTOM FIELDS")] + public Button RefreshButton; + [Space(50)] + //|||||||||||||| PANDORA END CODE ||||||||||||||||||| + [SerializeField] private Module.ShopBuyItems shopItems = null; [SerializeField] private ShopBuyBoard shopBuyBoard = null; [SerializeField] private Button sellButton = null; @@ -87,6 +95,53 @@ public override void Initialize() shopBuyBoard.OnChangeBuyType.Subscribe(SetMultiplePurchase).AddTo(gameObject); } + //|||||||||||||| PANDORA START CODE ||||||||||||||||||| + + public async void RefreshShop() + { + RefreshButton.interactable = false; + RefreshButton.GetComponentInChildren().text = "..."; + + Debug.LogError("Refresh started!"); + var task = Task.Run(async () => + { + await ReactiveShopState.InitAndUpdateBuyDigests(); + return true; + }); + Debug.LogError("Refresh Ended!"); + + var result = await task; + Debug.LogError("Task Ended!"); + if (result) + { + base.Show(false); + shopBuyBoard.ShowDefaultView(); + shopItems.Show(); + + Find().gameObject.SetActive(false); + } + Debug.LogError("Start Cooldown"); + StartCoroutine(RefreshCooldown()); + } + + System.Collections.IEnumerator RefreshCooldown() + { + RefreshButton.interactable = false; + int cooldown = 60; + PandoraBoxMaster.CurrentPanPlayer = PandoraBoxMaster.GetPanPlayer(States.Instance.CurrentAvatarState.agentAddress.ToString()); + if (PandoraBoxMaster.CurrentPanPlayer.PremiumEndBlock > Game.Game.instance.Agent.BlockIndex) + cooldown = 20; + TextMeshProUGUI buttonText = RefreshButton.GetComponentInChildren(); + + for (int i = 0; i < cooldown; i++) + { + buttonText.text = (cooldown - i).ToString(); + yield return new WaitForSeconds(1); + } + buttonText.text = ""; + RefreshButton.interactable = true; + } + //|||||||||||||| PANDORA END CODE ||||||||||||||||||| public override void Show(bool ignoreShowAnimation = false) { ShowAsync(); @@ -115,6 +170,8 @@ private async void ShowAsync(bool ignoreShowAnimation = false) Find().Close(); HelpTooltip.HelpMe(100018, true); } + + StartCoroutine(RefreshCooldown()); } public void Open()