From 75ec52f3d4077fdf84cfebe0bbf4ceb57adf5bf2 Mon Sep 17 00:00:00 2001 From: basil <2428390463@qq.com> Date: Sun, 4 Oct 2026 15:45:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=81=93=E5=85=B7=E7=A8=80?= =?UTF-8?q?=E6=9C=89=E5=BA=A6=E7=9A=84=20UI=20=E8=A1=A8=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Presentation/Common/View/IconArea.cs | 20 +- .../Presentation/Common/View/RarityPalette.cs | 37 ++ .../Common/View/RarityPalette.cs.meta | 11 + .../Presentation/Common/View/RarityPanel.cs | 20 + .../Common/View/RarityPanel.cs.meta | 11 + .../ItemBasicTooltipForm.Logic.cs | 8 +- .../ItemTooltip/ItemTooltipForm.Logic.cs | 7 + .../LevelUpRewardItem/LevelUpRewardItem.cs | 6 +- .../Presentation/Shop/ShopGoodsItem.cs | 18 +- Assets/GameMain/UI/RarityPalette.asset | 34 ++ Assets/GameMain/UI/RarityPalette.asset.meta | 8 + .../UI/UIForms/DisplayListForm.prefab | 8 +- Assets/GameMain/UI/UIForms/HudForm.prefab | 26 +- .../UI/UIForms/ItemTooltipForm.prefab | 421 +++++++++++++++- Assets/GameMain/UI/UIForms/LevelUpForm.prefab | 349 +++++++++++-- .../GameMain/UI/UIForms/SelectRoleForm.prefab | 69 ++- Assets/GameMain/UI/UIForms/ShopForm.prefab | 291 +++-------- .../GameMain/UI/UIForms/ShowAreaForm.prefab | 460 +++++++++++------- .../GameMain/UI/UIItems/CommonButton.prefab | 27 +- Assets/GameMain/UI/UIItems/DisplayItem.prefab | 114 +---- Assets/GameMain/UI/UIItems/GoodsItem.prefab | 289 ++++++++--- Assets/GameMain/UI/UIItems/IconArea.prefab | 88 +--- .../UI/UIItems/LevelUpRewardItem.prefab | 184 ++++++- .../UISprites/SelectRoleFormRT.renderTexture | 2 +- 24 files changed, 1690 insertions(+), 818 deletions(-) create mode 100644 Assets/GameMain/Scripts/Presentation/Common/View/RarityPalette.cs create mode 100644 Assets/GameMain/Scripts/Presentation/Common/View/RarityPalette.cs.meta create mode 100644 Assets/GameMain/Scripts/Presentation/Common/View/RarityPanel.cs create mode 100644 Assets/GameMain/Scripts/Presentation/Common/View/RarityPanel.cs.meta create mode 100644 Assets/GameMain/UI/RarityPalette.asset create mode 100644 Assets/GameMain/UI/RarityPalette.asset.meta diff --git a/Assets/GameMain/Scripts/Presentation/Common/View/IconArea.cs b/Assets/GameMain/Scripts/Presentation/Common/View/IconArea.cs index efb5073..17cea2d 100644 --- a/Assets/GameMain/Scripts/Presentation/Common/View/IconArea.cs +++ b/Assets/GameMain/Scripts/Presentation/Common/View/IconArea.cs @@ -6,10 +6,18 @@ namespace SepCore.UI { public class IconArea : MonoBehaviour { - [SerializeField] private Image _board; + public enum RarityDisplayMode + { + Background = 1, + Neutral = 2 + } [SerializeField] private Image _icon; + [SerializeField] private Image _background = null; + [SerializeField] private RarityPalette _rarityPalette = null; + [SerializeField] private RarityDisplayMode _rarityDisplayMode = RarityDisplayMode.Background; + public void OnInit(Sprite sprite, Rarity rarity) { SetIcon(sprite); @@ -23,14 +31,8 @@ namespace SepCore.UI public void SetRarity(Rarity rarity) { - _board.color = rarity switch - { - Rarity.White => Color.white, - Rarity.Blue => Color.blue, - Rarity.Purple => Color.magenta, - Rarity.Red => Color.red, - _ => Color.clear, - }; + Rarity displayRarity = _rarityDisplayMode == RarityDisplayMode.Background ? rarity : Rarity.None; + _background.color = _rarityPalette.Get(displayRarity).IconBackground; } public void OnReset() diff --git a/Assets/GameMain/Scripts/Presentation/Common/View/RarityPalette.cs b/Assets/GameMain/Scripts/Presentation/Common/View/RarityPalette.cs new file mode 100644 index 0000000..78965d0 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Common/View/RarityPalette.cs @@ -0,0 +1,37 @@ +using System; +using SepCore.Definition; +using UnityEngine; + +namespace SepCore.UI +{ + [CreateAssetMenu(menuName = "UI/Rarity Palette")] + public class RarityPalette : ScriptableObject + { + [Serializable] + public struct Colors + { + public Color Border; + public Color CardBackground; + public Color IconBackground; + } + + [SerializeField] private Colors _none; + [SerializeField] private Colors _white; + [SerializeField] private Colors _blue; + [SerializeField] private Colors _purple; + [SerializeField] private Colors _red; + + public Colors Get(Rarity rarity) + { + return rarity switch + { + Rarity.None => _none, + Rarity.White => _white, + Rarity.Blue => _blue, + Rarity.Purple => _purple, + Rarity.Red => _red, + _ => throw new ArgumentOutOfRangeException(nameof(rarity), rarity, "Unsupported UI rarity.") + }; + } + } +} diff --git a/Assets/GameMain/Scripts/Presentation/Common/View/RarityPalette.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/View/RarityPalette.cs.meta new file mode 100644 index 0000000..05a3fe4 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Common/View/RarityPalette.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 05db5e8e6e7f7e14c84c787effce4933 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Presentation/Common/View/RarityPanel.cs b/Assets/GameMain/Scripts/Presentation/Common/View/RarityPanel.cs new file mode 100644 index 0000000..2f71090 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Common/View/RarityPanel.cs @@ -0,0 +1,20 @@ +using SepCore.Definition; +using UnityEngine; +using UnityEngine.UI; + +namespace SepCore.UI +{ + public class RarityPanel : MonoBehaviour + { + [SerializeField] private RarityPalette _palette = null; + [SerializeField] private Image _background = null; + [SerializeField] private Image _border = null; + + public void SetRarity(Rarity rarity) + { + RarityPalette.Colors colors = _palette.Get(rarity); + _background.color = colors.CardBackground; + _border.color = colors.Border; + } + } +} diff --git a/Assets/GameMain/Scripts/Presentation/Common/View/RarityPanel.cs.meta b/Assets/GameMain/Scripts/Presentation/Common/View/RarityPanel.cs.meta new file mode 100644 index 0000000..028a6d3 --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/Common/View/RarityPanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 95abff91edc12444c880476c4cf00ab6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipForm.Logic.cs b/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipForm.Logic.cs index d53d1b2..b2cb1f3 100644 --- a/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipForm.Logic.cs +++ b/Assets/GameMain/Scripts/Presentation/ItemBasicTooltip/ItemBasicTooltipForm.Logic.cs @@ -1,6 +1,5 @@ using Cysharp.Threading.Tasks; using SepCore.AsyncTask; -using SepCore.Definition; using SepCore.Event; using UnityEngine; @@ -28,21 +27,22 @@ namespace SepCore.UI View.infoText.text = _context.Description; View.textFormatText.Set(_context.Price); View.recycleButton.gameObject.SetActive(_context.ShowRecycleButton); + View.iconArea.SetRarity(_context.Rarity); ResizeToFitContent(); if (!string.IsNullOrEmpty(_context.IconAssetName)) { - LoadIconAsync(_context.IconAssetName, _context.Rarity).Forget(); + LoadIconAsync(_context.IconAssetName).Forget(); } } - private async UniTaskVoid LoadIconAsync(string iconAssetName, Rarity rarity) + private async UniTaskVoid LoadIconAsync(string iconAssetName) { var sprite = await SpriteLoader.LoadSpriteByKeyAsync(iconAssetName); if (_context != null && _context.IconAssetName == iconAssetName) { - View.iconArea.OnInit(sprite, rarity); + View.iconArea.SetIcon(sprite); } } diff --git a/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipForm.Logic.cs b/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipForm.Logic.cs index bd9b0a7..f85076b 100644 --- a/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipForm.Logic.cs +++ b/Assets/GameMain/Scripts/Presentation/ItemTooltip/ItemTooltipForm.Logic.cs @@ -9,6 +9,8 @@ namespace SepCore.UI [SerializeField] private float _screenEdgePadding = 32f; [SerializeField] private float _verticalGap = 10f; + [SerializeField] private RarityPanel[] _rarityPanels = null; + private ItemTooltipContext _context; private Vector3 _targetPos; @@ -17,6 +19,11 @@ namespace SepCore.UI _context = context; _targetPos = ConvertWorldToAnchored(_context.TargetPos); + foreach (RarityPanel panel in _rarityPanels) + { + panel.SetRarity(_context.BasicContext.Rarity); + } + // 1. 刷新基础信息面板(同步执行,立即完成文本排版与尺寸自适应) View.basicForm.RefreshUI(_context.BasicContext); diff --git a/Assets/GameMain/Scripts/Presentation/LevelUp/LevelUpRewardItem/LevelUpRewardItem.cs b/Assets/GameMain/Scripts/Presentation/LevelUp/LevelUpRewardItem/LevelUpRewardItem.cs index 09cba82..189dd7f 100644 --- a/Assets/GameMain/Scripts/Presentation/LevelUp/LevelUpRewardItem/LevelUpRewardItem.cs +++ b/Assets/GameMain/Scripts/Presentation/LevelUp/LevelUpRewardItem/LevelUpRewardItem.cs @@ -17,6 +17,8 @@ namespace SepCore.UI [SerializeField] private TMP_Text _descriptionText; + [SerializeField] private RarityPanel _rarityPanel = null; + private LevelUpRewardItemContext _context; @@ -30,6 +32,8 @@ namespace SepCore.UI _context = context; + _rarityPanel.SetRarity(context.Rarity); + _titleText.text = context.Title; _descriptionText.text = context.Description; _iconArea.OnInit(context.Icon, context.Rarity); @@ -45,4 +49,4 @@ namespace SepCore.UI _iconArea.SetIcon(sprite); } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Presentation/Shop/ShopGoodsItem.cs b/Assets/GameMain/Scripts/Presentation/Shop/ShopGoodsItem.cs index 27fcaa3..fb9e834 100644 --- a/Assets/GameMain/Scripts/Presentation/Shop/ShopGoodsItem.cs +++ b/Assets/GameMain/Scripts/Presentation/Shop/ShopGoodsItem.cs @@ -2,6 +2,8 @@ using System; using SepCore.Event; using TMPro; using UnityEngine; +using UnityEngine.UI; +using SepCore.Definition; namespace SepCore.UI { @@ -19,6 +21,9 @@ namespace SepCore.UI [SerializeField] private CommonButton _purchaseButton = null; [SerializeField] private TMP_Text _purchaseLabel = null; [SerializeField] private CanvasGroup _canvasGroup = null; + [SerializeField] private RarityPalette _rarityPalette = null; + [SerializeField] private Image _rarityBackground = null; + [SerializeField] private Image _rarityBorder = null; private GoodsItemContext _data; @@ -35,6 +40,7 @@ namespace SepCore.UI _canvasGroup.alpha = 1f; _purchaseLabel.text = "购买"; + SetRarity(data.Rarity); _iconArea.OnInit(data.Icon, data.Rarity); _titleText.text = data.Name; _typeText.text = data.TypeName; @@ -46,16 +52,26 @@ namespace SepCore.UI { _index = -1; _data = null; + _iconArea.OnReset(); + SetRarity(Rarity.None); } public void MarkPurchased() { - OnReset(); + _index = -1; + _data = null; _canvasGroup.alpha = 0.5f; _purchaseButton.interactable = false; _purchaseLabel.text = "已购买"; } + private void SetRarity(Rarity rarity) + { + RarityPalette.Colors colors = _rarityPalette.Get(rarity); + _rarityBackground.color = colors.CardBackground; + _rarityBorder.color = colors.Border; + } + public void RefreshAvailability(int playerCoin, bool weaponCapacityFull) { if (_index < 0) diff --git a/Assets/GameMain/UI/RarityPalette.asset b/Assets/GameMain/UI/RarityPalette.asset new file mode 100644 index 0000000..ae8a0ab --- /dev/null +++ b/Assets/GameMain/UI/RarityPalette.asset @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 05db5e8e6e7f7e14c84c787effce4933, type: 3} + m_Name: RarityPalette + m_EditorClassIdentifier: + _none: + Border: {r: 0.6156863, g: 0.58431375, b: 0.5254902, a: 1} + CardBackground: {r: 0.26666668, g: 0.24313726, b: 0.20784314, a: 1} + IconBackground: {r: 0.27058825, g: 0.25490198, b: 0.23137255, a: 1} + _white: + Border: {r: 0.7882353, g: 0.7607843, b: 0.6862745, a: 1} + CardBackground: {r: 0.29411766, g: 0.27450982, b: 0.23921569, a: 1} + IconBackground: {r: 0.44313726, g: 0.41960785, b: 0.37254903, a: 1} + _blue: + Border: {r: 0.4745098, g: 0.68235296, b: 0.8784314, a: 1} + CardBackground: {r: 0.16078432, g: 0.24705882, b: 0.33333334, a: 1} + IconBackground: {r: 0.25882354, g: 0.40784314, b: 0.53333336, a: 1} + _purple: + Border: {r: 0.70980394, g: 0.6039216, b: 0.85882354, a: 1} + CardBackground: {r: 0.27058825, g: 0.2, b: 0.32941177, a: 1} + IconBackground: {r: 0.45882353, g: 0.3529412, b: 0.5803922, a: 1} + _red: + Border: {r: 0.8666667, g: 0.5568628, b: 0.5254902, a: 1} + CardBackground: {r: 0.33333334, g: 0.2, b: 0.21176471, a: 1} + IconBackground: {r: 0.5882353, g: 0.3647059, b: 0.3529412, a: 1} diff --git a/Assets/GameMain/UI/RarityPalette.asset.meta b/Assets/GameMain/UI/RarityPalette.asset.meta new file mode 100644 index 0000000..562b9a7 --- /dev/null +++ b/Assets/GameMain/UI/RarityPalette.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fdc414c684fa936469f4d9065421db9e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/UI/UIForms/DisplayListForm.prefab b/Assets/GameMain/UI/UIForms/DisplayListForm.prefab index b859ab8..731ea1b 100644 --- a/Assets/GameMain/UI/UIForms/DisplayListForm.prefab +++ b/Assets/GameMain/UI/UIForms/DisplayListForm.prefab @@ -896,22 +896,22 @@ PrefabInstance: - target: {fileID: 2138039234147195629, guid: a76ff56683a2bc2479ebd63dcdd658b0, type: 3} propertyPath: m_Color.a - value: 0.3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2138039234147195629, guid: a76ff56683a2bc2479ebd63dcdd658b0, type: 3} propertyPath: m_Color.b - value: 0.3 + value: 0.23137255 objectReference: {fileID: 0} - target: {fileID: 2138039234147195629, guid: a76ff56683a2bc2479ebd63dcdd658b0, type: 3} propertyPath: m_Color.g - value: 0.3 + value: 0.25490198 objectReference: {fileID: 0} - target: {fileID: 2138039234147195629, guid: a76ff56683a2bc2479ebd63dcdd658b0, type: 3} propertyPath: m_Color.r - value: 0.3 + value: 0.27058825 objectReference: {fileID: 0} - target: {fileID: 2501687765494131358, guid: a76ff56683a2bc2479ebd63dcdd658b0, type: 3} diff --git a/Assets/GameMain/UI/UIForms/HudForm.prefab b/Assets/GameMain/UI/UIForms/HudForm.prefab index f7f9f9f..811a5ac 100644 --- a/Assets/GameMain/UI/UIForms/HudForm.prefab +++ b/Assets/GameMain/UI/UIForms/HudForm.prefab @@ -37,7 +37,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -14, y: -14} + m_SizeDelta: {x: -10, y: -10} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5299361850566254458 MonoBehaviour: @@ -475,7 +475,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.39215687, g: 0.39215687, b: 0.39215687, a: 1} + m_Color: {r: 0.24313726, g: 0.24313726, b: 0.24313726, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -586,7 +586,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.78431374, g: 0.039215688, b: 0.039215688, a: 1} + m_Color: {r: 0.72156864, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -738,7 +738,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.039215688, g: 0.9607843, b: 0.039215688, a: 1} + m_Color: {r: 0.2509804, g: 0.8509804, b: 0.2509804, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -856,7 +856,7 @@ MonoBehaviour: m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -967,7 +967,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -14, y: -14} + m_SizeDelta: {x: -10, y: -10} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8665470951107162402 MonoBehaviour: @@ -1238,7 +1238,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.39215687, g: 0.39215687, b: 0.39215687, a: 1} + m_Color: {r: 0.24313726, g: 0.24313726, b: 0.24313726, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1292,7 +1292,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -14, y: -14} + m_SizeDelta: {x: -10, y: -10} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &134193338904535592 CanvasRenderer: @@ -1350,13 +1350,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34.85 + m_fontSize: 37.85 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -1625,7 +1625,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -14, y: -14} + m_SizeDelta: {x: -10, y: -10} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6366053473665816812 CanvasRenderer: @@ -1683,13 +1683,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34.85 + m_fontSize: 37.85 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 4 m_VerticalAlignment: 512 m_textAlignment: 65535 diff --git a/Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab b/Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab index 39c0963..808d905 100644 --- a/Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab +++ b/Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab @@ -90,6 +90,11 @@ MonoBehaviour: _view: {fileID: 139036983684137330} _panelSpacing: 16 _screenEdgePadding: 64 + _verticalGap: 10 + _rarityPanels: + - {fileID: 601633578485609649} + - {fileID: 3327690219772278512} + - {fileID: 3901599092657455669} --- !u!1 &625540161254782982 GameObject: m_ObjectHideFlags: 0 @@ -170,6 +175,7 @@ GameObject: - component: {fileID: 8066355685435304747} - component: {fileID: 6525813526944943277} - component: {fileID: 3743928296380281877} + - component: {fileID: 3901599092657455669} m_Layer: 5 m_Name: LastWaveDamageCard m_TagString: Untagged @@ -189,12 +195,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5180798332649869889} - {fileID: 7983888186606390993} m_Father: {fileID: 5356548455413550840} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -215.51001} + m_AnchoredPosition: {x: 210, y: -273.065} m_SizeDelta: {x: 420, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3758786147868567536 @@ -218,14 +225,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.55, g: 0.55, b: 0.55, a: 1} + m_Color: {r: 0.29411766, g: 0.27450982, b: 0.23921569, 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: e44eb69993a104eadbf3e35cf4bd3c37, type: 3} + m_Sprite: {fileID: 21300000, guid: bb1ed84a53bdd487e8ede423171f514d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -303,6 +310,24 @@ MonoBehaviour: - component: {fileID: 6525813526944943277} generateReference: 0 variableName: lastWaveDamageCardContentSizeFitter + - component: {fileID: 3901599092657455669} + generateReference: 0 + variableName: lastWaveDamageCardRarityPanel +--- !u!114 &3901599092657455669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 931699404490055452} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95abff91edc12444c880476c4cf00ab6, type: 3} + m_Name: + m_EditorClassIdentifier: + _palette: {fileID: 11400000, guid: fdc414c684fa936469f4d9065421db9e, type: 2} + _background: {fileID: 7832622533953399808} + _border: {fileID: 5735207975315014893} --- !u!1 &940244511227154073 GameObject: m_ObjectHideFlags: 0 @@ -648,7 +673,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 530, y: 500} - m_SizeDelta: {x: 420, y: 250} + m_SizeDelta: {x: 420, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2578522391300721647 MonoBehaviour: @@ -1154,8 +1179,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4279970104 - m_fontColor: {r: 0.22, g: 0.16, b: 0.105, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1252,6 +1277,102 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: TooltipRecycleButtonText +--- !u!1 &4731970508977943709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5180798332649869889} + - component: {fileID: 8433142059145080293} + - component: {fileID: 5735207975315014893} + - component: {fileID: 5785562559130123543} + m_Layer: 5 + m_Name: RarityBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5180798332649869889 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4731970508977943709} + 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: 3800548610765361629} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8433142059145080293 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4731970508977943709} + m_CullTransparentMesh: 1 +--- !u!114 &5735207975315014893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4731970508977943709} + 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.7882353, g: 0.7607843, b: 0.6862745, 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: a8c07bbe04fdaf04b80e27f651a8edd6, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5785562559130123543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4731970508977943709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &4780669091251385215 GameObject: m_ObjectHideFlags: 0 @@ -1345,8 +1466,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 - m_fontSizeBase: 28 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1503,8 +1624,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 - m_fontSizeBase: 28 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1661,8 +1782,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1739,6 +1860,7 @@ GameObject: - component: {fileID: 1881671435081453588} - component: {fileID: 6832372658333345311} - component: {fileID: 5454474459038192077} + - component: {fileID: 3327690219772278512} m_Layer: 5 m_Name: TagSynergyCard m_TagString: Untagged @@ -1758,13 +1880,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4415992610886616654} - {fileID: 5093141957192085313} - {fileID: 6227402324969167298} m_Father: {fileID: 5356548455413550840} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -83.05} + m_AnchoredPosition: {x: 210, y: -99.755} m_SizeDelta: {x: 420, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1062345450854289821 @@ -1788,14 +1911,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.55, g: 0.55, b: 0.55, a: 1} + m_Color: {r: 0.29411766, g: 0.27450982, b: 0.23921569, 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: e44eb69993a104eadbf3e35cf4bd3c37, type: 3} + m_Sprite: {fileID: 21300000, guid: bb1ed84a53bdd487e8ede423171f514d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1873,6 +1996,24 @@ MonoBehaviour: - component: {fileID: 6832372658333345311} generateReference: 0 variableName: tagSynergyCardContentSizeFitter + - component: {fileID: 3327690219772278512} + generateReference: 0 + variableName: tagSynergyCardRarityPanel +--- !u!114 &3327690219772278512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6102828229605413798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95abff91edc12444c880476c4cf00ab6, type: 3} + m_Name: + m_EditorClassIdentifier: + _palette: {fileID: 11400000, guid: fdc414c684fa936469f4d9065421db9e, type: 2} + _background: {fileID: 8158809682810521935} + _border: {fileID: 4749174813311179985} --- !u!1 &7041563492282097683 GameObject: m_ObjectHideFlags: 0 @@ -1948,8 +2089,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4279970104 - m_fontColor: {r: 0.22, g: 0.16, b: 0.105, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2101,8 +2242,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2180,6 +2321,7 @@ GameObject: - component: {fileID: 1423001204619296699} - component: {fileID: 4814609797652970109} - component: {fileID: 5640782314042646325} + - component: {fileID: 601633578485609649} m_Layer: 5 m_Name: BasicTooltipForm m_TagString: Untagged @@ -2199,6 +2341,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6204766801606186374} - {fileID: 2638066273377455195} - {fileID: 2312726378312491185} - {fileID: 2131471118485666816} @@ -2233,14 +2376,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.62, g: 0.62, b: 0.62, a: 1} + m_Color: {r: 0.29411766, g: 0.27450982, b: 0.23921569, 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: e44eb69993a104eadbf3e35cf4bd3c37, type: 3} + m_Sprite: {fileID: 21300000, guid: bb1ed84a53bdd487e8ede423171f514d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2337,6 +2480,24 @@ MonoBehaviour: - component: {fileID: 4814609797652970109} generateReference: 0 variableName: basicTooltipFormItemBasicTooltipForm + - component: {fileID: 601633578485609649} + generateReference: 0 + variableName: basicTooltipFormRarityPanel +--- !u!114 &601633578485609649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7661140775813668703} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95abff91edc12444c880476c4cf00ab6, type: 3} + m_Name: + m_EditorClassIdentifier: + _palette: {fileID: 11400000, guid: fdc414c684fa936469f4d9065421db9e, type: 2} + _background: {fileID: 1935160325901314298} + _border: {fileID: 705870892930369228} --- !u!1 &8230569029959109490 GameObject: m_ObjectHideFlags: 0 @@ -2487,6 +2648,198 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8835025238962334653 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6204766801606186374} + - component: {fileID: 4314149515474787557} + - component: {fileID: 705870892930369228} + - component: {fileID: 1942357455086087967} + m_Layer: 5 + m_Name: RarityBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6204766801606186374 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8835025238962334653} + 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: 7617469188909815455} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4314149515474787557 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8835025238962334653} + m_CullTransparentMesh: 1 +--- !u!114 &705870892930369228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8835025238962334653} + 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.7882353, g: 0.7607843, b: 0.6862745, 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: a8c07bbe04fdaf04b80e27f651a8edd6, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1942357455086087967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8835025238962334653} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &9206667162618358769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4415992610886616654} + - component: {fileID: 3207630786942790710} + - component: {fileID: 4749174813311179985} + - component: {fileID: 2976244912739435193} + m_Layer: 5 + m_Name: RarityBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4415992610886616654 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9206667162618358769} + 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: 3696081640428689589} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3207630786942790710 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9206667162618358769} + m_CullTransparentMesh: 1 +--- !u!114 &4749174813311179985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9206667162618358769} + 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.7882353, g: 0.7607843, b: 0.6862745, 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: a8c07bbe04fdaf04b80e27f651a8edd6, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2976244912739435193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9206667162618358769} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1001 &4570083026248103620 PrefabInstance: m_ObjectHideFlags: 0 @@ -2595,6 +2948,32 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: bb1ed84a53bdd487e8ede423171f514d, + type: 3} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Color.b + value: 0.23137255 + objectReference: {fileID: 0} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Color.g + value: 0.25490198 + objectReference: {fileID: 0} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Color.r + value: 0.27058825 + objectReference: {fileID: 0} + - target: {fileID: 6378938522083352310, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: _rarityDisplayMode + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8492647102234125480, guid: d5396f61766946c4db970694836a49fc, type: 3} propertyPath: m_Name diff --git a/Assets/GameMain/UI/UIForms/LevelUpForm.prefab b/Assets/GameMain/UI/UIForms/LevelUpForm.prefab index b07862a..8f6fe99 100644 --- a/Assets/GameMain/UI/UIForms/LevelUpForm.prefab +++ b/Assets/GameMain/UI/UIForms/LevelUpForm.prefab @@ -55,8 +55,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -190,8 +190,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.3137255, g: 0.3137255, b: 0.3137255, a: 0.39215687} m_RaycastTarget: 1 @@ -262,8 +262,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 335062b0d81ae40f49c923ef4bf19dd7, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: serializationItems: - {fileID: 4426878279441272725} - {fileID: 2261116646569783763} @@ -280,8 +280,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3172a8000d5463f45b2f4c5f5a19433d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _view: {fileID: 5409523094175394191} --- !u!114 &5409523094175394191 MonoBehaviour: @@ -293,8 +293,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 39b4ea16f6b8d6a47b6ea7078982a7d0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: rewardAreaRoot: {fileID: 8030040287481431578} levelUpRewardTemplate: {fileID: 5339260094138371585} refreshButton: {fileID: 2880959524925709550} @@ -347,8 +347,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Padding: m_Left: 0 m_Right: 0 @@ -373,8 +373,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: componentReferences: - component: {fileID: 8030040287481431578} generateReference: 1 @@ -393,7 +393,7 @@ PrefabInstance: - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_Sprite - value: + value: objectReference: {fileID: 21300000, guid: 8eb1e718a27bf42ec8048506aa13b80b, type: 3} - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -419,7 +419,12 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontSize - value: 60 + value: 55 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontStyle + value: 1 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -444,23 +449,23 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_spriteAsset - value: + value: objectReference: {fileID: 11400000, guid: bc065bcf1474d7d4387fafd202678c37, type: 2} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontSizeBase - value: 80 + value: 55 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_enableAutoSizing - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontColor32.rgba - value: 4294638330 + value: 4292801274 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -540,13 +545,13 @@ PrefabInstance: - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 7510942500789349387, guid: 92e9102fc83c8e949971efe6f1fa6501, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: + value: objectReference: {fileID: 3846984240573617890, guid: 92e9102fc83c8e949971efe6f1fa6501, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -669,11 +674,21 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_SizeDelta.y + value: -5 + objectReference: {fileID: 0} - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.5 + objectReference: {fileID: 0} - target: {fileID: 6036930758348516521, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_Name @@ -827,8 +842,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: componentReferences: - component: {fileID: 3295807416560938857} generateReference: 0 @@ -852,8 +867,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2efdcd06cdaa830448f76b22ea7c98fb, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: key: LevelUpRefreshCostText --- !u!114 &2747827682437384067 stripped MonoBehaviour: @@ -865,8 +880,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!114 &2880959524925709550 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -877,8 +892,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!224 &3295807416560938857 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -907,8 +922,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: componentReferences: - component: {fileID: 7799418069362394985} generateReference: 0 @@ -1049,6 +1064,56 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1437908740358975387, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1437908740358975387, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1437908740358975387, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1437908740358975387, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1437908740358975387, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1437908740358975387, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1437908740358975387, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.x + value: -206 + objectReference: {fileID: 0} + - target: {fileID: 1437908740358975387, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 1437908740358975387, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 81 + objectReference: {fileID: 0} + - target: {fileID: 1437908740358975387, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -1087,7 +1152,7 @@ PrefabInstance: - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 0} - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, type: 3} @@ -1134,6 +1199,201 @@ PrefabInstance: propertyPath: m_Color.r value: 1 objectReference: {fileID: 0} + - target: {fileID: 2988380103220247122, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2988380103220247122, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2988380103220247122, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.x + value: 132 + objectReference: {fileID: 0} + - target: {fileID: 2988380103220247122, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.y + value: 132 + objectReference: {fileID: 0} + - target: {fileID: 2988380103220247122, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2988380103220247122, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 3710912924644550894, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_fontSize + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 3710912924644550894, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3710912924644550894, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_fontColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3710912924644550894, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3710912924644550894, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_fontSizeBase + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 3710912924644550894, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3710912924644550894, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 3911554554314658376, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_fontSize + value: 27 + objectReference: {fileID: 0} + - target: {fileID: 3911554554314658376, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_fontSizeBase + value: 27 + objectReference: {fileID: 0} + - target: {fileID: 3911554554314658376, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3911554554314658376, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_VerticalAlignment + value: 512 + objectReference: {fileID: 0} + - target: {fileID: 6807785679739763284, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6807785679739763284, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6807785679739763284, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6807785679739763284, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6807785679739763284, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6807785679739763284, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.x + value: -60 + objectReference: {fileID: 0} + - target: {fileID: 6807785679739763284, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.y + value: 160 + objectReference: {fileID: 0} + - target: {fileID: 6807785679739763284, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 6853028224052317907, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_fontSize + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6853028224052317907, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_fontSizeBase + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6853028224052317907, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_VerticalAlignment + value: 512 + objectReference: {fileID: 0} + - target: {fileID: 7260934452891186329, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.y + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 7260934452891186329, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 8221398388285613312, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8221398388285613312, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8221398388285613312, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8221398388285613312, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8221398388285613312, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8221398388285613312, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.x + value: -206 + objectReference: {fileID: 0} + - target: {fileID: 8221398388285613312, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.y + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 8221398388285613312, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 81 + objectReference: {fileID: 0} + - target: {fileID: 8221398388285613312, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -96 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1165,8 +1425,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: componentReferences: - component: {fileID: 1260145051120981171} generateReference: 0 @@ -1174,6 +1434,9 @@ MonoBehaviour: - component: {fileID: 5339260094138371585} generateReference: 1 variableName: levelUpRewardTemplate + - component: {fileID: 9216646426709445169} + generateReference: 0 + variableName: levelUpRewardTemplateRarityPanel --- !u!114 &5339260094138371585 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6317226738738323411, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, @@ -1184,5 +1447,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 237d64392d274c14f9f5c81b54122a93, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: +--- !u!114 &9216646426709445169 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7087412285248003043, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + m_PrefabInstance: {fileID: 2140213659577717202} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1598348574975847574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95abff91edc12444c880476c4cf00ab6, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab b/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab index 98d4d39..b89d01d 100644 --- a/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab +++ b/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab @@ -348,9 +348,9 @@ 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: -145} - m_SizeDelta: {x: 400, y: 150} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -70} + m_SizeDelta: {x: 500, y: 120} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &404610411223787636 CanvasRenderer: m_ObjectHideFlags: 0 @@ -407,13 +407,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 72 - m_fontSizeBase: 36 + m_fontSize: 70 + m_fontSizeBase: 70 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -484,7 +484,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -10, y: -10} + m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6941950566611373671 CanvasRenderer: @@ -514,7 +514,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -16202538, guid: 8b4653ce8b4743942959e6a43d989847, type: 3} + m_Sprite: {fileID: -75404448, guid: c72ec2f6752f8435b8ed98f261364b9a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -614,6 +614,26 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 28259533045232718} m_Modifications: + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontSize + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontStyle + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontSizeBase + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4292801274 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -799,6 +819,16 @@ PrefabInstance: propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_SizeDelta.y + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.5 + objectReference: {fileID: 0} - target: {fileID: 6036930758348516521, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_Name @@ -1078,8 +1108,7 @@ PrefabInstance: propertyPath: m_Name value: ShowAreaForm objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 4580239466244705106, guid: 787aba226302d5749bebd1cf8cd1fb2a, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -1122,6 +1151,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 964052069956380423, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 964052069956380423, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.y + value: -20 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Enabled @@ -1300,7 +1339,7 @@ PrefabInstance: - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_AnchoredPosition.x - value: 1318.5293 + value: 1235 objectReference: {fileID: 0} - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} @@ -1322,6 +1361,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6878033219184294131, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 1606975545, guid: c72ec2f6752f8435b8ed98f261364b9a, + type: 3} - target: {fileID: 7726133595027118117, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Color.a diff --git a/Assets/GameMain/UI/UIForms/ShopForm.prefab b/Assets/GameMain/UI/UIForms/ShopForm.prefab index b594278..db7be9e 100644 --- a/Assets/GameMain/UI/UIForms/ShopForm.prefab +++ b/Assets/GameMain/UI/UIForms/ShopForm.prefab @@ -1279,7 +1279,7 @@ MonoBehaviour: - {fileID: 5890959863133644246} - {fileID: 6448493559222326449} - {fileID: 834211465075460200} - - {fileID: 480910443557377306} + - {fileID: 4568717414437845180} - {fileID: 976582056517860298} - {fileID: 6827573715148296231} - {fileID: 806571649733521250} @@ -2957,27 +2957,27 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7a99b22b7a9fd4f46b1be90bae1d5d5f, + objectReference: {fileID: 21300000, guid: bb1ed84a53bdd487e8ede423171f514d, type: 3} - target: {fileID: 525979217704849457, guid: dd09af1a9a441da409e57f235fbff385, type: 3} propertyPath: m_Color.a - value: 0.9019608 + value: 1 objectReference: {fileID: 0} - target: {fileID: 525979217704849457, guid: dd09af1a9a441da409e57f235fbff385, type: 3} propertyPath: m_Color.b - value: 0.5019608 + value: 0.23137255 objectReference: {fileID: 0} - target: {fileID: 525979217704849457, guid: dd09af1a9a441da409e57f235fbff385, type: 3} propertyPath: m_Color.g - value: 0.6392157 + value: 0.25490198 objectReference: {fileID: 0} - target: {fileID: 525979217704849457, guid: dd09af1a9a441da409e57f235fbff385, type: 3} propertyPath: m_Color.r - value: 0.72156864 + value: 0.27058825 objectReference: {fileID: 0} - target: {fileID: 580942998382748102, guid: dd09af1a9a441da409e57f235fbff385, type: 3} @@ -3402,22 +3402,27 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontSize - value: 38 + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontStyle + value: 1 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontColor.b - value: 0.11 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontColor.g - value: 0.16 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontColor.r - value: 0.22 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -3427,7 +3432,7 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontSizeBase - value: 80 + value: 50 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -3442,7 +3447,7 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontColor32.rgba - value: 4280035640 + value: 4294967295 objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -3623,12 +3628,12 @@ PrefabInstance: - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SizeDelta.x - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SizeDelta.y - value: -20 + value: -5 objectReference: {fileID: 0} - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -3638,7 +3643,7 @@ PrefabInstance: - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 2.5 objectReference: {fileID: 0} - target: {fileID: 6036930758348516521, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -3913,7 +3918,12 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontSize - value: 34 + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontStyle + value: 1 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -3933,7 +3943,7 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontSizeBase - value: 34 + value: 40 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -7496,7 +7506,12 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontSize - value: 32 + value: 48 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontStyle + value: 1 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -7527,7 +7542,7 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontSizeBase - value: 32 + value: 48 objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -7701,11 +7716,21 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_SizeDelta.y + value: -5 + objectReference: {fileID: 0} - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.5 + objectReference: {fileID: 0} - target: {fileID: 6036930758348516521, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_Name @@ -8200,81 +8225,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6435118920824550072} m_Modifications: - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 3 - objectReference: {fileID: 0} - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7138964402462000188} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: PlayUISound - objectReference: {fileID: 0} - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7138964402462000188} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: SepCore.UI.UGuiForm, SepCore.Runtime - objectReference: {fileID: 0} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument - value: 10001 - objectReference: {fileID: 0} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: SepCore.UI.UGuiForm, SepCore.Runtime - objectReference: {fileID: 0} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 303284632082678643, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 303284632082678643, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 303284632082678643, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 303284632082678643, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 498292184531558701, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_fontColor32.rgba - value: 4291946738 - objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_Pivot.x @@ -8293,7 +8253,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -8303,7 +8263,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -8313,7 +8273,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_SizeDelta.y - value: 698 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -8353,12 +8313,12 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.x - value: 285 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.y - value: -349 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -8375,181 +8335,40 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1750581065802632959, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_fontColor32.rgba - value: 4288460231 - objectReference: {fileID: 0} - - target: {fileID: 1750581065802632959, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_VerticalAlignment - value: 512 - objectReference: {fileID: 0} - - target: {fileID: 1750581065802632959, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_HorizontalAlignment - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1939791114573821530, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_text - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 1939791114573821530, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_fontColor32.rgba - value: 4291946738 - objectReference: {fileID: 0} - target: {fileID: 3072890538777882148, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_Name value: GoodsItemTemplate objectReference: {fileID: 0} - - target: {fileID: 3072890538777882148, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3585730205036254032, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_fontColor32.rgba - value: 4280035640 - objectReference: {fileID: 0} - - target: {fileID: 7507997495033505694, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_SizeDelta.x - value: -206 - objectReference: {fileID: 0} - - target: {fileID: 7507997495033505694, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 81 - objectReference: {fileID: 0} - - target: {fileID: 7507997495033505694, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -96 - objectReference: {fileID: 0} - - target: {fileID: 7569228790803904920, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_SizeDelta.y - value: -369.99994 - objectReference: {fileID: 0} - - target: {fileID: 7569228790803904920, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 4.9999695 - objectReference: {fileID: 0} - - target: {fileID: 7840400519825908318, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_SizeDelta.x - value: -206 - objectReference: {fileID: 0} - - target: {fileID: 7840400519825908318, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 81 - objectReference: {fileID: 0} - - target: {fileID: 7840400519825908318, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -30 - objectReference: {fileID: 0} - - target: {fileID: 8208316091986530181, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_fontColor32.rgba - value: 4291946738 - objectReference: {fileID: 0} - - target: {fileID: 8208316091986530181, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_HorizontalAlignment - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9154231783670383508, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9154231783670383508, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9154231783670383508, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9154231783670383508, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9154231783670383508, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 9154231783670383508, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -30 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3072890538777882148, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - insertIndex: -1 - addedObject: {fileID: 480910443557377306} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} ---- !u!225 &207289313747942428 stripped -CanvasGroup: - m_CorrespondingSourceObject: {fileID: 9012657706980112183, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - m_PrefabInstance: {fileID: 9219735843002010411} - m_PrefabAsset: {fileID: 0} --- !u!114 &4408146096950002354 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4818839934941563289, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} m_PrefabInstance: {fileID: 9219735843002010411} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6149116963983582479} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 271f2a0727c521c4280eb2d47fd8de33, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &6149116963983582479 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3072890538777882148, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, +--- !u!114 &4568717414437845180 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4653428629007971223, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} m_PrefabInstance: {fileID: 9219735843002010411} m_PrefabAsset: {fileID: 0} ---- !u!114 &480910443557377306 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6149116963983582479} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} m_Name: m_EditorClassIdentifier: - componentReferences: - - component: {fileID: 7653824607798275002} - generateReference: 0 - variableName: goodsItemTemplateRectTransform - - component: {fileID: 4408146096950002354} - generateReference: 1 - variableName: goodsItemTemplate - - component: {fileID: 207289313747942428} - generateReference: 0 - variableName: goodsItemTemplateCanvasGroup --- !u!224 &7653824607798275002 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, diff --git a/Assets/GameMain/UI/UIForms/ShowAreaForm.prefab b/Assets/GameMain/UI/UIForms/ShowAreaForm.prefab index 63315e0..bc733d5 100644 --- a/Assets/GameMain/UI/UIForms/ShowAreaForm.prefab +++ b/Assets/GameMain/UI/UIForms/ShowAreaForm.prefab @@ -367,8 +367,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -464,6 +464,101 @@ RectTransform: m_AnchoredPosition: {x: -250, y: 0} m_SizeDelta: {x: 500, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1574082857850142683 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7593133639248185041} + - component: {fileID: 4961428433853937976} + - component: {fileID: 6502321681636533510} + - component: {fileID: 8199020283039209913} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7593133639248185041 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574082857850142683} + 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: 8490814434453762966} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4961428433853937976 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574082857850142683} + m_CullTransparentMesh: 1 +--- !u!114 &6502321681636533510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574082857850142683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: dffef66376be4fa480fb02b19edbe903, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &8199020283039209913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574082857850142683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} + m_Name: + m_EditorClassIdentifier: + componentReferences: + - component: {fileID: 7593133639248185041} + generateReference: 0 + variableName: rawImageRectTransform + - component: {fileID: 4961428433853937976} + generateReference: 0 + variableName: rawImageCanvasRenderer + - component: {fileID: 6502321681636533510} + generateReference: 1 + variableName: roleAvatarRawImage --- !u!1 &3227833126606544377 GameObject: m_ObjectHideFlags: 0 @@ -520,8 +615,8 @@ MonoBehaviour: - {fileID: 2100451517701277823} - {fileID: 4059102342211282038} - {fileID: 2736115408289919804} - - {fileID: 8436788757745993687} - - {fileID: 4798095298119197318} + - {fileID: 8199020283039209913} + - {fileID: 3535167652535837075} nestedFormReferences: [] --- !u!114 &3227929133672348348 MonoBehaviour: @@ -538,8 +633,8 @@ MonoBehaviour: randomRoleCardObject: {fileID: 4313598784162796656} roleCardObject: {fileID: 2604126741424095600} roleNameText: {fileID: 4112113528007936114} - roleAvatarRawImage: {fileID: 3117713387295311880} - initialPropertyText: {fileID: 1857371878352018845} + roleAvatarRawImage: {fileID: 6502321681636533510} + initialPropertyText: {fileID: 4917889962198418997} --- !u!114 &5897815307102554357 MonoBehaviour: m_ObjectHideFlags: 0 @@ -586,11 +681,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 8209570255115306981} 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: 260} - m_SizeDelta: {x: 200, y: 75} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -27.5} + m_SizeDelta: {x: -600, y: 75} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &4068466903834385127 CanvasRenderer: m_ObjectHideFlags: 0 @@ -647,13 +742,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 56.8 - m_fontSizeBase: 36 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -961,8 +1056,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1247,8 +1342,6 @@ GameObject: m_Component: - component: {fileID: 4204822803152999667} - component: {fileID: 5419611936429596993} - - component: {fileID: 1857371878352018845} - - component: {fileID: 4798095298119197318} m_Layer: 5 m_Name: InitialPropertyText m_TagString: Untagged @@ -1269,6 +1362,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 411507595228115807} + - {fileID: 2206812706895148426} m_Father: {fileID: 8209570255115306981} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} @@ -1284,118 +1378,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6753958483977449699} m_CullTransparentMesh: 1 ---- !u!114 &1857371878352018845 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6753958483977449699} - 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: "+5 \u6700\u5927\u751F\u547D\u503C" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} - m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, - 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: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &4798095298119197318 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6753958483977449699} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} - m_Name: - m_EditorClassIdentifier: - componentReferences: - - component: {fileID: 4204822803152999667} - generateReference: 0 - variableName: initialPropertyTextRectTransform - - component: {fileID: 5419611936429596993} - generateReference: 0 - variableName: initialPropertyTextCanvasRenderer - - component: {fileID: 1857371878352018845} - generateReference: 1 - variableName: initialPropertyText --- !u!1 &6795703393885419410 GameObject: m_ObjectHideFlags: 0 @@ -1546,6 +1528,164 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7592915229792731156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2206812706895148426} + - component: {fileID: 7647464817844002379} + - component: {fileID: 4917889962198418997} + - component: {fileID: 3535167652535837075} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2206812706895148426 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7592915229792731156} + 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: 4204822803152999667} + 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: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7647464817844002379 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7592915229792731156} + m_CullTransparentMesh: 1 +--- !u!114 &4917889962198418997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7592915229792731156} + 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: "+5 \u6700\u5927\u751F\u547D\u503C" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &3535167652535837075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7592915229792731156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} + m_Name: + m_EditorClassIdentifier: + componentReferences: + - component: {fileID: 2206812706895148426} + generateReference: 0 + variableName: textRectTransform + - component: {fileID: 7647464817844002379} + generateReference: 0 + variableName: textCanvasRenderer + - component: {fileID: 4917889962198418997} + generateReference: 1 + variableName: initialPropertyText --- !u!1 &8003134321095091020 GameObject: m_ObjectHideFlags: 0 @@ -1621,8 +1761,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1731,8 +1871,6 @@ GameObject: m_Component: - component: {fileID: 8490814434453762966} - component: {fileID: 8937390920065765355} - - component: {fileID: 3117713387295311880} - - component: {fileID: 8436788757745993687} m_Layer: 5 m_Name: RoleAvatar m_TagString: Untagged @@ -1753,6 +1891,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1780688932911537739} + - {fileID: 7593133639248185041} m_Father: {fileID: 8209570255115306981} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -1768,55 +1907,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8945250500578090325} m_CullTransparentMesh: 1 ---- !u!114 &3117713387295311880 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8945250500578090325} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 8400000, guid: 91b565625868b59428114c4a5b945e80, type: 2} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!114 &8436788757745993687 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8945250500578090325} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} - m_Name: - m_EditorClassIdentifier: - componentReferences: - - component: {fileID: 8490814434453762966} - generateReference: 0 - variableName: roleAvatarRectTransform - - component: {fileID: 8937390920065765355} - generateReference: 0 - variableName: roleAvatarCanvasRenderer - - component: {fileID: 3117713387295311880} - generateReference: 1 - variableName: roleAvatarRawImage --- !u!1 &8952439535039706234 GameObject: m_ObjectHideFlags: 0 @@ -1986,7 +2076,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + 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 diff --git a/Assets/GameMain/UI/UIItems/CommonButton.prefab b/Assets/GameMain/UI/UIItems/CommonButton.prefab index 162f60c..325c646 100644 --- a/Assets/GameMain/UI/UIItems/CommonButton.prefab +++ b/Assets/GameMain/UI/UIItems/CommonButton.prefab @@ -109,8 +109,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: 2.5} + m_SizeDelta: {x: 0, y: -5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2981775322929280725 CanvasRenderer: @@ -150,7 +150,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4293322470 + rgba: 4292801274 m_fontColor: {r: 0.98, g: 0.95, b: 0.87, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -168,13 +168,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 60 + m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -306,21 +306,6 @@ MonoBehaviour: _onPointerEnterAction: m_PersistentCalls: m_Calls: [] - _onClickAction: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 _onPointerExitAction: m_PersistentCalls: m_Calls: [] diff --git a/Assets/GameMain/UI/UIItems/DisplayItem.prefab b/Assets/GameMain/UI/UIItems/DisplayItem.prefab index 5756d72..edfb6b4 100644 --- a/Assets/GameMain/UI/UIItems/DisplayItem.prefab +++ b/Assets/GameMain/UI/UIItems/DisplayItem.prefab @@ -81,15 +81,15 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 0 + m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_HighlightedColor: {r: 1.13, g: 1.13, b: 1.13, a: 1} + m_PressedColor: {r: 0.9, g: 0.9, b: 0.9, a: 1} + m_SelectedColor: {r: 1.13, g: 1.13, b: 1.13, a: 1} + m_DisabledColor: {r: 0.65, g: 0.65, b: 0.65, a: 1} m_ColorMultiplier: 1 - m_FadeDuration: 0.1 + m_FadeDuration: 0.08 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -102,7 +102,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 2138039234147195629} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -121,41 +121,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3448502482762597571} m_Modifications: - - target: {fileID: 584092194682812729, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, type: 3} propertyPath: m_Pivot.x @@ -256,76 +221,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2257813602893232910, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8492647102234125480, guid: d5396f61766946c4db970694836a49fc, type: 3} propertyPath: m_Name value: IconArea objectReference: {fileID: 0} - - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/GameMain/UI/UIItems/GoodsItem.prefab b/Assets/GameMain/UI/UIItems/GoodsItem.prefab index fcb2624..bff24f8 100644 --- a/Assets/GameMain/UI/UIItems/GoodsItem.prefab +++ b/Assets/GameMain/UI/UIItems/GoodsItem.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1147614353546637132 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1608715277404325044} + - component: {fileID: 1787729013044507978} + - component: {fileID: 4972582073666248060} + m_Layer: 5 + m_Name: RarityBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1608715277404325044 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1147614353546637132} + 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: 1568602919960830097} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1787729013044507978 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1147614353546637132} + m_CullTransparentMesh: 1 +--- !u!114 &4972582073666248060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1147614353546637132} + 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.7882353, g: 0.7607843, b: 0.6862745, 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: a8c07bbe04fdaf04b80e27f651a8edd6, 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 &2039268993833529549 GameObject: m_ObjectHideFlags: 0 @@ -34,8 +109,8 @@ RectTransform: 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: -244} - m_SizeDelta: {x: -44, y: 66} + m_AnchoredPosition: {x: 81, y: -96} + m_SizeDelta: {x: -206, y: 66} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1664476319281387097 CanvasRenderer: @@ -55,8 +130,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -75,7 +150,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4289001471 + rgba: 4288460231 m_fontColor: {r: 0.78, g: 0.71, b: 0.61, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -93,15 +168,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 27 - m_fontSizeBase: 36 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 22 m_fontSizeMax: 27 m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -169,8 +244,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: -24, y: -12} + m_AnchoredPosition: {x: 0, y: 2.5} + m_SizeDelta: {x: 0, y: -5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7397614348107641414 CanvasRenderer: @@ -190,8 +265,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -209,8 +284,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294638330 - m_fontColor: {r: 0.16, g: 0.12, b: 0.08, a: 1} + rgba: 4279508777 + m_fontColor: {r: 0.16078432, g: 0.121568635, b: 0.078431375, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -227,13 +302,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 32 - m_fontSizeBase: 32 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 100 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -280,6 +355,7 @@ GameObject: - component: {fileID: 1568602919960830097} - component: {fileID: 4818839934941563289} - component: {fileID: 9012657706980112183} + - component: {fileID: 4653428629007971223} m_Layer: 5 m_Name: GoodsItem m_TagString: Untagged @@ -300,6 +376,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1642301384952913762} + - {fileID: 1608715277404325044} - {fileID: 9154231783670383508} - {fileID: 7840400519825908318} - {fileID: 7507997495033505694} @@ -323,8 +400,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 271f2a0727c521c4280eb2d47fd8de33, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _iconArea: {fileID: 4358550435683084285} _titleText: {fileID: 8208316091986530181} _typeText: {fileID: 1750581065802632959} @@ -333,6 +410,9 @@ MonoBehaviour: _purchaseButton: {fileID: 17896329480872315} _purchaseLabel: {fileID: 3585730205036254032} _canvasGroup: {fileID: 9012657706980112183} + _rarityPalette: {fileID: 11400000, guid: fdc414c684fa936469f4d9065421db9e, type: 2} + _rarityBackground: {fileID: 7856203203445552886} + _rarityBorder: {fileID: 4972582073666248060} --- !u!225 &9012657706980112183 CanvasGroup: m_ObjectHideFlags: 0 @@ -345,6 +425,28 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!114 &4653428629007971223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3072890538777882148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbaa237e23f7d4d3f85f73e0acd7eaec, type: 3} + m_Name: + m_EditorClassIdentifier: + componentReferences: + - component: {fileID: 1568602919960830097} + generateReference: 0 + variableName: goodsItemTemplateRectTransform + - component: {fileID: 4818839934941563289} + generateReference: 1 + variableName: goodsItemTemplate + - component: {fileID: 9012657706980112183} + generateReference: 0 + variableName: goodsItemTemplateCanvasGroup --- !u!1 &3487172905367850696 GameObject: m_ObjectHideFlags: 0 @@ -379,8 +481,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: -67} - m_SizeDelta: {x: -60, y: -514} + m_AnchoredPosition: {x: 0, y: 4.9999695} + m_SizeDelta: {x: -60, y: -369.99994} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8740690420287903044 CanvasRenderer: @@ -400,8 +502,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -420,7 +522,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294638330 + rgba: 4291946738 m_fontColor: {r: 0.95, g: 0.91, b: 0.82, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -438,10 +540,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 - m_fontSizeBase: 28 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 22 m_fontSizeMax: 28 m_fontStyle: 0 @@ -535,17 +637,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.62, g: 0.62, b: 0.62, a: 1} + m_Color: {r: 0.29411766, g: 0.27450982, b: 0.23921569, 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: e44eb69993a104eadbf3e35cf4bd3c37, type: 3} + m_Sprite: {fileID: 21300000, guid: bb1ed84a53bdd487e8ede423171f514d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -610,8 +712,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -620,7 +722,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 40 + m_text: 40 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, @@ -630,7 +732,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294638330 + rgba: 4291946738 m_fontColor: {r: 0.95, g: 0.91, b: 0.82, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -724,8 +826,8 @@ RectTransform: 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: -182} - m_SizeDelta: {x: -44, y: 58} + m_AnchoredPosition: {x: 81, y: -30} + m_SizeDelta: {x: -206, y: 58} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7410853422288194364 CanvasRenderer: @@ -745,8 +847,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -765,7 +867,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294638330 + rgba: 4291946738 m_fontColor: {r: 0.95, g: 0.91, b: 0.82, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -790,7 +892,7 @@ MonoBehaviour: m_fontSizeMin: 30 m_fontSizeMax: 40 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -836,7 +938,7 @@ PrefabInstance: - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_Sprite - value: + value: objectReference: {fileID: 21300000, guid: 061c9d880ec844e0c9961efef5c0185a, type: 3} - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -882,27 +984,32 @@ PrefabInstance: - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_PressedSprite - value: + value: objectReference: {fileID: 21300000, guid: 2fdafc6b5cb0b4fb18cfab4dbd4facf0, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_DisabledSprite - value: + value: objectReference: {fileID: 21300000, guid: 64940e89325a24b99aa029d9a27d7aaf, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_SelectedSprite - value: + value: objectReference: {fileID: 21300000, guid: 061c9d880ec844e0c9961efef5c0185a, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SpriteState.m_HighlightedSprite - value: + value: objectReference: {fileID: 21300000, guid: 061c9d880ec844e0c9961efef5c0185a, type: 3} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -913,6 +1020,11 @@ PrefabInstance: propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size @@ -933,26 +1045,36 @@ PrefabInstance: propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 3 objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayUISound + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: + value: objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 7510942500789349387, guid: 92e9102fc83c8e949971efe6f1fa6501, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: + value: objectReference: {fileID: 3846984240573617890, guid: 92e9102fc83c8e949971efe6f1fa6501, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -983,7 +1105,7 @@ PrefabInstance: - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -995,6 +1117,16 @@ PrefabInstance: propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: PlayUISound objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: SepCore.UI.UGuiForm, SepCore.Runtime + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName @@ -1023,13 +1155,18 @@ PrefabInstance: - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UI.UGuiForm, Assembly-CSharp + value: SepCore.UI.UGuiForm, SepCore.Runtime objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument value: 10000 objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -1200,8 +1337,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!224 &5474605388468845308 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -1219,7 +1356,7 @@ PrefabInstance: - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, type: 3} propertyPath: m_Pivot.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, type: 3} @@ -1229,7 +1366,7 @@ PrefabInstance: - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, type: 3} @@ -1239,7 +1376,7 @@ PrefabInstance: - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, type: 3} @@ -1294,12 +1431,12 @@ PrefabInstance: - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: -30 objectReference: {fileID: 0} - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, type: 3} @@ -1316,6 +1453,32 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7a99b22b7a9fd4f46b1be90bae1d5d5f, + type: 3} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Color.b + value: 0.5019608 + objectReference: {fileID: 0} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Color.g + value: 0.6392157 + objectReference: {fileID: 0} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Color.r + value: 0.72156864 + objectReference: {fileID: 0} + - target: {fileID: 6378938522083352310, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: _rarityDisplayMode + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8492647102234125480, guid: d5396f61766946c4db970694836a49fc, type: 3} propertyPath: m_Name @@ -1336,8 +1499,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 578fa91d15f54e74a95ccce338d0a772, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!224 &9154231783670383508 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, diff --git a/Assets/GameMain/UI/UIItems/IconArea.prefab b/Assets/GameMain/UI/UIItems/IconArea.prefab index dd3dbf3..610cde6 100644 --- a/Assets/GameMain/UI/UIItems/IconArea.prefab +++ b/Assets/GameMain/UI/UIItems/IconArea.prefab @@ -1,80 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &584092194682812729 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8734155450713179919} - - component: {fileID: 7431400453079551114} - - component: {fileID: 34098086402281480} - m_Layer: 5 - m_Name: Board - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8734155450713179919 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 584092194682812729} - 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: 2013242078151408287} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7431400453079551114 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 584092194682812729} - m_CullTransparentMesh: 1 ---- !u!114 &34098086402281480 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 584092194682812729} - 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: a8c07bbe04fdaf04b80e27f651a8edd6, 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 &2257813602893232910 GameObject: m_ObjectHideFlags: 0 @@ -133,14 +58,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.52, g: 0.52, b: 0.52, a: 1} + m_Color: {r: 0.72156864, g: 0.6392157, b: 0.5019608, 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: 5ee2e37ef5f43486b8da4f5a267df2d7, type: 3} + m_Sprite: {fileID: 21300000, guid: 7a99b22b7a9fd4f46b1be90bae1d5d5f, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -185,7 +110,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -10, y: -10} + m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1956022961265664776 CanvasRenderer: @@ -215,7 +140,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65a506fc3ca171347ac74203416a3d7f, type: 3} + m_Sprite: {fileID: 1606975545, guid: c72ec2f6752f8435b8ed98f261364b9a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -256,7 +181,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9186646302530785755} - - {fileID: 8734155450713179919} - {fileID: 1933500728459274583} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -285,5 +209,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 578fa91d15f54e74a95ccce338d0a772, type: 3} m_Name: m_EditorClassIdentifier: - _board: {fileID: 34098086402281480} _icon: {fileID: 8624349548156562800} + _background: {fileID: 2722773646958450980} + _rarityPalette: {fileID: 11400000, guid: fdc414c684fa936469f4d9065421db9e, type: 2} + _rarityDisplayMode: 1 diff --git a/Assets/GameMain/UI/UIItems/LevelUpRewardItem.prefab b/Assets/GameMain/UI/UIItems/LevelUpRewardItem.prefab index ad43e0e..6913c19 100644 --- a/Assets/GameMain/UI/UIItems/LevelUpRewardItem.prefab +++ b/Assets/GameMain/UI/UIItems/LevelUpRewardItem.prefab @@ -55,8 +55,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -145,6 +145,7 @@ GameObject: m_Component: - component: {fileID: 923096931429369185} - component: {fileID: 6317226738738323411} + - component: {fileID: 7087412285248003043} m_Layer: 5 m_Name: LevelUpRewardItem m_TagString: Untagged @@ -165,6 +166,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4023449246430043819} + - {fileID: 1891544655951654975} - {fileID: 2988380103220247122} - {fileID: 1437908740358975387} - {fileID: 8221398388285613312} @@ -187,12 +189,28 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 237d64392d274c14f9f5c81b54122a93, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _iconArea: {fileID: 7642089700794670651} _titleText: {fileID: 6853028224052317907} _typeText: {fileID: 3911554554314658376} _descriptionText: {fileID: 1810094455862003132} + _rarityPanel: {fileID: 7087412285248003043} +--- !u!114 &7087412285248003043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 837081792673381700} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95abff91edc12444c880476c4cf00ab6, type: 3} + m_Name: + m_EditorClassIdentifier: + _palette: {fileID: 11400000, guid: fdc414c684fa936469f4d9065421db9e, type: 2} + _background: {fileID: 4985400448038592131} + _border: {fileID: 6176317099234518444} --- !u!1 &4223357504617318674 GameObject: m_ObjectHideFlags: 0 @@ -248,8 +266,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -383,8 +401,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -518,17 +536,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.62, g: 0.62, b: 0.62, a: 1} + m_Color: {r: 0.29411766, g: 0.27450982, b: 0.23921569, 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: e44eb69993a104eadbf3e35cf4bd3c37, type: 3} + m_Sprite: {fileID: 21300000, guid: bb1ed84a53bdd487e8ede423171f514d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -538,6 +556,102 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7799629783028655695 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1891544655951654975} + - component: {fileID: 4375806110913965375} + - component: {fileID: 6176317099234518444} + - component: {fileID: 6026414298468920318} + m_Layer: 5 + m_Name: RarityBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1891544655951654975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7799629783028655695} + 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: 923096931429369185} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4375806110913965375 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7799629783028655695} + m_CullTransparentMesh: 1 +--- !u!114 &6176317099234518444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7799629783028655695} + 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.7882353, g: 0.7607843, b: 0.6862745, 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: a8c07bbe04fdaf04b80e27f651a8edd6, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6026414298468920318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7799629783028655695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8665592665641696731 GameObject: m_ObjectHideFlags: 0 @@ -593,8 +707,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -689,7 +803,7 @@ PrefabInstance: - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_Sprite - value: + value: objectReference: {fileID: 21300000, guid: 061c9d880ec844e0c9961efef5c0185a, type: 3} - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -789,23 +903,23 @@ PrefabInstance: - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 837081792673381700} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: + value: objectReference: {fileID: 837081792673381700} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 7510942500789349387, guid: 92e9102fc83c8e949971efe6f1fa6501, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: + value: objectReference: {fileID: 3846984240573617890, guid: 92e9102fc83c8e949971efe6f1fa6501, type: 3} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -836,7 +950,7 @@ PrefabInstance: - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: + value: objectReference: {fileID: 837081792673381700} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -1157,6 +1271,32 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: bb1ed84a53bdd487e8ede423171f514d, + type: 3} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Color.b + value: 0.23137255 + objectReference: {fileID: 0} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Color.g + value: 0.25490198 + objectReference: {fileID: 0} + - target: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Color.r + value: 0.27058825 + objectReference: {fileID: 0} + - target: {fileID: 6378938522083352310, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: _rarityDisplayMode + value: 2 + objectReference: {fileID: 0} - target: {fileID: 8492647102234125480, guid: d5396f61766946c4db970694836a49fc, type: 3} propertyPath: m_Name @@ -1183,5 +1323,5 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 578fa91d15f54e74a95ccce338d0a772, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/GameMain/UI/UISprites/SelectRoleFormRT.renderTexture b/Assets/GameMain/UI/UISprites/SelectRoleFormRT.renderTexture index e819102..b2d0942 100644 --- a/Assets/GameMain/UI/UISprites/SelectRoleFormRT.renderTexture +++ b/Assets/GameMain/UI/UISprites/SelectRoleFormRT.renderTexture @@ -30,7 +30,7 @@ RenderTexture: m_TextureSettings: serializedVersion: 2 m_FilterMode: 1 - m_Aniso: 1 + m_Aniso: 0 m_MipBias: 0 m_WrapU: 1 m_WrapV: 1