diff --git a/Client/Assets/Bundles/UILoadUpdateWindow.prefab b/Client/Assets/Bundles/UILoadUpdateWindow.prefab index cb6779b..d136026 100644 --- a/Client/Assets/Bundles/UILoadUpdateWindow.prefab +++ b/Client/Assets/Bundles/UILoadUpdateWindow.prefab @@ -191,6 +191,7 @@ GameObject: - component: {fileID: 8270483239104722155} - component: {fileID: 3099109932356522100} - component: {fileID: 5439601954591314253} + - component: {fileID: 981330745879587036} m_Layer: 5 m_Name: UILoadUpdateWindow m_TagString: Untagged @@ -313,6 +314,24 @@ MonoBehaviour: _requireSelectionWhenGamepad: 1 _blockLowerScopes: 1 _autoSelectFirstAvailable: 1 +--- !u!114 &981330745879587036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 526598954257632073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5552ea6a0a020954781d0ca2e1944512, type: 3} + m_Name: + m_EditorClassIdentifier: + _controllers: + - _id: 60e6401174c842769af619ed1b1e9d5f + _name: ctlLevel + _length: 2 + _description: + _bindings: [] --- !u!1 &541431694581587512 GameObject: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs index 035a962..155ab18 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/Generate/ui_UILoadUpdateWindow.cs @@ -41,6 +41,13 @@ namespace Game.UI #endregion + public UXController.ControllerDefinition CtlLevel { get; private set; } + public override void Awake() + { + base.Awake(); + var ctl = gameObject.GetComponent(); + CtlLevel = ctl.GetControllerByName("ctlLevel"); + } } } diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework index 16989c4..24a3484 160000 --- a/Client/Packages/com.alicizax.unity.framework +++ b/Client/Packages/com.alicizax.unity.framework @@ -1 +1 @@ -Subproject commit 16989c4df673be9e02f88192c3a541867c44ff3a +Subproject commit 24a348466812e97a2e2cbe49a44138bb87021283 diff --git a/Client/Packages/com.alicizax.unity.ui.extension b/Client/Packages/com.alicizax.unity.ui.extension index f5a2128..fb9846d 160000 --- a/Client/Packages/com.alicizax.unity.ui.extension +++ b/Client/Packages/com.alicizax.unity.ui.extension @@ -1 +1 @@ -Subproject commit f5a2128622f14c1a6355f72a70392d33f0c7f07d +Subproject commit fb9846d10c45f4322212c23dac92395aa1208e9c diff --git a/Client/ProjectSettings/UIGenerateConfiguration.asset b/Client/ProjectSettings/UIGenerateConfiguration.asset index 819ca8e..6ad654c 100644 --- a/Client/ProjectSettings/UIGenerateConfiguration.asset +++ b/Client/ProjectSettings/UIGenerateConfiguration.asset @@ -73,4 +73,7 @@ MonoBehaviour: GenerateHolderCodePath: Assets/Scripts/Hotfix/GameLogic/UI//Generate UIPrefabRootPath: Assets/Bundles/UI LoadType: 1 - UIScriptGeneratorRuleHelper: AlicizaX.UI.Editor.DefaultUIGeneratorRuleHelper + UIIdentifierFormatterTypeName: + UIResourcePathResolverTypeName: + UIScriptCodeEmitterTypeName: + UIScriptFileWriterTypeName: UnityEngine.UI.UXControllerUIScriptFileWriter