diff --git a/Assets/PerfectWorld/Scripts/UI/ShopDetailPanel.cs b/Assets/PerfectWorld/Scripts/UI/ShopDetailPanel.cs index d74287a2f8..d1ab9d1441 100644 --- a/Assets/PerfectWorld/Scripts/UI/ShopDetailPanel.cs +++ b/Assets/PerfectWorld/Scripts/UI/ShopDetailPanel.cs @@ -1,8 +1,10 @@ -using System; using BrewMonster.Network; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using TMPro; using UnityEngine; using UnityEngine.UI; -using TMPro; public class ShopDetailPanel : MonoBehaviour { @@ -75,8 +77,10 @@ public class ShopDetailPanel : MonoBehaviour itemNameText.text = currentItem.name; if (itemDescriptionText != null) - itemDescriptionText.text = currentItem.desc; - + { + RemoveCaretColor(itemDescriptionText.text = ConvertColorCodeOfText(currentItem.desc)); + } + if (itemQuantityText != null) itemQuantityText.text = $"Quantity: {currentItem.num}"; @@ -99,7 +103,93 @@ public class ShopDetailPanel : MonoBehaviour // Update gift info UpdateGiftInfo(); } - + struct ColorText + { + public string hex; + public string content; + } + private string ConvertColorCodeOfText(string input) + { + /*string returnValue = ""; + List colorTexts = new List(); + ColorText currentColorText = new ColorText(); + currentColorText.hex = "ffffff"; + currentColorText.content = ""; + for (int i = 0; i < input.Length; i++) + { + if (input[i] == '^' && i + 6 < input.Length) + { + // Store the current segment before changing color + colorTexts.Add(currentColorText); + + // Start a new color segment + currentColorText = new ColorText(); + currentColorText.hex = input.Substring(i + 1, 6); + currentColorText.content = ""; + i += 6; + } + else + { + currentColorText.content += input[i]; + } + } + foreach ( var ct in colorTexts) + { + if (ct.hex.ToLower() != "ffffff") + { + returnValue += $"{ct.content}"; + } + else + { + returnValue += ct.content; + } + Debug.Log($"[ShopDetailPanel] Processed ColorText: Hex='{ct.hex}', Content='{ct.content}'"); + } + + return returnValue;*/ + + + if (string.IsNullOrEmpty(input)) + return input; + + input = input.Replace("\\r\\n", "\n"); + input = input.Replace("\\r", "\n"); + input = input.Replace("\\n", "\n"); + + input = input.Replace("\r\n", "\n"); + input = input.Replace("\r", "\n"); + input = input.Replace("\n", "\n"); + + System.Text.StringBuilder sb = new System.Text. StringBuilder(); + for (int i = 0; i < input.Length; i++) + { + + if (input[i] == '^' && i + 6 < input.Length) + { + string hex = input.Substring(i + 1, 6); + if (hex.ToLower() != "ffffff") + { + sb.Append($""); + } + i += 6; + } + else + { + sb.Append(input[i]); + } + } + + sb.Append(""); + return sb.ToString(); + } + + public static string RemoveCaretColor(string input) + { + return System.Text.RegularExpressions.Regex.Replace(input, @"\^[0-9a-fA-F]{6}", ""); + } + + + void UpdateBuyOptions() { for (int i = 0; i < buyOptionButtons.Length && i < currentItem.buy.Length; i++) diff --git a/Assets/PerfectWorld/Scripts/UI/ShopUIManager.cs b/Assets/PerfectWorld/Scripts/UI/ShopUIManager.cs index 19d24e8342..ddcf0ec7b1 100644 --- a/Assets/PerfectWorld/Scripts/UI/ShopUIManager.cs +++ b/Assets/PerfectWorld/Scripts/UI/ShopUIManager.cs @@ -31,7 +31,8 @@ public class ShopUIManager : MonoBehaviour public TextMeshProUGUI detailItemQuantity; public Button buyButton; public Button closeDetailButton; - + public ScrollRect detailScrollRect; + [Header("Main Panel Components")] public Button closeShopButton; @@ -273,6 +274,8 @@ public class ShopUIManager : MonoBehaviour Debug.LogError("ShopDetailPanel script not found on shopDetailPanel GameObject!"); // Fallback to the old method UpdateDetailPanel(item); + detailScrollRect.verticalNormalizedPosition = 1f; + LayoutRebuilder.ForceRebuildLayoutImmediate(detailScrollRect.content); } } } diff --git a/Assets/Prefabs/UI/MallUI.prefab b/Assets/Prefabs/UI/MallUI.prefab index fcf1a7d083..c21b4e4033 100644 --- a/Assets/Prefabs/UI/MallUI.prefab +++ b/Assets/Prefabs/UI/MallUI.prefab @@ -213,6 +213,96 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &768129286328248421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6843270102236093710} + - component: {fileID: 6069932423782242755} + - component: {fileID: 3864676156475965674} + - component: {fileID: 4033629796526204752} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6843270102236093710 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 768129286328248421} + 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: 8043788806156166990} + m_Father: {fileID: 3601317357440687424} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 20, y: -20} + m_SizeDelta: {x: -40, y: -20} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6069932423782242755 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 768129286328248421} + m_CullTransparentMesh: 1 +--- !u!114 &3864676156475965674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 768129286328248421} + 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: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4033629796526204752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 768129286328248421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &874719281743352125 GameObject: m_ObjectHideFlags: 0 @@ -368,9 +458,9 @@ RectTransform: - {fileID: 8761838049529348566} m_Father: {fileID: 6279944142683492433} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 73.5, y: -82.4} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 147, y: 116.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &424813723601076052 @@ -974,9 +1064,9 @@ RectTransform: - {fileID: 2635347666608474034} m_Father: {fileID: 6279944142683492433} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 73.5, y: -557.43335} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 147, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2783001383898350917 @@ -1458,9 +1548,9 @@ RectTransform: - {fileID: 3465129417775596107} m_Father: {fileID: 6921900574306804872} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 253.67606, y: -34.225502} m_SizeDelta: {x: 166.4507, y: 61.887} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2471496789853926854 @@ -1591,6 +1681,7 @@ GameObject: - component: {fileID: 281531643843465414} - component: {fileID: 2618416459695309123} - component: {fileID: 7501549973084074577} + - component: {fileID: 8096798556228768701} m_Layer: 5 m_Name: info_txt m_TagString: Untagged @@ -1605,17 +1696,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2772880781287320310} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 6433182719979269332} + m_Father: {fileID: 8043788806156166990} 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.8267, y: -10.0352} - m_SizeDelta: {x: 375.2516, y: 198.8297} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194.92911, y: -17.375} + m_SizeDelta: {x: 389.85822, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2618416459695309123 CanvasRenderer: @@ -1716,6 +1807,20 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &8096798556228768701 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2772880781287320310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &3004779745642241228 GameObject: m_ObjectHideFlags: 0 @@ -1750,9 +1855,9 @@ RectTransform: - {fileID: 6607009122237547209} m_Father: {fileID: 6921900574306804872} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 753.02814, y: -34.225502} m_SizeDelta: {x: 166.4507, y: 61.887} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6604777758543866085 @@ -2052,7 +2157,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 281531643843465414} + - {fileID: 3601317357440687424} m_Father: {fileID: 5140547493815028462} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2132,9 +2237,9 @@ RectTransform: - {fileID: 7453030741144867795} m_Father: {fileID: 6279944142683492433} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 73.5, y: -438.9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 147, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5113860492054378637 @@ -2253,9 +2358,9 @@ RectTransform: - {fileID: 7881121413444915257} m_Father: {fileID: 6279944142683492433} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 73.5, y: -675.9667} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 147, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &188443220859053986 @@ -2871,9 +2976,9 @@ RectTransform: - {fileID: 3953026038879993000} m_Father: {fileID: 6279944142683492433} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 73.5, y: -201.83334} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 147, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5160228589296753130 @@ -3302,9 +3407,9 @@ RectTransform: - {fileID: 7368110207669039191} m_Father: {fileID: 6921900574306804872} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 420.12674, y: -34.225502} m_SizeDelta: {x: 166.4507, y: 61.887} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5818043599573700572 @@ -3695,7 +3800,7 @@ RectTransform: m_Father: {fileID: 4310760051865461200} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.22351074, y: 0.023500443} m_SizeDelta: {x: -24.1577, y: -6.6333} m_Pivot: {x: 0.5, y: 0.5} @@ -3846,9 +3951,9 @@ RectTransform: - {fileID: 1824832118339051429} m_Father: {fileID: 6921900574306804872} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 87.22535, y: -34.225502} m_SizeDelta: {x: 166.4507, y: 61.887} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5876619622367789936 @@ -3967,9 +4072,9 @@ RectTransform: - {fileID: 1529712157810231189} m_Father: {fileID: 6921900574306804872} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 586.57745, y: -34.225502} m_SizeDelta: {x: 166.4507, y: 61.887} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4405492307389281063 @@ -5183,7 +5288,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 6, y: 0} - m_SizeDelta: {x: -6, y: 553} + m_SizeDelta: {x: -6, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &6400593268502276303 MonoBehaviour: @@ -5450,6 +5555,113 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &7075210357172926766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3601317357440687424} + - component: {fileID: 3959349314686963008} + - component: {fileID: 115440194568332304} + - component: {fileID: 7755780540810375478} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3601317357440687424 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7075210357172926766} + 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: 6843270102236093710} + m_Father: {fileID: 6433182719979269332} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.38580322, y: -0.6046982} + m_SizeDelta: {x: -9.2587, y: -10.4677} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3959349314686963008 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7075210357172926766} + m_CullTransparentMesh: 1 +--- !u!114 &115440194568332304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7075210357172926766} + 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.039215688} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7755780540810375478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7075210357172926766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 8043788806156166990} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.05 + m_Inertia: 1 + m_DecelerationRate: 0.2 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 6843270102236093710} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &7396253783238719601 GameObject: m_ObjectHideFlags: 0 @@ -5544,7 +5756,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1845571473519222713 RectTransform: m_ObjectHideFlags: 0 @@ -5638,6 +5850,7 @@ MonoBehaviour: detailItemQuantity: {fileID: 0} buyButton: {fileID: 780999421718195231} closeDetailButton: {fileID: 0} + detailScrollRect: {fileID: 7755780540810375478} closeShopButton: {fileID: 0} --- !u!114 &8660700033567669795 MonoBehaviour: @@ -5901,9 +6114,9 @@ RectTransform: - {fileID: 5424053570241907517} m_Father: {fileID: 6279944142683492433} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 73.5, y: -320.36667} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 147, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6316976477275547731 @@ -6397,6 +6610,84 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7806094949612074959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8043788806156166990} + - component: {fileID: 7817639546637297957} + - component: {fileID: 6902120980637972019} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8043788806156166990 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7806094949612074959} + 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: 281531643843465414} + m_Father: {fileID: 6843270102236093710} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -0} + m_SizeDelta: {x: 389.85822, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &7817639546637297957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7806094949612074959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &6902120980637972019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7806094949612074959} + 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: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &7933133516311341179 GameObject: m_ObjectHideFlags: 0 @@ -6672,6 +6963,7 @@ MonoBehaviour: normalButtonColor: {r: 1, g: 1, b: 1, a: 1} selectedButtonColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} disabledButtonColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + shopManager: {fileID: 0} --- !u!1 &8140865511923505877 GameObject: m_ObjectHideFlags: 0