From 6bc495a92c0d243e44464c1f83a1aa1ee5d42f85 Mon Sep 17 00:00:00 2001 From: Osama Deep Date: Tue, 26 Apr 2022 05:33:34 +0300 Subject: [PATCH] Chrono Tool, equip any item --- .../Resources/UI/Prefabs/ChronoSlot.prefab | 318 +++++++++++-- .../UI/Prefabs/UI_BattleResultPopup.prefab | 24 +- .../UI/Prefabs/UI_ChronoSlotsPopup.prefab | 109 +---- .../UI/Prefabs/UI_ItemTooltip.prefab | 231 +++------- .../UI/Prefabs/UI_LoginSystem.prefab | 257 ++++++++++- .../_Scripts/BlockChain/ActionManager.cs | 21 + .../_Scripts/Game/Character/CharacterBase.cs | 32 +- .../Assets/_Scripts/Game/Character/Player.cs | 33 +- .../ItemMoreOption.prefab | 435 +++++++++++++++++- .../PandoraBox/Scripts/PandoraBoxMaster.cs | 7 +- .../_Scripts/UI/Combination/SubRecipeView.cs | 8 + .../Assets/_Scripts/UI/Module/ChronoSlot.cs | 23 +- .../UI/Module/EnhancementInventory.cs | 2 +- .../Assets/_Scripts/UI/Module/Inventory.cs | 5 +- .../_Scripts/UI/Module/Item/EquipmentSlot.cs | 1 - .../_Scripts/UI/Widget/BattlePreparation.cs | 2 +- .../Assets/_Scripts/UI/Widget/Hud/HpBar.cs | 32 +- .../_Scripts/UI/Widget/Tooltip/ItemTooltip.cs | 302 ++++++------ 18 files changed, 1297 insertions(+), 545 deletions(-) diff --git a/nekoyume/Assets/Resources/UI/Prefabs/ChronoSlot.prefab b/nekoyume/Assets/Resources/UI/Prefabs/ChronoSlot.prefab index b22e2c73eec..1a55542378c 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/ChronoSlot.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/ChronoSlot.prefab @@ -73,7 +73,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -206.33633, y: -33.949463} + m_AnchoredPosition: {x: -200.4, y: -33.95} m_SizeDelta: {x: 97.3348, y: 23.9454} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6555863498824617858 @@ -432,7 +432,6 @@ GameObject: - component: {fileID: 5632487236220588107} - component: {fileID: 6763260073236985337} - component: {fileID: 1622784414788798592} - - component: {fileID: 5491627550254955243} m_Layer: 5 m_Name: AddressText m_TagString: Untagged @@ -457,7 +456,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 117.600006, y: 36.5} - m_SizeDelta: {x: 0, y: 27.8612} + m_SizeDelta: {x: 290.75, y: 27.8612} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6763260073236985337 CanvasRenderer: @@ -514,10 +513,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12 + m_fontSize: 12.45 m_fontSizeBase: 12 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 8 m_fontSizeMax: 32 m_fontStyle: 0 @@ -530,7 +529,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -556,20 +555,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &5491627550254955243 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2336564192810915360} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &2694225854664529127 GameObject: m_ObjectHideFlags: 0 @@ -684,7 +669,6 @@ GameObject: - component: {fileID: 2422510378129342012} - component: {fileID: 7828001777338031263} - component: {fileID: 392594380688945486} - - component: {fileID: 2354661136904890298} m_Layer: 5 m_Name: APRefillText m_TagString: Untagged @@ -708,8 +692,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 117.600006, y: 0.0000033379} - m_SizeDelta: {x: 0, y: 28.6967} + m_AnchoredPosition: {x: 117.600006, y: 0} + m_SizeDelta: {x: 230, y: 28.7} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7828001777338031263 CanvasRenderer: @@ -766,10 +750,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 21.42 + m_fontSize: 20.1 m_fontSizeBase: 21.42 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 8 m_fontSizeMax: 32 m_fontStyle: 0 @@ -782,7 +766,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -808,20 +792,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &2354661136904890298 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3758320955610598093} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &4513510816971702463 GameObject: m_ObjectHideFlags: 0 @@ -988,6 +958,139 @@ MonoBehaviour: defaultWordSpacing: 0 defaultLineSpacingInitialized: 0 defaultLineSpacing: 0 +--- !u!1 &5317383345642052711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8911040789009765677} + - component: {fileID: 1708450692600657391} + - component: {fileID: 4664218393911041069} + - component: {fileID: 8210296285573923620} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8911040789009765677 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5317383345642052711} + 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: 2584134564216441101} + m_Father: {fileID: 906186260637822460} + m_RootOrder: 11 + 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: 125.66, y: 0} + m_SizeDelta: {x: 55.3774, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1708450692600657391 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5317383345642052711} + m_CullTransparentMesh: 1 +--- !u!114 &4664218393911041069 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5317383345642052711} + 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: 45179b48ce56c4ed18b4c1f9ef4e72b2, 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 &8210296285573923620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5317383345642052711} + 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: 4664218393911041069} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6930396789798022067} + m_TargetAssemblyTypeName: Nekoyume.UI.Module.ChronoSlot, Nekoyume + m_MethodName: CollectAP + 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 &5513343760910302237 GameObject: m_ObjectHideFlags: 0 @@ -1083,6 +1186,140 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6338710326824729042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2584134564216441101} + - component: {fileID: 3785602806388941976} + - component: {fileID: 4726393535071144638} + 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 &2584134564216441101 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6338710326824729042} + 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: 8911040789009765677} + 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.3139, y: 0.4186} + m_SizeDelta: {x: -9.4165, y: -9.2073} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3785602806388941976 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6338710326824729042} + m_CullTransparentMesh: 1 +--- !u!114 &4726393535071144638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6338710326824729042} + 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: Refill + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: da30528eb07f14a528ca47d39cfc648a, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20.75 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + 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 &6565755886105151160 GameObject: m_ObjectHideFlags: 0 @@ -1288,6 +1525,7 @@ RectTransform: - {fileID: 3787858095262186575} - {fileID: 749558304225060662} - {fileID: 7980779116504422455} + - {fileID: 8911040789009765677} m_Father: {fileID: 7778286864631315859} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_BattleResultPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_BattleResultPopup.prefab index 6f14db71d90..059fa37c4de 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_BattleResultPopup.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_BattleResultPopup.prefab @@ -1462,7 +1462,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 65} + m_SizeDelta: {x: 200, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5763845858810283453 CanvasRenderer: @@ -1838,7 +1838,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 65} + m_SizeDelta: {x: 200, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &128695271115349937 CanvasRenderer: @@ -3566,7 +3566,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 520, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7953334354609671252 @@ -6942,7 +6942,7 @@ PrefabInstance: - target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 92 objectReference: {fileID: 0} - target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab, type: 3} @@ -7061,6 +7061,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0c75875ee6d9a724ab977f6af0c747ab, type: 3} +--- !u!224 &2946634846980001026 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2855381624818415449, guid: 0c75875ee6d9a724ab977f6af0c747ab, + type: 3} + m_PrefabInstance: {fileID: 1100240318847875675} + m_PrefabAsset: {fileID: 0} --- !u!114 &8828973387584366379 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8485351490845318512, guid: 0c75875ee6d9a724ab977f6af0c747ab, @@ -7073,12 +7079,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0e4bc746f35a40a28d25e70e7d5307a5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &2946634846980001026 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2855381624818415449, guid: 0c75875ee6d9a724ab977f6af0c747ab, - type: 3} - m_PrefabInstance: {fileID: 1100240318847875675} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1141868800928187020 PrefabInstance: m_ObjectHideFlags: 0 @@ -8343,7 +8343,7 @@ PrefabInstance: - target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 92 objectReference: {fileID: 0} - target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab, type: 3} @@ -12183,7 +12183,7 @@ PrefabInstance: - target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 92 objectReference: {fileID: 0} - target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab, type: 3} diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_ChronoSlotsPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_ChronoSlotsPopup.prefab index 82ed1eca720..fdfd119e40e 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_ChronoSlotsPopup.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_ChronoSlotsPopup.prefab @@ -1378,11 +1378,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8651601265192141225} m_Modifications: - - target: {fileID: 714665952803558946, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1849666679564753566, guid: fc24ce4f14eae6841881a10ece115a81, type: 3} propertyPath: m_AnchoredPosition.y @@ -1393,21 +1388,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -9.700012 objectReference: {fileID: 0} - - target: {fileID: 6033486946117268058, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -200.6 - objectReference: {fileID: 0} - - target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -33.95 - objectReference: {fileID: 0} - target: {fileID: 7778286864631315859, guid: fc24ce4f14eae6841881a10ece115a81, type: 3} propertyPath: m_Pivot.x @@ -1513,19 +1493,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7875841342821198115, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8373136985122855380, guid: fc24ce4f14eae6841881a10ece115a81, type: 3} propertyPath: m_Name value: ChronoSlot (1) objectReference: {fileID: 0} - - target: {fileID: 9115631703319336075, guid: fc24ce4f14eae6841881a10ece115a81, + - target: {fileID: 8684556999725256456, guid: fc24ce4f14eae6841881a10ece115a81, type: 3} - propertyPath: m_IsActive + propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] @@ -1974,61 +1949,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8651601265192141225} m_Modifications: - - target: {fileID: 714665952803558946, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1229783996724167744, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1229783996724167744, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1849666679564753566, guid: fc24ce4f14eae6841881a10ece115a81, type: 3} propertyPath: m_AnchoredPosition.y value: -9.700012 objectReference: {fileID: 0} - - target: {fileID: 2422510378129342012, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3787858095262186575, guid: fc24ce4f14eae6841881a10ece115a81, type: 3} propertyPath: m_AnchoredPosition.y value: -9.700012 objectReference: {fileID: 0} - - target: {fileID: 5632487236220588107, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6031077379990603966, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6033486946117268058, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -200.6 - objectReference: {fileID: 0} - - target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -33.95 - objectReference: {fileID: 0} - target: {fileID: 7778286864631315859, guid: fc24ce4f14eae6841881a10ece115a81, type: 3} propertyPath: m_Pivot.x @@ -2134,26 +2064,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7875841342821198115, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8373136985122855380, guid: fc24ce4f14eae6841881a10ece115a81, type: 3} propertyPath: m_Name value: ChronoSlot (2) objectReference: {fileID: 0} - - target: {fileID: 8684556999725256456, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9115631703319336075, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fc24ce4f14eae6841881a10ece115a81, type: 3} --- !u!114 &6104299889505517346 stripped @@ -2186,31 +2101,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -9.700012 objectReference: {fileID: 0} - - target: {fileID: 2422510378129342012, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3787858095262186575, guid: fc24ce4f14eae6841881a10ece115a81, type: 3} propertyPath: m_AnchoredPosition.y value: -9.700012 objectReference: {fileID: 0} - - target: {fileID: 5632487236220588107, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -200.6 - objectReference: {fileID: 0} - - target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -33.95 - objectReference: {fileID: 0} - target: {fileID: 7778286864631315859, guid: fc24ce4f14eae6841881a10ece115a81, type: 3} propertyPath: m_Pivot.x diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_ItemTooltip.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_ItemTooltip.prefab index ec17eeba24c..2b57d32f3a7 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_ItemTooltip.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_ItemTooltip.prefab @@ -1034,9 +1034,9 @@ RectTransform: m_Father: {fileID: 9066380728871251085} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 119.979996, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &421616024339742900 @@ -1666,10 +1666,10 @@ RectTransform: m_Father: {fileID: 1927420267364873128} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 175, y: -75} - m_SizeDelta: {x: 340, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 340, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7132723727655539264 MonoBehaviour: @@ -2198,10 +2198,10 @@ RectTransform: m_Father: {fileID: 3485201730566377189} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 170, y: -17} - m_SizeDelta: {x: 330, y: 20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 330, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1149228688048494118 CanvasRenderer: @@ -3280,10 +3280,10 @@ RectTransform: m_Father: {fileID: 5917835120211513970} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 10, y: 0} - m_SizeDelta: {x: 300, y: 130.51} + m_SizeDelta: {x: 300, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &1375128911266392326 CanvasRenderer: @@ -3645,10 +3645,10 @@ RectTransform: m_Father: {fileID: 5411497288316300611} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 70, y: -15.705} - m_SizeDelta: {x: 147.71, y: 31.41} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5220672059146872662 CanvasRenderer: @@ -3988,10 +3988,10 @@ RectTransform: m_Father: {fileID: 2971763231940169261} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 127, y: -9.005} - m_SizeDelta: {x: 246, y: 18.01} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8099618175053297516 CanvasRenderer: @@ -5578,10 +5578,10 @@ RectTransform: m_Father: {fileID: 8763263670523863861} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 170, y: -489} - m_SizeDelta: {x: 340, y: 389} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 340, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2198234649963356238 MonoBehaviour: @@ -6403,10 +6403,10 @@ RectTransform: m_Father: {fileID: 8680177690316125780} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 162.5, y: 0} - m_SizeDelta: {x: 325, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6942494697574376300 CanvasRenderer: @@ -7312,9 +7312,9 @@ RectTransform: m_Father: {fileID: 5874796353590529737} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 76, y: -8} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 140, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8913709804334819731 @@ -7383,10 +7383,10 @@ RectTransform: m_Father: {fileID: 3485201730566377189} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 170, y: -368} - m_SizeDelta: {x: 320, y: 42} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 320, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1830635506337719944 CanvasRenderer: @@ -10403,10 +10403,10 @@ RectTransform: m_Father: {fileID: 1927420267364873128} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 175, y: -25} - m_SizeDelta: {x: 340, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 340, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5595629744877721394 CanvasRenderer: @@ -11115,10 +11115,10 @@ RectTransform: m_Father: {fileID: 3485201730566377189} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 170, y: -272} - m_SizeDelta: {x: 340, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 340, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2526778613746074659 CanvasRenderer: @@ -11421,10 +11421,10 @@ RectTransform: m_Father: {fileID: 9066380728871251085} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 27.695, y: 0} - m_SizeDelta: {x: 45.39, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3422684703798155329 CanvasRenderer: @@ -12330,10 +12330,10 @@ RectTransform: m_Father: {fileID: 3485201730566377189} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 170, y: -47} - m_SizeDelta: {x: 330, y: 20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 330, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4409059218031836117 CanvasRenderer: @@ -12422,10 +12422,10 @@ RectTransform: m_Father: {fileID: 4409059218031836120} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 162.5, y: 0} - m_SizeDelta: {x: 325, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4409059219538695313 CanvasRenderer: @@ -13518,8 +13518,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} - m_sharedMaterial: {fileID: -2364689171920820918, guid: 8a682b7747d4a664089b7b1065aa0035, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: da30528eb07f14a528ca47d39cfc648a, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -16411,10 +16410,10 @@ RectTransform: m_Father: {fileID: 3485201730566377189} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 170, y: -132} - m_SizeDelta: {x: 340, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 340, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7344356578971147314 CanvasRenderer: @@ -18341,10 +18340,10 @@ RectTransform: m_Father: {fileID: 8763263670523863861} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 170, y: -50} - m_SizeDelta: {x: 340, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 340, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6159890653271027511 MonoBehaviour: @@ -23379,9 +23378,9 @@ RectTransform: m_Father: {fileID: 9066380728871251085} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 60.39, y: -15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2461045810045620229 @@ -23425,10 +23424,10 @@ RectTransform: m_Father: {fileID: 9066380728871251085} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90.185, y: 0} - m_SizeDelta: {x: 39.59, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4285115386813451801 CanvasRenderer: @@ -26682,41 +26681,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8497555296224735992} m_Modifications: - - target: {fileID: 625521651201837245, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_SizeDelta.x - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 625521651201837245, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_SizeDelta.y - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 722898739386758307, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_fontSize - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 1092634672069306947, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1092634672069306947, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1092634672069306947, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1092634672069306947, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1588346651005213986, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, type: 3} propertyPath: m_Pivot.x @@ -26760,7 +26724,7 @@ PrefabInstance: - target: {fileID: 1588346651005213986, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, type: 3} propertyPath: m_SizeDelta.y - value: 128.8322 + value: 141.8601 objectReference: {fileID: 0} - target: {fileID: 1588346651005213986, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, type: 3} @@ -26805,7 +26769,7 @@ PrefabInstance: - target: {fileID: 1588346651005213986, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, type: 3} propertyPath: m_AnchoredPosition.y - value: -64.41608 + value: -70.93005 objectReference: {fileID: 0} - target: {fileID: 1588346651005213986, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, type: 3} @@ -26822,56 +26786,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3184364488147150264, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_fontSize - value: 30 - objectReference: {fileID: 0} - target: {fileID: 7394357503114626202, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, type: 3} propertyPath: m_Name value: ItemMoreOption objectReference: {fileID: 0} - - target: {fileID: 8020117775928058935, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_SizeDelta.x - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 8020117775928058935, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_SizeDelta.y - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 8020117775928058935, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 33.3 - objectReference: {fileID: 0} - - target: {fileID: 8020117775928058935, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -54.362 - objectReference: {fileID: 0} - - target: {fileID: 9093940711201178670, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9093940711201178670, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9093940711201178670, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9093940711201178670, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2fd91ad1b5ab0954ebda008f3c13eb96, type: 3} --- !u!224 &1884084541792842524 stripped diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_LoginSystem.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_LoginSystem.prefab index a61c5f86bd0..c30aa0e9813 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_LoginSystem.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_LoginSystem.prefab @@ -3091,13 +3091,14 @@ RectTransform: - {fileID: 5413189970616208611} - {fileID: 5566150719963122585} - {fileID: 7925234584372908007} + - {fileID: 8965859687158376669} m_Father: {fileID: 8982525101724790047} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 215.32742, y: 209.5} - m_SizeDelta: {x: 406.6548, y: 100} + m_AnchoredPosition: {x: 268.6939, y: 209.5} + m_SizeDelta: {x: 513.3878, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &413729867716050445 MonoBehaviour: @@ -7059,6 +7060,222 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1619614013700692730} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2822023218345408958 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2263679896617303403} + m_Modifications: + - target: {fileID: 1334709349913495145, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1334709349913495145, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1334709349913495145, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 8982525101724790035} + - target: {fileID: 1334709349913495145, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1334709349913495145, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetProfileIndex + objectReference: {fileID: 0} + - target: {fileID: 1334709349913495145, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Nekoyume.UI.LoginSystem, Nekoyume + objectReference: {fileID: 0} + - target: {fileID: 1334709349913495145, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1334709349913495145, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1408767627865937363, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1981457462966157050, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Hue + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 2067272256848380769, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 701e40d7288c6466ea956763bcd2f233, + type: 3} + - target: {fileID: 2067272256848380769, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Color.b + value: 0.39215687 + objectReference: {fileID: 0} + - target: {fileID: 2067272256848380769, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Color.g + value: 0.39215687 + objectReference: {fileID: 0} + - target: {fileID: 2067272256848380769, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Color.r + value: 0.39215687 + objectReference: {fileID: 0} + - target: {fileID: 2738034447286896192, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Color.b + value: 0.8386979 + objectReference: {fileID: 0} + - target: {fileID: 2738034447286896192, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Color.g + value: 0.36320752 + objectReference: {fileID: 0} + - target: {fileID: 2738034447286896192, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2738034447286896192, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7334744473121436322, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + propertyPath: m_Name + value: ProfileSlot (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 094bb0bf1607e5c4591c28d328d1a9b8, type: 3} +--- !u!224 &8965859687158376669 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6576652709929161059, guid: 094bb0bf1607e5c4591c28d328d1a9b8, + type: 3} + m_PrefabInstance: {fileID: 2822023218345408958} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3943147862770065028 PrefabInstance: m_ObjectHideFlags: 0 @@ -7681,16 +7898,16 @@ PrefabInstance: m_RemovedComponents: - {fileID: 8412804679155927953, guid: 5423cf792096944a3884ee1f4b0d4183, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5423cf792096944a3884ee1f4b0d4183, type: 3} ---- !u!114 &2170003972628104885 stripped +--- !u!114 &703167617280544389 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5718414708290026654, guid: 5423cf792096944a3884ee1f4b0d4183, + m_CorrespondingSourceObject: {fileID: 6378403036447978670, guid: 5423cf792096944a3884ee1f4b0d4183, type: 3} m_PrefabInstance: {fileID: 5856514585864026667} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dd36e9ecf7775ae45bc40a208c43fc92, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &7884794739021490221 stripped @@ -7699,16 +7916,16 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5856514585864026667} m_PrefabAsset: {fileID: 0} ---- !u!114 &703167617280544389 stripped +--- !u!114 &2170003972628104885 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6378403036447978670, guid: 5423cf792096944a3884ee1f4b0d4183, + m_CorrespondingSourceObject: {fileID: 5718414708290026654, guid: 5423cf792096944a3884ee1f4b0d4183, type: 3} m_PrefabInstance: {fileID: 5856514585864026667} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: dd36e9ecf7775ae45bc40a208c43fc92, type: 3} m_Name: m_EditorClassIdentifier: --- !u!224 &5472293426345035332 stripped @@ -7860,18 +8077,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 087d608eb50946b409525e83801de9d2, type: 3} ---- !u!1 &7325552906847629322 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1907849136098932, guid: 087d608eb50946b409525e83801de9d2, - type: 3} - m_PrefabInstance: {fileID: 7327163783354351230} - m_PrefabAsset: {fileID: 0} --- !u!224 &7399502949231005216 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 224898616830980190, guid: 087d608eb50946b409525e83801de9d2, type: 3} m_PrefabInstance: {fileID: 7327163783354351230} m_PrefabAsset: {fileID: 0} +--- !u!1 &7325552906847629322 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1907849136098932, guid: 087d608eb50946b409525e83801de9d2, + type: 3} + m_PrefabInstance: {fileID: 7327163783354351230} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7554304586818702786 PrefabInstance: m_ObjectHideFlags: 0 @@ -8061,12 +8278,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7be548df9809bfa49b4378b1228575d6, type: 3} ---- !u!224 &1446695842736227535 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8990862485258832141, guid: 7be548df9809bfa49b4378b1228575d6, - type: 3} - m_PrefabInstance: {fileID: 7554304586818702786} - m_PrefabAsset: {fileID: 0} --- !u!114 &1446695841905302001 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8990862484493702195, guid: 7be548df9809bfa49b4378b1228575d6, @@ -8079,3 +8290,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &1446695842736227535 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8990862485258832141, guid: 7be548df9809bfa49b4378b1228575d6, + type: 3} + m_PrefabInstance: {fileID: 7554304586818702786} + m_PrefabAsset: {fileID: 0} diff --git a/nekoyume/Assets/_Scripts/BlockChain/ActionManager.cs b/nekoyume/Assets/_Scripts/BlockChain/ActionManager.cs index 8cafeb4a2be..3faa254653c 100644 --- a/nekoyume/Assets/_Scripts/BlockChain/ActionManager.cs +++ b/nekoyume/Assets/_Scripts/BlockChain/ActionManager.cs @@ -461,6 +461,27 @@ private void ProcessAction(T gameAction) where T : GameAction .DoOnError(e => HandleException(action.Id, e)); } + public IObservable> DailyRewardPandora(AvatarState avatarState) + { + var blockCount = Game.Game.instance.Agent.BlockIndex - + avatarState.dailyRewardReceivedIndex + 1; + + var action = new DailyReward + { + avatarAddress = avatarState.address, + }; + action.PayCost(Game.Game.instance.Agent, States.Instance, TableSheets.Instance); + //LocalLayerActions.Instance.Register(action.Id, action.PayCost, _agent.BlockIndex); + ProcessAction(action); + + return _agent.ActionRenderer.EveryRender() + .Timeout(ActionTimeout) + .Where(eval => eval.Action.Id.Equals(action.Id)) + .First() + .ObserveOnMainThread() + .DoOnError(e => HandleException(action.Id, e)); + } + public IObservable> ItemEnhancement( Equipment baseEquipment, Equipment materialEquipment, diff --git a/nekoyume/Assets/_Scripts/Game/Character/CharacterBase.cs b/nekoyume/Assets/_Scripts/Game/Character/CharacterBase.cs index 04d3868b425..f8babed3916 100644 --- a/nekoyume/Assets/_Scripts/Game/Character/CharacterBase.cs +++ b/nekoyume/Assets/_Scripts/Game/Character/CharacterBase.cs @@ -20,8 +20,7 @@ public abstract class CharacterBase : MonoBehaviour { protected const float AnimatorTimeScale = 1.2f; - [SerializeField] - private bool shouldContainHUD = true; + [SerializeField] private bool shouldContainHUD = true; public GameObject attackPoint; public SortingGroup sortingGroup; @@ -80,6 +79,7 @@ private set protected bool AttackEndCalled { get; set; } private bool _forceQuit; + protected virtual bool CanRun { get @@ -90,7 +90,6 @@ protected virtual bool CanRun } return !Mathf.Approximately(RunSpeed, 0f); - } } @@ -209,7 +208,11 @@ public virtual void UpdateHpBar() } HudContainer.UpdatePosition(gameObject, HUDOffset); - HPBar.Set(CurrentHP, CharacterModel.Stats.BuffStats.HP, HP); + //HPBar.Set(CurrentHP, CharacterModel.Stats.BuffStats.HP, HP); + //|||||||||||||| PANDORA START CODE ||||||||||||||||||| + HPBar.SetPandora(CurrentHP, CharacterModel.Stats.BuffStats.HP, HP, CharacterModel.ATK, CharacterModel.DEF, + CharacterModel.SPD); + //|||||||||||||| PANDORA END CODE ||||||||||||||||||| HPBar.SetBuffs(CharacterModel.Buffs); HPBar.SetLevel(Level); @@ -222,6 +225,7 @@ public bool ShowSpeech(string key, params int[] list) { SpeechBubble = Widget.Create(); } + SpeechBubble.enable = true; if (SpeechBubble.gameObject.activeSelf) @@ -279,7 +283,6 @@ protected virtual IEnumerator CoProcessDamage(Model.BattleStatus.Skill.SkillInfo protected virtual void OnDeadStart() { - } protected virtual void OnDeadEnd() @@ -484,7 +487,8 @@ public void DisableHudContainer() } } - protected virtual void ProcessAttack(CharacterBase target, Model.BattleStatus.Skill.SkillInfo skill, bool isLastHit, + protected virtual void ProcessAttack(CharacterBase target, Model.BattleStatus.Skill.SkillInfo skill, + bool isLastHit, bool isConsiderElementalType) { if (!target) return; @@ -558,6 +562,7 @@ private IEnumerator CoAnimationAttack(bool isCritical) { Animator.Attack(); } + _forceQuit = false; var coroutine = StartCoroutine(CoTimeOut()); yield return new WaitUntil(() => AttackEndCalled || _forceQuit); @@ -566,6 +571,7 @@ private IEnumerator CoAnimationAttack(bool isCritical) { continue; } + PostAnimationForTheKindOfAttack(); break; } @@ -584,13 +590,15 @@ private IEnumerator CoAnimationCastAttack(bool isCritical) { Animator.CastAttack(); } + _forceQuit = false; var coroutine = StartCoroutine(CoTimeOut()); yield return new WaitUntil(() => AttackEndCalled || _forceQuit); StopCoroutine(coroutine); if (_forceQuit) { - continue;; + continue; + ; } PostAnimationForTheKindOfAttack(); @@ -602,7 +610,8 @@ private IEnumerator CoAnimationCastAttack(bool isCritical) private IEnumerator CoAnimationCastBlow(IReadOnlyList infos) { var info = infos.First(); - var copy = new Model.BattleStatus.Skill.SkillInfo(info.Target, info.Effect, info.Critical, info.SkillCategory, + var copy = new Model.BattleStatus.Skill.SkillInfo(info.Target, info.Effect, info.Critical, + info.SkillCategory, info.WaveTurn, ElementalType.Normal, info.SkillTargetType, info.Buff); yield return StartCoroutine(CoAnimationCast(copy)); @@ -897,6 +906,7 @@ private IEnumerator CoExecuteAction() } } } + yield return new WaitForSeconds(waitSeconds); var coroutine = StartCoroutine(stage.CoSkill(action)); yield return coroutine; @@ -946,7 +956,9 @@ public class ActionParams public IEnumerable buffInfos; public Func, IEnumerator> func; - public ActionParams(CharacterBase characterBase, IEnumerable enumerable, IEnumerable buffInfos1, Func, IEnumerator> coNormalAttack) + public ActionParams(CharacterBase characterBase, IEnumerable enumerable, + IEnumerable buffInfos1, + Func, IEnumerator> coNormalAttack) { character = characterBase; skillInfos = enumerable; @@ -954,4 +966,4 @@ public ActionParams(CharacterBase characterBase, IEnumerable(transform.position); - } + //if (UnityEngine.Random.Range(0, 10) == 1) + //{ + // id = 10141001; + // level = 10; + // AudioController.instance.PlaySfx(AudioController.SfxCode.DamageFire); + // VFXController.instance.Create(transform.position); + //} + + //var sprite = SpriteHelper.GetPlayerSpineTextureWeapon(id); + //var levelVFXPrefab = ResourcesHelper.GetAuraWeaponPrefab(id, level); //id,level + //SpineController.UpdateWeapon(id, sprite, levelVFXPrefab); - var sprite = SpriteHelper.GetPlayerSpineTextureWeapon(id); //|||||||||||||| PANDORA END CODE ||||||||||||||||||| - var levelVFXPrefab = ResourcesHelper.GetAuraWeaponPrefab(id, level); //id,level - //var sprite = weapon.GetPlayerSpineTexture(); + var levelVFXPrefab = ResourcesHelper.GetAuraWeaponPrefab(id, level); + var sprite = weapon.GetPlayerSpineTexture(); SpineController.UpdateWeapon(id, sprite, levelVFXPrefab); } @@ -389,6 +393,15 @@ public void Equip(int armorId, int weaponId) private void UpdateCustomize() { + ////|||||||||||||| PANDORA START CODE ||||||||||||||||||| + //System.Random xx = new System.Random(); + //int y = xx.Next(TableSheetsHelper.MakeTableSheets().CostumeItemSheet.Values.Count); + + //Costume x = new Costume(TableSheetsHelper.MakeTableSheets().CostumeItemSheet.First, Guid.NewGuid()); + //EquipCostume(x); + ////|||||||||||||| PANDORA END CODE ||||||||||||||||||| + + if (IsFullCostumeEquipped) { return; diff --git a/nekoyume/Assets/_Scripts/PandoraBox/Prefabs/ItemInformationTooltip/ItemMoreOption.prefab b/nekoyume/Assets/_Scripts/PandoraBox/Prefabs/ItemInformationTooltip/ItemMoreOption.prefab index 0a584e2be79..7a371a3d38d 100644 --- a/nekoyume/Assets/_Scripts/PandoraBox/Prefabs/ItemInformationTooltip/ItemMoreOption.prefab +++ b/nekoyume/Assets/_Scripts/PandoraBox/Prefabs/ItemInformationTooltip/ItemMoreOption.prefab @@ -1,5 +1,102 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2468087199040378025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 885867617367013980} + - component: {fileID: 3066417751911242646} + - component: {fileID: 3953755860217114844} + - component: {fileID: 1359516438943302297} + m_Layer: 5 + m_Name: Image (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &885867617367013980 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2468087199040378025} + 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: 2237515979716106335} + m_Father: {fileID: 1588346651005213986} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 33.3, y: -107.3} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3066417751911242646 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2468087199040378025} + m_CullTransparentMesh: 1 +--- !u!114 &3953755860217114844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2468087199040378025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 10508bfb6a2314ad7b45a5ada9cd159a, 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 &1359516438943302297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2468087199040378025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &3402675847459747346 GameObject: m_ObjectHideFlags: 0 @@ -35,7 +132,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 109.050125, y: -90.6} + m_AnchoredPosition: {x: 109.050125, y: -77.6} m_SizeDelta: {x: 111.1578, y: 21.1021} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3172323288119160355 @@ -191,8 +288,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0, y: 0.0569} - m_SizeDelta: {x: -29.77, y: -30.1109} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6241809231146386506 CanvasRenderer: @@ -250,7 +347,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20.9 + m_fontSize: 30 m_fontSizeBase: 16 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -503,8 +600,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0, y: 0.0569} - m_SizeDelta: {x: -29.77, y: -30.1109} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9174675533231747579 CanvasRenderer: @@ -562,7 +659,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20.9 + m_fontSize: 30 m_fontSizeBase: 16 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -624,6 +721,318 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &5222443234995161666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5565664881716682604} + - component: {fileID: 4839748838218312336} + - component: {fileID: 301970826787164808} + - component: {fileID: 7312047911355085504} + m_Layer: 0 + m_Name: TxtName (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5565664881716682604 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5222443234995161666} + 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: 1588346651005213986} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 109.050125, y: -106.399994} + m_SizeDelta: {x: 111.1578, y: 21.1021} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4839748838218312336 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5222443234995161666} + m_CullTransparentMesh: 1 +--- !u!114 &301970826787164808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5222443234995161666} + 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: Add item to Inventory + 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: 4292146175 + m_fontColor: {r: 1, g: 0.95294124, b: 0.8313726, 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: 11.55 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 13 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + 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!114 &7312047911355085504 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5222443234995161666} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &5411590831048644191 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2237515979716106335} + - component: {fileID: 4253908220598328173} + - component: {fileID: 9124214591423162552} + - component: {fileID: 6059013037189313117} + m_Layer: 0 + m_Name: TxtName (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2237515979716106335 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5411590831048644191} + 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: 885867617367013980} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4253908220598328173 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5411590831048644191} + m_CullTransparentMesh: 1 +--- !u!114 &9124214591423162552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5411590831048644191} + 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: I + 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: 4292146175 + m_fontColor: {r: 1, g: 0.95294124, b: 0.8313726, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 30 + m_fontStyle: 1 + 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!114 &6059013037189313117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5411590831048644191} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &6728977488085966068 GameObject: m_ObjectHideFlags: 0 @@ -659,7 +1068,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 109.050125, y: -53.8} + m_AnchoredPosition: {x: 109.050125, y: -49.038036} m_SizeDelta: {x: 111.1578, y: 21.1021} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5271053219569085435 @@ -816,8 +1225,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 33.3, y: -91.499985} - m_SizeDelta: {x: 52.0812, y: 51.0452} + m_AnchoredPosition: {x: 33.3, y: -78.499985} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5124687809817267149 CanvasRenderer: @@ -912,6 +1321,8 @@ RectTransform: - {fileID: 7851154328355924918} - {fileID: 8146726007272367525} - {fileID: 625521651201837245} + - {fileID: 5565664881716682604} + - {fileID: 885867617367013980} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1014,8 +1425,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 33.3, y: -54.7} - m_SizeDelta: {x: 52.0812, y: 51.0452} + m_AnchoredPosition: {x: 33.3, y: -49.6} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &866746443870828141 CanvasRenderer: diff --git a/nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoraBoxMaster.cs b/nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoraBoxMaster.cs index f21119d97aa..2cf2f27bb0b 100644 --- a/nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoraBoxMaster.cs +++ b/nekoyume/Assets/_Scripts/PandoraBox/Scripts/PandoraBoxMaster.cs @@ -15,7 +15,7 @@ public class PandoraBoxMaster : MonoBehaviour //Unsaved Reg Settings public static string OriginalVersionId = "v100174"; - public static string VersionId = "010043"; + public static string VersionId = "010044A"; //Pandora Database public static PanDatabase PanDatabase; @@ -28,7 +28,7 @@ public class PandoraBoxMaster : MonoBehaviour public static int ActionCooldown = 4; public static bool MarketPriceHelper = false; public static string MarketPriceValue; - public static int NumberOfProfiles = 4; + public static int NumberOfProfiles = 5; public static int LoginIndex; public static int ArenaTicketsToUse = 1; public static List ArenaFavTargets = new List(); @@ -44,6 +44,9 @@ public class PandoraBoxMaster : MonoBehaviour public GameObject CosmicSword; public Sprite CosmicIcon; + //Inventory + //public static List TestShopItems = new List(); + private void Awake() { if (Instance == null) diff --git a/nekoyume/Assets/_Scripts/UI/Combination/SubRecipeView.cs b/nekoyume/Assets/_Scripts/UI/Combination/SubRecipeView.cs index b86e89c3e8c..7a2329a2041 100644 --- a/nekoyume/Assets/_Scripts/UI/Combination/SubRecipeView.cs +++ b/nekoyume/Assets/_Scripts/UI/Combination/SubRecipeView.cs @@ -299,6 +299,14 @@ private void UpdateInformation(int index) } else { + //|||||||||||||| PANDORA START CODE ||||||||||||||||||| + var currentAvatarLevel = + States.Instance.CurrentAvatarState.worldInformation.TryGetLastClearedStageId( + out var clearedStage); + //Debug.LogError(currentAvatarLevel + " " + row.Level + " " + clearedStage); + CanCraft = clearedStage >= row.Level; + //|||||||||||||| PANDORA END CODE ||||||||||||||||||| + levelText.text = L10nManager.Localize("UI_REQUIRED_LEVEL", row.Level); var hasEnoughLevel = States.Instance.CurrentAvatarState.level >= row.Level; levelText.color = hasEnoughLevel diff --git a/nekoyume/Assets/_Scripts/UI/Module/ChronoSlot.cs b/nekoyume/Assets/_Scripts/UI/Module/ChronoSlot.cs index 46615165afd..9b168b0201a 100644 --- a/nekoyume/Assets/_Scripts/UI/Module/ChronoSlot.cs +++ b/nekoyume/Assets/_Scripts/UI/Module/ChronoSlot.cs @@ -20,6 +20,7 @@ namespace Nekoyume.UI.Module { using Bencodex.Types; using Nekoyume.PandoraBox; + using Nekoyume.State.Subjects; using Nekoyume.UI.Scroller; using UniRx; @@ -48,6 +49,23 @@ public async void GetState() currentAvatarState = avatarState; } + public void CollectAP() + { + if (!PandoraBoxMaster.CurrentPandoraPlayer.IsPremium()) + { + } + + Game.Game.instance.ActionManager.DailyRewardPandora(currentAvatarState).Subscribe(); + + var address = currentAvatarState.address; + if (GameConfigStateSubject.ActionPointState.ContainsKey(address)) + { + GameConfigStateSubject.ActionPointState.Remove(address); + } + + GameConfigStateSubject.ActionPointState.Add(address, true); + } + public void SetSlot(long currentBlockIndex, int slotIndex, AvatarState state = null) { _slotIndex = slotIndex; @@ -59,7 +77,10 @@ private void UpdateInformation(long currentBlockIndex, AvatarState state) { AvatarNameText.text = state.NameWithHash; AvatarAddressText.text = state.address.ToString(); - APText.text = "Action Points: " + state.actionPoint.ToString() + "/120"; + + var blockCount = Game.Game.instance.Agent.BlockIndex - state.dailyRewardReceivedIndex + 1; + + APText.text = "Action Points: " + blockCount + " " + state.actionPoint.ToString() + "/120"; UpdateArena(state, currentBlockIndex); diff --git a/nekoyume/Assets/_Scripts/UI/Module/EnhancementInventory.cs b/nekoyume/Assets/_Scripts/UI/Module/EnhancementInventory.cs index 16894b6349a..626ecec6ce3 100644 --- a/nekoyume/Assets/_Scripts/UI/Module/EnhancementInventory.cs +++ b/nekoyume/Assets/_Scripts/UI/Module/EnhancementInventory.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using Nekoyume.Battle; diff --git a/nekoyume/Assets/_Scripts/UI/Module/Inventory.cs b/nekoyume/Assets/_Scripts/UI/Module/Inventory.cs index ea484ac6ebe..ad07525a49d 100644 --- a/nekoyume/Assets/_Scripts/UI/Module/Inventory.cs +++ b/nekoyume/Assets/_Scripts/UI/Module/Inventory.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using Nekoyume.Battle; @@ -120,8 +120,7 @@ private void Set() } _selectedModel = null; - foreach (var item in - inventory.Items.OrderByDescending(x => x.item is ITradableItem)) + foreach (var item in inventory.Items.OrderByDescending(x => x.item is ITradableItem)) { if (item.Locked) { diff --git a/nekoyume/Assets/_Scripts/UI/Module/Item/EquipmentSlot.cs b/nekoyume/Assets/_Scripts/UI/Module/Item/EquipmentSlot.cs index 4a12a3a1393..de9b3a10730 100644 --- a/nekoyume/Assets/_Scripts/UI/Module/Item/EquipmentSlot.cs +++ b/nekoyume/Assets/_Scripts/UI/Module/Item/EquipmentSlot.cs @@ -224,7 +224,6 @@ public void Set( gradeHsv.hue = gradeData.GradeHsvHue; gradeHsv.saturation = gradeData.GradeHsvSaturation; gradeHsv.value = gradeData.GradeHsvValue; - optionTagBg.gameObject.SetActive(false); enhancementImage.gameObject.SetActive(false); if (itemBase is Equipment equip) diff --git a/nekoyume/Assets/_Scripts/UI/Widget/BattlePreparation.cs b/nekoyume/Assets/_Scripts/UI/Widget/BattlePreparation.cs index 35cd767645a..8838c9b431c 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/BattlePreparation.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/BattlePreparation.cs @@ -387,13 +387,13 @@ private void Equip(InventoryItem inventoryItem) if (!slot.IsEmpty) { + Debug.LogError("?"); Unequip(slot, true); } var currentAvatarState = Game.Game.instance.States.CurrentAvatarState; slot.Set(itemBase, OnClickSlot, OnDoubleClickSlot); LocalLayerModifier.SetItemEquip(currentAvatarState.address, slot.Item, true); - var player = Game.Game.instance.Stage.GetPlayer(); switch (itemBase) { diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Hud/HpBar.cs b/nekoyume/Assets/_Scripts/UI/Widget/Hud/HpBar.cs index 0d5974b1271..c31ee36744e 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Hud/HpBar.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Hud/HpBar.cs @@ -13,14 +13,11 @@ namespace Nekoyume.UI { public class HpBar : ProgressBar { - [SerializeField] - private BuffLayout buffLayout = null; + [SerializeField] private BuffLayout buffLayout = null; - [SerializeField] - private TextMeshProUGUI levelText = null; + [SerializeField] private TextMeshProUGUI levelText = null; - [SerializeField] - private Slider additionalSlider = null; + [SerializeField] private Slider additionalSlider = null; public HpBarVFX HpVFX { get; private set; } @@ -56,14 +53,31 @@ public void SetLevel(int value) public void Set(int current, int additional, int max) { SetText($"{current} / {max}"); - SetValue((float) math.min(current, max - additional) / max); + SetValue((float)math.min(current, max - additional) / max); bool isHPBoosted = additional > 0; additionalSlider.gameObject.SetActive(isHPBoosted); if (isHPBoosted) - additionalSlider.value = (float) current / max; + additionalSlider.value = (float)current / max; } + //|||||||||||||| PANDORA START CODE ||||||||||||||||||| + public void SetPandora(int current, int additional, int max, int ATK, int DEF, float SPD) + { + SetText($"" + + $"HP:{current}" + + $",ATK:{ATK}" + + $",DEF:{DEF}" + + $",SPD:{SPD / 100f}"); + SetValue((float)math.min(current, max - additional) / max); + + bool isHPBoosted = additional > 0; + additionalSlider.gameObject.SetActive(isHPBoosted); + if (isHPBoosted) + additionalSlider.value = (float)current / max; + } + //|||||||||||||| PANDORA END CODE ||||||||||||||||||| + protected override void OnDestroy() { if (HpVFX) @@ -74,4 +88,4 @@ protected override void OnDestroy() base.OnDestroy(); } } -} +} \ No newline at end of file diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Tooltip/ItemTooltip.cs b/nekoyume/Assets/_Scripts/UI/Widget/Tooltip/ItemTooltip.cs index 1ead5702b87..6742dc4dfad 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Tooltip/ItemTooltip.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Tooltip/ItemTooltip.cs @@ -13,6 +13,7 @@ namespace Nekoyume.UI { using Nekoyume.Model.Mail; + using Nekoyume.Model.State; using Nekoyume.PandoraBox; using Nekoyume.State; using Nekoyume.UI.Scroller; @@ -31,9 +32,9 @@ public abstract class ItemTooltip : NewVerticalTooltipWidget [SerializeField] private RectTransform DiscordHolder; ShopItem currentShopItem; ItemBase currentItemBase; //for copy item info - Nekoyume.Model.State.AvatarState currentSellerAvatar; + + AvatarState currentSellerAvatar; PandoraPlayer currentSeller; - bool isShopBuy; [Space(50)] //|||||||||||||| PANDORA END CODE ||||||||||||||||||| @@ -75,16 +76,16 @@ protected override void Update() if (Input.GetKeyDown(KeyCode.M)) { - if (isShopBuy) + if (currentSellerAvatar != null) { - if (currentSeller.PremiumEndBlock > Game.Game.instance.Agent.BlockIndex) + if (currentSeller.IsPremium()) { if (currentSeller.IsIgnoringMessage) OneLineSystem.Push(MailType.System, "Pandora Box: Owner Prefer not to contacted!", NotificationCell.NotificationType.Alert); else - Application.OpenURL($"https://discordapp.com/users/{currentSeller.DiscordID}"); + Application.OpenURL("https://discordapp.com/users/" + currentSeller.DiscordID); } else OneLineSystem.Push(MailType.System, "Pandora Box: Player Not Premium!", @@ -97,123 +98,132 @@ protected override void Update() if (Input.GetKeyDown(KeyCode.C)) { - if (isShopBuy) - { - string itemString = "===== Pandora Item Information ====="; + ClipboardHelper.CopyToClipboard(GetItemInfo()); + OneLineSystem.Push(MailType.System, + "Pandora Box: Item Info copy to Clipboard Successfully!", + NotificationCell.NotificationType.Information); + } - if (currentSeller.PremiumEndBlock > Game.Game.instance.Agent.BlockIndex) - { - if (currentSeller.IsProtected) - { - itemString += "\nOwner Name : PRIVATE"; - itemString += "\nOwner Address : PRIVATE"; - itemString += "\nItem Name : " + currentShopItem.ItemBase.GetLocalizedName(false); - try - { - itemString += "\nItem Stats : " + GetItemMainStats(); - } - catch - { - } - - try - { - itemString += "\nItem Skills : " + GetItemSkills(); - } - catch - { - } - - itemString += "\nItem Shop ID : " + currentShopItem.OrderDigest.OrderId; - itemString += "\nTime (Utc) : " + DateTime.UtcNow; - } - else - { - itemString += "\nOwner Name : " + currentSellerAvatar.NameWithHash; - itemString += "\nOwner Address : " + currentSellerAvatar.agentAddress; - itemString += "\nItem Name : " + currentShopItem.ItemBase.GetLocalizedName(false); - try - { - itemString += "\nItem Stats : " + GetItemMainStats(); - } - catch - { - } - - try - { - itemString += "\nItem Skills : " + GetItemSkills(); - } - catch - { - } - - itemString += "\nItem Shop ID : " + currentShopItem.OrderDigest.OrderId; - itemString += "\nTime (Utc) : " + DateTime.UtcNow; - } - } - else - { - itemString += "\nOwner Name : " + currentSellerAvatar.NameWithHash; - itemString += "\nOwner Address : " + currentSellerAvatar.agentAddress; - itemString += "\nItem Name : " + currentShopItem.ItemBase.GetLocalizedName(false); - try - { - itemString += "\nItem Stats : " + GetItemMainStats(); - } - catch - { - } - - try - { - itemString += "\nItem Skills : " + GetItemSkills(); - } - catch - { - } - - itemString += "\nItem Shop ID : " + currentShopItem.OrderDigest.OrderId; - itemString += "\nTime (Utc) : " + DateTime.UtcNow; - } + if (Input.GetKeyDown(KeyCode.I)) + { + if (currentItemBase is INonFungibleItem nonFungibleItem) + { + var nonFungibleId = nonFungibleItem.NonFungibleId; + Debug.LogError(nonFungibleId); + } - ClipboardHelper.CopyToClipboard(itemString); + //States.Instance.CurrentAvatarState.inventory.AddItem(currentItemBase); + //InventoryItem xx = new InventoryItem(currentItemBase,1,true,false,true); + if (currentSellerAvatar is null) + { + States.Instance.CurrentAvatarState.inventory.AddItem(currentItemBase); OneLineSystem.Push(MailType.System, - "Pandora Box: Item Info copy to Clipboard Successfully!", + "Pandora Box: Item Added to your inventory Successfully!", NotificationCell.NotificationType.Information); } else { - string itemString = "===== Pandora Item Information ====="; - PandoraPlayer buyer = - PandoraBoxMaster.GetPandoraPlayer(States.Instance.CurrentAvatarState.agentAddress.ToString()); - itemString += "\nOwner Name : " + States.Instance.CurrentAvatarState.NameWithHash; - itemString += "\nOwner Address : " + buyer.Address; - itemString += "\nItem Name : " + currentItemBase.GetLocalizedName(false); - try - { - itemString += "\nItem Stats : " + GetItemMainStats(); - } - catch - { - } + OneLineSystem.Push(MailType.System, + "Pandora Box: Coming Soon!", + NotificationCell.NotificationType.Information); + } + } + } + + public async void SetSellerName(Guid guid) + { + var order = await Util.GetOrder(guid); + - try + var (exist, avatarState) = await States.TryGetAvatarStateAsync(order.SellerAvatarAddress); + if (!exist) + { + Debug.LogError("NOT EXIST!"); + OwnerName.gameObject.SetActive(false); + } + else + { + currentSellerAvatar = avatarState; + currentSeller = PandoraBoxMaster.GetPandoraPlayer(avatarState.agentAddress.ToString()); + + if (currentSeller.IsPremium()) + { + if (currentSeller.IsProtected) + OwnerName.text = "PRIVATE!"; + else + OwnerName.text = "[P] " + avatarState.NameWithHash; + } + else + { + if (PandoraBoxMaster.CurrentPandoraPlayer.IsPremium()) { - itemString += "\nItem Skills : " + GetItemSkills(); + OwnerName.text = "" + avatarState.NameWithHash; } - catch + else { + OwnerName.text = "PREMIUM FEATURE!"; } + } +#if UNITY_EDITOR + Debug.LogError(avatarState.agentAddress + " | " + order.OrderId + " | " + $"{avatarState.name} #{avatarState.address.ToHex().Substring(0, 4)}"); +#endif + OwnerName.gameObject.SetActive(true); + } + } - itemString += "\nTime (Utc) : " + DateTime.UtcNow; + string GetItemInfo() + { + AvatarState ownerAvatarState = + currentSellerAvatar == null ? States.Instance.CurrentAvatarState : currentSellerAvatar; - ClipboardHelper.CopyToClipboard(itemString); - OneLineSystem.Push(MailType.System, - "Pandora Box: Item Info copy to Clipboard Successfully!", - NotificationCell.NotificationType.Information); + string itemString = "===== Pandora Item Information ====="; + + if (PandoraBoxMaster.CurrentPandoraPlayer.IsPremium()) + { + PandoraPlayer currentPandoraPlayer = + PandoraBoxMaster.GetPandoraPlayer(ownerAvatarState.agentAddress.ToString()); + if (currentPandoraPlayer.IsProtected) + { + itemString += "\nOwner Avatar Name : PRIVATE"; + itemString += "\nOwner Agent Address : PRIVATE"; + itemString += "\nOwner Avatar Address : PRIVATE"; } + else + { + itemString += "\nOwner Avatar Name : " + ownerAvatarState.NameWithHash; + itemString += "\nOwner Agent Address : " + ownerAvatarState.agentAddress; + itemString += "\nOwner Avatar Address : " + ownerAvatarState.address; + } + } + else + { + itemString += "\nOwner Avatar Name : PREMIUM FEATURE"; + itemString += "\nOwner Agent Address : PREMIUM FEATURE"; + itemString += "\nOwner Avatar Address : PREMIUM FEATURE"; + } + + itemString += "\nItem Localized Name : " + currentItemBase.GetLocalizedName(false); + try + { + itemString += "\nItem Main Stats : " + GetItemMainStats(); } + catch + { + } + + try + { + itemString += "\nItem Skills : " + GetItemSkills(); + } + catch + { + } + + if (!(currentShopItem is null)) + itemString += "\nItem Shop ID : " + currentShopItem.OrderDigest.OrderId; + itemString += "\nCurrent Time (Utc) : " + DateTime.UtcNow; + + return itemString; } void EnableShopTool() @@ -367,6 +377,7 @@ public override void Close(bool ignoreCloseAnimation = false) base.Close(ignoreCloseAnimation); } + //Show from: UI_ShopSell_MaterialView public virtual void Show( ItemBase item, string submitText, @@ -394,13 +405,23 @@ public virtual void Show( _onClose = onClose; _onBlocked = onBlocked; + //|||||||||||||| PANDORA START CODE ||||||||||||||||||| + currentSellerAvatar = null; + OwnerName.text = ""; + currentItemBase = item; + //|||||||||||||| PANDORA END CODE ||||||||||||||||||| scrollbar.value = 1f; UpdatePosition(target); base.Show(); StartCoroutine(CoUpdate(submitButton.gameObject)); + //|||||||||||||| PANDORA CODE ||||||||||||||||||| + if (PandoraBoxMaster.MarketPriceHelper) + EnableShopTool(); + else + DisableShopTool(); } - //when it come from avatar profile + //Show from: UI_AvatarInfoPopup,UI_BattlePreparation,UI_RankingBoard,UI_FriendInfoPopupPandora,UI_ShopSell_LeftSide public virtual void Show( InventoryItem item, string submitText, @@ -428,7 +449,7 @@ public virtual void Show( _onBlocked = onBlocked; //|||||||||||||| PANDORA START CODE ||||||||||||||||||| - isShopBuy = false; + currentSellerAvatar = null; OwnerName.text = ""; currentItemBase = item.ItemBase; //|||||||||||||| PANDORA END CODE ||||||||||||||||||| @@ -444,7 +465,7 @@ public virtual void Show( DisableShopTool(); } - //this for sell items, no need to show owner since its me + //Show from: UI_ShopSell,UI_ShopSell_MaterialView public virtual void Show( ShopItem item, System.Action onRegister, @@ -475,16 +496,13 @@ public virtual void Show( //|||||||||||||| PANDORA START CODE ||||||||||||||||||| - isShopBuy = false; currentShopItem = item; + currentItemBase = item.ItemBase; var order = Util.GetOrder(item.OrderDigest.OrderId); - if (OwnerName) - OwnerName.text = ""; - + OwnerName.text = ""; #if UNITY_EDITOR Debug.LogError(item.OrderDigest.OrderId); #endif - //|||||||||||||| PANDORA END CODE ||||||||||||||||||| @@ -499,7 +517,7 @@ public virtual void Show( DisableShopTool(); } - + //Show from: UI_ShopBuy,UI_ShopBuy_MaterialView public virtual void Show( ShopItem item, System.Action onBuy, @@ -526,8 +544,9 @@ public virtual void Show( _onClose = onClose; //|||||||||||||| PANDORA START CODE ||||||||||||||||||| - isShopBuy = true; + currentShopItem = item; OwnerName.text = ""; + currentItemBase = item.ItemBase; SetSellerName(item.OrderDigest.OrderId); //|||||||||||||| PANDORA END CODE ||||||||||||||||||| @@ -535,6 +554,7 @@ public virtual void Show( UpdatePosition(target); base.Show(); StartCoroutine(CoUpdate(buy.gameObject)); + //|||||||||||||| PANDORA CODE ||||||||||||||||||| if (PandoraBoxMaster.MarketPriceHelper) EnableShopTool(); @@ -542,50 +562,7 @@ public virtual void Show( DisableShopTool(); } - //|||||||||||||| PANDORA START CODE ||||||||||||||||||| - public async void SetSellerName(Guid guid) - { - var order = await Util.GetOrder(guid); - - - var (exist, avatarState) = await States.TryGetAvatarStateAsync(order.SellerAvatarAddress); - if (!exist) - { - Debug.LogError("NOT EXIST!"); - OwnerName.gameObject.SetActive(false); - } - else - { - currentSellerAvatar = avatarState; - currentSeller = PandoraBoxMaster.GetPandoraPlayer(avatarState.agentAddress.ToString()); - - if (currentSeller.PremiumEndBlock > Game.Game.instance.Agent.BlockIndex) - { - if (currentSeller.IsProtected) - OwnerName.text = "PRIVATE!"; - else - OwnerName.text = "[P] " + avatarState.NameWithHash; - } - else - { - if (PandoraBoxMaster.CurrentPandoraPlayer.IsPremium()) - { - OwnerName.text = "" + avatarState.NameWithHash; - } - else - { - OwnerName.text = "PREMIUM FEATURE!"; - } - } -#if UNITY_EDITOR - Debug.LogError(avatarState.agentAddress + " | " + order.OrderId); -#endif - OwnerName.gameObject.SetActive(true); - } - } - //|||||||||||||| PANDORA END CODE ||||||||||||||||||| - - + //Show from: UI_Enhancement public virtual void Show( EnhancementInventoryItem item, string submitText, @@ -611,6 +588,11 @@ public virtual void Show( _onClose = onClose; _onBlocked = onBlocked; + //|||||||||||||| PANDORA START CODE ||||||||||||||||||| + OwnerName.text = ""; + currentSellerAvatar = null; + currentItemBase = item.ItemBase; + //|||||||||||||| PANDORA END CODE ||||||||||||||||||| scrollbar.value = 1f; UpdatePosition(target); base.Show();