From b3186ae1520557803089ea75cea88d063927f585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B5=B7?= <1464576565@qq.com> Date: Tue, 11 Nov 2025 16:02:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Hotfix/GameLogic/GameInput.cs | 1048 ----------------- .../Hotfix/GameLogic/GameInput.cs.meta | 2 - .../Scripts/Hotfix/GameLogic/HotfixEntry.cs | 1 - .../Scripts/Hotfix/GameLogic/TestMono.cs | 26 - .../Scripts/Hotfix/GameLogic/TestMono.cs.meta | 2 - .../Scripts/Hotfix/GameLogic/TestWindow.meta | 3 - .../GameLogic/TestWindow/UIHomeWindow.cs | 42 - .../GameLogic/TestWindow/UIHomeWindow.cs.meta | 3 - .../Hotfix/GameLogic/UI.meta} | 5 +- .../Scripts/Hotfix/GameLogic/UI/Generate.meta | 8 + .../Generate}/ui_UILoadUpdateWindow.cs | 0 .../Generate}/ui_UILoadUpdateWindow.cs.meta | 0 .../Hotfix/GameLogic/{ => UI}/UILoadUpdate.cs | 1 - .../GameLogic/{ => UI}/UILoadUpdate.cs.meta | 0 .../Hotfix/GameLogic/UITestCardWidget.cs | 10 - .../Hotfix/GameLogic/UITestCardWidget.cs.meta | 3 - .../Hotfix/GameLogic/UITestViewHolder.cs | 17 - .../Hotfix/GameLogic/UITestViewHolder.cs.meta | 2 - .../Hotfix/GameLogic/ui_TestViewHolder.cs | 22 - .../GameLogic/ui_TestViewHolder.cs.meta | 2 - .../Hotfix/GameLogic/ui_UITestCardWidget.cs | 22 - .../GameLogic/ui_UITestCardWidget.cs.meta | 2 - .../Hotfix/GameLogic/ui_UITestWindow.cs | 35 - .../Hotfix/GameLogic/ui_UITestWindow.cs.meta | 2 - .../Scripts/Hotfix/UXHotfixComponent.cs | 16 - .../Scripts/Hotfix/UXHotfixComponent.cs.meta | 2 - Client/Assets/uielementconfig.txt | 86 -- .../UIGenerateConfiguration.asset | 2 +- 28 files changed, 12 insertions(+), 1352 deletions(-) delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/GameInput.cs delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/GameInput.cs.meta delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs.meta delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/TestWindow.meta delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs.meta rename Client/Assets/{uielementconfig.txt.meta => Scripts/Hotfix/GameLogic/UI.meta} (57%) create mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate.meta rename Client/Assets/Scripts/Hotfix/GameLogic/{ => UI/Generate}/ui_UILoadUpdateWindow.cs (100%) rename Client/Assets/Scripts/Hotfix/GameLogic/{ => UI/Generate}/ui_UILoadUpdateWindow.cs.meta (100%) rename Client/Assets/Scripts/Hotfix/GameLogic/{ => UI}/UILoadUpdate.cs (96%) rename Client/Assets/Scripts/Hotfix/GameLogic/{ => UI}/UILoadUpdate.cs.meta (100%) delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/UITestCardWidget.cs delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/UITestCardWidget.cs.meta delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/UITestViewHolder.cs delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/UITestViewHolder.cs.meta delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/ui_TestViewHolder.cs delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/ui_TestViewHolder.cs.meta delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestCardWidget.cs delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestCardWidget.cs.meta delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs delete mode 100644 Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs.meta delete mode 100644 Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs delete mode 100644 Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs.meta delete mode 100644 Client/Assets/uielementconfig.txt diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/GameInput.cs b/Client/Assets/Scripts/Hotfix/GameLogic/GameInput.cs deleted file mode 100644 index c62f907..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/GameInput.cs +++ /dev/null @@ -1,1048 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.13.1 -// from Assets/Art/GameInputSO.inputactions -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine.InputSystem; -using UnityEngine.InputSystem.Utilities; - -/// -/// Provides programmatic access to , , and instances defined in asset "Assets/Art/GameInputSO.inputactions". -/// -/// -/// This class is source generated and any manual edits will be discarded if the associated asset is reimported or modified. -/// -/// -/// -/// using namespace UnityEngine; -/// using UnityEngine.InputSystem; -/// -/// // Example of using an InputActionMap named "Player" from a UnityEngine.MonoBehaviour implementing callback interface. -/// public class Example : MonoBehaviour, MyActions.IPlayerActions -/// { -/// private MyActions_Actions m_Actions; // Source code representation of asset. -/// private MyActions_Actions.PlayerActions m_Player; // Source code representation of action map. -/// -/// void Awake() -/// { -/// m_Actions = new MyActions_Actions(); // Create asset object. -/// m_Player = m_Actions.Player; // Extract action map object. -/// m_Player.AddCallbacks(this); // Register callback interface IPlayerActions. -/// } -/// -/// void OnDestroy() -/// { -/// m_Actions.Dispose(); // Destroy asset object. -/// } -/// -/// void OnEnable() -/// { -/// m_Player.Enable(); // Enable all actions within map. -/// } -/// -/// void OnDisable() -/// { -/// m_Player.Disable(); // Disable all actions within map. -/// } -/// -/// #region Interface implementation of MyActions.IPlayerActions -/// -/// // Invoked when "Move" action is either started, performed or canceled. -/// public void OnMove(InputAction.CallbackContext context) -/// { -/// Debug.Log($"OnMove: {context.ReadValue<Vector2>()}"); -/// } -/// -/// // Invoked when "Attack" action is either started, performed or canceled. -/// public void OnAttack(InputAction.CallbackContext context) -/// { -/// Debug.Log($"OnAttack: {context.ReadValue<float>()}"); -/// } -/// -/// #endregion -/// } -/// -/// -public partial class @GameInput: IInputActionCollection2, IDisposable -{ - /// - /// Provides access to the underlying asset instance. - /// - public InputActionAsset asset { get; } - - /// - /// Constructs a new instance. - /// - public @GameInput() - { - asset = InputActionAsset.FromJson(@"{ - ""name"": ""GameInputSO"", - ""maps"": [ - { - ""name"": ""Player"", - ""id"": ""f62a4b92-ef5e-4175-8f4c-c9075429d32c"", - ""actions"": [ - { - ""name"": ""Move"", - ""type"": ""Value"", - ""id"": ""6bc1aaf4-b110-4ff7-891e-5b9fe6f32c4d"", - ""expectedControlType"": ""Vector2"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": true - }, - { - ""name"": ""Look"", - ""type"": ""Value"", - ""id"": ""2690c379-f54d-45be-a724-414123833eb4"", - ""expectedControlType"": ""Vector2"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": true - }, - { - ""name"": ""Jump"", - ""type"": ""Button"", - ""id"": ""8c4abdf8-4099-493a-aa1a-129acec7c3df"", - ""expectedControlType"": """", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""Sprint"", - ""type"": ""Value"", - ""id"": ""980e881e-182c-404c-8cbf-3d09fdb48fef"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": true - }, - { - ""name"": ""Escape"", - ""type"": ""Button"", - ""id"": ""d0bfd212-2876-4c8e-b35e-cfb618a9dc0b"", - ""expectedControlType"": """", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""InteractPrimary"", - ""type"": ""Button"", - ""id"": ""66b26e9d-c51a-4fb2-a4cc-3f44bdff3355"", - ""expectedControlType"": """", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""InteractSecondary"", - ""type"": ""Button"", - ""id"": ""5cc4edbd-955c-4718-8bce-ce78d07abf3f"", - ""expectedControlType"": """", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""Zoom"", - ""type"": ""PassThrough"", - ""id"": ""702f73cf-2f96-4624-871e-f1263393b8f5"", - ""expectedControlType"": """", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""Toggle Walking"", - ""type"": ""Button"", - ""id"": ""4a6790ad-d534-44f4-bfde-3a550760bd39"", - ""expectedControlType"": """", - ""processors"": """", - ""interactions"": ""Press(behavior=1)"", - ""initialStateCheck"": false - } - ], - ""bindings"": [ - { - ""name"": ""WASD"", - ""id"": ""b7594ddb-26c9-4ba2-bd5a-901468929edc"", - ""path"": ""2DVector(mode=1)"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""Move"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""up"", - ""id"": ""2063a8b5-6a45-43de-851b-65f3d46e7b58"", - ""path"": ""/w"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""64e4d037-32e1-4fb9-80e4-fc7330404dfe"", - ""path"": ""/s"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""0fce8b11-5eab-4e4e-a741-b732e7b20873"", - ""path"": ""/a"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""7bdda0d6-57a8-47c8-8238-8aecf3110e47"", - ""path"": ""/d"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""up"", - ""id"": ""bb94b405-58d3-4998-8535-d705c1218a98"", - ""path"": ""/upArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""929d9071-7dd0-4368-9743-6793bb98087e"", - ""path"": ""/downArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""28abadba-06ff-4d37-bb70-af2f1e35a3b9"", - ""path"": ""/leftArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""45f115b6-9b4f-4ba8-b500-b94c93bf7d7e"", - ""path"": ""/rightArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": """", - ""id"": ""e2f9aa65-db06-4c5b-a2e9-41bc8acb9517"", - ""path"": ""/leftStick"", - ""interactions"": """", - ""processors"": ""StickDeadzone"", - ""groups"": ""Gamepad"", - ""action"": ""Move"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""ed66cbff-2900-4a62-8896-696503cfcd31"", - ""path"": ""/delta"", - ""interactions"": """", - ""processors"": ""InvertVector2(invertX=false),ScaleVector2(x=0.05,y=0.05)"", - ""groups"": ""KeyboardMouse"", - ""action"": ""Look"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""d1d171b6-19d8-47a6-ba3a-71b6a8e7b3c0"", - ""path"": ""/rightStick"", - ""interactions"": """", - ""processors"": ""InvertVector2(invertX=false),StickDeadzone,ScaleVector2(x=300,y=300)"", - ""groups"": ""Gamepad"", - ""action"": ""Look"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""1bd55a0b-761e-4ae4-89ae-8ec127e08a29"", - ""path"": ""/space"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""Jump"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""9f973413-5e27-4239-acee-38c4a63feeba"", - ""path"": ""/buttonSouth"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Jump"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""dc65b89f-9bd3-43fb-92af-d0d87ba5faa4"", - ""path"": ""/leftShift"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""Sprint"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""c8fcd86e-dcfd-4f88-8e93-b638cdbf3320"", - ""path"": ""/leftTrigger"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Sprint"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""2253ad85-a0da-43df-ac0e-ee4d9e37f9fa"", - ""path"": ""/escape"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""Escape"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""ec4c5980-4d30-41c4-b1b4-658d52b3a103"", - ""path"": ""/leftButton"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""InteractPrimary"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""adcb95fb-24a3-4c13-a238-588970915d06"", - ""path"": ""/rightButton"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""KeyboardMouse"", - ""action"": ""InteractSecondary"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""18772126-eab8-4125-b643-22aa0566bc51"", - ""path"": ""/scroll/y"", - ""interactions"": """", - ""processors"": ""Clamp(min=-0.1,max=0.1)"", - ""groups"": """", - ""action"": ""Zoom"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""fcac67ce-ed18-4457-b978-8eff197ccf91"", - ""path"": ""/dpad/y"", - ""interactions"": """", - ""processors"": ""Clamp(min=-0.01,max=0.01)"", - ""groups"": """", - ""action"": ""Zoom"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""5edc2393-2264-49df-8e82-18f9cfa4e062"", - ""path"": ""/leftCtrl"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""Toggle Walking"", - ""isComposite"": false, - ""isPartOfComposite"": false - } - ] - }, - { - ""name"": ""UI"", - ""id"": ""ebfdbacf-7468-4988-9497-b726572473ea"", - ""actions"": [ - { - ""name"": ""Cancel"", - ""type"": ""Button"", - ""id"": ""1c614fd1-b2d4-4a37-8a58-480ab69e09a5"", - ""expectedControlType"": """", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""Submit"", - ""type"": ""Button"", - ""id"": ""8a983366-d7b9-4953-89d1-7f6e4392ecc6"", - ""expectedControlType"": """", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - } - ], - ""bindings"": [ - { - ""name"": """", - ""id"": ""55447a8c-bc61-4ae9-98e4-ccdcdb2bd538"", - ""path"": ""*/{Cancel}"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""Cancel"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""9783ec4c-2684-44b8-b4dc-ca554c527049"", - ""path"": ""*/{Submit}"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""Submit"", - ""isComposite"": false, - ""isPartOfComposite"": false - } - ] - } - ], - ""controlSchemes"": [ - { - ""name"": ""KeyboardMouse"", - ""bindingGroup"": ""KeyboardMouse"", - ""devices"": [ - { - ""devicePath"": """", - ""isOptional"": false, - ""isOR"": false - }, - { - ""devicePath"": """", - ""isOptional"": false, - ""isOR"": false - } - ] - }, - { - ""name"": ""Gamepad"", - ""bindingGroup"": ""Gamepad"", - ""devices"": [ - { - ""devicePath"": """", - ""isOptional"": true, - ""isOR"": false - }, - { - ""devicePath"": """", - ""isOptional"": true, - ""isOR"": false - }, - { - ""devicePath"": """", - ""isOptional"": true, - ""isOR"": false - } - ] - }, - { - ""name"": ""Xbox Controller"", - ""bindingGroup"": ""Xbox Controller"", - ""devices"": [] - }, - { - ""name"": ""PS4 Controller"", - ""bindingGroup"": ""PS4 Controller"", - ""devices"": [] - } - ] -}"); - // Player - m_Player = asset.FindActionMap("Player", throwIfNotFound: true); - m_Player_Move = m_Player.FindAction("Move", throwIfNotFound: true); - m_Player_Look = m_Player.FindAction("Look", throwIfNotFound: true); - m_Player_Jump = m_Player.FindAction("Jump", throwIfNotFound: true); - m_Player_Sprint = m_Player.FindAction("Sprint", throwIfNotFound: true); - m_Player_Escape = m_Player.FindAction("Escape", throwIfNotFound: true); - m_Player_InteractPrimary = m_Player.FindAction("InteractPrimary", throwIfNotFound: true); - m_Player_InteractSecondary = m_Player.FindAction("InteractSecondary", throwIfNotFound: true); - m_Player_Zoom = m_Player.FindAction("Zoom", throwIfNotFound: true); - m_Player_ToggleWalking = m_Player.FindAction("Toggle Walking", throwIfNotFound: true); - // UI - m_UI = asset.FindActionMap("UI", throwIfNotFound: true); - m_UI_Cancel = m_UI.FindAction("Cancel", throwIfNotFound: true); - m_UI_Submit = m_UI.FindAction("Submit", throwIfNotFound: true); - } - - ~@GameInput() - { - UnityEngine.Debug.Assert(!m_Player.enabled, "This will cause a leak and performance issues, GameInput.Player.Disable() has not been called."); - UnityEngine.Debug.Assert(!m_UI.enabled, "This will cause a leak and performance issues, GameInput.UI.Disable() has not been called."); - } - - /// - /// Destroys this asset and all associated instances. - /// - public void Dispose() - { - UnityEngine.Object.Destroy(asset); - } - - /// - public InputBinding? bindingMask - { - get => asset.bindingMask; - set => asset.bindingMask = value; - } - - /// - public ReadOnlyArray? devices - { - get => asset.devices; - set => asset.devices = value; - } - - /// - public ReadOnlyArray controlSchemes => asset.controlSchemes; - - /// - public bool Contains(InputAction action) - { - return asset.Contains(action); - } - - /// - public IEnumerator GetEnumerator() - { - return asset.GetEnumerator(); - } - - /// - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - - /// - public void Enable() - { - asset.Enable(); - } - - /// - public void Disable() - { - asset.Disable(); - } - - /// - public IEnumerable bindings => asset.bindings; - - /// - public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) - { - return asset.FindAction(actionNameOrId, throwIfNotFound); - } - - /// - public int FindBinding(InputBinding bindingMask, out InputAction action) - { - return asset.FindBinding(bindingMask, out action); - } - - // Player - private readonly InputActionMap m_Player; - private List m_PlayerActionsCallbackInterfaces = new List(); - private readonly InputAction m_Player_Move; - private readonly InputAction m_Player_Look; - private readonly InputAction m_Player_Jump; - private readonly InputAction m_Player_Sprint; - private readonly InputAction m_Player_Escape; - private readonly InputAction m_Player_InteractPrimary; - private readonly InputAction m_Player_InteractSecondary; - private readonly InputAction m_Player_Zoom; - private readonly InputAction m_Player_ToggleWalking; - /// - /// Provides access to input actions defined in input action map "Player". - /// - public struct PlayerActions - { - private @GameInput m_Wrapper; - - /// - /// Construct a new instance of the input action map wrapper class. - /// - public PlayerActions(@GameInput wrapper) { m_Wrapper = wrapper; } - /// - /// Provides access to the underlying input action "Player/Move". - /// - public InputAction @Move => m_Wrapper.m_Player_Move; - /// - /// Provides access to the underlying input action "Player/Look". - /// - public InputAction @Look => m_Wrapper.m_Player_Look; - /// - /// Provides access to the underlying input action "Player/Jump". - /// - public InputAction @Jump => m_Wrapper.m_Player_Jump; - /// - /// Provides access to the underlying input action "Player/Sprint". - /// - public InputAction @Sprint => m_Wrapper.m_Player_Sprint; - /// - /// Provides access to the underlying input action "Player/Escape". - /// - public InputAction @Escape => m_Wrapper.m_Player_Escape; - /// - /// Provides access to the underlying input action "Player/InteractPrimary". - /// - public InputAction @InteractPrimary => m_Wrapper.m_Player_InteractPrimary; - /// - /// Provides access to the underlying input action "Player/InteractSecondary". - /// - public InputAction @InteractSecondary => m_Wrapper.m_Player_InteractSecondary; - /// - /// Provides access to the underlying input action "Player/Zoom". - /// - public InputAction @Zoom => m_Wrapper.m_Player_Zoom; - /// - /// Provides access to the underlying input action "Player/ToggleWalking". - /// - public InputAction @ToggleWalking => m_Wrapper.m_Player_ToggleWalking; - /// - /// Provides access to the underlying input action map instance. - /// - public InputActionMap Get() { return m_Wrapper.m_Player; } - /// - public void Enable() { Get().Enable(); } - /// - public void Disable() { Get().Disable(); } - /// - public bool enabled => Get().enabled; - /// - /// Implicitly converts an to an instance. - /// - public static implicit operator InputActionMap(PlayerActions set) { return set.Get(); } - /// - /// Adds , and callbacks provided via on all input actions contained in this map. - /// - /// Callback instance. - /// - /// If is null or have already been added this method does nothing. - /// - /// - public void AddCallbacks(IPlayerActions instance) - { - if (instance == null || m_Wrapper.m_PlayerActionsCallbackInterfaces.Contains(instance)) return; - m_Wrapper.m_PlayerActionsCallbackInterfaces.Add(instance); - @Move.started += instance.OnMove; - @Move.performed += instance.OnMove; - @Move.canceled += instance.OnMove; - @Look.started += instance.OnLook; - @Look.performed += instance.OnLook; - @Look.canceled += instance.OnLook; - @Jump.started += instance.OnJump; - @Jump.performed += instance.OnJump; - @Jump.canceled += instance.OnJump; - @Sprint.started += instance.OnSprint; - @Sprint.performed += instance.OnSprint; - @Sprint.canceled += instance.OnSprint; - @Escape.started += instance.OnEscape; - @Escape.performed += instance.OnEscape; - @Escape.canceled += instance.OnEscape; - @InteractPrimary.started += instance.OnInteractPrimary; - @InteractPrimary.performed += instance.OnInteractPrimary; - @InteractPrimary.canceled += instance.OnInteractPrimary; - @InteractSecondary.started += instance.OnInteractSecondary; - @InteractSecondary.performed += instance.OnInteractSecondary; - @InteractSecondary.canceled += instance.OnInteractSecondary; - @Zoom.started += instance.OnZoom; - @Zoom.performed += instance.OnZoom; - @Zoom.canceled += instance.OnZoom; - @ToggleWalking.started += instance.OnToggleWalking; - @ToggleWalking.performed += instance.OnToggleWalking; - @ToggleWalking.canceled += instance.OnToggleWalking; - } - - /// - /// Removes , and callbacks provided via on all input actions contained in this map. - /// - /// - /// Calling this method when have not previously been registered has no side-effects. - /// - /// - private void UnregisterCallbacks(IPlayerActions instance) - { - @Move.started -= instance.OnMove; - @Move.performed -= instance.OnMove; - @Move.canceled -= instance.OnMove; - @Look.started -= instance.OnLook; - @Look.performed -= instance.OnLook; - @Look.canceled -= instance.OnLook; - @Jump.started -= instance.OnJump; - @Jump.performed -= instance.OnJump; - @Jump.canceled -= instance.OnJump; - @Sprint.started -= instance.OnSprint; - @Sprint.performed -= instance.OnSprint; - @Sprint.canceled -= instance.OnSprint; - @Escape.started -= instance.OnEscape; - @Escape.performed -= instance.OnEscape; - @Escape.canceled -= instance.OnEscape; - @InteractPrimary.started -= instance.OnInteractPrimary; - @InteractPrimary.performed -= instance.OnInteractPrimary; - @InteractPrimary.canceled -= instance.OnInteractPrimary; - @InteractSecondary.started -= instance.OnInteractSecondary; - @InteractSecondary.performed -= instance.OnInteractSecondary; - @InteractSecondary.canceled -= instance.OnInteractSecondary; - @Zoom.started -= instance.OnZoom; - @Zoom.performed -= instance.OnZoom; - @Zoom.canceled -= instance.OnZoom; - @ToggleWalking.started -= instance.OnToggleWalking; - @ToggleWalking.performed -= instance.OnToggleWalking; - @ToggleWalking.canceled -= instance.OnToggleWalking; - } - - /// - /// Unregisters and unregisters all input action callbacks via . - /// - /// - public void RemoveCallbacks(IPlayerActions instance) - { - if (m_Wrapper.m_PlayerActionsCallbackInterfaces.Remove(instance)) - UnregisterCallbacks(instance); - } - - /// - /// Replaces all existing callback instances and previously registered input action callbacks associated with them with callbacks provided via . - /// - /// - /// If is null, calling this method will only unregister all existing callbacks but not register any new callbacks. - /// - /// - /// - /// - public void SetCallbacks(IPlayerActions instance) - { - foreach (var item in m_Wrapper.m_PlayerActionsCallbackInterfaces) - UnregisterCallbacks(item); - m_Wrapper.m_PlayerActionsCallbackInterfaces.Clear(); - AddCallbacks(instance); - } - } - /// - /// Provides a new instance referencing this action map. - /// - public PlayerActions @Player => new PlayerActions(this); - - // UI - private readonly InputActionMap m_UI; - private List m_UIActionsCallbackInterfaces = new List(); - private readonly InputAction m_UI_Cancel; - private readonly InputAction m_UI_Submit; - /// - /// Provides access to input actions defined in input action map "UI". - /// - public struct UIActions - { - private @GameInput m_Wrapper; - - /// - /// Construct a new instance of the input action map wrapper class. - /// - public UIActions(@GameInput wrapper) { m_Wrapper = wrapper; } - /// - /// Provides access to the underlying input action "UI/Cancel". - /// - public InputAction @Cancel => m_Wrapper.m_UI_Cancel; - /// - /// Provides access to the underlying input action "UI/Submit". - /// - public InputAction @Submit => m_Wrapper.m_UI_Submit; - /// - /// Provides access to the underlying input action map instance. - /// - public InputActionMap Get() { return m_Wrapper.m_UI; } - /// - public void Enable() { Get().Enable(); } - /// - public void Disable() { Get().Disable(); } - /// - public bool enabled => Get().enabled; - /// - /// Implicitly converts an to an instance. - /// - public static implicit operator InputActionMap(UIActions set) { return set.Get(); } - /// - /// Adds , and callbacks provided via on all input actions contained in this map. - /// - /// Callback instance. - /// - /// If is null or have already been added this method does nothing. - /// - /// - public void AddCallbacks(IUIActions instance) - { - if (instance == null || m_Wrapper.m_UIActionsCallbackInterfaces.Contains(instance)) return; - m_Wrapper.m_UIActionsCallbackInterfaces.Add(instance); - @Cancel.started += instance.OnCancel; - @Cancel.performed += instance.OnCancel; - @Cancel.canceled += instance.OnCancel; - @Submit.started += instance.OnSubmit; - @Submit.performed += instance.OnSubmit; - @Submit.canceled += instance.OnSubmit; - } - - /// - /// Removes , and callbacks provided via on all input actions contained in this map. - /// - /// - /// Calling this method when have not previously been registered has no side-effects. - /// - /// - private void UnregisterCallbacks(IUIActions instance) - { - @Cancel.started -= instance.OnCancel; - @Cancel.performed -= instance.OnCancel; - @Cancel.canceled -= instance.OnCancel; - @Submit.started -= instance.OnSubmit; - @Submit.performed -= instance.OnSubmit; - @Submit.canceled -= instance.OnSubmit; - } - - /// - /// Unregisters and unregisters all input action callbacks via . - /// - /// - public void RemoveCallbacks(IUIActions instance) - { - if (m_Wrapper.m_UIActionsCallbackInterfaces.Remove(instance)) - UnregisterCallbacks(instance); - } - - /// - /// Replaces all existing callback instances and previously registered input action callbacks associated with them with callbacks provided via . - /// - /// - /// If is null, calling this method will only unregister all existing callbacks but not register any new callbacks. - /// - /// - /// - /// - public void SetCallbacks(IUIActions instance) - { - foreach (var item in m_Wrapper.m_UIActionsCallbackInterfaces) - UnregisterCallbacks(item); - m_Wrapper.m_UIActionsCallbackInterfaces.Clear(); - AddCallbacks(instance); - } - } - /// - /// Provides a new instance referencing this action map. - /// - public UIActions @UI => new UIActions(this); - private int m_KeyboardMouseSchemeIndex = -1; - /// - /// Provides access to the input control scheme. - /// - /// - public InputControlScheme KeyboardMouseScheme - { - get - { - if (m_KeyboardMouseSchemeIndex == -1) m_KeyboardMouseSchemeIndex = asset.FindControlSchemeIndex("KeyboardMouse"); - return asset.controlSchemes[m_KeyboardMouseSchemeIndex]; - } - } - private int m_GamepadSchemeIndex = -1; - /// - /// Provides access to the input control scheme. - /// - /// - public InputControlScheme GamepadScheme - { - get - { - if (m_GamepadSchemeIndex == -1) m_GamepadSchemeIndex = asset.FindControlSchemeIndex("Gamepad"); - return asset.controlSchemes[m_GamepadSchemeIndex]; - } - } - private int m_XboxControllerSchemeIndex = -1; - /// - /// Provides access to the input control scheme. - /// - /// - public InputControlScheme XboxControllerScheme - { - get - { - if (m_XboxControllerSchemeIndex == -1) m_XboxControllerSchemeIndex = asset.FindControlSchemeIndex("Xbox Controller"); - return asset.controlSchemes[m_XboxControllerSchemeIndex]; - } - } - private int m_PS4ControllerSchemeIndex = -1; - /// - /// Provides access to the input control scheme. - /// - /// - public InputControlScheme PS4ControllerScheme - { - get - { - if (m_PS4ControllerSchemeIndex == -1) m_PS4ControllerSchemeIndex = asset.FindControlSchemeIndex("PS4 Controller"); - return asset.controlSchemes[m_PS4ControllerSchemeIndex]; - } - } - /// - /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "Player" which allows adding and removing callbacks. - /// - /// - /// - public interface IPlayerActions - { - /// - /// Method invoked when associated input action "Move" is either , or . - /// - /// - /// - /// - void OnMove(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Look" is either , or . - /// - /// - /// - /// - void OnLook(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Jump" is either , or . - /// - /// - /// - /// - void OnJump(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Sprint" is either , or . - /// - /// - /// - /// - void OnSprint(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Escape" is either , or . - /// - /// - /// - /// - void OnEscape(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "InteractPrimary" is either , or . - /// - /// - /// - /// - void OnInteractPrimary(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "InteractSecondary" is either , or . - /// - /// - /// - /// - void OnInteractSecondary(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Zoom" is either , or . - /// - /// - /// - /// - void OnZoom(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Toggle Walking" is either , or . - /// - /// - /// - /// - void OnToggleWalking(InputAction.CallbackContext context); - } - /// - /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "UI" which allows adding and removing callbacks. - /// - /// - /// - public interface IUIActions - { - /// - /// Method invoked when associated input action "Cancel" is either , or . - /// - /// - /// - /// - void OnCancel(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Submit" is either , or . - /// - /// - /// - /// - void OnSubmit(InputAction.CallbackContext context); - } -} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/GameInput.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/GameInput.cs.meta deleted file mode 100644 index be14373..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/GameInput.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 2fa6a9e6f9f9ffa489915ed5f963ac67 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs b/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs index f033c91..113ed50 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/HotfixEntry.cs @@ -9,7 +9,6 @@ using AlicizaX; using AlicizaX.Localization; using YooAsset; using Cysharp.Threading.Tasks; -using Hotfix.GameLogic; using Luban; using UnityEngine.SceneManagement; diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs b/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs deleted file mode 100644 index ac599a1..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using Cysharp.Threading.Tasks; -using Hotfix.GameLogic.TestWindow; -using UnityEditor; -using UnityEngine; -using UnityEngine.Profiling; -using UnityEngine.UI; - - -public class TestMono : MonoBehaviour -{ - public Action callBack; - public UXButton _button; - public bool interactable; - - [Sirenix.OdinInspector.Button] - public void Test() - { - _button.Selected = interactable; - } - - public void Print(int index) - { - Debug.Log("Index"); - } -} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs.meta deleted file mode 100644 index bf178f4..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: f09b695799b281842af084a0cb741bdd \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow.meta b/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow.meta deleted file mode 100644 index df45159..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 828b46d2c5eb4264bbaceb409fc9150b -timeCreated: 1753768359 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs b/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs deleted file mode 100644 index 60e8f7d..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs +++ /dev/null @@ -1,42 +0,0 @@ -using AlicizaX; -using AlicizaX.UI.Runtime; -using GameLogic.Event.Generated; -using GameLogic.UI; -using UnityEngine; - -namespace Hotfix.GameLogic.TestWindow -{ - [Prewarm(2)] - public readonly struct ModeChangedEvent : IEventArgs - { - } - - public readonly struct ModeHGameChangedEvent : IEventArgs - { - } - - [Window(UILayer.UI)] - public class UIHomeWindow : UIWindow - { - protected override void OnInitialize() - { - baseui.ImgBackGround.color = Color.gray; - baseui.Btntest.onClick.AddListener(OnTestClick); - } - - private void OnTestClick() - { - Debug.Log("ShowUIA"); - } - - protected override void OnOpen() - { - Debug.Log("OnOpen"); - } - - protected override void OnClose() - { - Debug.Log("OnClose"); - } - } -} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs.meta deleted file mode 100644 index 11ed324..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/TestWindow/UIHomeWindow.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0edc29f83cc34c5eb513f0666dca292f -timeCreated: 1753768367 \ No newline at end of file diff --git a/Client/Assets/uielementconfig.txt.meta b/Client/Assets/Scripts/Hotfix/GameLogic/UI.meta similarity index 57% rename from Client/Assets/uielementconfig.txt.meta rename to Client/Assets/Scripts/Hotfix/GameLogic/UI.meta index e4278db..963fa35 100644 --- a/Client/Assets/uielementconfig.txt.meta +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: 80277f623b9fa2c4284a4734a018bb2e -TextScriptImporter: +guid: 2d6787dcf4460914ebecefe9005032d2 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate.meta b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate.meta new file mode 100644 index 0000000..88413a1 --- /dev/null +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a187e1f86f993645bf2647c33dc8624 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UILoadUpdateWindow.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs similarity index 100% rename from Client/Assets/Scripts/Hotfix/GameLogic/ui_UILoadUpdateWindow.cs rename to Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UILoadUpdateWindow.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs.meta similarity index 100% rename from Client/Assets/Scripts/Hotfix/GameLogic/ui_UILoadUpdateWindow.cs.meta rename to Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs.meta diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs similarity index 96% rename from Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs rename to Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs index f245d73..1d8ac53 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs @@ -1,7 +1,6 @@ using AlicizaX.UI.Runtime; using Game.UI; -using GameLogic.UI; using UnityEngine; diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs.meta similarity index 100% rename from Client/Assets/Scripts/Hotfix/GameLogic/UILoadUpdate.cs.meta rename to Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs.meta diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UITestCardWidget.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UITestCardWidget.cs deleted file mode 100644 index 5dbffb0..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UITestCardWidget.cs +++ /dev/null @@ -1,10 +0,0 @@ -using AlicizaX.UI.Runtime; - -namespace GameLogic.UI -{ - public class UITestCardWidget : UIWidget - { - } - - -} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UITestCardWidget.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/UITestCardWidget.cs.meta deleted file mode 100644 index df03808..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UITestCardWidget.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 59e3ce2038bb4cb2a48cda67db3a6185 -timeCreated: 1744162362 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UITestViewHolder.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UITestViewHolder.cs deleted file mode 100644 index 9a6bcbf..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UITestViewHolder.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using AlicizaX.UI.RecyclerView; -using GameLogic.UI; -using UnityEngine; - -public class UITestViewHolder : ViewHolder -{ - [SerializeField] private ui_TestViewHolder holder; - - public override void BindViewData(T data) - { - if (data is string text) - { - holder.TextTitl.text = text; - } - } -} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UITestViewHolder.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/UITestViewHolder.cs.meta deleted file mode 100644 index 791ba4d..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UITestViewHolder.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: a5a07351da0e2d140bd6a0896e610b05 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/ui_TestViewHolder.cs b/Client/Assets/Scripts/Hotfix/GameLogic/ui_TestViewHolder.cs deleted file mode 100644 index 4cbef85..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/ui_TestViewHolder.cs +++ /dev/null @@ -1,22 +0,0 @@ -using TMPro; -using UnityEngine;using Sirenix.OdinInspector; -using AlicizaX.UI.Runtime; -namespace GameLogic.UI -{ - [UIRes(ui_TestViewHolder.ResTag, EUIResLoadType.AssetBundle)] - public class ui_TestViewHolder : UIHolderObjectBase - { - - public const string ResTag = "TestViewHolder"; - #region Generated by Script Tool - - [SerializeField] - [ReadOnly] - [HideLabel] - private TextMeshProUGUI mTextTitl; - public TextMeshProUGUI TextTitl => mTextTitl; - - - #endregion - } -} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/ui_TestViewHolder.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/ui_TestViewHolder.cs.meta deleted file mode 100644 index ce08600..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/ui_TestViewHolder.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 6ccb240eacf30f0498b99d2c28620636 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestCardWidget.cs b/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestCardWidget.cs deleted file mode 100644 index 8d12d7c..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestCardWidget.cs +++ /dev/null @@ -1,22 +0,0 @@ -using UnityEngine.UI; -using Sirenix.OdinInspector; -using AlicizaX.UI.Runtime; -using UnityEngine; -namespace GameLogic.UI -{ - [UIRes(ui_UITestCardWidget.ResTag, EUIResLoadType.AssetBundle)] - public class ui_UITestCardWidget : UIHolderObjectBase - { - public const string ResTag = "UITestCardWidget"; - #region Generated by Script Tool - - [SerializeField] - [ReadOnly] - [HideLabel] - private Image mImgLoader; - public Image ImgLoader => mImgLoader; - - - #endregion - } -} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestCardWidget.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestCardWidget.cs.meta deleted file mode 100644 index 222429c..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestCardWidget.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 41db8c05e1d575a4fabbe2449c65f28b \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs b/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs deleted file mode 100644 index 766756c..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs +++ /dev/null @@ -1,35 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; -using TMPro; -using Sirenix.OdinInspector; -using AlicizaX.UI.Runtime; -namespace GameLogic.UI -{ - [UIRes(ui_UITestWindow.ResTag, EUIResLoadType.AssetBundle)] - public class ui_UITestWindow : UIHolderObjectBase - { - public const string ResTag = "UITestWindow"; - #region Generated by Script Tool - - [SerializeField] - [ReadOnly] - [HideLabel] - private Image mImgBackGround; - public Image ImgBackGround => mImgBackGround; - - [SerializeField] - [ReadOnly] - [HideLabel] - private UXButton mBtntest; - public UXButton Btntest => mBtntest; - - [SerializeField] - [ReadOnly] - [HideLabel] - private TextMeshProUGUI mTextTitl; - public TextMeshProUGUI TextTitl => mTextTitl; - - - #endregion - } -} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs.meta deleted file mode 100644 index 4c155c0..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/ui_UITestWindow.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: ca1ef561ac5a9b8438b50785de7197dc \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs b/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs deleted file mode 100644 index 297bd4c..0000000 --- a/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEngine; - -public class UXHotfixComponent : MonoBehaviour -{ - // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs.meta b/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs.meta deleted file mode 100644 index 22e9417..0000000 --- a/Client/Assets/Scripts/Hotfix/UXHotfixComponent.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 366fc66b74c28654189d16f54713ec0b \ No newline at end of file diff --git a/Client/Assets/uielementconfig.txt b/Client/Assets/uielementconfig.txt deleted file mode 100644 index 5d7abf7..0000000 --- a/Client/Assets/uielementconfig.txt +++ /dev/null @@ -1,86 +0,0 @@ -[ - { - "uiElementRegex": "Rect", - "componentType": "RectTransform" - }, - { - "uiElementRegex": "Obj", - "componentType": "GameObject" - }, - { - "uiElementRegex": "Tf", - "componentType": "Transform" - }, - { - "uiElementRegex": "Btn", - "componentType": "UXButton" - }, - { - "uiElementRegex": "Slider", - "componentType": "Slider" - }, - { - "uiElementRegex": "Img", - "componentType": "Image" - }, - { - "uiElementRegex": "RImg", - "componentType": "RawImage" - }, - { - "uiElementRegex": "Scrollbar", - "componentType": "Scrollbar" - }, - { - "uiElementRegex": "ScrollRect", - "componentType": "ScrollRect" - }, - { - "uiElementRegex": "GLayout", - "componentType": "GridLayoutGroup" - }, - { - "uiElementRegex": "HLayout", - "componentType": "HorizontalLayoutGroup" - }, - { - "uiElementRegex": "VLayout", - "componentType": "VerticalLayoutGroup" - }, - { - "uiElementRegex": "Text", - "componentType": "TMPro.TextMeshProUGUI" - }, - { - "uiElementRegex": "TogGroup", - "componentType": "UXGroup" - }, - { - "uiElementRegex": "Mask2D", - "componentType": "RectMask2D" - }, - { - "uiElementRegex": "Video", - "componentType": "Video.VideoPlayer" - }, - { - "uiElementRegex": "Input", - "componentType": "TMPro.TMP_InputField" - }, - { - "uiElementRegex": "CanvasGroup", - "componentType": "CanvasGroup" - }, - { - "uiElementRegex": "ScrollView", - "componentType": "RecyclerView" - }, - { - "uiElementRegex": "Drag", - "componentType": "UXDraggable" - }, - { - "uiElementRegex": "", - "componentType": "" - } -] \ No newline at end of file diff --git a/Client/ProjectSettings/UIGenerateConfiguration.asset b/Client/ProjectSettings/UIGenerateConfiguration.asset index 24c3840..f71f953 100644 --- a/Client/ProjectSettings/UIGenerateConfiguration.asset +++ b/Client/ProjectSettings/UIGenerateConfiguration.asset @@ -75,7 +75,7 @@ MonoBehaviour: LoadType: 0 - ProjectName: Hotfix NameSpace: Game.UI - GenerateHolderCodePath: Assets/Scripts/Hotfix/GameLogic + GenerateHolderCodePath: Assets/Scripts/Hotfix/GameLogic/UI//Generate UIPrefabRootPath: Assets/Bundles/UI LoadType: 1 UIScriptGeneratorRuleHelper: AlicizaX.UI.Editor.DefaultIuiGeneratorRuleHelper