Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add TimeLimitText at mobile shop product ui #3679

Merged
merged 5 commits into from
Nov 25, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
262 changes: 243 additions & 19 deletions nekoyume/Assets/AddressableAssets/UI/Module/CellView/ShopListCell.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b708144171a1bc147970bae86908d740, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand All @@ -87,13 +87,14 @@ GameObject:
- component: {fileID: 1978011882784618612}
- component: {fileID: 1077592112557681892}
- component: {fileID: 2939644774623070573}
- component: {fileID: 7457957838130933032}
m_Layer: 5
m_Name: HitText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1978011882784618612
RectTransform:
m_ObjectHideFlags: 0
Expand All @@ -111,9 +112,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38.000004, y: -11}
m_SizeDelta: {x: 80, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 20, y: 0}
m_SizeDelta: {x: 27.52, y: 24}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1077592112557681892
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -169,10 +170,10 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 18
m_fontSize: 16
m_fontSizeBase: 16
m_fontWeight: 400
m_enableAutoSizing: 1
m_enableAutoSizing: 0
m_fontSizeMin: 8
m_fontSizeMax: 18
m_fontStyle: 1
Expand Down Expand Up @@ -211,6 +212,20 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &7457957838130933032
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1322319086297525622}
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 &1356455650511809648
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -491,6 +506,156 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2081817192742951497
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6836120807062215710}
- component: {fileID: 2741600633544025370}
- component: {fileID: 1021118161736743225}
- component: {fileID: 5245694159389111353}
m_Layer: 5
m_Name: TimeLimitText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &6836120807062215710
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2081817192742951497}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7997875426382973431}
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: 20, y: 0}
m_SizeDelta: {x: 72.07, y: 24}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2741600633544025370
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2081817192742951497}
m_CullTransparentMesh: 1
--- !u!114 &1021118161736743225
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2081817192742951497}
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: 23h59m
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 7a651b26cd62dc0479659cbcab053405, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4292146175
m_fontColor: {r: 1, g: 0.9529412, b: 0.83137256, 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: 18
m_fontSizeBase: 18
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 8
m_fontSizeMax: 18
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: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &5245694159389111353
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2081817192742951497}
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 &2589755492628373246
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -7226,6 +7391,7 @@ GameObject:
- component: {fileID: 5314311859402862257}
- component: {fileID: 3917757165685642901}
- component: {fileID: 9046216784942976258}
- component: {fileID: 5052100113743942912}
m_Layer: 5
m_Name: DiscountText
m_TagString: Untagged
Expand All @@ -7250,9 +7416,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 38.000004, y: -11}
m_SizeDelta: {x: 80, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 20, y: 0}
m_SizeDelta: {x: 40.46, y: 24}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5314311859402862257
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -7281,7 +7447,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: HIT
m_text: -70%
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 7a651b26cd62dc0479659cbcab053405, type: 2}
Expand All @@ -7308,10 +7474,10 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 18
m_fontSize: 16
m_fontSizeBase: 16
m_fontWeight: 400
m_enableAutoSizing: 1
m_enableAutoSizing: 0
m_fontSizeMin: 8
m_fontSizeMax: 18
m_fontStyle: 1
Expand Down Expand Up @@ -7381,6 +7547,20 @@ MonoBehaviour:
defaultWordSpacing: 0
defaultLineSpacingInitialized: 0
defaultLineSpacing: 0
--- !u!114 &5052100113743942912
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7869733830757711421}
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 &7988284167526852263
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -7392,8 +7572,10 @@ GameObject:
- component: {fileID: 7997875426382973431}
- component: {fileID: 5205912172533475951}
- component: {fileID: 6172202386598003317}
- component: {fileID: 4168874428492252087}
- component: {fileID: 3493753789446057245}
m_Layer: 5
m_Name: Discount
m_Name: Tag
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -7413,14 +7595,15 @@ RectTransform:
m_Children:
- {fileID: 4466553813072544141}
- {fileID: 1978011882784618612}
- {fileID: 6836120807062215710}
m_Father: {fileID: 3355135985904493532}
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: 39.499985, y: -37}
m_SizeDelta: {x: 81, y: 34}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -2, y: -20}
m_SizeDelta: {x: 0, y: 34}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5205912172533475951
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -7450,7 +7633,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f2d65f2be975d434f84bd9df18060bd3, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
Expand All @@ -7459,6 +7642,46 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &4168874428492252087
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7988284167526852263}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 20
m_Right: 15
m_Top: 0
m_Bottom: 10
m_ChildAlignment: 1
m_Spacing: 5
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 1
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &3493753789446057245
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7988284167526852263}
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 &8292352029755277450
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -7757,7 +7980,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
productName: {fileID: 5222071418796668922}
tagObj: {fileID: 7988284167526852263}
discount: {fileID: 3917757165685642901}
timeLimitText: {fileID: 1021118161736743225}
preDiscountPrice:
- {fileID: 6661138847484510167}
- {fileID: 8532332721428587442}
Expand All @@ -7766,7 +7991,6 @@ MonoBehaviour:
- {fileID: 2992634991224384990}
buyLimitDescription: {fileID: 3822169720137276769}
discountObjs:
- {fileID: 7988284167526852263}
- {fileID: 4247121415829727809}
- {fileID: 9162058662933925732}
recommended: {fileID: 5841545080298985372}
Expand Down
Loading