diff --git a/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab b/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab index e1e493d..eb648f5 100644 --- a/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab +++ b/Client/Assets/Bundles/UI/UILoadUpdateWindow.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 6045476244398503520} - component: {fileID: 3754033378428747194} - component: {fileID: 3596253569820580282} + - component: {fileID: 3682956989792047135} m_Layer: 5 m_Name: TestViewHolder m_TagString: Untagged @@ -129,6 +130,54 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: text: {fileID: 5232094481069283953} + _btnTest: {fileID: 3682956989792047135} +--- !u!114 &3682956989792047135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13453462280259649} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7e92b092d584bb39e5239463f064cbe, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 1, g: 0, b: 0, a: 1} + m_PressedColor: {r: 0.36658788, g: 1, b: 0, a: 1} + m_SelectedColor: {r: 1, g: 0, b: 0.97422075, 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: 3754033378428747194} + m_ChildTransitions: [] + hoverAudioClip: {fileID: 0} + clickAudioClip: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &526598954257632073 GameObject: m_ObjectHideFlags: 0 @@ -1105,8 +1154,8 @@ MonoBehaviour: padding: {x: 0, y: 0} scroll: 1 snap: 1 - scrollSpeed: 1 - wheelSpeed: 10 + scrollSpeed: 0.5 + wheelSpeed: 5.5 templates: - {fileID: 3596253569820580282} content: {fileID: 5086806237606523596} @@ -1362,7 +1411,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/RecyclerViewMixedItemRenderExample.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/RecyclerViewMixedItemRenderExample.cs deleted file mode 100644 index 9a1c57f..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/RecyclerViewMixedItemRenderExample.cs +++ /dev/null @@ -1,179 +0,0 @@ -using System; -using AlicizaX.UI; -using TMPro; -using UnityEngine; -using UnityEngine.UI; - -public static class RecyclerViewMixedExample -{ - public const string HeaderViewName = "MixedExampleHeader"; - public const string LeftMessageViewName = "MixedExampleLeftMessage"; - public const string RightMessageViewName = "MixedExampleRightMessage"; - - public static void Register(UGMixedList list) - { - list.RegisterItemRender(HeaderViewName); - list.RegisterItemRender(LeftMessageViewName); - list.RegisterItemRender(RightMessageViewName); - } -} - -public abstract class MixedExampleItemData : IMixedViewData -{ - public string TemplateName { get; set; } -} - -public sealed class MixedExampleHeaderData : MixedExampleItemData -{ - public string Title; - - public MixedExampleHeaderData() - { - TemplateName = RecyclerViewMixedExample.HeaderViewName; - } -} - -public sealed class MixedExampleLeftMessageData : MixedExampleItemData -{ - public string Message; - - public MixedExampleLeftMessageData() - { - TemplateName = RecyclerViewMixedExample.LeftMessageViewName; - } -} - -public sealed class MixedExampleRightMessageData : MixedExampleItemData -{ - public string Message; - - public MixedExampleRightMessageData() - { - TemplateName = RecyclerViewMixedExample.RightMessageViewName; - } -} - -public sealed class MixedExampleHeaderViewHolder : InteractiveViewHolder -{ - [SerializeField] private TextMeshProUGUI title; - - public TextMeshProUGUI Title => title; -} - -public abstract class MixedExampleMessageViewHolder : InteractiveViewHolder -{ - [SerializeField] private Image background; - [SerializeField] private TextMeshProUGUI message; - - public TextMeshProUGUI Message => message; - public Image Background => background; -} - -public sealed class MixedExampleLeftMessageViewHolder : MixedExampleMessageViewHolder -{ -} - -public sealed class MixedExampleRightMessageViewHolder : MixedExampleMessageViewHolder -{ -} - -public sealed class MixedExampleHeaderItemRender : ItemRender -{ - public MixedExampleHeaderItemRender(MixedExampleHeaderViewHolder holder) : base(holder) - { - } - - protected override void Bind(MixedExampleHeaderData data, int index) - { - Holder.Title.text = data.Title; - } -} - -public abstract class MixedExampleMessageItemRender : ItemRender - where THolder : MixedExampleMessageViewHolder - where TData : MixedExampleItemData -{ - private static readonly Color NormalColor = Color.white; - private static readonly Color HoverColor = new(0.9f, 0.9f, 0.9f, 1f); - private static readonly Color SelectedColor = new(1f, 0.95f, 0.75f, 1f); - - private bool hovered; - private bool selected; - - protected MixedExampleMessageItemRender(THolder holder) : base(holder) - { - } - - protected override void Bind(TData data, int index) - { - Holder.Message.text = GetMessage(data); - ApplyBackgroundColor(); - } - - protected override void OnSelectionChanged(bool isSelected) - { - selected = isSelected; - ApplyBackgroundColor(); - } - - protected override void OnClear() - { - hovered = false; - selected = false; - ApplyBackgroundColor(); - } - - protected override void OnPointerEnter() - { - hovered = true; - ApplyBackgroundColor(); - } - - protected override void OnPointerExit() - { - hovered = false; - ApplyBackgroundColor(); - } - - protected abstract string GetMessage(TData data); - - private void ApplyBackgroundColor() - { - if (Holder.Background == null) - { - return; - } - - if (selected) - { - Holder.Background.color = SelectedColor; - return; - } - - Holder.Background.color = hovered ? HoverColor : NormalColor; - } -} - -public sealed class MixedExampleLeftMessageItemRender : MixedExampleMessageItemRender -{ - public MixedExampleLeftMessageItemRender(MixedExampleLeftMessageViewHolder holder) : base(holder) - { - } - - protected override string GetMessage(MixedExampleLeftMessageData data) - { - return data.Message; - } -} - -public sealed class MixedExampleRightMessageItemRender : MixedExampleMessageItemRender -{ - public MixedExampleRightMessageItemRender(MixedExampleRightMessageViewHolder holder) : base(holder) - { - } - - protected override string GetMessage(MixedExampleRightMessageData data) - { - return data.Message; - } -} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/RecyclerViewMixedItemRenderExample.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/UI/RecyclerViewMixedItemRenderExample.cs.meta deleted file mode 100644 index ecdc972..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/RecyclerViewMixedItemRenderExample.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fa788c7b66e75b44bae8fbc40e1eea8f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollItemRender.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollItemRender.cs index 6a12ccd..e7af577 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollItemRender.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollItemRender.cs @@ -1,19 +1,85 @@ using AlicizaX; using AlicizaX.UI; +using UnityEngine.EventSystems; public sealed class TestScrollItemRender : ItemRender { - public TestScrollItemRender(TestScrollViewHolder holder) : base(holder) + public override ItemInteractionFlags InteractionFlags => + ItemInteractionFlags.PointerClick | + ItemInteractionFlags.PointerEnter | + ItemInteractionFlags.PointerExit | + ItemInteractionFlags.Select | + ItemInteractionFlags.Deselect | + ItemInteractionFlags.Submit | + ItemInteractionFlags.Move; + + protected override void OnHolderAttached() { + base.OnHolderAttached(); + Holder.BtnTest.onClick.AddListener(OnInnerButtonClick); } - protected override void Bind(TestData data, int index) + protected override void OnHolderDetached() + { + Holder.BtnTest.onClick.RemoveListener(OnInnerButtonClick); + } + + protected override void OnBind(TestData data, int index) { Holder.Text.text = data.Name; } - protected override void OnClick() + protected override void OnPointerClick(PointerEventData eventData) { - Log.Info(CurrentData.Name + " is clicked"); + Log.Info(CurrentData.Name + " item clicked"); + } + + protected override void OnPointerEnter(PointerEventData eventData) + { + Holder.Text.fontStyle = TMPro.FontStyles.Bold; + // Log.Info(CurrentData.Name + " Pointer Enter"); + } + + protected override void OnPointerExit(PointerEventData eventData) + { + Holder.Text.fontStyle = TMPro.FontStyles.Normal; + // Log.Info(CurrentData.Name + " Pointer Exit"); + } + + protected override void OnItemSelected(BaseEventData eventData) + { + Holder.Text.color = UnityEngine.Color.yellow; + Log.Info(CurrentData.Name + " Selected"); + } + + protected override void OnItemDeselected(BaseEventData eventData) + { + Holder.Text.color = UnityEngine.Color.black; + Log.Info(CurrentData.Name + " OnItemDeselected"); + } + + protected override void OnSubmit(BaseEventData eventData) + { + Log.Info(CurrentData.Name + " submitted"); + } + + protected override void OnSelectionChanged(bool selected) + { + if (selected) + { + Log.Info(CurrentData.Name + $" selection changed {selected}"); + } + } + + protected override void OnClear() + { + base.OnClear(); + Holder.Text.fontStyle = TMPro.FontStyles.Normal; + Holder.Text.color = UnityEngine.Color.black; + } + + private void OnInnerButtonClick() + { + Log.Info(CurrentData.Name + " button clicked"); } } diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollViewHolder.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollViewHolder.cs index 42e1ff0..fea4d73 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollViewHolder.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/TestScrollViewHolder.cs @@ -1,10 +1,13 @@ using AlicizaX.UI; using TMPro; using UnityEngine; +using UnityEngine.UI; -public class TestScrollViewHolder : InteractiveViewHolder +public class TestScrollViewHolder : ViewHolder { [SerializeField] private TextMeshProUGUI text; public TextMeshProUGUI Text => text; + [SerializeField] private UXButton _btnTest; + public UXButton BtnTest => _btnTest; } diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs index 050756c..7b70e7f 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs @@ -26,13 +26,7 @@ public class UILoadUpdate : UITabWindow _list.RegisterItemRender(); baseui.ImgBackGround.color = Color.gray; baseui.BtnTest.onClick.AddListener(OnTestClick); - List testDataList = new List(); - for (int i = 0; i < 3; i++) - { - testDataList.Add(new TestData() { Name = $"TestProp:{i}" }); - } - - _list.Data = testDataList; + SetListAndFocusFirst(CreateTestDataList(1000000)); baseui.BtnQTest.onClick.AddListener(OnBtnQTestClick); baseui.BtnEscTest.onClick.AddListener(OnBtnEscTestClick); @@ -41,11 +35,7 @@ public class UILoadUpdate : UITabWindow private void OnBtnETestClick() { - List testDataList = new List(); - for (int i = 0; i < 4; i++) - { - testDataList.Add(new TestData() { Name = $"TestProp:{i}" }); - } + SetListAndFocusFirst(CreateTestDataList(4000)); Log.Info("Btn E Click"); } @@ -57,14 +47,31 @@ public class UILoadUpdate : UITabWindow private void OnBtnQTestClick() { - List testDataList = new List(); - for (int i = 0; i < 30; i++) + SetListAndFocusFirst(CreateTestDataList(30000)); + Log.Info("Btn Q Click"); + } + + private static List CreateTestDataList(int count) + { + List testDataList = new List(count); + for (int i = 0; i < count; i++) { testDataList.Add(new TestData() { Name = $"TestProp:{i}" }); } - _list.Data = testDataList; - Log.Info("Btn Q Click"); + return testDataList; + } + + private void SetListAndFocusFirst(List dataList) + { + _list.Data = dataList; + FocusFirstItemAsync().Forget(); + } + + private async UniTaskVoid FocusFirstItemAsync() + { + await UniTask.NextFrame(); + _list.RecyclerView.TryFocusIndex(0); } protected override void OnRegisterEvent(EventListenerProxy proxy) diff --git a/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes index ccaba2a..f97c129 100644 Binary files a/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes and b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes differ diff --git a/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.hash b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.hash index a0d8145..e8045ca 100644 --- a/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.hash +++ b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.hash @@ -1 +1 @@ -662b785d \ No newline at end of file +2a2af379 \ No newline at end of file diff --git a/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.json b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.json index e87df61..fbae8d4 100644 --- a/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.json +++ b/Client/Bundles/StandaloneWindows64/DefaultPackage/Simulate/DefaultPackage_Simulate.json @@ -10,7 +10,7 @@ "BuildPipeline": "EditorSimulateBuildPipeline", "PackageName": "DefaultPackage", "PackageVersion": "Simulate", - "PackageNote": "2026/3/27 18:08:01", + "PackageNote": "2026/3/31 16:14:42", "AssetList": [ { "Address": "Click", @@ -162,7 +162,7 @@ "UnityCRC": 0, "FileHash": "9ff2ef11fc95cbce9b51368acd1d4383", "FileCRC": 0, - "FileSize": 63498, + "FileSize": 63485, "Encrypted": false, "Tags": [ "UI" diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework index 9bcf20a..5188a9c 160000 --- a/Client/Packages/com.alicizax.unity.framework +++ b/Client/Packages/com.alicizax.unity.framework @@ -1 +1 @@ -Subproject commit 9bcf20ad6a470a8043ede1693e9e808d8e07799d +Subproject commit 5188a9c35fb10a85c8018fe4d92cbe30e3f0666f diff --git a/Client/Packages/com.alicizax.unity.ui.extension b/Client/Packages/com.alicizax.unity.ui.extension index 4008063..dc8c840 160000 --- a/Client/Packages/com.alicizax.unity.ui.extension +++ b/Client/Packages/com.alicizax.unity.ui.extension @@ -1 +1 @@ -Subproject commit 40080636d8b4d106ed65955ea4b75f70bef4904f +Subproject commit dc8c840d692e83d525655cf657fcc9d1ff069a36 diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt index dc2ac56..8e53835 100644 --- a/Client/UserSettings/Layouts/default-2022.dwlt +++ b/Client/UserSettings/Layouts/default-2022.dwlt @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 43 + x: 1920 + y: 48 width: 1920 height: 997 m_ShowMode: 4 @@ -40,11 +40,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 338 - width: 411 - height: 609 - m_MinSize: {x: 50, y: 50} - m_MaxSize: {x: 4000, y: 4000} + y: 360 + width: 818 + height: 587 + m_MinSize: {x: 51, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -70,7 +70,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 411 + width: 818 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} @@ -174,7 +174,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 151 + controlID: 156 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -193,10 +193,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 411 - height: 338 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 818 + height: 360 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -219,9 +219,9 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 411 + x: 818 y: 0 - width: 293 + width: 512 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} @@ -245,8 +245,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 293 - height: 373 + width: 512 + height: 465 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} @@ -270,9 +270,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 373 - width: 293 - height: 574 + y: 465 + width: 512 + height: 482 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} @@ -295,9 +295,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 704 + x: 1330 y: 0 - width: 575 + width: 130 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -321,12 +321,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1279 + x: 1460 y: 0 - width: 641 + width: 460 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -352,10 +352,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 411 - width: 410 - height: 588 + x: 1920 + y: 438 + width: 817 + height: 566 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -408,10 +408,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 410 - height: 567 - m_Scale: {x: 0.21354167, y: 0.21354167} - m_Translation: {x: 205, y: 283.5} + width: 817 + height: 545 + m_Scale: {x: 0.42552084, y: 0.42552084} + m_Translation: {x: 408.5, y: 272.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -419,12 +419,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -960 - y: -1327.6097 + y: -640.39166 width: 1920 - height: 2655.2195 + height: 1280.7833 m_MinimalGUI: 1 - m_defaultScale: 0.21354167 - m_LastWindowPixelSize: {x: 410, y: 588} + m_defaultScale: 0.42552084 + m_LastWindowPixelSize: {x: 817, y: 566} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -520,10 +520,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 73 - width: 410 - height: 317 + x: 1920 + y: 78 + width: 817 + height: 339 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -578,7 +578,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -616,7 +616,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -111, y: -131} + snapOffset: {x: -111, y: -106} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Orientation @@ -630,7 +630,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -656,7 +656,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Constraints index: 1 @@ -669,7 +669,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Collisions index: 2 @@ -721,7 +721,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Occlusion Culling index: 3 @@ -734,7 +734,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Physics Debugger index: 4 @@ -747,7 +747,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Scene Visibility index: 5 @@ -760,7 +760,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Particles index: 6 @@ -1056,7 +1056,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_WindowGUID: f6827acf47ff6e841a7f3bef03f3908f m_Gizmos: 1 - m_OverrideSceneCullingMask: 0 + m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 1 @@ -1064,9 +1064,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1539.4205, y: 557.68085, z: 9.765504} + m_Target: {x: 1003.8969, y: 1001.6229, z: 212.76372} speed: 2 - m_Value: {x: 998.3771, y: 1000.3188, z: 671.488} + m_Value: {x: 1003.8969, y: 1001.6229, z: 212.76372} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1096,7 +1096,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -1114,11 +1114,11 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.000000006657127, y: 0.00000006869945, z: -0.000000016071727, w: -0.99999994} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 492.05862 + m_Target: 4.8635325 speed: 2 - m_Value: 10 + m_Value: 4.8635325 m_Ortho: m_Target: 1 speed: 2 @@ -1163,10 +1163,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 411 - y: 73 - width: 291 - height: 352 + x: 2738 + y: 78 + width: 510 + height: 444 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1180,9 +1180,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 84730000 - m_LastClickedID: 29572 - m_ExpandedIDs: acbbffffc2bbffff847300008e73000090730000cc730000de730000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 8c4fffffb44fffff9651ffffba51ffffc251ffff928dffff9e8dffffc68dffffa88fffffcc8fffffd48fffff28fbfffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1226,10 +1226,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 411 - y: 446 - width: 291 - height: 553 + x: 2738 + y: 543 + width: 510 + height: 461 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1260,9 +1260,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 704 - y: 73 - width: 573 + x: 3250 + y: 78 + width: 128 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1301,7 +1301,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: 000000007e020000586a00005a6a00005c6a00005e6a0000606a0000626a0000646a0000666a0000686a00006a6a00006c6a00006e6a0000706a0000726a0000746a0000766a0000786a00007a6a00007c6a00007e6a0000806a0000826a0000846a0000866a0000886a00008a6a00008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000be6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000 + m_ExpandedIDs: 000000007e020000606a0000626a0000646a0000666a0000686a00006a6a00006c6a00006e6a0000706a0000726a0000746a0000766a0000786a00007a6a00007c6a00007e6a0000806a0000826a0000846a0000866a0000886a00008a6a00008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000be6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000206b0000226b0000246b0000266b0000286b00002a6b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1329,18 +1329,18 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000007e020000586a00005a6a00005c6a00005e6a0000606a0000626a0000646a0000666a0000686a00006a6a00006c6a00006e6a0000706a0000726a0000746a0000766a0000786a00007a6a00007c6a00007e6a0000806a0000826a0000846a0000866a0000886a00008a6a00008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000be6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b00003a6d0000566d0000326f0000ffffff7f + m_ExpandedIDs: ffffffff000000007e020000606a0000626a0000646a0000666a0000686a00006a6a00006c6a00006e6a0000706a0000726a0000746a0000766a0000786a00007a6a00007c6a00007e6a0000806a0000826a0000846a0000866a0000886a00008a6a00008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000be6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000206b0000226b0000246b0000266b0000286b00002a6b0000306d0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: TestScrollItemBinder - m_OriginalName: TestScrollItemBinder + m_Name: UILoadUpdateWindow + m_OriginalName: UILoadUpdateWindow m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 28438 + m_UserData: 27948 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0 @@ -1405,9 +1405,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1279 - y: 73 - width: 640 + x: 3380 + y: 78 + width: 459 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1422,7 +1422,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: -151 + m_CachedPref: 282 m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1