From 1cd3936f49eb77cdf53c634da5ec74867202522c Mon Sep 17 00:00:00 2001 From: SepComet <202308010230@stu.csust.edu.cn> Date: Fri, 12 Jun 2026 17:23:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E8=8F=9C=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E5=B9=B6=E6=94=B9=E9=80=A0=E9=80=9A=E7=94=A8=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 CommonButton 改为基于 Unity Button 实现，保留原有 pointer enter、click、pointer exit 三类事件配置，同时接入 Selectable/Button 的导航、选中和提交能力。补充 CommonButton 自定义 Inspector，保留项目自定义事件与背景配置的编辑体验。 - 同步调整菜单相关 UI，将 StartMenuForm 迁移为 MenuForm，并更新 UIForm 配置、菜单 Controller/Form 以及相关 prefab 引用。更新多个 UI prefab 和通用按钮 prefab，使菜单、商店、角色选择、道具展示等界面能够使用新的按钮选中与导航交互。 --- Assets/GameMain/DataTables/UIForm.txt | 1 - .../Base/Definition/Enum/UIFormType.cs | 4 +- .../Scripts/Editor/CommonButtonEditor.cs | 39 ++ .../Scripts/Editor/CommonButtonEditor.cs.meta | 11 + .../DisplayItemInfo/DisplayItemInfoForm.cs | 8 +- .../Presentation/Menu/Menu/MenuController.cs | 2 +- .../Presentation/Menu/Menu/MenuForm.cs | 10 +- .../Runtime/UIBase/Common/CommonButton.cs | 103 ++--- Assets/GameMain/UI/UIForms/DialogForm.prefab | 378 ++++++++++++------ .../UI/UIForms/DisplayItemInfoForm.prefab | 82 +++- .../{StartMenuForm.prefab => MenuForm.prefab} | 356 ++++++++++++++++- ...uForm.prefab.meta => MenuForm.prefab.meta} | 0 .../GameMain/UI/UIForms/SelectRoleForm.prefab | 75 ++++ Assets/GameMain/UI/UIForms/ShopForm.prefab | 9 +- .../GameMain/UI/UIItems/CommonButton.prefab | 64 +-- Assets/GameMain/UI/UIItems/DisplayItem.prefab | 87 ++-- Assets/GameMain/UI/UIItems/RoleItem.prefab | 34 +- Assets/Launcher.unity | 4 +- 18 files changed, 1022 insertions(+), 245 deletions(-) create mode 100644 Assets/GameMain/Scripts/Editor/CommonButtonEditor.cs create mode 100644 Assets/GameMain/Scripts/Editor/CommonButtonEditor.cs.meta rename Assets/GameMain/UI/UIForms/{StartMenuForm.prefab => MenuForm.prefab} (87%) rename Assets/GameMain/UI/UIForms/{StartMenuForm.prefab.meta => MenuForm.prefab.meta} (100%) diff --git a/Assets/GameMain/DataTables/UIForm.txt b/Assets/GameMain/DataTables/UIForm.txt index 9907a30..5a24bc0 100644 --- a/Assets/GameMain/DataTables/UIForm.txt +++ b/Assets/GameMain/DataTables/UIForm.txt @@ -5,7 +5,6 @@ 100 主菜单 MenuForm Default False True 101 设置 SettingForm Default False True 102 关于 AboutForm Default False True - 200 开始菜单 StartMenuForm Default False True 201 角色选择页 SelectRoleForm Default False True 202 游戏商店页 ShopForm Default False True 203 游戏HUD HudForm HUD False True diff --git a/Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs index 52d8217..d34617b 100644 --- a/Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs @@ -18,11 +18,11 @@ namespace SepCore.Definition /// 弹出框。 /// DialogForm = 1, - + /// /// 主菜单。 /// - MenuForm = 200, + MenuForm = 100, /// /// 设置。 diff --git a/Assets/GameMain/Scripts/Editor/CommonButtonEditor.cs b/Assets/GameMain/Scripts/Editor/CommonButtonEditor.cs new file mode 100644 index 0000000..b257ad5 --- /dev/null +++ b/Assets/GameMain/Scripts/Editor/CommonButtonEditor.cs @@ -0,0 +1,39 @@ +using SepCore.UI; +using UnityEditor; +using UnityEditor.UI; + +namespace SepCore.Editor +{ + [CustomEditor(typeof(CommonButton), true)] + [CanEditMultipleObjects] + public class CommonButtonEditor : ButtonEditor + { + private SerializedProperty _background; + private SerializedProperty _onPointerEnterAction; + private SerializedProperty _onClickAction; + private SerializedProperty _onPointerExitAction; + + protected override void OnEnable() + { + base.OnEnable(); + _background = serializedObject.FindProperty("_background"); + _onPointerEnterAction = serializedObject.FindProperty("_onPointerEnterAction"); + _onClickAction = serializedObject.FindProperty("_onClickAction"); + _onPointerExitAction = serializedObject.FindProperty("_onPointerExitAction"); + } + + public override void OnInspectorGUI() + { + base.OnInspectorGUI(); + + serializedObject.Update(); + EditorGUILayout.Space(); + EditorGUILayout.LabelField("Common Button", EditorStyles.boldLabel); + EditorGUILayout.PropertyField(_background); + EditorGUILayout.PropertyField(_onPointerEnterAction); + EditorGUILayout.PropertyField(_onClickAction); + EditorGUILayout.PropertyField(_onPointerExitAction); + serializedObject.ApplyModifiedProperties(); + } + } +} diff --git a/Assets/GameMain/Scripts/Editor/CommonButtonEditor.cs.meta b/Assets/GameMain/Scripts/Editor/CommonButtonEditor.cs.meta new file mode 100644 index 0000000..e5c50dc --- /dev/null +++ b/Assets/GameMain/Scripts/Editor/CommonButtonEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1b99c0bea7d65bb4eb60742bf62120df +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs index 732fde0..08b584d 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs @@ -55,10 +55,10 @@ namespace SepCore.UI _content.anchoredPosition3D = _targetPos; } - if (_itemTitle != null) _itemTitle.text = _context.Title ?? string.Empty; - if (_itemTypeText != null) _itemTypeText.text = BuildTypeText(_context.ItemType) ?? string.Empty; - if (_itemDescription != null) _itemDescription.text = _context.Description ?? string.Empty; - if (_itemPrice != null) _itemPrice.text = $"{_context.Price} "; + _itemTitle.text = _context.Title ?? string.Empty; + _itemTypeText.text = BuildTypeText(_context.ItemType) ?? string.Empty; + _itemDescription.text = _context.Description ?? string.Empty; + _itemPrice.text = $"{_context.Price} "; if (_recycleButton != null) { diff --git a/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuController.cs b/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuController.cs index a165d53..ce09e17 100644 --- a/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuController.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuController.cs @@ -53,7 +53,7 @@ namespace SepCore.UI public override void BindUseCase(IUIUseCase useCase) { - Log.Info("StartMenuForm doesn't need UseCase"); + Log.Info("MenuForm doesn't need UseCase"); } private void OnMenuStartGameButtonClick(object sender, GameEventArgs e) diff --git a/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuForm.cs b/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuForm.cs index e664bf3..d73210c 100644 --- a/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Menu/Menu/MenuForm.cs @@ -1,12 +1,20 @@ using SepCore.Event; +using UnityEngine; +using UnityEngine.EventSystems; using UnityGameFramework.Runtime; namespace SepCore.UI { public class MenuForm : UGuiForm { + [SerializeField] private GameObject _defaultButton; + public void RefreshUI(MenuContext context) { + if (EventSystem.current.currentSelectedGameObject != _defaultButton) + { + EventSystem.current.SetSelectedGameObject(this._defaultButton); + } } #region Lifecycle @@ -21,7 +29,7 @@ namespace SepCore.UI return; } - Log.Warning("StartMenuForm requires StartMenuFormContext as userData."); + Log.Warning("MenuForm requires MenuFormContext as userData."); } protected override void OnClose(bool isShutdown, object userData) diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs index 9e629d3..21dcc0f 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Common/CommonButton.cs @@ -1,15 +1,15 @@ using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; +using UnityEngine.UI; namespace SepCore.UI { - public class CommonButton : MonoBehaviour, IPointerEnterHandler, IPointerDownHandler, IPointerExitHandler, - IPointerUpHandler + public class CommonButton : Button { - private const float FadeTime = 0.3f; - private const float OnHoverAlpha = 0.7f; - private const float OnClickAlpha = 0.6f; + [SerializeField] private Image _background = null; + + private Color _originalBackgroundColor; [SerializeField] private UnityEvent _onPointerEnterAction = new(); @@ -17,64 +17,73 @@ namespace SepCore.UI [SerializeField] private UnityEvent _onPointerExitAction = new(); - [SerializeField] private bool _enableFade = true; - - private CanvasGroup _canvasGroup = null; - - private void Awake() + protected override void Awake() { - _canvasGroup = gameObject.GetOrAddComponent(); + base.Awake(); + _originalBackgroundColor = _background.color; } - private void OnDisable() + protected override void OnEnable() { - _canvasGroup.alpha = 1f; + _background.color = _originalBackgroundColor; } - public void OnPointerEnter(PointerEventData eventData) + protected override void OnDisable() + { + _background.color = new Color(0.3f, 0.3f, 0.3f, 0.3f); + } + + public override void OnPointerEnter(PointerEventData eventData) { if (eventData.button != PointerEventData.InputButton.Left) { return; } - StopAllCoroutines(); - if (_enableFade) - StartCoroutine(_canvasGroup.FadeToAlpha(OnHoverAlpha, FadeTime)); + EnterHoverState(); + } + + public override void OnPointerDown(PointerEventData eventData) + { + base.OnPointerDown(eventData); + + _onClickAction?.Invoke(); + } + + public override void OnPointerExit(PointerEventData eventData) + { + if (eventData.button != PointerEventData.InputButton.Left) + { + return; + } + + ExitHoverState(); + } + + public override void OnSelect(BaseEventData eventData) + { + _background.color = new Color(1f, 0.9f, 0.3f); + EnterHoverState(); + } + + public override void OnDeselect(BaseEventData eventData) + { + _background.color = _originalBackgroundColor; + ExitHoverState(); + } + + private void EnterHoverState() + { + if (EventSystem.current.currentSelectedGameObject != gameObject) + { + EventSystem.current.SetSelectedGameObject(this.gameObject); + } + _onPointerEnterAction.Invoke(); } - public void OnPointerDown(PointerEventData eventData) + private void ExitHoverState() { - if (eventData.button != PointerEventData.InputButton.Left) - { - return; - } - - _canvasGroup.alpha = OnClickAlpha; - _onClickAction.Invoke(); - } - - public void OnPointerUp(PointerEventData eventData) - { - if (eventData.button != PointerEventData.InputButton.Left) - { - return; - } - - _canvasGroup.alpha = OnHoverAlpha; - } - - public void OnPointerExit(PointerEventData eventData) - { - if (eventData.button != PointerEventData.InputButton.Left) - { - return; - } - - StopAllCoroutines(); - if (_enableFade) - StartCoroutine(_canvasGroup.FadeToAlpha(1.0f, FadeTime)); _onPointerExitAction.Invoke(); } } diff --git a/Assets/GameMain/UI/UIForms/DialogForm.prefab b/Assets/GameMain/UI/UIForms/DialogForm.prefab index b5a286d..eaa6bb7 100644 --- a/Assets/GameMain/UI/UIForms/DialogForm.prefab +++ b/Assets/GameMain/UI/UIForms/DialogForm.prefab @@ -857,26 +857,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime - m_MethodName: PlayUISound - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 10000 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.UGuiForm, SepCore.Runtime m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -887,8 +901,8 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UIModule.GameUI.DialogForm, SepC.UIModule.GameUI + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.DialogForm, SepCore.Presentation m_MethodName: OnConfirmButtonClick m_Mode: 1 m_Arguments: @@ -899,6 +913,16 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + _background: {fileID: 11426380} + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: [] + _onClickAction: + m_PersistentCalls: + m_Calls: [] + _onPointerExitAction: + m_PersistentCalls: + m_Calls: [] --- !u!1 &125418 GameObject: m_ObjectHideFlags: 0 @@ -985,7 +1009,7 @@ GameObject: - component: {fileID: 22498214} - component: {fileID: 22269018} - component: {fileID: 22354136} - - component: {fileID: 8328317774963448969} + - component: {fileID: 8310015081728058196} m_Layer: 5 m_Name: DialogForm m_TagString: Untagged @@ -1044,7 +1068,7 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &8328317774963448969 +--- !u!114 &8310015081728058196 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1053,7 +1077,7 @@ MonoBehaviour: m_GameObject: {fileID: 128074} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6cdade95ec8f34540b4be99a03ecefb9, type: 3} + m_Script: {fileID: 11500000, guid: e75b6daf7a6651845bdbc6cf9dcaa400, type: 3} m_Name: m_EditorClassIdentifier: _titleText: {fileID: 8529908876024288455} @@ -1205,26 +1229,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime - m_MethodName: PlayUISound - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 10000 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.UGuiForm, SepCore.Runtime m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -1235,8 +1273,8 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UIModule.GameUI.DialogForm, SepC.UIModule.GameUI + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.DialogForm, SepCore.Presentation m_MethodName: OnCancelButtonClick m_Mode: 1 m_Arguments: @@ -1247,6 +1285,16 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + _background: {fileID: 11483494} + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: [] + _onClickAction: + m_PersistentCalls: + m_Calls: [] + _onPointerExitAction: + m_PersistentCalls: + m_Calls: [] --- !u!1 &143604 GameObject: m_ObjectHideFlags: 0 @@ -1306,26 +1354,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime - m_MethodName: PlayUISound - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 10000 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.UGuiForm, SepCore.Runtime m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -1336,8 +1398,8 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UIModule.GameUI.DialogForm, SepC.UIModule.GameUI + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.DialogForm, SepCore.Presentation m_MethodName: OnOtherButtonClick m_Mode: 1 m_Arguments: @@ -1348,6 +1410,16 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + _background: {fileID: 11414520} + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: [] + _onClickAction: + m_PersistentCalls: + m_Calls: [] + _onPointerExitAction: + m_PersistentCalls: + m_Calls: [] --- !u!1 &151362 GameObject: m_ObjectHideFlags: 0 @@ -1804,26 +1876,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime - m_MethodName: PlayUISound - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 10000 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.UGuiForm, SepCore.Runtime m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -1834,8 +1920,8 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UIModule.GameUI.DialogForm, SepC.UIModule.GameUI + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.DialogForm, SepCore.Presentation m_MethodName: OnConfirmButtonClick m_Mode: 1 m_Arguments: @@ -1846,6 +1932,16 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + _background: {fileID: 11465964} + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: [] + _onClickAction: + m_PersistentCalls: + m_Calls: [] + _onPointerExitAction: + m_PersistentCalls: + m_Calls: [] --- !u!1 &170296 GameObject: m_ObjectHideFlags: 0 @@ -2039,26 +2135,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime - m_MethodName: PlayUISound - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 10000 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.UGuiForm, SepCore.Runtime m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -2069,8 +2179,8 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UIModule.GameUI.DialogForm, SepC.UIModule.GameUI + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.DialogForm, SepCore.Presentation m_MethodName: OnCancelButtonClick m_Mode: 1 m_Arguments: @@ -2081,6 +2191,16 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + _background: {fileID: 11425690} + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: [] + _onClickAction: + m_PersistentCalls: + m_Calls: [] + _onPointerExitAction: + m_PersistentCalls: + m_Calls: [] --- !u!1 &174596 GameObject: m_ObjectHideFlags: 0 @@ -2392,26 +2512,40 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime - m_MethodName: PlayUISound - m_Mode: 3 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 10000 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UI.UGuiForm, SepCore.Runtime + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.UGuiForm, SepCore.Runtime m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -2422,8 +2556,8 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 8328317774963448969} - m_TargetAssemblyTypeName: SepC.UIModule.GameUI.DialogForm, SepC.UIModule.GameUI + - m_Target: {fileID: 8310015081728058196} + m_TargetAssemblyTypeName: SepCore.UI.DialogForm, SepCore.Presentation m_MethodName: OnConfirmButtonClick m_Mode: 1 m_Arguments: @@ -2434,6 +2568,16 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + _background: {fileID: 11445860} + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: [] + _onClickAction: + m_PersistentCalls: + m_Calls: [] + _onPointerExitAction: + m_PersistentCalls: + m_Calls: [] --- !u!1 &199804 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab b/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab index ce035e9..cd40c7c 100644 --- a/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab +++ b/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab @@ -201,11 +201,44 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + _background: {fileID: 1146537876476268394} _onPointerEnterAction: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 395929355422612576} - m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp + - m_Target: {fileID: 4303509830935515119} + m_TargetAssemblyTypeName: SepCore.UI.UGuiForm, SepCore.Runtime m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -219,8 +252,8 @@ MonoBehaviour: _onClickAction: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 395929355422612576} - m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp + - m_Target: {fileID: 4303509830935515119} + m_TargetAssemblyTypeName: SepCore.UI.UGuiForm, SepCore.Runtime m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -246,7 +279,6 @@ MonoBehaviour: _onPointerExitAction: m_PersistentCalls: m_Calls: [] - _enableFade: 1 --- !u!1 &2619564942114189097 GameObject: m_ObjectHideFlags: 0 @@ -441,6 +473,39 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + _background: {fileID: 3213865834535204668} _onPointerEnterAction: m_PersistentCalls: m_Calls: @@ -486,7 +551,6 @@ MonoBehaviour: _onPointerExitAction: m_PersistentCalls: m_Calls: [] - _enableFade: 1 --- !u!1 &4049733250793100133 GameObject: m_ObjectHideFlags: 0 @@ -687,7 +751,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u51FA\u552E 17 " + m_text: "\u51FA\u552E 17 " m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, @@ -1085,7 +1149,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.30980393, g: 0.30980393, b: 0.30980393, a: 1} + m_Color: {r: 0.29803923, g: 0.29803923, b: 0.29803923, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1160,7 +1224,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.30980393, g: 0.30980393, b: 0.30980393, a: 1} + m_Color: {r: 0.3, g: 0.3, b: 0.3, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/GameMain/UI/UIForms/StartMenuForm.prefab b/Assets/GameMain/UI/UIForms/MenuForm.prefab similarity index 87% rename from Assets/GameMain/UI/UIForms/StartMenuForm.prefab rename to Assets/GameMain/UI/UIForms/MenuForm.prefab index 6c4c621..dd8d626 100644 --- a/Assets/GameMain/UI/UIForms/StartMenuForm.prefab +++ b/Assets/GameMain/UI/UIForms/MenuForm.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 1485619142061088732} - component: {fileID: 3415034459133320325} m_Layer: 5 - m_Name: StartMenuForm + m_Name: MenuForm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -50,6 +50,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d448bbb919fe8454da81331191044ead, type: 3} m_Name: m_EditorClassIdentifier: + _defaultButton: {fileID: 7849301975966537090} --- !u!1 &4895202931097406015 GameObject: m_ObjectHideFlags: 0 @@ -239,6 +240,51 @@ PrefabInstance: propertyPath: m_text value: "\u56FE\u9274" objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _background + value: + objectReference: {fileID: 345099064574680782} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 345099064574680782} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -564,6 +610,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} +--- !u!114 &345099064574680782 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + m_PrefabInstance: {fileID: 3987767593865014622} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &5406226763477641025 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -583,6 +641,56 @@ PrefabInstance: propertyPath: m_text value: "\u9000\u51FA\u6E38\u620F" objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _background + value: + objectReference: {fileID: 637634966344259004} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Interactable + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 637634966344259004} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -908,6 +1016,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} +--- !u!114 &637634966344259004 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + m_PrefabInstance: {fileID: 4270601179512776236} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &5122170317293300787 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -927,6 +1047,51 @@ PrefabInstance: propertyPath: m_text value: "\u6863\u6848" objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _background + value: + objectReference: {fileID: 990282440119873477} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 990282440119873477} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -1252,6 +1417,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} +--- !u!114 &990282440119873477 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + m_PrefabInstance: {fileID: 4477523726204574805} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &4788170818870220362 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, @@ -1271,6 +1448,51 @@ PrefabInstance: propertyPath: m_text value: "\u5F00\u59CB\u6E38\u620F" objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _background + value: + objectReference: {fileID: 915430015319378619} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 915430015319378619} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -1596,12 +1818,30 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} +--- !u!114 &915430015319378619 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + m_PrefabInstance: {fileID: 4551219499134613803} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &4861791807867450164 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} m_PrefabInstance: {fileID: 4551219499134613803} m_PrefabAsset: {fileID: 0} +--- !u!1 &7849301975966537090 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6036930758348516521, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + m_PrefabInstance: {fileID: 4551219499134613803} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7406673753591251603 PrefabInstance: m_ObjectHideFlags: 0 @@ -1615,6 +1855,51 @@ PrefabInstance: propertyPath: m_text value: "\u5173\u4E8E" objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _background + value: + objectReference: {fileID: 6148722132083568899} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 6148722132083568899} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -1946,6 +2231,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7406673753591251603} m_PrefabAsset: {fileID: 0} +--- !u!114 &6148722132083568899 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + m_PrefabInstance: {fileID: 7406673753591251603} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8105457770356808217 PrefabInstance: m_ObjectHideFlags: 0 @@ -1959,6 +2256,51 @@ PrefabInstance: propertyPath: m_text value: "\u8BBE\u7F6E" objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _background + value: + objectReference: {fileID: 4891246053961263497} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 4891246053961263497} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.29803923 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.9019608 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -2290,3 +2632,15 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8105457770356808217} m_PrefabAsset: {fileID: 0} +--- !u!114 &4891246053961263497 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + m_PrefabInstance: {fileID: 8105457770356808217} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/GameMain/UI/UIForms/StartMenuForm.prefab.meta b/Assets/GameMain/UI/UIForms/MenuForm.prefab.meta similarity index 100% rename from Assets/GameMain/UI/UIForms/StartMenuForm.prefab.meta rename to Assets/GameMain/UI/UIForms/MenuForm.prefab.meta diff --git a/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab b/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab index bbd94f0..21b6d5f 100644 --- a/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab +++ b/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab @@ -2157,6 +2157,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -2383,6 +2388,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -2609,6 +2619,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -2835,6 +2855,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -3061,6 +3091,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -3556,6 +3591,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -3782,6 +3822,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -4008,6 +4053,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Transition + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -4234,6 +4289,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -4460,6 +4520,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -4686,6 +4751,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size @@ -4912,6 +4982,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size diff --git a/Assets/GameMain/UI/UIForms/ShopForm.prefab b/Assets/GameMain/UI/UIForms/ShopForm.prefab index 836c2a3..2a6d12c 100644 --- a/Assets/GameMain/UI/UIForms/ShopForm.prefab +++ b/Assets/GameMain/UI/UIForms/ShopForm.prefab @@ -695,7 +695,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2, y: 0.000067918794} + m_AnchoredPosition: {x: 2, y: 0.0005856944} m_SizeDelta: {x: -2, y: 300} m_Pivot: {x: 0, y: 1} --- !u!1 &3529895034686484875 @@ -1678,7 +1678,7 @@ MonoBehaviour: m_HandleRect: {fileID: 8982130026310361329} m_Direction: 2 m_Value: 0 - m_Size: 0.99999577 + m_Size: 0.9549088 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -3406,6 +3406,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1939791114573821530, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, + type: 3} + propertyPath: m_text + value: 40 + objectReference: {fileID: 0} - target: {fileID: 3072890538777882148, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_Name diff --git a/Assets/GameMain/UI/UIItems/CommonButton.prefab b/Assets/GameMain/UI/UIItems/CommonButton.prefab index 87f4ca8..e8dd7ef 100644 --- a/Assets/GameMain/UI/UIItems/CommonButton.prefab +++ b/Assets/GameMain/UI/UIItems/CommonButton.prefab @@ -269,33 +269,42 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - _onHoverAction: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: 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 - - 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 + m_Calls: [] + _background: {fileID: 3719248416810234768} + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: [] _onClickAction: m_PersistentCalls: m_Calls: @@ -311,3 +320,6 @@ MonoBehaviour: 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 ab08df5..7e9d152 100644 --- a/Assets/GameMain/UI/UIItems/DisplayItem.prefab +++ b/Assets/GameMain/UI/UIItems/DisplayItem.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 3448502482762597571} - component: {fileID: 2817356147833661953} - - component: {fileID: 1037051458616003099} - component: {fileID: 8108003253794388876} - component: {fileID: 8968323939827146374} m_Layer: 5 @@ -48,36 +47,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 257858949270972103} m_CullTransparentMesh: 1 ---- !u!114 &1037051458616003099 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257858949270972103} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &8108003253794388876 MonoBehaviour: m_ObjectHideFlags: 0 @@ -104,6 +73,39 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + _background: {fileID: 2138039234147195629} _onPointerEnterAction: m_PersistentCalls: m_Calls: @@ -149,7 +151,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - _enableFade: 0 --- !u!1001 &4063068678868026313 PrefabInstance: m_ObjectHideFlags: 0 @@ -158,6 +159,11 @@ 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 @@ -288,6 +294,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 @@ -358,6 +369,18 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d5396f61766946c4db970694836a49fc, type: 3} +--- !u!114 &2138039234147195629 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2722773646958450980, guid: d5396f61766946c4db970694836a49fc, + type: 3} + m_PrefabInstance: {fileID: 4063068678868026313} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &2563272144824088918 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, diff --git a/Assets/GameMain/UI/UIItems/RoleItem.prefab b/Assets/GameMain/UI/UIItems/RoleItem.prefab index 21a96d6..0ef5df7 100644 --- a/Assets/GameMain/UI/UIItems/RoleItem.prefab +++ b/Assets/GameMain/UI/UIItems/RoleItem.prefab @@ -210,6 +210,39 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + _background: {fileID: 7726133595027118117} _onPointerEnterAction: m_PersistentCalls: m_Calls: @@ -255,5 +288,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} m_Name: m_EditorClassIdentifier: - _button: {fileID: 3813327180119752992} _roleImage: {fileID: 6878033219184294131} diff --git a/Assets/Launcher.unity b/Assets/Launcher.unity index e463d15..2407e20 100644 --- a/Assets/Launcher.unity +++ b/Assets/Launcher.unity @@ -1563,7 +1563,7 @@ MonoBehaviour: - _uiFormType: 1 _controllerTypeName: SepCore.UI.DialogController, SepCore.Presentation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - _uiFormType: 200 + - _uiFormType: 100 _controllerTypeName: SepCore.UI.MenuController, SepCore.Presentation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - _uiFormType: 101 @@ -1645,6 +1645,8 @@ MonoBehaviour: offsetSmoothing: 0.8 offsetDeadZone: 0.1 _baseFollowOffset: {x: 0, y: 10, z: 0} + _lockRotation: 1 + _fixedRotationEuler: {x: 90, y: 0, z: 0} --- !u!114 &2103467909 MonoBehaviour: m_ObjectHideFlags: 0