diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinBottomButtons.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinBottomButtons.prefab index 9f5ddcdcfd5..9a24c5392ed 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinBottomButtons.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinBottomButtons.prefab @@ -113,7 +113,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 57.5} - m_SizeDelta: {x: 200, y: 50} + m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0} --- !u!222 &3265894270079234934 CanvasRenderer: @@ -183,7 +183,7 @@ MonoBehaviour: m_textAlignment: 65535 m_characterSpacing: -5 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -50 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -430,7 +430,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 26} - m_SizeDelta: {x: 120, y: 40} + m_SizeDelta: {x: 150, y: 40} m_Pivot: {x: 0.5, y: 0} --- !u!222 &2495088357312886189 CanvasRenderer: @@ -460,7 +460,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Payment + m_text: Pembayaran m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 7a651b26cd62dc0479659cbcab053405, type: 2} @@ -490,16 +490,16 @@ MonoBehaviour: m_fontSize: 20 m_fontSizeBase: 20 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 8 - m_fontSizeMax: 32 + m_enableAutoSizing: 1 + m_fontSizeMin: 16 + m_fontSizeMax: 20 m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -50 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -1606,8 +1606,8 @@ MonoBehaviour: m_Calls: [] m_text: 25/400 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a215dd9105aed4fea9d665ae472083d6, type: 2} - m_sharedMaterial: {fileID: -2364689171920820918, guid: a215dd9105aed4fea9d665ae472083d6, + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: -2364689171920820918, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -1796,8 +1796,8 @@ MonoBehaviour: m_Calls: [] m_text: 500 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a215dd9105aed4fea9d665ae472083d6, type: 2} - m_sharedMaterial: {fileID: -2364689171920820918, guid: a215dd9105aed4fea9d665ae472083d6, + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: -2364689171920820918, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -2528,7 +2528,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 27} - m_SizeDelta: {x: 120, y: 40} + m_SizeDelta: {x: 150, y: 40} m_Pivot: {x: 0.5, y: 0} --- !u!222 &6662148739001868207 CanvasRenderer: @@ -2597,7 +2597,7 @@ MonoBehaviour: m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -50 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -2695,7 +2695,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 57.5} - m_SizeDelta: {x: 200, y: 50} + m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0} --- !u!222 &6779921287777640604 CanvasRenderer: @@ -2765,7 +2765,7 @@ MonoBehaviour: m_textAlignment: 65535 m_characterSpacing: -5 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -50 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -3400,10 +3400,15 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 1856527894406669635, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.x + value: 124 + objectReference: {fileID: 0} - target: {fileID: 1856527894406669635, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_AnchoredPosition.x - value: 82.5 + value: 77 objectReference: {fileID: 0} - target: {fileID: 1856527894406669635, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} @@ -3425,10 +3430,15 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 2093121074662882131, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_text + value: 102950 + objectReference: {fileID: 0} - target: {fileID: 2093121074662882131, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_fontSize - value: 21.65 + value: 18 objectReference: {fileID: 0} - target: {fileID: 2289454837665031795, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} @@ -3455,6 +3465,16 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 2484364370337764447, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_text + value: 102950 + objectReference: {fileID: 0} + - target: {fileID: 2484364370337764447, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_fontSize + value: 18 + objectReference: {fileID: 0} - target: {fileID: 2503240502717228133, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_Sprite @@ -3471,10 +3491,25 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3700778693047214633, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3700778693047214633, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3700778693047214633, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.x + value: 124 + objectReference: {fileID: 0} - target: {fileID: 3700778693047214633, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_AnchoredPosition.x - value: 30.5 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3700778693047214633, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} @@ -3586,10 +3621,25 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3967174404781969424, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3967174404781969424, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3967174404781969424, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.x + value: 124 + objectReference: {fileID: 0} - target: {fileID: 3967174404781969424, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_AnchoredPosition.x - value: 82.5 + value: 77 objectReference: {fileID: 0} - target: {fileID: 3967174404781969424, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} @@ -3601,6 +3651,41 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 4398608494510433434, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_fontSize + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 4745601344262981819, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4745601344262981819, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4745601344262981819, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.x + value: 68 + objectReference: {fileID: 0} + - target: {fileID: 4745601344262981819, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.y + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 4745601344262981819, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 108 + objectReference: {fileID: 0} + - target: {fileID: 4745601344262981819, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -13 + objectReference: {fileID: 0} - target: {fileID: 4888166535097214629, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_RootOrder @@ -3661,16 +3746,51 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 5364533562997230854, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.x + value: 160 + objectReference: {fileID: 0} - target: {fileID: 5364533562997230854, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_AnchoredPosition.x - value: 199.5 + value: 214 objectReference: {fileID: 0} - target: {fileID: 5364533562997230854, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_AnchoredPosition.y value: -33.5 objectReference: {fileID: 0} + - target: {fileID: 5411272010972045732, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5411272010972045732, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5411272010972045732, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.x + value: 68 + objectReference: {fileID: 0} + - target: {fileID: 5411272010972045732, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.y + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 5411272010972045732, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 108 + objectReference: {fileID: 0} + - target: {fileID: 5411272010972045732, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -13 + objectReference: {fileID: 0} - target: {fileID: 5866472276698387722, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_IsActive @@ -3691,10 +3811,15 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 6147752482000111254, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.x + value: 160 + objectReference: {fileID: 0} - target: {fileID: 6147752482000111254, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_AnchoredPosition.x - value: 199.5 + value: 214 objectReference: {fileID: 0} - target: {fileID: 6147752482000111254, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} @@ -3714,7 +3839,7 @@ PrefabInstance: - target: {fileID: 6433871440247883435, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_SizeDelta.x - value: 48 + value: 77 objectReference: {fileID: 0} - target: {fileID: 6433871440247883435, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} @@ -3724,7 +3849,7 @@ PrefabInstance: - target: {fileID: 6433871440247883435, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_AnchoredPosition.x - value: 88 + value: 117 objectReference: {fileID: 0} - target: {fileID: 6433871440247883435, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} @@ -3797,16 +3922,31 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 8060754518305157581, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.x + value: 160 + objectReference: {fileID: 0} - target: {fileID: 8060754518305157581, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_AnchoredPosition.x - value: 199.5 + value: 214 objectReference: {fileID: 0} - target: {fileID: 8060754518305157581, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_AnchoredPosition.y value: -33.5 objectReference: {fileID: 0} + - target: {fileID: 8112356213407286881, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_text + value: 102950 + objectReference: {fileID: 0} + - target: {fileID: 8112356213407286881, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_fontSize + value: 18 + objectReference: {fileID: 0} - target: {fileID: 8136804997809114372, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_AnchorMax.y @@ -3872,6 +4012,36 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8945186383660650549, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8945186383660650549, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8945186383660650549, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.x + value: 68 + objectReference: {fileID: 0} + - target: {fileID: 8945186383660650549, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_SizeDelta.y + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 8945186383660650549, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 108 + objectReference: {fileID: 0} + - target: {fileID: 8945186383660650549, guid: 9067b4811aa0241b7a96a2cc09536ced, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -13 + objectReference: {fileID: 0} - target: {fileID: 8972125639260608703, guid: 9067b4811aa0241b7a96a2cc09536ced, type: 3} propertyPath: m_text diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfo.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfo.prefab index efe142ed285..52007c05780 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfo.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfo.prefab @@ -427,8 +427,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} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 1} + m_SizeDelta: {x: 0, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2897145994476537639 CanvasRenderer: @@ -485,19 +485,19 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 + m_fontSize: 12.5 m_fontSizeBase: 16 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 8 - m_fontSizeMax: 32 + m_enableAutoSizing: 1 + m_fontSizeMin: 12 + m_fontSizeMax: 16 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -50 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -672,8 +672,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} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 1.0000001} + m_SizeDelta: {x: 0, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8518068334916337372 CanvasRenderer: @@ -733,16 +733,16 @@ MonoBehaviour: m_fontSize: 16 m_fontSizeBase: 16 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 8 - m_fontSizeMax: 32 + m_enableAutoSizing: 1 + m_fontSizeMin: 12 + m_fontSizeMax: 16 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -50 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -1324,7 +1324,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 6} - m_SizeDelta: {x: 53, y: 49} + m_SizeDelta: {x: 58, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2546948988074048945 CanvasRenderer: @@ -1477,8 +1477,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} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 1} + m_SizeDelta: {x: 0, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1543014162730348499 CanvasRenderer: @@ -1538,16 +1538,16 @@ MonoBehaviour: m_fontSize: 16 m_fontSizeBase: 16 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 8 - m_fontSizeMax: 32 + m_enableAutoSizing: 1 + m_fontSizeMin: 12 + m_fontSizeMax: 16 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -50 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -1841,8 +1841,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} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 1} + m_SizeDelta: {x: 0, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &351373392981724409 CanvasRenderer: @@ -1902,16 +1902,16 @@ MonoBehaviour: m_fontSize: 16 m_fontSizeBase: 16 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 8 - m_fontSizeMax: 32 + m_enableAutoSizing: 1 + m_fontSizeMin: 12 + m_fontSizeMax: 16 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -50 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/BoxCatBtnContainers.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/BoxCatBtnContainers.prefab index fca29e43c58..7f59a087b2a 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/BoxCatBtnContainers.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/BoxCatBtnContainers.prefab @@ -220,7 +220,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4828494976580914264} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -664,6 +664,7 @@ RectTransform: - {fileID: 1746023452119210584} - {fileID: 5056754596130723956} - {fileID: 4765745760727776828} + - {fileID: 7600546328719228411} - {fileID: 4094387556917437919} - {fileID: 3069580314173953723} m_Father: {fileID: 6362720311405667501} @@ -2285,6 +2286,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5151443130174874718 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7600546328719228411} + - component: {fileID: 9057452729404019576} + - component: {fileID: 7478032419956731259} + m_Layer: 5 + m_Name: Text_01 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7600546328719228411 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5151443130174874718} + 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: 4828494976580914264} + m_RootOrder: 3 + 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: -7, y: -42} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9057452729404019576 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5151443130174874718} + m_CullTransparentMesh: 1 +--- !u!114 &7478032419956731259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5151443130174874718} + 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: D:CC + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 28 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -5 + m_wordSpacing: 0 + m_lineSpacing: -50 + 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 &5764991244105514115 GameObject: m_ObjectHideFlags: 0 @@ -3492,7 +3628,7 @@ PrefabInstance: - target: {fileID: 2092428802851178608, guid: bc9d58051629344ec8ea666a833999b0, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 2092428802851178608, guid: bc9d58051629344ec8ea666a833999b0, type: 3} diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/CombinationBtn.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/CombinationBtn.prefab index 885032ba1ef..8d7d4d6076b 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/CombinationBtn.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/CombinationBtn.prefab @@ -11841,6 +11841,173 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6471699674123186888 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4382955833000868026} + - component: {fileID: 7922854518951171249} + - component: {fileID: 2180484617025135534} + - component: {fileID: 3165556572900983422} + m_Layer: 5 + m_Name: Text_02 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4382955833000868026 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6471699674123186888} + 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: 8338442938563373544} + m_RootOrder: 5 + 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: 115.53996, y: -38.62001} + m_SizeDelta: {x: 130, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7922854518951171249 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6471699674123186888} + m_CullTransparentMesh: 1 +--- !u!114 &2180484617025135534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6471699674123186888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Workshop + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26 + m_fontSizeBase: 26 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: -5 + m_wordSpacing: 0 + m_lineSpacing: -50 + 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 &3165556572900983422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6471699674123186888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 27 + l10nKey: UI_MAIN_MENU_COMBINATION + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 --- !u!1 &6597229380042160155 GameObject: m_ObjectHideFlags: 0 @@ -12583,7 +12750,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8338442938563373544} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12618,7 +12785,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Workshopasdasd + m_text: Workshop m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} @@ -12961,6 +13128,7 @@ RectTransform: - {fileID: 1148819529888051777} - {fileID: 5204584470288503779} - {fileID: 7004156271689514272} + - {fileID: 4382955833000868026} - {fileID: 8338442937347405798} m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/QuestBtn.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/QuestBtn.prefab index e3bdc02e6af..830ae9a02b7 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/QuestBtn.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/QuestBtn.prefab @@ -984,6 +984,7 @@ RectTransform: - {fileID: 1682102090297898844} - {fileID: 8234664414506164379} - {fileID: 2111375140795726438} + - {fileID: 6536849996257248009} - {fileID: 5935667936361861180} m_Father: {fileID: 2673266939117811253} m_RootOrder: 0 @@ -1458,11 +1459,11 @@ RectTransform: m_GameObject: {fileID: 6656707262268546537} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99, y: 0.99, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2311400786746109373} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1720,6 +1721,173 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7407035204185132748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6536849996257248009} + - component: {fileID: 2774835782043363971} + - component: {fileID: 5520891608466833979} + - component: {fileID: 666390028525139301} + m_Layer: 5 + m_Name: Text_01 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6536849996257248009 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7407035204185132748} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99, y: 0.99, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2311400786746109373} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000015258789, y: -2} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2774835782043363971 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7407035204185132748} + m_CullTransparentMesh: 1 +--- !u!114 &5520891608466833979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7407035204185132748} + 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: Adventure + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26 + m_fontSizeBase: 26 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -5 + m_wordSpacing: 0 + m_lineSpacing: -50 + 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 &666390028525139301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7407035204185132748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 27 + l10nKey: ADVENTURE + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 --- !u!1 &7611270138687692930 GameObject: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RaidBtn.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RaidBtn.prefab index dd21993eaf4..215e3305cca 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RaidBtn.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RaidBtn.prefab @@ -29261,6 +29261,173 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1827504762535979982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4839052004913961931} + - component: {fileID: 533675275775516972} + - component: {fileID: 826900090241841255} + - component: {fileID: 554989589637358220} + m_Layer: 5 + m_Name: Text_01 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4839052004913961931 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827504762535979982} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.2222223, y: 1.2222223, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2020646868919055834} + 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: 77.67902, y: -19.215168} + m_SizeDelta: {x: 127.11112, y: 26.589504} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &533675275775516972 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827504762535979982} + m_CullTransparentMesh: 1 +--- !u!114 &826900090241841255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827504762535979982} + 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: World Boss + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4289374890 + m_fontColor: {r: 0.6666667, g: 0.6666667, b: 0.6666667, 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 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -5 + m_wordSpacing: 0 + m_lineSpacing: -50 + 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 &554989589637358220 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827504762535979982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 27 + l10nKey: UI_MAIN_MENU_WORLDBOSS + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 --- !u!1 &2489386785564459920 GameObject: m_ObjectHideFlags: 0 @@ -29368,12 +29535,12 @@ RectTransform: m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6684225965647263715} - m_RootOrder: 2 + m_Father: {fileID: 4617867177338651019} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -78.00001} + m_AnchoredPosition: {x: 0, y: -48} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6752938357428850992 @@ -44619,6 +44786,173 @@ MonoBehaviour: m_ColorMode: 2 m_BlurMode: 0 m_AdvancedBlur: 0 +--- !u!1 &4699027967880009231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6312728939677330397} + - component: {fileID: 5757552317308872142} + - component: {fileID: 7311117030403511300} + - component: {fileID: 8963992506331948967} + m_Layer: 5 + m_Name: Text_01 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6312728939677330397 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4699027967880009231} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4617867177338651019} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5757552317308872142 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4699027967880009231} + m_CullTransparentMesh: 1 +--- !u!114 &7311117030403511300 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4699027967880009231} + 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: World Boss + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26 + m_fontSizeBase: 26 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -5 + m_wordSpacing: 0 + m_lineSpacing: -50 + 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 &8963992506331948967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4699027967880009231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 27 + l10nKey: UI_MAIN_MENU_WORLDBOSS + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 --- !u!1 &4699250389826090731 GameObject: m_ObjectHideFlags: 0 @@ -44646,7 +44980,7 @@ RectTransform: m_GameObject: {fileID: 4699250389826090731} 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_LocalScale: {x: 1.2, y: 1.2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8088310778780114024} @@ -44678,7 +45012,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -49761,6 +50095,8 @@ RectTransform: - {fileID: 2289669823915776800} - {fileID: 6210845405394287771} - {fileID: 8822888979465370497} + - {fileID: 6312728939677330397} + - {fileID: 6659974995213235428} m_Father: {fileID: 6684225965647263715} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -50008,6 +50344,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3171993612449619454} + - {fileID: 4324397966855141849} m_Father: {fileID: 6684225965647263715} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -65619,7 +65956,6 @@ RectTransform: m_Children: - {fileID: 4617867177338651019} - {fileID: 8088310778780114024} - - {fileID: 6659974995213235428} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -70672,6 +71008,82 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 +--- !u!1 &7367995200306036257 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3335440095307032397} + - component: {fileID: 2882034649533832918} + - component: {fileID: 1951586589083993353} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3335440095307032397 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367995200306036257} + 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: 4324397966855141849} + 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: 114.5, y: -30} + m_SizeDelta: {x: 29, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2882034649533832918 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367995200306036257} + m_CullTransparentMesh: 1 +--- !u!114 &1951586589083993353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367995200306036257} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.6666667, g: 0.6666667, b: 0.6666667, 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: 62c7e1f85f30c8140b07a5ee353c84af, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7513049190601866530 GameObject: m_ObjectHideFlags: 0 @@ -80517,6 +80929,191 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8159903586399199115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2020646868919055834} + - component: {fileID: 659442467633903366} + m_Layer: 5 + m_Name: Text_Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2020646868919055834 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8159903586399199115} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4839052004913961931} + - {fileID: 3822768397467630138} + m_Father: {fileID: 4324397966855141849} + 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: 202.55556, y: -30} + m_SizeDelta: {x: 127.11112, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &659442467633903366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8159903586399199115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: -8 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 1 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &8198357156490782151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4324397966855141849} + - component: {fileID: 5405920187242708862} + - component: {fileID: 1935187655845053656} + - component: {fileID: 8410984695233829405} + - component: {fileID: 3451399711824286565} + m_Layer: 5 + m_Name: Lock_Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4324397966855141849 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8198357156490782151} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 0.9, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3335440095307032397} + - {fileID: 2020646868919055834} + m_Father: {fileID: 8088310778780114024} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 35} + m_SizeDelta: {x: 366.1111, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5405920187242708862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8198357156490782151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 50 + m_Right: 50 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 1 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1935187655845053656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8198357156490782151} + 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!222 &8410984695233829405 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8198357156490782151} + m_CullTransparentMesh: 1 +--- !u!114 &3451399711824286565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8198357156490782151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.627451} + 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: 94a6712e7b2e0d741a50286be14eea0c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8391180235420465169 GameObject: m_ObjectHideFlags: 0 @@ -90211,6 +90808,173 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 62.2} m_SizeDelta: {x: 160, y: 60} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8925070694860963846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3822768397467630138} + - component: {fileID: 2280961217495045670} + - component: {fileID: 3995090034224882054} + - component: {fileID: 4357424973342446178} + m_Layer: 5 + m_Name: Text_Stage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3822768397467630138 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925070694860963846} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2020646868919055834} + 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: 69.91112, y: -45.21517} + m_SizeDelta: {x: 127.11112, y: 17.728832} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2280961217495045670 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925070694860963846} + m_CullTransparentMesh: 1 +--- !u!114 &3995090034224882054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925070694860963846} + 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: Stage 50 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4289374890 + m_fontColor: {r: 0.6666667, g: 0.6666667, b: 0.6666667, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -5 + m_wordSpacing: 0 + m_lineSpacing: -50 + 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 &4357424973342446178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8925070694860963846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 27 + l10nKey: + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 --- !u!1001 &972286577259843602 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RankingBtn.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RankingBtn.prefab index c7b96ecb7cf..79ea9626aaa 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RankingBtn.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/RankingBtn.prefab @@ -388,7 +388,6 @@ RectTransform: - {fileID: 21887679660293355} - {fileID: 2505441311892281251} - {fileID: 8232355514928224794} - - {fileID: 6864952659803937324} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -888,6 +887,82 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 5} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &685483031548475937 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4782004183841183372} + - component: {fileID: 558487044270774250} + - component: {fileID: 6279981505435891958} + m_Layer: 5 + m_Name: Tower_Dim + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4782004183841183372 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 685483031548475937} + 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: 8232355514928224794} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 174, y: 499} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &558487044270774250 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 685483031548475937} + m_CullTransparentMesh: 1 +--- !u!114 &6279981505435891958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 685483031548475937} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, 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: baf88e28475bb054cb5a81795145f10e, 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!1 &731439669861634235 GameObject: m_ObjectHideFlags: 0 @@ -991,6 +1066,173 @@ MonoBehaviour: loop: 1 loopDelay: 1 updateMode: 0 +--- !u!1 &1002539831044603770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5052664919878413060} + - component: {fileID: 3936926243040497678} + - component: {fileID: 2064257758623209957} + - component: {fileID: 4303956515061926204} + m_Layer: 5 + m_Name: Text_01 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5052664919878413060 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002539831044603770} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 227069572547131843} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3936926243040497678 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002539831044603770} + m_CullTransparentMesh: 1 +--- !u!114 &2064257758623209957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002539831044603770} + 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: Arena + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4289374890 + m_fontColor: {r: 0.6666667, g: 0.6666667, b: 0.6666667, 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 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -5 + m_wordSpacing: 0 + m_lineSpacing: -50 + 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 &4303956515061926204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002539831044603770} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 27 + l10nKey: UI_MAIN_MENU_RANKING + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 --- !u!1 &1014001184399826450 GameObject: m_ObjectHideFlags: 0 @@ -1070,7 +1312,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2344532089105996186 +--- !u!1 &1754431535604609766 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1078,65 +1320,65 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2798841816448128397} - - component: {fileID: 8077267613752187273} - - component: {fileID: 7269738307372722005} + - component: {fileID: 1916693862762815011} + - component: {fileID: 2220320446098201360} + - component: {fileID: 4919999387672875213} m_Layer: 5 - m_Name: Bg_add + m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2798841816448128397 +--- !u!224 &1916693862762815011 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2344532089105996186} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1754431535604609766} + 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_LocalScale: {x: 0.9, y: 0.9, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5348842462879540978} - m_RootOrder: 1 + m_Father: {fileID: 3954081031411027409} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 16.5} - m_SizeDelta: {x: 80, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 36} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8077267613752187273 +--- !u!222 &2220320446098201360 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2344532089105996186} + m_GameObject: {fileID: 1754431535604609766} m_CullTransparentMesh: 1 ---- !u!114 &7269738307372722005 +--- !u!114 &4919999387672875213 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2344532089105996186} + m_GameObject: {fileID: 1754431535604609766} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 0f61099b14515e846a095f60b3b832a9, type: 2} - m_Color: {r: 0, g: 0.7025659, b: 1, a: 0.27450982} + m_Material: {fileID: 0} + m_Color: {r: 0.6666667, g: 0.6666667, b: 0.6666667, 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: 2ca4e332521dd4678a899db56f0e581e, type: 3} + m_Sprite: {fileID: 21300000, guid: 62c7e1f85f30c8140b07a5ee353c84af, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1146,7 +1388,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2572923835809257109 +--- !u!1 &2344532089105996186 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1154,34 +1396,177 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8232355514928224794} + - component: {fileID: 2798841816448128397} + - component: {fileID: 8077267613752187273} + - component: {fileID: 7269738307372722005} m_Layer: 5 - m_Name: LockObjects + m_Name: Bg_add m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8232355514928224794 +--- !u!224 &2798841816448128397 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2572923835809257109} + m_GameObject: {fileID: 2344532089105996186} 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: 21887680680723080} - m_RootOrder: 3 + m_Father: {fileID: 5348842462879540978} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 0, y: 16.5} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8077267613752187273 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2344532089105996186} + m_CullTransparentMesh: 1 +--- !u!114 &7269738307372722005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2344532089105996186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 0f61099b14515e846a095f60b3b832a9, type: 2} + m_Color: {r: 0, g: 0.7025659, b: 1, a: 0.27450982} + 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: 2ca4e332521dd4678a899db56f0e581e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2572923835809257109 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8232355514928224794} + m_Layer: 5 + m_Name: LockObjects + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8232355514928224794 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2572923835809257109} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4782004183841183372} + - {fileID: 3954081031411027409} + m_Father: {fileID: 21887680680723080} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3090404575607548929 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 227069572547131843} + - component: {fileID: 774403529964354266} + m_Layer: 5 + m_Name: Text_Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &227069572547131843 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3090404575607548929} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5052664919878413060} + - {fileID: 8659588650219257059} + m_Father: {fileID: 3954081031411027409} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &774403529964354266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3090404575607548929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 5 + m_Bottom: 10 + m_ChildAlignment: 3 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 1 + m_ChildScaleHeight: 1 + m_ReverseArrangement: 0 --- !u!1 &3274532100143954482 GameObject: m_ObjectHideFlags: 0 @@ -1364,32 +1749,275 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5348842462879540978} - m_RootOrder: 0 + m_Father: {fileID: 5348842462879540978} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 10} + m_SizeDelta: {x: 135, y: 37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4982771968149238378 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4046231390810500134} + m_CullTransparentMesh: 1 +--- !u!114 &2282433373043246652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4046231390810500134} + 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: 98643db945dfd4bbb8892a22fa24f946, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4247963707701526566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8659588650219257059} + - component: {fileID: 1289725048563333171} + - component: {fileID: 2411938236276271204} + - component: {fileID: 2349454718141685598} + m_Layer: 5 + m_Name: Text_Stage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8659588650219257059 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4247963707701526566} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 227069572547131843} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1289725048563333171 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4247963707701526566} + m_CullTransparentMesh: 1 +--- !u!114 &2411938236276271204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4247963707701526566} + 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: Stage 25 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4289374890 + m_fontColor: {r: 0.6666667, g: 0.6666667, b: 0.6666667, 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: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -5 + m_wordSpacing: 0 + m_lineSpacing: -50 + 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 &2349454718141685598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4247963707701526566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 27 + l10nKey: + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 +--- !u!1 &4445287362777637470 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 234765809728238821} + - component: {fileID: 3270600542406340669} + - component: {fileID: 9184902237990004220} + m_Layer: 0 + m_Name: ArenaTicketCount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &234765809728238821 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4445287362777637470} + 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: 2065926967829751717} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 10} - m_SizeDelta: {x: 135, y: 37} + m_AnchoredPosition: {x: 21, y: 20.5} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4982771968149238378 +--- !u!222 &3270600542406340669 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4046231390810500134} + m_GameObject: {fileID: 4445287362777637470} m_CullTransparentMesh: 1 ---- !u!114 &2282433373043246652 +--- !u!114 &9184902237990004220 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4046231390810500134} + m_GameObject: {fileID: 4445287362777637470} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1400,17 +2028,77 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 98643db945dfd4bbb8892a22fa24f946, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4445287362777637470 + m_text: 5 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e14cdec1ec99d4f2ba55eff738f74f8e, type: 2} + m_sharedMaterial: {fileID: 1820101775899876419, guid: e14cdec1ec99d4f2ba55eff738f74f8e, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4293783039 + m_fontColor: {r: 1, g: 0.9292453, b: 0.9292453, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 0 + m_HorizontalAlignment: 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 &4541078369163759969 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1418,51 +2106,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 234765809728238821} - - component: {fileID: 3270600542406340669} - - component: {fileID: 9184902237990004220} - m_Layer: 0 - m_Name: ArenaTicketCount + - component: {fileID: 2617228258599282740} + - component: {fileID: 2254622400540832241} + - component: {fileID: 45616220256582301} + - component: {fileID: 2585016941807075013} + m_Layer: 5 + m_Name: Text_01 (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &234765809728238821 +--- !u!224 &2617228258599282740 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4445287362777637470} + m_GameObject: {fileID: 4541078369163759969} 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_LocalScale: {x: 1.1, y: 1.1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2065926967829751717} - m_RootOrder: 3 + m_Father: {fileID: 2505441311892281251} + m_RootOrder: 4 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: 21, y: 20.5} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 3.4, y: -5} + m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3270600542406340669 +--- !u!222 &2254622400540832241 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4445287362777637470} + m_GameObject: {fileID: 4541078369163759969} m_CullTransparentMesh: 1 ---- !u!114 &9184902237990004220 +--- !u!114 &45616220256582301 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4445287362777637470} + m_GameObject: {fileID: 4541078369163759969} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1476,18 +2165,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 5 + m_text: Arena m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: e14cdec1ec99d4f2ba55eff738f74f8e, type: 2} - m_sharedMaterial: {fileID: 1820101775899876419, guid: e14cdec1ec99d4f2ba55eff738f74f8e, - type: 2} + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4293783039 - m_fontColor: {r: 1, g: 0.9292453, b: 0.9292453, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1504,19 +2192,19 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 + m_fontSize: 28 + m_fontSizeBase: 28 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 8 m_fontSizeMax: 32 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -5 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -50 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 @@ -1546,6 +2234,37 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &2585016941807075013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4541078369163759969} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 27 + l10nKey: UI_MAIN_MENU_RANKING + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 --- !u!1 &4555874126950257317 GameObject: m_ObjectHideFlags: 0 @@ -1577,8 +2296,8 @@ RectTransform: m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 21887680680723080} - m_RootOrder: 4 + m_Father: {fileID: 2505441311892281251} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2588,6 +3307,8 @@ RectTransform: - {fileID: 21887681494209307} - {fileID: 7604452899302235937} - {fileID: 654358469586272635} + - {fileID: 2617228258599282740} + - {fileID: 6864952659803937324} m_Father: {fileID: 21887680680723080} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2877,6 +3598,126 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8694411756715663979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3954081031411027409} + - component: {fileID: 2612180548826070407} + - component: {fileID: 5683332489995398918} + - component: {fileID: 3145706641770215617} + - component: {fileID: 2387162446089472864} + m_Layer: 5 + m_Name: Lock_Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3954081031411027409 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8694411756715663979} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1916693862762815011} + - {fileID: 227069572547131843} + m_Father: {fileID: 8232355514928224794} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2612180548826070407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8694411756715663979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 50 + m_Right: 50 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 1 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &5683332489995398918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8694411756715663979} + 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!222 &3145706641770215617 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8694411756715663979} + m_CullTransparentMesh: 1 +--- !u!114 &2387162446089472864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8694411756715663979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.627451} + 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: 94a6712e7b2e0d741a50286be14eea0c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8815195591246568066 GameObject: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/ShopBtn.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/ShopBtn.prefab index 94d02bf2c98..1157e036997 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/ShopBtn.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/ShopBtn.prefab @@ -1337,6 +1337,7 @@ RectTransform: - {fileID: 2117963323469927503} - {fileID: 8347244533818123768} - {fileID: 7716833337508423867} + - {fileID: 7733699665344727966} - {fileID: 9044489233577518989} m_Father: {fileID: 0} m_RootOrder: 0 @@ -4402,7 +4403,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1806947039787728185} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7868,6 +7869,173 @@ MonoBehaviour: m_RotationOrder: 4 beginValue: 0 endValue: 1 +--- !u!1 &8719805506543957082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7733699665344727966} + - component: {fileID: 451885826224824757} + - component: {fileID: 3492808557744766346} + - component: {fileID: 424534771387203232} + m_Layer: 5 + m_Name: Text_03 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7733699665344727966 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8719805506543957082} + 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: 1806947039787728185} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 162.94, y: -36.37} + m_SizeDelta: {x: 130, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &451885826224824757 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8719805506543957082} + m_CullTransparentMesh: 1 +--- !u!114 &3492808557744766346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8719805506543957082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Shop + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4026531840 + m_fontColor: {r: 0, g: 0, b: 0, a: 0.9411765} + 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: 26 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: -5 + m_wordSpacing: 0 + m_lineSpacing: -50 + 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 &424534771387203232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8719805506543957082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 27 + l10nKey: UI_MAIN_MENU_SHOP + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 --- !u!1 &8849036602878522369 GameObject: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/StakingBtn.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/StakingBtn.prefab index 6cd48c76ed5..02c8ae63e6a 100644 --- a/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/StakingBtn.prefab +++ b/nekoyume/Assets/AddressableAssets/UI/Module/Lobby/StakingBtn.prefab @@ -150,6 +150,7 @@ RectTransform: - {fileID: 3317755364091931427} - {fileID: 7702144876723794782} - {fileID: 814064675049409318} + - {fileID: 6353520659713945240} - {fileID: 3028424330904642687} m_Father: {fileID: 0} m_RootOrder: 0 @@ -332,7 +333,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2674885860706672921} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -467,6 +468,173 @@ MonoBehaviour: defaultWordSpacing: 0 defaultLineSpacingInitialized: 0 defaultLineSpacing: 0 +--- !u!1 &4177925589961350370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6353520659713945240} + - component: {fileID: 4974139728866503668} + - component: {fileID: 846685452882810400} + - component: {fileID: 1144163934400727114} + m_Layer: 5 + m_Name: Text_01 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6353520659713945240 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177925589961350370} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2674885860706672921} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -23.99999} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4974139728866503668 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177925589961350370} + m_CullTransparentMesh: 1 +--- !u!114 &846685452882810400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177925589961350370} + 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: Collecting + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8a682b7747d4a664089b7b1065aa0035, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 4f57ca6e7d2e44cc587af4449010a5f2, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -5 + m_wordSpacing: 0 + m_lineSpacing: -50 + 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 &1144163934400727114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4177925589961350370} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 27 + l10nKey: UI_MAIN_MENU_STAKING + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 --- !u!1 &5582978022049418341 GameObject: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/ReceiveArea.prefab b/nekoyume/Assets/AddressableAssets/UI/Module/ReceiveArea.prefab new file mode 100644 index 00000000000..2de6b5a72e2 --- /dev/null +++ b/nekoyume/Assets/AddressableAssets/UI/Module/ReceiveArea.prefab @@ -0,0 +1,977 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1198564617615910989 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 542740154521583474} + - component: {fileID: 546954731440027568} + - component: {fileID: 7497116594061331311} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &542740154521583474 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1198564617615910989} + 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: 6862946354839056062} + m_RootOrder: 0 + 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: -41, y: 0} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &546954731440027568 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1198564617615910989} + m_CullTransparentMesh: 1 +--- !u!114 &7497116594061331311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1198564617615910989} + 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: 4990c9bfed5794c54a74bd017d02191a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1674287712562242715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6356063883066438581} + - component: {fileID: 1145802838360157926} + - component: {fileID: 3174921166461389620} + - component: {fileID: 238712016301714851} + - component: {fileID: 3664756644707036389} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6356063883066438581 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674287712562242715} + 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: 3811910274368290963} + 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: 1} + m_SizeDelta: {x: -171.12, y: 2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1145802838360157926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674287712562242715} + m_CullTransparentMesh: 1 +--- !u!114 &3174921166461389620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674287712562242715} + 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: UI_RECEIVE_ALL + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: ee85c922f6a7b4b5ba900ec7f0dedb49, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0dd5ff07d6b414a099a10f9e2c6f9c2a, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4290233309 + m_fontColor: {r: 0.8679245, g: 0.76531076, b: 0.7164471, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 1 + m_HorizontalAlignment: 4 + 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 &238712016301714851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674287712562242715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 1 + l10nKey: UI_RECEIVE_ALL + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 +--- !u!114 &3664756644707036389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674287712562242715} + 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 &1877008915015434012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2890574942437117283} + - component: {fileID: 2037916062991464951} + - component: {fileID: 7930091191787157626} + - component: {fileID: 3646264293035868426} + m_Layer: 5 + m_Name: Text_help + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2890574942437117283 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1877008915015434012} + 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: 3802854736529154490} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 12} + m_SizeDelta: {x: 0, y: 32} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2037916062991464951 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1877008915015434012} + m_CullTransparentMesh: 1 +--- !u!114 &7930091191787157626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1877008915015434012} + 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: UI_RECEIVE_ALL_CONTENT + 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: 4284375462 + m_fontColor: {r: 0.6509804, g: 0.38039216, b: 0.36862746, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 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 &3646264293035868426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1877008915015434012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} + m_Name: + m_EditorClassIdentifier: + fixedFontAsset: 0 + fixedFontStyle: 0 + fixedFontSizeOffset: 0 + fixedSpacingOption: 0 + fixedMarginOption: 0 + fontMaterialType: 0 + l10nKey: UI_RECEIVE_ALL_CONTENT + fontMaterialIndexInitialized: 0 + fontMaterialIndex: 0 + defaultFontStylesInitialized: 0 + defaultFontStyles: 0 + defaultFontSizeInitialized: 0 + defaultFontSize: 0 + defaultCharacterSpacingInitialized: 0 + defaultCharacterSpacing: 0 + defaultWordSpacingInitialized: 0 + defaultWordSpacing: 0 + defaultLineSpacingInitialized: 0 + defaultLineSpacing: 0 +--- !u!1 &2274379383093321131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1780688153990552346} + - component: {fileID: 1227066340117938042} + - component: {fileID: 7625434347236964521} + m_Layer: 5 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1780688153990552346 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2274379383093321131} + 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: 6862946354839056062} + m_RootOrder: 1 + 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: 7, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1227066340117938042 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2274379383093321131} + m_CullTransparentMesh: 1 +--- !u!114 &7625434347236964521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2274379383093321131} + 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: 232323 + 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: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 8 + m_fontSizeMax: 32 + m_fontStyle: 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!1 &5187071510443619690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8540610943547806109} + - component: {fileID: 953943051467543535} + - component: {fileID: 8052773725111017652} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8540610943547806109 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5187071510443619690} + 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: 3802854736529154490} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 32, y: 134} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &953943051467543535 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5187071510443619690} + m_CullTransparentMesh: 1 +--- !u!114 &8052773725111017652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5187071510443619690} + 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: 0.9019608} + 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: 9c38f8997b73447c5a0c6bedae161682, 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!1 &6296667345791823343 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3802854736529154490} + m_Layer: 5 + m_Name: ReceiveArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3802854736529154490 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6296667345791823343} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8540610943547806109} + - {fileID: 5939591038083424908} + - {fileID: 3811910274368290963} + - {fileID: 2890574942437117283} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 9.999999, y: 75} + m_Pivot: {x: 0.5, y: 0} +--- !u!1 &6401931465730702637 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3811910274368290963} + - component: {fileID: 2817644467049752076} + - component: {fileID: 6760600137238187985} + - component: {fileID: 57551439146866824} + - component: {fileID: 6127687268964127436} + m_Layer: 5 + m_Name: ReceiveButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3811910274368290963 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6401931465730702637} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6356063883066438581} + - {fileID: 6862946354839056062} + m_Father: {fileID: 3802854736529154490} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -10} + m_SizeDelta: {x: 300, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2817644467049752076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6401931465730702637} + 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: 0 + 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: 57551439146866824} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &6760600137238187985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6401931465730702637} + m_CullTransparentMesh: 1 +--- !u!114 &57551439146866824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6401931465730702637} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3483b1826aa594389a7d7299dcab8151, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!95 &6127687268964127436 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6401931465730702637} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &7648915994328656545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6862946354839056062} + - component: {fileID: 8388273127259704216} + - component: {fileID: 8616117812820509299} + m_Layer: 5 + m_Name: Goods + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6862946354839056062 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7648915994328656545} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 542740154521583474} + - {fileID: 1780688153990552346} + m_Father: {fileID: 3811910274368290963} + m_RootOrder: 1 + 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: 15, y: 0} + m_SizeDelta: {x: 100, y: 19.9} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &8388273127259704216 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7648915994328656545} + m_CullTransparentMesh: 1 +--- !u!114 &8616117812820509299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7648915994328656545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.066037714, g: 0.064104274, b: 0.061365236, a: 0.78431374} + 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: ab8a3d3905fc6485b99af9a34ebc0a85, 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!1 &9066319145397542629 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5939591038083424908} + - component: {fileID: 1735291422686909162} + - component: {fileID: 7341969798553484978} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5939591038083424908 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9066319145397542629} + 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: 3802854736529154490} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -10} + m_SizeDelta: {x: 315, y: 53} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1735291422686909162 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9066319145397542629} + m_CullTransparentMesh: 1 +--- !u!114 &7341969798553484978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9066319145397542629} + 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: 0.7372549} + 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: 31b63571ca8d84cd29facb19700b529e, 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 diff --git a/nekoyume/Assets/AddressableAssets/UI/Module/ReceiveArea.prefab.meta b/nekoyume/Assets/AddressableAssets/UI/Module/ReceiveArea.prefab.meta new file mode 100644 index 00000000000..52a740247bb --- /dev/null +++ b/nekoyume/Assets/AddressableAssets/UI/Module/ReceiveArea.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6bd94f9e38be94a4a9199ff6c830f03f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_BattleResult.spriteatlas b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_BattleResult.spriteatlas index d745b6a0df6..3c1bb4c8357 100644 --- a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_BattleResult.spriteatlas +++ b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_BattleResult.spriteatlas @@ -175,6 +175,7 @@ SpriteAtlas: - {fileID: 21300000, guid: ce045db8a9e3555428084733ed9f2a10, type: 3} - {fileID: 21300000, guid: 63112dd86b77e412e8005ef6e991a9d0, type: 3} - {fileID: 21300000, guid: a1520ed8120a48f4697eddfca35b2ed8, type: 3} + - {fileID: 21300000, guid: 62c7e1f85f30c8140b07a5ee353c84af, type: 3} - {fileID: 21300000, guid: 149516097e93cf24c892072063bcf0a5, type: 3} - {fileID: 21300000, guid: b550fb09379c14e9da9213f5e65aff49, type: 3} - {fileID: 21300000, guid: 23bc1f293e20d4c15b583a7a67bab116, type: 3} @@ -251,6 +252,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 22e176fdf9f23824c9600955271593c0, type: 3} - {fileID: 21300000, guid: 3039830e96fb0134aaa61e13c672fef4, type: 3} - {fileID: 21300000, guid: a9885d1ec8c1dae4294b4bf8a9a9e178, type: 3} + - {fileID: 21300000, guid: 94a6712e7b2e0d741a50286be14eea0c, type: 3} - {fileID: 21300000, guid: 0d11282efb8a045558d8b1364266b5c0, type: 3} - {fileID: 21300000, guid: b741d13ee7bb44ad185d1d90c24c35c2, type: 3} - {fileID: 21300000, guid: bc32333ea13304191bee07df4643a087, type: 3} @@ -404,6 +406,7 @@ SpriteAtlas: - UI_icon_open - button_brown_minus - Button_Tab_bg_Normal_05 + - Icon_Lock - button_page_02_reverse - UI_Btn_bg_04 - UI_box_Inventory_01 @@ -480,6 +483,7 @@ SpriteAtlas: - UI_victory_gold_ribbon - UI_box_05_ef - UI_mail_popup_01 + - UI_Gradiant_bg_04 - Common_bg_7R_Gradiant - UI_scroll_bg - UI_Btn_bg_02_Press diff --git a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Combination.spriteatlas b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Combination.spriteatlas index 783fb57111f..54aba4e09df 100644 --- a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Combination.spriteatlas +++ b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Combination.spriteatlas @@ -184,6 +184,7 @@ SpriteAtlas: - {fileID: 21300000, guid: ce045db8a9e3555428084733ed9f2a10, type: 3} - {fileID: 21300000, guid: 63112dd86b77e412e8005ef6e991a9d0, type: 3} - {fileID: 21300000, guid: a1520ed8120a48f4697eddfca35b2ed8, type: 3} + - {fileID: 21300000, guid: 62c7e1f85f30c8140b07a5ee353c84af, type: 3} - {fileID: 21300000, guid: 149516097e93cf24c892072063bcf0a5, type: 3} - {fileID: 21300000, guid: b550fb09379c14e9da9213f5e65aff49, type: 3} - {fileID: 21300000, guid: 23bc1f293e20d4c15b583a7a67bab116, type: 3} @@ -261,6 +262,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3c39dfed8a782494f9def5a4cdfe99b4, type: 3} - {fileID: 21300000, guid: 3039830e96fb0134aaa61e13c672fef4, type: 3} - {fileID: 21300000, guid: a9885d1ec8c1dae4294b4bf8a9a9e178, type: 3} + - {fileID: 21300000, guid: 94a6712e7b2e0d741a50286be14eea0c, type: 3} - {fileID: 21300000, guid: 0d11282efb8a045558d8b1364266b5c0, type: 3} - {fileID: 21300000, guid: b741d13ee7bb44ad185d1d90c24c35c2, type: 3} - {fileID: 21300000, guid: bc32333ea13304191bee07df4643a087, type: 3} @@ -424,6 +426,7 @@ SpriteAtlas: - UI_icon_open - button_brown_minus - Button_Tab_bg_Normal_05 + - Icon_Lock - button_page_02_reverse - UI_Btn_bg_04 - UI_box_Inventory_01 @@ -501,6 +504,7 @@ SpriteAtlas: - UI_icon_login_lock - UI_box_05_ef - UI_mail_popup_01 + - UI_Gradiant_bg_04 - Common_bg_7R_Gradiant - UI_scroll_bg - UI_Btn_bg_02_Press diff --git a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Common.spriteatlas b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Common.spriteatlas index fe92d6d2b12..10bb7ac74a3 100644 --- a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Common.spriteatlas +++ b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Common.spriteatlas @@ -258,6 +258,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 1f6faad8f41d01f4eaad32be99f96dfb, type: 3} - {fileID: 21300000, guid: 63112dd86b77e412e8005ef6e991a9d0, type: 3} - {fileID: 21300000, guid: a1520ed8120a48f4697eddfca35b2ed8, type: 3} + - {fileID: 21300000, guid: 62c7e1f85f30c8140b07a5ee353c84af, type: 3} - {fileID: 21300000, guid: 149516097e93cf24c892072063bcf0a5, type: 3} - {fileID: 21300000, guid: b550fb09379c14e9da9213f5e65aff49, type: 3} - {fileID: 21300000, guid: d0303f095dc0040ef926d7b4c0481588, type: 3} @@ -378,6 +379,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3a0ea20e8e0254404a27b6c827aab686, type: 3} - {fileID: 21300000, guid: 3039830e96fb0134aaa61e13c672fef4, type: 3} - {fileID: 21300000, guid: a9885d1ec8c1dae4294b4bf8a9a9e178, type: 3} + - {fileID: 21300000, guid: 94a6712e7b2e0d741a50286be14eea0c, type: 3} - {fileID: 21300000, guid: 0d11282efb8a045558d8b1364266b5c0, type: 3} - {fileID: 21300000, guid: 5239f92e89bdbb54abae0311f68711d8, type: 3} - {fileID: 21300000, guid: b741d13ee7bb44ad185d1d90c24c35c2, type: 3} @@ -621,6 +623,7 @@ SpriteAtlas: - UI_combo_02 - button_brown_minus - Button_Tab_bg_Normal_05 + - Icon_Lock - button_page_02_reverse - UI_Btn_bg_04 - Rank_bg_06 @@ -741,6 +744,7 @@ SpriteAtlas: - UI_Popup_bg_09 - UI_box_05_ef - UI_mail_popup_01 + - UI_Gradiant_bg_04 - Common_bg_7R_Gradiant - UI_icon_item_bg_14 - UI_scroll_bg diff --git a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Rune.spriteatlas b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Rune.spriteatlas index 527f91e1ab5..ebd03741684 100644 --- a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Rune.spriteatlas +++ b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Rune.spriteatlas @@ -169,6 +169,7 @@ SpriteAtlas: - {fileID: 21300000, guid: ce045db8a9e3555428084733ed9f2a10, type: 3} - {fileID: 21300000, guid: 63112dd86b77e412e8005ef6e991a9d0, type: 3} - {fileID: 21300000, guid: a1520ed8120a48f4697eddfca35b2ed8, type: 3} + - {fileID: 21300000, guid: 62c7e1f85f30c8140b07a5ee353c84af, type: 3} - {fileID: 21300000, guid: 149516097e93cf24c892072063bcf0a5, type: 3} - {fileID: 21300000, guid: b550fb09379c14e9da9213f5e65aff49, type: 3} - {fileID: 21300000, guid: 23bc1f293e20d4c15b583a7a67bab116, type: 3} @@ -241,6 +242,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3c39dfed8a782494f9def5a4cdfe99b4, type: 3} - {fileID: 21300000, guid: 3039830e96fb0134aaa61e13c672fef4, type: 3} - {fileID: 21300000, guid: a9885d1ec8c1dae4294b4bf8a9a9e178, type: 3} + - {fileID: 21300000, guid: 94a6712e7b2e0d741a50286be14eea0c, type: 3} - {fileID: 21300000, guid: 0d11282efb8a045558d8b1364266b5c0, type: 3} - {fileID: 21300000, guid: b741d13ee7bb44ad185d1d90c24c35c2, type: 3} - {fileID: 21300000, guid: bc32333ea13304191bee07df4643a087, type: 3} @@ -385,6 +387,7 @@ SpriteAtlas: - UI_icon_open - button_brown_minus - Button_Tab_bg_Normal_05 + - Icon_Lock - button_page_02_reverse - UI_Btn_bg_04 - UI_box_Inventory_01 @@ -457,6 +460,7 @@ SpriteAtlas: - UI_icon_login_lock - UI_box_05_ef - UI_mail_popup_01 + - UI_Gradiant_bg_04 - Common_bg_7R_Gradiant - UI_scroll_bg - UI_Btn_bg_02_Press diff --git a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Shop.spriteatlas b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Shop.spriteatlas index 34ef7b6aa77..9599954745f 100644 --- a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Shop.spriteatlas +++ b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_Shop.spriteatlas @@ -201,6 +201,7 @@ SpriteAtlas: - {fileID: 21300000, guid: ce045db8a9e3555428084733ed9f2a10, type: 3} - {fileID: 21300000, guid: 63112dd86b77e412e8005ef6e991a9d0, type: 3} - {fileID: 21300000, guid: a1520ed8120a48f4697eddfca35b2ed8, type: 3} + - {fileID: 21300000, guid: 62c7e1f85f30c8140b07a5ee353c84af, type: 3} - {fileID: 21300000, guid: 149516097e93cf24c892072063bcf0a5, type: 3} - {fileID: 21300000, guid: b550fb09379c14e9da9213f5e65aff49, type: 3} - {fileID: 21300000, guid: 23bc1f293e20d4c15b583a7a67bab116, type: 3} @@ -296,6 +297,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3c39dfed8a782494f9def5a4cdfe99b4, type: 3} - {fileID: 21300000, guid: 3039830e96fb0134aaa61e13c672fef4, type: 3} - {fileID: 21300000, guid: a9885d1ec8c1dae4294b4bf8a9a9e178, type: 3} + - {fileID: 21300000, guid: 94a6712e7b2e0d741a50286be14eea0c, type: 3} - {fileID: 21300000, guid: 543a872e0e3b842578d7e9f53ff3c187, type: 3} - {fileID: 21300000, guid: 0d11282efb8a045558d8b1364266b5c0, type: 3} - {fileID: 21300000, guid: b741d13ee7bb44ad185d1d90c24c35c2, type: 3} @@ -481,6 +483,7 @@ SpriteAtlas: - UI_icon_open - button_brown_minus - Button_Tab_bg_Normal_05 + - Icon_Lock - button_page_02_reverse - UI_Btn_bg_04 - UI_box_Inventory_01 @@ -576,6 +579,7 @@ SpriteAtlas: - UI_icon_login_lock - UI_box_05_ef - UI_mail_popup_01 + - UI_Gradiant_bg_04 - Common_Btn_Normal - Common_bg_7R_Gradiant - UI_scroll_bg diff --git a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_WorldBoss.spriteatlas b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_WorldBoss.spriteatlas index 3a660a77691..9236ef28956 100644 --- a/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_WorldBoss.spriteatlas +++ b/nekoyume/Assets/Resources/SpriteAtlases/UI/Atlas_WorldBoss.spriteatlas @@ -264,6 +264,7 @@ SpriteAtlas: - {fileID: 21300000, guid: ce045db8a9e3555428084733ed9f2a10, type: 3} - {fileID: 21300000, guid: 63112dd86b77e412e8005ef6e991a9d0, type: 3} - {fileID: 21300000, guid: a1520ed8120a48f4697eddfca35b2ed8, type: 3} + - {fileID: 21300000, guid: 62c7e1f85f30c8140b07a5ee353c84af, type: 3} - {fileID: 21300000, guid: 149516097e93cf24c892072063bcf0a5, type: 3} - {fileID: 21300000, guid: b550fb09379c14e9da9213f5e65aff49, type: 3} - {fileID: 21300000, guid: 1242f629318f1db4bac418b773e128c9, type: 3} @@ -387,6 +388,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3039830e96fb0134aaa61e13c672fef4, type: 3} - {fileID: 21300000, guid: 1a2f661ed7471524c9fde8f945f75580, type: 3} - {fileID: 21300000, guid: a9885d1ec8c1dae4294b4bf8a9a9e178, type: 3} + - {fileID: 21300000, guid: 94a6712e7b2e0d741a50286be14eea0c, type: 3} - {fileID: 21300000, guid: 0d11282efb8a045558d8b1364266b5c0, type: 3} - {fileID: 21300000, guid: 5239f92e89bdbb54abae0311f68711d8, type: 3} - {fileID: 21300000, guid: b741d13ee7bb44ad185d1d90c24c35c2, type: 3} @@ -637,6 +639,7 @@ SpriteAtlas: - UI_icon_open - button_brown_minus - Button_Tab_bg_Normal_05 + - Icon_Lock - button_page_02_reverse - UI_Btn_bg_04 - Illust_Paper_Serimnir @@ -760,6 +763,7 @@ SpriteAtlas: - UI_box_05_ef - Icon_Personnel_2 - UI_mail_popup_01 + - UI_Gradiant_bg_04 - Common_bg_7R_Gradiant - UI_icon_item_bg_14 - UI_scroll_bg diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_ArenaJoin.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_ArenaJoin.prefab index aa89037af40..d51d5af5a60 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_ArenaJoin.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_ArenaJoin.prefab @@ -3332,15 +3332,20 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5513246164202496408} m_Modifications: + - target: {fileID: 1219814218727759744, guid: cc962a46f90dc234c8b0ae136474a8a6, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3 + objectReference: {fileID: 0} - target: {fileID: 1470902170355418776, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} propertyPath: m_SizeDelta.y - value: 20 + value: 6 objectReference: {fileID: 0} - target: {fileID: 1470902170355418776, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1574489342133667355, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} @@ -3465,12 +3470,12 @@ PrefabInstance: - target: {fileID: 1905035832962379343, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} propertyPath: m_SizeDelta.y - value: 20 + value: 6 objectReference: {fileID: 0} - target: {fileID: 1905035832962379343, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2306348561999225733, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} @@ -3510,12 +3515,12 @@ PrefabInstance: - target: {fileID: 2988178420169514734, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} propertyPath: m_SizeDelta.y - value: 20 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2988178420169514734, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3403605833098415959, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} @@ -3542,6 +3547,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 15.900024 objectReference: {fileID: 0} + - target: {fileID: 4399330519337689268, guid: cc962a46f90dc234c8b0ae136474a8a6, + type: 3} + propertyPath: m_text + value: Coustume + objectReference: {fileID: 0} - target: {fileID: 4399330519337689268, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} propertyPath: m_fontSize @@ -3557,6 +3567,16 @@ PrefabInstance: propertyPath: m_enableAutoSizing value: 1 objectReference: {fileID: 0} + - target: {fileID: 4750427515189944215, guid: cc962a46f90dc234c8b0ae136474a8a6, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5308648682338774268, guid: cc962a46f90dc234c8b0ae136474a8a6, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3 + objectReference: {fileID: 0} - target: {fileID: 6772403724807335520, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} propertyPath: _value @@ -3587,15 +3607,20 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7491975274680134415, guid: cc962a46f90dc234c8b0ae136474a8a6, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3 + objectReference: {fileID: 0} - target: {fileID: 8169428902187586008, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} propertyPath: m_SizeDelta.y - value: 20 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8169428902187586008, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8323499210207278238, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} @@ -3622,6 +3647,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 9154004183822306799, guid: cc962a46f90dc234c8b0ae136474a8a6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9196715674172059435, guid: cc962a46f90dc234c8b0ae136474a8a6, type: 3} propertyPath: m_AnchorMax.y diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_MailPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_MailPopup.prefab index fe5114fd1fd..0512b9e1e0f 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_MailPopup.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_MailPopup.prefab @@ -1,81 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &9429796018432853 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1660591559336000618} - - component: {fileID: 1663099419057271976} - - component: {fileID: 8685389382168135799} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1660591559336000618 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9429796018432853} - 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: 5745956692783066534} - m_RootOrder: 0 - 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: -41, y: 0} - m_SizeDelta: {x: 30, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1663099419057271976 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9429796018432853} - m_CullTransparentMesh: 1 ---- !u!114 &8685389382168135799 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9429796018432853} - 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: 4990c9bfed5794c54a74bd017d02191a, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &227741561391520980 GameObject: m_ObjectHideFlags: 0 @@ -490,356 +414,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 524976808187311534} m_CullTransparentMesh: 1 ---- !u!1 &558424088141391747 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5239637032992501933} - - component: {fileID: 2262247296998960638} - - component: {fileID: 4362929796098705452} - - component: {fileID: 1428691263655603899} - - component: {fileID: 2474865101142847485} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5239637032992501933 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558424088141391747} - 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: 2622511431731430283} - 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: 1} - m_SizeDelta: {x: -171.13, y: 2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2262247296998960638 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558424088141391747} - m_CullTransparentMesh: 1 ---- !u!114 &4362929796098705452 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558424088141391747} - 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: UI_RECEIVE_ALL - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: ee85c922f6a7b4b5ba900ec7f0dedb49, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 0dd5ff07d6b414a099a10f9e2c6f9c2a, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4290233309 - m_fontColor: {r: 0.8679245, g: 0.76531076, b: 0.7164471, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 8 - m_fontSizeMax: 32 - m_fontStyle: 1 - m_HorizontalAlignment: 4 - 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 &1428691263655603899 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558424088141391747} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} - m_Name: - m_EditorClassIdentifier: - fixedFontAsset: 0 - fixedFontStyle: 0 - fixedFontSizeOffset: 0 - fixedSpacingOption: 0 - fixedMarginOption: 0 - fontMaterialType: 1 - l10nKey: UI_RECEIVE_ALL - fontMaterialIndexInitialized: 0 - fontMaterialIndex: 0 - defaultFontStylesInitialized: 0 - defaultFontStyles: 0 - defaultFontSizeInitialized: 0 - defaultFontSize: 0 - defaultCharacterSpacingInitialized: 0 - defaultCharacterSpacing: 0 - defaultWordSpacingInitialized: 0 - defaultWordSpacing: 0 - defaultLineSpacingInitialized: 0 - defaultLineSpacing: 0 ---- !u!114 &2474865101142847485 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 558424088141391747} - 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 &761057603984751620 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4079921420832771707} - - component: {fileID: 921981932098140911} - - component: {fileID: 9119507351459593058} - - component: {fileID: 2457147338485563922} - m_Layer: 5 - m_Name: Text_help - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4079921420832771707 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 761057603984751620} - 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: 2613737386854179490} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 12} - m_SizeDelta: {x: 0, y: 32} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &921981932098140911 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 761057603984751620} - m_CullTransparentMesh: 1 ---- !u!114 &9119507351459593058 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 761057603984751620} - 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: UI_RECEIVE_ALL_CONTENT - 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: 4284375462 - m_fontColor: {r: 0.6509804, g: 0.38039216, b: 0.36862746, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 8 - m_fontSizeMax: 32 - m_fontStyle: 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 &2457147338485563922 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 761057603984751620} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6d668203cf6645c0bb09a4991d4bbe06, type: 3} - m_Name: - m_EditorClassIdentifier: - fixedFontAsset: 0 - fixedFontStyle: 0 - fixedFontSizeOffset: 0 - fixedSpacingOption: 0 - fixedMarginOption: 0 - fontMaterialType: 0 - l10nKey: UI_RECEIVE_ALL_CONTENT - fontMaterialIndexInitialized: 0 - fontMaterialIndex: 0 - defaultFontStylesInitialized: 0 - defaultFontStyles: 0 - defaultFontSizeInitialized: 0 - defaultFontSize: 0 - defaultCharacterSpacingInitialized: 0 - defaultCharacterSpacing: 0 - defaultWordSpacingInitialized: 0 - defaultWordSpacing: 0 - defaultLineSpacingInitialized: 0 - defaultLineSpacing: 0 --- !u!1 &1032013245828674532 GameObject: m_ObjectHideFlags: 0 @@ -909,169 +483,34 @@ MonoBehaviour: 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: 0.7882353} - 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: 1} - 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: 6406763897851751120} - m_HandleRect: {fileID: 8924846716784298935} - m_Direction: 3 - m_Value: 0 - m_Size: 1 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &1086387366104227507 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 591640623039698946} - - component: {fileID: 109425767451196514} - - component: {fileID: 8741861059339336625} - m_Layer: 5 - m_Name: text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &591640623039698946 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1086387366104227507} - 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: 5745956692783066534} - m_RootOrder: 1 - 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: 7, y: 0} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &109425767451196514 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1086387366104227507} - m_CullTransparentMesh: 1 ---- !u!114 &8741861059339336625 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1086387366104227507} - 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: 232323 - 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: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 8 - m_fontSizeMax: 32 - m_fontStyle: 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} + 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: 0.7882353} + 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: 1} + 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: 6406763897851751120} + m_HandleRect: {fileID: 8924846716784298935} + m_Direction: 3 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1341912697623964642 GameObject: m_ObjectHideFlags: 0 @@ -3823,190 +3262,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5179678215775170295 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2613737386854179490} - m_Layer: 5 - m_Name: ReceiveArea - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2613737386854179490 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5179678215775170295} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7351545940649022085} - - {fileID: 4822795439582273940} - - {fileID: 2622511431731430283} - - {fileID: 4079921420832771707} - m_Father: {fileID: 6192936696093948539} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 9.999999, y: 75} - m_Pivot: {x: 0.5, y: 0} ---- !u!1 &5213922406332415541 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2622511431731430283} - - component: {fileID: 4006480479187035412} - - component: {fileID: 5571465607144574153} - - component: {fileID: 1175402980590738320} - - component: {fileID: 5010891653283107284} - m_Layer: 5 - m_Name: ReceiveButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2622511431731430283 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5213922406332415541} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5239637032992501933} - - {fileID: 5745956692783066534} - m_Father: {fileID: 2613737386854179490} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -10} - m_SizeDelta: {x: 300, y: 42} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4006480479187035412 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5213922406332415541} - 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: 0 - 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: 1175402980590738320} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!222 &5571465607144574153 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5213922406332415541} - m_CullTransparentMesh: 1 ---- !u!114 &1175402980590738320 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5213922406332415541} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3483b1826aa594389a7d7299dcab8151, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!95 &5010891653283107284 -Animator: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5213922406332415541} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &5282284442200910953 GameObject: m_ObjectHideFlags: 0 @@ -4554,86 +3809,10 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9bb4e59514e90489d985e9a17c838085, type: 3} m_Name: - m_EditorClassIdentifier: - m_Horizontal: 0 - m_Veritical: 1 ---- !u!1 &6191153838926002509 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7119598241983542001} - - component: {fileID: 3613575186819078372} - - component: {fileID: 3378626168457596558} - m_Layer: 5 - m_Name: IconImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7119598241983542001 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6191153838926002509} - 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: 5006201107956194553} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -2} - m_SizeDelta: {x: 17, y: 17} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3613575186819078372 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6191153838926002509} - m_CullTransparentMesh: 0 ---- !u!114 &3378626168457596558 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6191153838926002509} - 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: c3ca118786abb3d429d4f756c2fa4123, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6304905872290674290 + m_EditorClassIdentifier: + m_Horizontal: 0 + m_Veritical: 1 +--- !u!1 &6191153838926002509 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4641,66 +3820,66 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7351545940649022085} - - component: {fileID: 2143359743715856631} - - component: {fileID: 9170062746102129580} + - component: {fileID: 7119598241983542001} + - component: {fileID: 3613575186819078372} + - component: {fileID: 3378626168457596558} m_Layer: 5 - m_Name: Bg + m_Name: IconImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7351545940649022085 +--- !u!224 &7119598241983542001 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6304905872290674290} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 6191153838926002509} + 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: 2613737386854179490} + m_Father: {fileID: 5006201107956194553} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -25} - m_SizeDelta: {x: 32, y: 134} - m_Pivot: {x: 0.5, y: 0} ---- !u!222 &2143359743715856631 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -2} + m_SizeDelta: {x: 17, y: 17} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3613575186819078372 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6304905872290674290} - m_CullTransparentMesh: 1 ---- !u!114 &9170062746102129580 + m_GameObject: {fileID: 6191153838926002509} + m_CullTransparentMesh: 0 +--- !u!114 &3378626168457596558 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6304905872290674290} + m_GameObject: {fileID: 6191153838926002509} 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: 0.9019608} - m_RaycastTarget: 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: 9c38f8997b73447c5a0c6bedae161682, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: c3ca118786abb3d429d4f756c2fa4123, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5853,82 +5032,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &7877254554547183101 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4822795439582273940} - - component: {fileID: 619058206935323122} - - component: {fileID: 8457833578415242666} - m_Layer: 5 - m_Name: Bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4822795439582273940 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7877254554547183101} - 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: 2613737386854179490} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -10} - m_SizeDelta: {x: 315, y: 53} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &619058206935323122 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7877254554547183101} - m_CullTransparentMesh: 1 ---- !u!114 &8457833578415242666 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7877254554547183101} - 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: 0.7372549} - 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: 31b63571ca8d84cd29facb19700b529e, 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!1 &7968783393982050829 GameObject: m_ObjectHideFlags: 0 @@ -6889,84 +5992,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8837681912867842489 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5745956692783066534} - - component: {fileID: 7271775753839544448} - - component: {fileID: 7426772176779837803} - m_Layer: 5 - m_Name: Goods - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5745956692783066534 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8837681912867842489} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1660591559336000618} - - {fileID: 591640623039698946} - m_Father: {fileID: 2622511431731430283} - m_RootOrder: 1 - 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: 15, y: 0} - m_SizeDelta: {x: 100, y: 19.9} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &7271775753839544448 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8837681912867842489} - m_CullTransparentMesh: 1 ---- !u!114 &7426772176779837803 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8837681912867842489} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.066037714, g: 0.064104274, b: 0.061365236, a: 0.78431374} - 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: ab8a3d3905fc6485b99af9a34ebc0a85, 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!1 &8863079598666655946 GameObject: m_ObjectHideFlags: 0 @@ -7590,6 +6615,149 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 755099055512260953} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1189979934548984600 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6192936696093948539} + m_Modifications: + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_SizeDelta.x + value: 9.999999 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6296667345791823343, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_Name + value: ReceiveArea + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6bd94f9e38be94a4a9199ff6c830f03f, type: 3} +--- !u!224 &2613737386854179490 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + m_PrefabInstance: {fileID: 1189979934548984600} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4006480479187035412 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2817644467049752076, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + m_PrefabInstance: {fileID: 1189979934548984600} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &5179678215775170295 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6296667345791823343, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + m_PrefabInstance: {fileID: 1189979934548984600} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1780863957943313475 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_Menu.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_Menu.prefab index 26d69c5e1a5..3438efea835 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_Menu.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_Menu.prefab @@ -6688,6 +6688,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -140 objectReference: {fileID: 0} + - target: {fileID: 227069572547131843, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 227069572547131843, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 227069572547131843, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 227069572547131843, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 227069572547131843, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 635508035456408890, guid: 16913dec42abae948a9298f9e887d339, type: 3} propertyPath: m_IsActive @@ -6698,6 +6723,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -95 objectReference: {fileID: 0} + - target: {fileID: 685483031548475937, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 857790416818701628, guid: 16913dec42abae948a9298f9e887d339, type: 3} propertyPath: m_Enabled @@ -6718,6 +6748,56 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 1916693862762815011, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1916693862762815011, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1916693862762815011, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1916693862762815011, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1916693862762815011, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2064257758623209957, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_fontColor.b + value: 0.6666667 + objectReference: {fileID: 0} + - target: {fileID: 2064257758623209957, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_fontColor.g + value: 0.6666667 + objectReference: {fileID: 0} + - target: {fileID: 2064257758623209957, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_fontColor.r + value: 0.6666667 + objectReference: {fileID: 0} + - target: {fileID: 2064257758623209957, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4289374890 + objectReference: {fileID: 0} + - target: {fileID: 2387162446089472864, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_Color.a + value: 0.627451 + objectReference: {fileID: 0} - target: {fileID: 2505441311892281251, guid: 16913dec42abae948a9298f9e887d339, type: 3} propertyPath: m_AnchorMax.x @@ -6753,6 +6833,41 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2612180548826070407, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_Padding.m_Left + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2612180548826070407, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_Padding.m_Right + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2617228258599282740, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2617228258599282740, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2617228258599282740, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2617228258599282740, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2617228258599282740, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -137 + objectReference: {fileID: 0} - target: {fileID: 3405122212466712689, guid: 16913dec42abae948a9298f9e887d339, type: 3} propertyPath: m_Enabled @@ -6768,11 +6883,51 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0.2590027 objectReference: {fileID: 0} + - target: {fileID: 3954081031411027409, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3954081031411027409, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 53 + objectReference: {fileID: 0} + - target: {fileID: 4309048005241003774, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4555874126950257317, guid: 16913dec42abae948a9298f9e887d339, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4782004183841183372, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4782004183841183372, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4782004183841183372, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_SizeDelta.x + value: 154 + objectReference: {fileID: 0} + - target: {fileID: 4782004183841183372, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_SizeDelta.y + value: 574 + objectReference: {fileID: 0} + - target: {fileID: 4782004183841183372, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -320 + objectReference: {fileID: 0} - target: {fileID: 4783575879649647900, guid: 16913dec42abae948a9298f9e887d339, type: 3} propertyPath: m_IsActive @@ -6783,6 +6938,36 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5052664919878413060, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5052664919878413060, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5052664919878413060, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5052664919878413060, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5052664919878413060, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5052664919878413060, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5333937922385733655, guid: 16913dec42abae948a9298f9e887d339, type: 3} propertyPath: m_Enabled @@ -6853,6 +7038,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8218340474097224269, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 53 + objectReference: {fileID: 0} - target: {fileID: 8232355514928224794, guid: 16913dec42abae948a9298f9e887d339, type: 3} propertyPath: m_AnchorMax.x @@ -6881,8 +7071,18 @@ PrefabInstance: - target: {fileID: 8232355514928224794, guid: 16913dec42abae948a9298f9e887d339, type: 3} propertyPath: m_SizeDelta.y + value: 0.0000019073486 + objectReference: {fileID: 0} + - target: {fileID: 8232355514928224794, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8232355514928224794, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 33 + objectReference: {fileID: 0} - target: {fileID: 8427618971591113178, guid: 16913dec42abae948a9298f9e887d339, type: 3} propertyPath: m_Enabled @@ -6893,6 +7093,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -0.34100342 objectReference: {fileID: 0} + - target: {fileID: 8659588650219257059, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8659588650219257059, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8659588650219257059, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8659588650219257059, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8659588650219257059, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8659588650219257059, guid: 16913dec42abae948a9298f9e887d339, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8919328922962173905, guid: 16913dec42abae948a9298f9e887d339, type: 3} propertyPath: m_fontColor32.rgba @@ -9443,6 +9673,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3535892294681875373, guid: 1ffb848deec53694c97c3f01ed7a5b4c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4168524533700969186, guid: 1ffb848deec53694c97c3f01ed7a5b4c, type: 3} propertyPath: m_fontColor.a @@ -9463,6 +9698,16 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 4575422773675835264} + - target: {fileID: 5582978022049418341, guid: 1ffb848deec53694c97c3f01ed7a5b4c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8316174926513112879, guid: 1ffb848deec53694c97c3f01ed7a5b4c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8634408717293390308, guid: 1ffb848deec53694c97c3f01ed7a5b4c, type: 3} propertyPath: m_Color.a @@ -9702,11 +9947,66 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 352076192044691363, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 659442467633903366, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_Padding.m_Bottom + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1189503575198492046, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1604157235560211703, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 1918436148852470881, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1918436148852470881, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1918436148852470881, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2020646868919055834, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2020646868919055834, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2020646868919055834, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2020646868919055834, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 152.55556 + objectReference: {fileID: 0} + - target: {fileID: 2020646868919055834, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2044772974871969620, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -9727,6 +10027,16 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2766251616676670442, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3009030470514509408, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3217935393555257170, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_LocalScale.x @@ -9742,6 +10052,66 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3335440095307032397, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3335440095307032397, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3335440095307032397, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3335440095307032397, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 64.5 + objectReference: {fileID: 0} + - target: {fileID: 3335440095307032397, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3451399711824286565, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_Color.a + value: 0.627451 + objectReference: {fileID: 0} + - target: {fileID: 3822768397467630138, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3822768397467630138, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3822768397467630138, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3822768397467630138, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3822768397467630138, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3822768397467630138, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -43 + objectReference: {fileID: 0} - target: {fileID: 4057956634174629556, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_Enabled @@ -9757,11 +10127,71 @@ PrefabInstance: propertyPath: speechBubble value: objectReference: {fileID: 2894346975772333054} + - target: {fileID: 4324397966855141849, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_SizeDelta.x + value: 266.1111 + objectReference: {fileID: 0} + - target: {fileID: 4839052004913961931, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4839052004913961931, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4839052004913961931, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4839052004913961931, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4839052004913961931, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4839052004913961931, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -17 + objectReference: {fileID: 0} - target: {fileID: 4912332099590422159, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_Name value: ClaimButton objectReference: {fileID: 0} + - target: {fileID: 4930248739294827264, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_Color.a + value: 0.78431374 + objectReference: {fileID: 0} + - target: {fileID: 5241240525393632708, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5405920187242708862, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_Padding.m_Left + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 5405920187242708862, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_Padding.m_Right + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 5477960224599540772, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5608115725178288552, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_EffectFactor @@ -9797,6 +10227,11 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 6562693519203584345, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_SizeDelta.x + value: 202.41 + objectReference: {fileID: 0} - target: {fileID: 6684225965647263715, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_Pivot.x @@ -9922,6 +10357,11 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 7138106595059812588, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7200776773981205319, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_Name @@ -9932,6 +10372,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7668544746703926416, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7755361176131704418, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_fontColor.a @@ -9947,6 +10392,16 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 7968081866622926917, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8153362086083100049, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8353667610615792071, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} propertyPath: m_Enabled @@ -9967,6 +10422,11 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8748129480448398869, guid: 2d793ad4fed23994fad4b7fd5c99b304, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d793ad4fed23994fad4b7fd5c99b304, type: 3} --- !u!224 &967204440583816733 stripped @@ -10257,6 +10717,41 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1929002957489927283} m_Modifications: + - target: {fileID: 238419717081356799, guid: a1a8cf8d009954b41b08759608622cfa, + type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 238419717081356799, guid: a1a8cf8d009954b41b08759608622cfa, + type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 238419717081356799, guid: a1a8cf8d009954b41b08759608622cfa, + type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 238419717099112676, guid: a1a8cf8d009954b41b08759608622cfa, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 238419717099134150, guid: a1a8cf8d009954b41b08759608622cfa, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 238419717100619232, guid: a1a8cf8d009954b41b08759608622cfa, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4012832384470580357, guid: a1a8cf8d009954b41b08759608622cfa, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8338442937347405792, guid: a1a8cf8d009954b41b08759608622cfa, type: 3} propertyPath: m_fontColor32.rgba @@ -10382,6 +10877,11 @@ PrefabInstance: propertyPath: m_Name value: CombinationBtn objectReference: {fileID: 0} + - target: {fileID: 8858187353535008037, guid: a1a8cf8d009954b41b08759608622cfa, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1a8cf8d009954b41b08759608622cfa, type: 3} --- !u!224 &107377045575133976 stripped diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_MobileShop.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_MobileShop.prefab index cca52a86cc2..3ab9528e6b6 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_MobileShop.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_MobileShop.prefab @@ -8621,6 +8621,7 @@ GameObject: - component: {fileID: 8484429703337487584} - component: {fileID: 6808450648978192070} - component: {fileID: 8669608279656443845} + - component: {fileID: 6358043605660945761} m_Layer: 5 m_Name: ConditionalButton_Type8 m_TagString: Untagged @@ -8724,6 +8725,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &6358043605660945761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136146003052278109} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a31d2fe1de140e1b55dcc96e488b751, type: 3} + m_Name: + m_EditorClassIdentifier: + type: 0 --- !u!1 &8729199200233024399 GameObject: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_QuestPopup.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_QuestPopup.prefab index bbe905ede57..45611a08362 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_QuestPopup.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_QuestPopup.prefab @@ -433,7 +433,7 @@ RectTransform: - {fileID: 9138215251925966336} - {fileID: 7824542944352047730} m_Father: {fileID: 3104326235381396197} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1530,6 +1530,8 @@ MonoBehaviour: filterType: 0 scroll: {fileID: 192174903448513590} closeButton: {fileID: 8235199005190274074} + receiveAllButton: {fileID: 550124667095232114} + receiveAllContainer: {fileID: 8636327765509236113} --- !u!82 &5166568895246881991 AudioSource: m_ObjectHideFlags: 0 @@ -1659,6 +1661,7 @@ RectTransform: m_Children: - {fileID: 4955138152344251173} - {fileID: 7118047845859379066} + - {fileID: 1476710028995406276} - {fileID: 4489913007181794803} - {fileID: 2711227036800431818} m_Father: {fileID: 3104844367815860507} @@ -1852,7 +1855,7 @@ RectTransform: - {fileID: 8351492583733520710} - {fileID: 8693392760842680535} m_Father: {fileID: 3104326235381396197} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -6202,6 +6205,159 @@ MonoBehaviour: defaultWordSpacing: 0 defaultLineSpacingInitialized: 0 defaultLineSpacing: 0 +--- !u!1001 &2357678173023127678 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3104326235381396197} + m_Modifications: + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_SizeDelta.x + value: -44 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_SizeDelta.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6296667345791823343, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_Name + value: ReceiveArea + objectReference: {fileID: 0} + - target: {fileID: 6296667345791823343, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6356063883066438581, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + propertyPath: m_SizeDelta.x + value: -171.12 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6bd94f9e38be94a4a9199ff6c830f03f, type: 3} +--- !u!114 &550124667095232114 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2817644467049752076, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + m_PrefabInstance: {fileID: 2357678173023127678} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1476710028995406276 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3802854736529154490, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + m_PrefabInstance: {fileID: 2357678173023127678} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8636327765509236113 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6296667345791823343, guid: 6bd94f9e38be94a4a9199ff6c830f03f, + type: 3} + m_PrefabInstance: {fileID: 2357678173023127678} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4035382884083346158 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/Resources/UI/Prefabs/UI_Synopsis.prefab b/nekoyume/Assets/Resources/UI/Prefabs/UI_Synopsis.prefab index b5c195c1631..2dbcffa5958 100644 --- a/nekoyume/Assets/Resources/UI/Prefabs/UI_Synopsis.prefab +++ b/nekoyume/Assets/Resources/UI/Prefabs/UI_Synopsis.prefab @@ -32,11 +32,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6853995158418111380} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 19.8, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1840586465201766619 @@ -101,7 +101,7 @@ MonoBehaviour: m_fontSizeMin: 8 m_fontSizeMax: 24 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -279,7 +279,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8593490191605374742 @@ -522,7 +522,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6913707290309893646 @@ -689,7 +689,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7187932178191588114 @@ -1049,7 +1049,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2094622055466214093 @@ -1520,7 +1520,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3540169559044910879 @@ -1687,7 +1687,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1991994886120410064 @@ -2006,7 +2006,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3954974032895849685 @@ -2325,7 +2325,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4977247763633897256 @@ -2568,7 +2568,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8979775796930642122 @@ -3045,7 +3045,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3374570058703040178 @@ -3446,7 +3446,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7678099935848724068 @@ -3765,7 +3765,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6017397123140251734 @@ -4512,7 +4512,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2587065877566889166 @@ -4720,7 +4720,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5083172131285569375 @@ -4963,7 +4963,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3135595916907030484 @@ -5130,7 +5130,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2605655844464034015 @@ -5297,7 +5297,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7888048980838879580 @@ -5350,7 +5350,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -5868,7 +5868,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &196261004522383342 @@ -5921,7 +5921,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -6076,7 +6076,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5855892394373455349 @@ -6284,7 +6284,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1035, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6774814158061266844 @@ -6527,7 +6527,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3411815652343610209 @@ -6842,11 +6842,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6853995158418111380} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 19.799995, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7029243346523185477 @@ -6911,7 +6911,7 @@ MonoBehaviour: m_fontSizeMin: 8 m_fontSizeMax: 24 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -7206,7 +7206,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4865047683197274660 @@ -7525,7 +7525,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6556546237673331829 @@ -7656,6 +7656,82 @@ MonoBehaviour: defaultWordSpacing: 0 defaultLineSpacingInitialized: 0 defaultLineSpacing: 0 +--- !u!1 &6118508726574742102 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4722760737322491260} + - component: {fileID: 6145478583846420227} + - component: {fileID: 2999029209853863519} + m_Layer: 5 + m_Name: Arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4722760737322491260 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6118508726574742102} + 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: 6853995158418111380} + m_RootOrder: 3 + 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: 37.5, y: -2} + m_SizeDelta: {x: 25, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6145478583846420227 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6118508726574742102} + m_CullTransparentMesh: 1 +--- !u!114 &2999029209853863519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6118508726574742102} + 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: 4fd51e08ad5b53b4a9c5e472f6557185, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6472739585439229433 GameObject: m_ObjectHideFlags: 0 @@ -7845,14 +7921,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3445875107858792144} - {fileID: 8753949178984013012} - {fileID: 3912460628559341310} + - {fileID: 4722760737322491260} m_Father: {fileID: 5016851818203654897} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -20, y: 20} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -30, y: -61} m_SizeDelta: {x: 100, y: 40} m_Pivot: {x: 1, y: 0} --- !u!222 &529760342811932208 @@ -8213,7 +8291,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2974122892664540608 @@ -8613,6 +8691,82 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7762317019563904358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3445875107858792144} + - component: {fileID: 8142945974613611779} + - component: {fileID: 4381988591151379487} + m_Layer: 5 + m_Name: Dim + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3445875107858792144 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7762317019563904358} + 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: 6853995158418111380} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8142945974613611779 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7762317019563904358} + m_CullTransparentMesh: 1 +--- !u!114 &4381988591151379487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7762317019563904358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.16981131, g: 0.08152636, b: 0.04085083, a: 0.5019608} + 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: 620ec6ee949fecd4693c9b7230d1894d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7794948540686409528 GameObject: m_ObjectHideFlags: 0 @@ -8877,7 +9031,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1035, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6779190548015615974 @@ -9044,7 +9198,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2884836607066795103 @@ -9287,7 +9441,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2378753089626895134 @@ -9952,7 +10106,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3368527257885889902 @@ -10119,7 +10273,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8092793495962756688 @@ -10362,7 +10516,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} + m_AnchoredPosition: {x: 0, y: -100} m_SizeDelta: {x: 1036, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2715521600265861331 diff --git a/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/Common_gradiant_64_Shop.png b/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/Common_gradiant_64_Shop.png new file mode 100644 index 00000000000..ce7adb3faf4 Binary files /dev/null and b/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/Common_gradiant_64_Shop.png differ diff --git a/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/Common_gradiant_64_Shop.png.meta b/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/Common_gradiant_64_Shop.png.meta new file mode 100644 index 00000000000..dbb8077fec4 --- /dev/null +++ b/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/Common_gradiant_64_Shop.png.meta @@ -0,0 +1,122 @@ +fileFormatVersion: 2 +guid: 620ec6ee949fecd4693c9b7230d1894d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/button_skip.png b/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/button_skip.png new file mode 100644 index 00000000000..633d8b4ee28 Binary files /dev/null and b/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/button_skip.png differ diff --git a/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/button_skip.png.meta b/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/button_skip.png.meta new file mode 100644 index 00000000000..ba3bd42414e --- /dev/null +++ b/nekoyume/Assets/Resources/UI/Textures/00_Synopsis/button_skip.png.meta @@ -0,0 +1,122 @@ +fileFormatVersion: 2 +guid: 4fd51e08ad5b53b4a9c5e472f6557185 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/Icon_Lock.png b/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/Icon_Lock.png new file mode 100644 index 00000000000..49fa9b3203a Binary files /dev/null and b/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/Icon_Lock.png differ diff --git a/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/Icon_Lock.png.meta b/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/Icon_Lock.png.meta new file mode 100644 index 00000000000..759c2bf5eba --- /dev/null +++ b/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/Icon_Lock.png.meta @@ -0,0 +1,122 @@ +fileFormatVersion: 2 +guid: 62c7e1f85f30c8140b07a5ee353c84af +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/UI_Gradiant_bg_04.png b/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/UI_Gradiant_bg_04.png new file mode 100644 index 00000000000..e7aefe6f32e Binary files /dev/null and b/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/UI_Gradiant_bg_04.png differ diff --git a/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/UI_Gradiant_bg_04.png.meta b/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/UI_Gradiant_bg_04.png.meta new file mode 100644 index 00000000000..4d73cd54d9f --- /dev/null +++ b/nekoyume/Assets/UIResources/Atlas_image/Common/UI_Common/UI_Gradiant_bg_04.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 94a6712e7b2e0d741a50286be14eea0c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/nekoyume/Assets/UIResources/Content/Shop/Prefab/IAP_ProductTab.prefab b/nekoyume/Assets/UIResources/Content/Shop/Prefab/IAP_ProductTab.prefab index cf5a3c2c217..e65388bd419 100644 --- a/nekoyume/Assets/UIResources/Content/Shop/Prefab/IAP_ProductTab.prefab +++ b/nekoyume/Assets/UIResources/Content/Shop/Prefab/IAP_ProductTab.prefab @@ -641,6 +641,7 @@ GameObject: - component: {fileID: 2300888738013243646} - component: {fileID: 7587823053832371763} - component: {fileID: 5333993403680860447} + - component: {fileID: 6070358987996683733} m_Layer: 5 m_Name: IAP_ProductTab m_TagString: Untagged @@ -780,6 +781,19 @@ MonoBehaviour: disabledText: {fileID: 5825503032614024788} enabledText: {fileID: 6729935436368134996} k__BackingField: {fileID: 2300888738013243646} +--- !u!114 &6070358987996683733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6049426971333627130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a31d2fe1de140e1b55dcc96e488b751, type: 3} + m_Name: + m_EditorClassIdentifier: + type: 0 --- !u!1 &6820251113957128798 GameObject: m_ObjectHideFlags: 0 diff --git a/nekoyume/Assets/_Scripts/Analyzer.cs b/nekoyume/Assets/_Scripts/Analyzer.cs index b07e603e184..c1e3d7a02d0 100644 --- a/nekoyume/Assets/_Scripts/Analyzer.cs +++ b/nekoyume/Assets/_Scripts/Analyzer.cs @@ -4,12 +4,11 @@ #nullable enable using System.Collections.Generic; -using Firebase.Analytics; using mixpanel; using Nekoyume.State; #if ENABLE_FIREBASE -using NineChronicles.GoogleServices.Firebase.Runtime; +using Firebase.Analytics; #endif //using Sentry; @@ -131,10 +130,10 @@ private static void InitializeFirebaseAnalytics( string targetNetwork, string rpcServerHost) { - FirebaseAnalytics.SetUserProperty("client-host", clientHost); - FirebaseAnalytics.SetUserProperty("client-hash", clientHash); - FirebaseAnalytics.SetUserProperty("target-network", targetNetwork); - FirebaseAnalytics.SetUserProperty("rpc-server-host", rpcServerHost); + FirebaseAnalytics.SetUserProperty("client_host", clientHost); + FirebaseAnalytics.SetUserProperty("client_hash", clientHash); + FirebaseAnalytics.SetUserProperty("target_network", targetNetwork); + FirebaseAnalytics.SetUserProperty("rpc_server_host", rpcServerHost); } #endif @@ -178,7 +177,7 @@ public void Track(string eventName, params (string key, string value)[] properti { Mixpanel.Track(eventName); #if ENABLE_FIREBASE - FirebaseAnalytics.LogEvent(eventName); + FirebaseAnalytics.LogEvent(eventName.Replace("/", "_")); #endif return; } @@ -192,13 +191,13 @@ public void Track(string eventName, params (string key, string value)[] properti var (key, value) = properties[i]; mixpanelValues[key] = value; #if ENABLE_FIREBASE - firebaseParameters[i] = new Parameter(key, value); + firebaseParameters[i] = new Parameter(key.Replace("/", "_"), value); #endif } Mixpanel.Track(eventName, mixpanelValues); #if ENABLE_FIREBASE - FirebaseAnalytics.LogEvent(eventName, firebaseParameters); + FirebaseAnalytics.LogEvent(eventName.Replace("/", "_"), firebaseParameters); #endif } @@ -223,7 +222,7 @@ public void Track(string eventName, params (string key, string value)[] properti #if ENABLE_FIREBASE var firebaseParameters = ValuesToParameters(valueDict); - FirebaseAnalytics.LogEvent(eventName, firebaseParameters); + FirebaseAnalytics.LogEvent(eventName.Replace("/", "_"), firebaseParameters); #endif // if (returnTrace) @@ -268,7 +267,7 @@ private static Parameter ValueToParameter(KeyValuePair item) { var (key, value) = item; var str = value.ToString(); - return new Parameter(key, str); + return new Parameter(key.Replace("/", "_"), str); } private static Parameter[] ValuesToParameters(Dictionary values) diff --git a/nekoyume/Assets/_Scripts/Blockchain/ActionRenderHandler.cs b/nekoyume/Assets/_Scripts/Blockchain/ActionRenderHandler.cs index f9c085e57b5..c15355b1262 100644 --- a/nekoyume/Assets/_Scripts/Blockchain/ActionRenderHandler.cs +++ b/nekoyume/Assets/_Scripts/Blockchain/ActionRenderHandler.cs @@ -69,8 +69,8 @@ private static class Singleton private ActionRenderer _actionRenderer; - // approximately 4h - private const int WorkshopNotifiedBlockCount = 1200; + // approximately 4h == 1200 block count + private const int WorkshopNotifiedBlockCount = 0; private ActionRenderHandler() { diff --git a/nekoyume/Assets/_Scripts/Game/Stage.cs b/nekoyume/Assets/_Scripts/Game/Stage.cs index e21db5e1486..285d2e91ab8 100644 --- a/nekoyume/Assets/_Scripts/Game/Stage.cs +++ b/nekoyume/Assets/_Scripts/Game/Stage.cs @@ -571,7 +571,7 @@ private IEnumerator CoStageEnd(BattleLog log) _battleResultModel.StageID = log.stageId; avatarState.worldInformation.TryGetLastClearedStageId(out var lasStageId); _battleResultModel.LastClearedStageId = lasStageId; - _battleResultModel.IsClear = log.IsClear; + _battleResultModel.IsClear = isClear; var isMulti = PlayCount > 1; if (IsExitReserved) @@ -600,7 +600,7 @@ private IEnumerator CoStageEnd(BattleLog log) _battleResultModel.NextState = BattleResultPopup.NextState.NextStage; } } - else + else // Failed { _battleResultModel.NextState = BattleResultPopup.NextState.None; } diff --git a/nekoyume/Assets/_Scripts/UI/Module/Lobby/MainMenu.cs b/nekoyume/Assets/_Scripts/UI/Module/Lobby/MainMenu.cs index 5045c9a0720..47169125bb8 100644 --- a/nekoyume/Assets/_Scripts/UI/Module/Lobby/MainMenu.cs +++ b/nekoyume/Assets/_Scripts/UI/Module/Lobby/MainMenu.cs @@ -93,15 +93,6 @@ private void Awake() private bool PointEnterTrigger() { - if (!IsUnlocked) - { - var tooltip = Widget.Find(); - tooltip.HideAll(false); - - _cat = Widget.Find() - .Show(true, _messageForCat, gameObject); - } - return IsUnlocked; } @@ -111,34 +102,12 @@ private bool PointExitTrigger() { ResetLocalizationKey(); } - else - { -#if !UNITY_ANDROID - if (!_cat) - { - return IsUnlocked; - } - - _cat.Hide(); - _cat = null; -#endif - } return IsUnlocked; } #endregion - public void JingleTheCat() - { - if (!_cat) - { - return; - } - - _cat.Jingle(); - } - private void ResetLocalizationKey() { if (!speechBubble) diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Menu.cs b/nekoyume/Assets/_Scripts/UI/Widget/Menu.cs index 61270da2842..8fde757b3e7 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Menu.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Menu.cs @@ -364,7 +364,6 @@ public void QuestClick() { if (!btnQuest.IsUnlocked) { - btnQuest.JingleTheCat(); return; } @@ -385,7 +384,6 @@ public void ShopClick() { if (!btnShop.IsUnlocked) { - btnShop.JingleTheCat(); return; } @@ -416,7 +414,6 @@ private void CombinationClickInternal(System.Action showAction) if (!btnCombination.IsUnlocked) { - btnCombination.JingleTheCat(); return; } @@ -436,7 +433,6 @@ public void RankingClick() { if (!btnRanking.IsUnlocked) { - btnRanking.JingleTheCat(); return; } @@ -454,7 +450,6 @@ public void RankingClick() //{ // if (!btnMimisbrunnr.IsUnlocked) // { - // btnMimisbrunnr.JingleTheCat(); // return; // } @@ -521,7 +516,6 @@ public void StakingClick() { if (!btnStaking.IsUnlocked) { - btnStaking.JingleTheCat(); return; } @@ -532,7 +526,6 @@ public void WorldBossClick() { if (!btnWorldBoss.IsUnlocked) { - btnWorldBoss.JingleTheCat(); return; } diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/BattleResultPopup.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/BattleResultPopup.cs index 2fbcaf28109..4ca7dcdff26 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Popup/BattleResultPopup.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Popup/BattleResultPopup.cs @@ -606,9 +606,9 @@ private IEnumerator CoUpdateBottom(int limitSeconds) SharedModel.StageType == StageType.EventDungeon; if (isActionPointEnough) { - var value = - SharedModel.StageID >= Battle.RequiredStageForExitButton || - SharedModel.LastClearedStageId >= Battle.RequiredStageForExitButton; + var value = SharedModel.IsClear && + (SharedModel.StageID >= Battle.RequiredStageForExitButton || + SharedModel.LastClearedStageId >= Battle.RequiredStageForExitButton); repeatButton.gameObject.SetActive(value); repeatButton.interactable = value; } diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Popup/QuestPopup.cs b/nekoyume/Assets/_Scripts/UI/Widget/Popup/QuestPopup.cs index 310c60e52b3..88024abeb0c 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Popup/QuestPopup.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Popup/QuestPopup.cs @@ -4,7 +4,9 @@ using System; using System.Collections.Generic; using System.Linq; +using Nekoyume.Game; using Nekoyume.Game.Controller; +using Nekoyume.Model.Item; using UnityEngine; using UnityEngine.UI; using QuestModel = Nekoyume.Model.Quest.Quest; @@ -37,6 +39,12 @@ public class QuestPopup : XTweenPopupWidget [SerializeField] private Button closeButton = null; + [SerializeField] + private Button receiveAllButton; + + [SerializeField] + private GameObject receiveAllContainer; + private ReactiveProperty _questList = new ReactiveProperty(); private readonly Module.ToggleGroup _toggleGroup = new Module.ToggleGroup(); @@ -56,6 +64,7 @@ protected override void Awake() Close(); AudioController.PlayClick(); }); + receiveAllButton.onClick.AddListener(ReceiveAll); } public override void Show(bool ignoreShowAnimation = false) @@ -128,6 +137,32 @@ private void OnQuestListChanged(QuestList list) quest.Complete && quest.isReceivable); } + + receiveAllContainer.SetActive(list.Any(quest => + quest.IsPaidInAction && quest.isReceivable)); + } + + private void ReceiveAll() + { + var avatarAddress = States.Instance.CurrentAvatarState.address; + var questList = _questList.Value; + var mailRewards = questList + .Where(q => q.isReceivable && q.Complete) + .SelectMany(q => + { + LocalLayerModifier.RemoveReceivableQuest(avatarAddress, q.Id); + return q.Reward.ItemMap; + }).Select(itemMap => + { + var item = ItemFactory.CreateMaterial( + TableSheets.Instance.MaterialItemSheet, + itemMap.Item1); + var itemId = item.ItemId; + var count = itemMap.Item2; + LocalLayerModifier.AddItem(avatarAddress, itemId, count); + return new MailReward(item, count); + }).ToList(); + Find().Show(mailRewards); } } diff --git a/nekoyume/Assets/_Scripts/UI/Widget/Synopsis.cs b/nekoyume/Assets/_Scripts/UI/Widget/Synopsis.cs index 1db898d13ae..e6665e02834 100644 --- a/nekoyume/Assets/_Scripts/UI/Widget/Synopsis.cs +++ b/nekoyume/Assets/_Scripts/UI/Widget/Synopsis.cs @@ -356,23 +356,8 @@ public override void Show(bool ignoreShowAnimation = false) base.Show(ignoreShowAnimation); Analyzer.Instance.Track("Unity/Synopsis Start"); AudioController.instance.PlayMusic(AudioController.MusicCode.Prologue); -#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN - var skipPrologue = States.Instance.AgentState.avatarAddresses.Any(); - var baseKey = RegistryKey.OpenBaseKey( - RegistryHive.CurrentUser, - Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32); - - var subKey = baseKey.OpenSubKey(@"Software\Planetarium\9c"); - if (subKey != null) - { - var value = subKey.GetValue("SkipSynopsis"); - skipPrologue |= value is int i && i == 1; - } -#else - var skipPrologue = States.Instance.AgentState.avatarAddresses.Any(); -#endif - skipButton.SetActive(skipPrologue); - StartCoroutine(StartSynopsis(skipPrologue)); + skipButton.SetActive(true); + StartCoroutine(StartSynopsis(true)); } private async Task End() diff --git a/nekoyume/ProjectSettings/ProjectSettings.asset b/nekoyume/ProjectSettings/ProjectSettings.asset index 1a79904dc72..4098a587db1 100644 --- a/nekoyume/ProjectSettings/ProjectSettings.asset +++ b/nekoyume/ProjectSettings/ProjectSettings.asset @@ -136,7 +136,7 @@ PlayerSettings: 16:10: 0 16:9: 1 Others: 0 - bundleVersion: 30.0.0 + bundleVersion: 30.1.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -165,7 +165,7 @@ PlayerSettings: iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 20 + AndroidBundleVersionCode: 23 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 33 AndroidPreferredInstallLocation: 2