diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes index 75edf4b..3b37b3a 100644 Binary files a/Client/Assets/Test/GameLogic.dll.bytes and b/Client/Assets/Test/GameLogic.dll.bytes differ diff --git a/Client/Assets/Test/GameLogic.pdb.bytes b/Client/Assets/Test/GameLogic.pdb.bytes index a86fce9..cb01ffb 100644 Binary files a/Client/Assets/Test/GameLogic.pdb.bytes and b/Client/Assets/Test/GameLogic.pdb.bytes differ diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework index 03c0fe6..d06c59d 160000 --- a/Client/Packages/com.alicizax.unity.framework +++ b/Client/Packages/com.alicizax.unity.framework @@ -1 +1 @@ -Subproject commit 03c0fe672321abb77b613dbe1883926011d064c6 +Subproject commit d06c59ddf81cf228c7676fb3dc4e619259a39d1d diff --git a/Client/Packages/com.alicizax.unity.ui.extension b/Client/Packages/com.alicizax.unity.ui.extension index 8a0a2b1..fc993a1 160000 --- a/Client/Packages/com.alicizax.unity.ui.extension +++ b/Client/Packages/com.alicizax.unity.ui.extension @@ -1 +1 @@ -Subproject commit 8a0a2b1a00807ac7a51bad0aafc231c996fc232f +Subproject commit fc993a1dbebbbddd5d76f9ba63c68c1909754012 diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt index 451117a..e16aaf3 100644 --- a/Client/UserSettings/Layouts/default-2022.dwlt +++ b/Client/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Inspector + m_Title: Console m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -41,10 +41,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 491 - width: 303 + width: 542 height: 456 - m_MinSize: {x: 51, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 50, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 303 + width: 542 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} @@ -173,7 +173,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 143 + controlID: 153 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,10 +192,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 303 + width: 542 height: 491 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} @@ -219,14 +219,14 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 303 + x: 542 y: 0 - width: 598 + width: 382 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 68 + controlID: 49 draggingID: 0 --- !u!114 &10 MonoBehaviour: @@ -245,10 +245,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 598 + width: 382 height: 461 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -271,7 +271,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 461 - width: 598 + width: 382 height: 486 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} @@ -295,9 +295,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 901 + x: 924 y: 0 - width: 376 + width: 353 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -354,7 +354,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 564 - width: 302 + width: 541 height: 435 m_SerializedDataModeController: m_DataMode: 0 @@ -408,10 +408,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 302 + width: 541 height: 414 - m_Scale: {x: 0.15729167, y: 0.15729167} - m_Translation: {x: 151, y: 207} + m_Scale: {x: 0.28177083, y: 0.28177083} + m_Translation: {x: 270.5, y: 207} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -419,12 +419,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -960 - y: -1316.0265 + y: -734.6396 width: 1920 - height: 2632.053 + height: 1469.2792 m_MinimalGUI: 1 - m_defaultScale: 0.15729167 - m_LastWindowPixelSize: {x: 302, y: 435} + m_defaultScale: 0.28177083 + m_LastWindowPixelSize: {x: 541, y: 435} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -522,7 +522,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 302 + width: 541 height: 470 m_SerializedDataModeController: m_DataMode: 0 @@ -1064,9 +1064,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 579.45624, y: 618.977, z: -1.1704005} + m_Target: {x: 422.91672, y: 565.4434, z: 2.556824} speed: 2 - m_Value: {x: 579.45624, y: 618.977, z: -1.1704005} + m_Value: {x: 422.91672, y: 565.4434, z: 2.556824} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1116,9 +1116,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 310.7893 + m_Target: 248.39851 speed: 2 - m_Value: 310.7893 + m_Value: 248.39851 m_Ortho: m_Target: 1 speed: 2 @@ -1163,9 +1163,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 303 + x: 542 y: 73 - width: 596 + width: 380 height: 440 m_SerializedDataModeController: m_DataMode: 0 @@ -1180,9 +1180,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: a248ffff - m_LastClickedID: -46942 - m_ExpandedIDs: a842fffff247ffffa248ffff8c49ffff704affff4c55ffff6e5cffff7c5cffff62d6ffff72f4ffff96f7ffff08f9ffffbcfaffff6a700000 + m_SelectedIDs: 6c6d0000 + m_LastClickedID: 28012 + m_ExpandedIDs: 04fbffff426d0000546d0000926d0000ba6d0000dc6d0000fe6d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1198,7 +1198,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1226,9 +1226,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 303 + x: 542 y: 534 - width: 596 + width: 380 height: 465 m_SerializedDataModeController: m_DataMode: 0 @@ -1260,9 +1260,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 901 + x: 924 y: 73 - width: 374 + width: 351 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1300,7 +1300,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: + m_ExpandedIDs: 000000007a7100007c7100007e71000080710000827100008471000086710000887100008a7100008c7100008e71000090710000927100009471000096710000987100009a7100009c7100009e710000a0710000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1325,10 +1325,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 1060} + scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000e46e0000f26e0000f46e00003c6f0000367400003c740000487400004a740000507400005274000084770000867700008a7700006a8f0000708f0000748f00004ea3000050a3000052a300000aaa0000ffffff7f + m_ExpandedIDs: ffffffff000000007a7100007c7100007e71000080710000827100008471000086710000887100008a7100008c7100008e71000090710000927100009471000096710000987100009a7100009c7100009e710000a0710000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1425,7 +1425,7 @@ MonoBehaviour: m_ControlHash: 1412526313 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 152 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: