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 00000000000..efe9f185d57 Binary files /dev/null and b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.png differ diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.png.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.png.meta new file mode 100644 index 00000000000..bd9bb72e2f5 --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 7109b9dc8ccb84443b41067d5f46d142 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: bc82ca5e3404720489dabc753630f4e7 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Atlas.asset b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Atlas.asset new file mode 100644 index 00000000000..60f1d27a375 --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Atlas.asset @@ -0,0 +1,17 @@ +%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: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: shop_refresh_Atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 3471352a65dbf6e4885ebfc1639fe088, type: 3} + materials: + - {fileID: 2100000, guid: 63201867bc928f84481799350748feab, type: 2} diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Atlas.asset.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Atlas.asset.meta new file mode 100644 index 00000000000..942dd4c37d4 --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0d94c8ec72dc8d419125a43f37f0f85 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/AddressableAssets/UI/Background/shop_refresh/shop_refresh_Material.mat b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Material.mat similarity index 90% rename from nekoyume/Assets/AddressableAssets/UI/Background/shop_refresh/shop_refresh_Material.mat rename to nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Material.mat index c2473ae1d2c..e50c2d141fd 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Background/shop_refresh/shop_refresh_Material.mat +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Material.mat @@ -20,7 +20,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 62d02a8e1a444114695f9acd5e47e6fa, type: 3} + m_Texture: {fileID: 2800000, guid: 7109b9dc8ccb84443b41067d5f46d142, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: @@ -29,7 +29,7 @@ Material: - _OutlineReferenceTexWidth: 1024 - _OutlineSmoothness: 1 - _OutlineWidth: 3 - - _StencilComp: 8 + - _StencilComp: 0 - _StencilRef: 1 - _StraightAlphaInput: 0 - _ThresholdEnd: 0.25 diff --git a/nekoyume/Assets/AddressableAssets/UI/Background/shop_refresh/shop_refresh_Material.mat.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Material.mat.meta similarity index 79% rename from nekoyume/Assets/AddressableAssets/UI/Background/shop_refresh/shop_refresh_Material.mat.meta rename to nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Material.mat.meta index 181dd070baa..169fe0f8ae4 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Background/shop_refresh/shop_refresh_Material.mat.meta +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3a56ea12140828b4a8e3d2e9be9ee6b6 +guid: 63201867bc928f84481799350748feab NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_SkeletonData.asset b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_SkeletonData.asset new file mode 100644 index 00000000000..f8215ce67e0 --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_SkeletonData.asset @@ -0,0 +1,24 @@ +%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: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: shop_refresh_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 765e550c06eb12948a6292ca5dd4c9a4, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: d0ae964ef28941c4a81ff1ce00107430, type: 3} + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_SkeletonData.asset.meta b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_SkeletonData.asset.meta new file mode 100644 index 00000000000..eca190f41e9 --- /dev/null +++ b/nekoyume/Assets/_PandoraBox/Prefabs/shop_refresh_Old/shop_refresh_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2ca8e2475b69a84980a2e668269f8cb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/_PandoraBox/Scripts/PandoraBoxMaster.cs b/nekoyume/Assets/_PandoraBox/Scripts/PandoraBoxMaster.cs index 1902986ebff..d91c5e05d22 100644 --- a/nekoyume/Assets/_PandoraBox/Scripts/PandoraBoxMaster.cs +++ b/nekoyume/Assets/_PandoraBox/Scripts/PandoraBoxMaster.cs @@ -16,7 +16,7 @@ public class PandoraBoxMaster : MonoBehaviour //Unsaved Reg Settings public static string OriginalVersionId = "v100121"; - public static string VersionId = "010031"; + public static string VersionId = "010032"; public static PanDatabase PanDatabase; public static PanPlayer CurrentPanPlayer; public static int ActionCooldown = 4; @@ -211,6 +211,8 @@ public void Load() { WhatsNewShown = false; PlayerPrefs.SetString("_PandoraBox_Ver", PandoraBoxMaster.VersionId); + PlayerPrefs.SetInt("_PandoraBox_General_IsMultipleLogin", 0); + IsMultipleLogin = false; //PlayerPrefs.SetInt("_PandoraBox_General_WhatsNewShown", 0); //false } diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/FriendInfoPopupPandora.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/FriendInfoPopupPandora.cs index 4d8bad41b78..4da936f816e 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Popup/FriendInfoPopupPandora.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Popup/FriendInfoPopupPandora.cs @@ -149,7 +149,11 @@ public void SetNemesis() } else { - if (PandoraBoxMaster.ArenaFavTargets.Count > 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()