diff --git a/Packages/manifest.json b/Packages/manifest.json index 8f18695..10738f3 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,7 +1,7 @@ { "dependencies": { "com.code-philosophy.hybridclr": "https://gitee.com/focus-creative-games/hybridclr_unity.git", - "com.tuyoogame.yooasset": "2.3.16", + "com.tuyoogame.yooasset": "2.3.17", "com.unity.cinemachine": "2.10.3", "com.unity.collab-proxy": "2.8.1", "com.unity.ide.rider": "3.0.36", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 201d3d0..3b03504 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -8,7 +8,7 @@ "hash": "01754c8fb47bd49697b3428993109e7a972a7968" }, "com.tuyoogame.yooasset": { - "version": "2.3.16", + "version": "2.3.17", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index f810878..2d780a2 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -39,6 +39,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -854 - m_OriginalInstanceId: -858 - m_LoadAssets: 0 + m_UserModificationsInstanceId: -834 + m_OriginalInstanceId: -838 + m_LoadAssets: -1 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index e2baa14..4b1ad2a 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 2560 height: 1349 m_ShowMode: 4 - m_Title: Project + m_Title: Console m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 721} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 42 + controlID: 122 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 43 + controlID: 41 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 44 + controlID: 42 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -194,9 +194,9 @@ MonoBehaviour: height: 787 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 15} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -209,7 +209,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: PackageManagerWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -218,18 +218,16 @@ MonoBehaviour: y: 0 width: 1470 height: 787 - m_MinSize: {x: 202, y: 221} + m_MinSize: {x: 802, y: 271} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} m_Panes: + - {fileID: 14} + - {fileID: 15} - {fileID: 16} - {fileID: 17} - - {fileID: 18} - - {fileID: 13} - - {fileID: 12} - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 2 + m_LastSelected: 4 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,7 +238,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -249,17 +247,17 @@ MonoBehaviour: y: 787 width: 1877 height: 512 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 20} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 12} m_Panes: + - {fileID: 18} + - {fileID: 19} - {fileID: 20} + - {fileID: 12} - {fileID: 21} - - {fileID: 22} - - {fileID: 14} - - {fileID: 23} - m_Selected: 0 - m_LastSelected: 3 + m_Selected: 3 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -281,81 +279,13 @@ MonoBehaviour: height: 1299 m_MinSize: {x: 276, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 22} m_Panes: - - {fileID: 24} - - {fileID: 25} + - {fileID: 22} + - {fileID: 23} m_Selected: 0 m_LastSelected: 1 --- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 66e43420e95cd0b4bae8803a31e9817b, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 800, y: 600} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: AssetBundle Builder - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 407 - y: 73 - width: 1468 - height: 562 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b730ebd685b28964a9f002593751e98a, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 800, y: 600} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: AssetBundle Collector - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 407 - y: 73 - width: 1468 - height: 562 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -390,7 +320,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &15 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -428,9 +358,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 52740000 - m_LastClickedID: 0 - m_ExpandedIDs: 08fbffffda7e0000 + m_SelectedIDs: 0a880000 + m_LastClickedID: 34826 + m_ExpandedIDs: 5ed1ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -454,7 +384,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &16 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -852,7 +782,7 @@ MonoBehaviour: m_Position: m_Target: {x: 0, y: 9991.666, z: 100} speed: 2 - m_Value: {x: 1280, y: 720, z: 0} + m_Value: {x: 0, y: 9991.666, z: 100} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -902,9 +832,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0.04959424, y: 0.36880958, z: -0.019750372, w: 0.9279708} m_Size: - m_Target: 6.4852448 + m_Target: 18.651653 speed: 2 - m_Value: 1468.6047 + m_Value: 18.651653 m_Ortho: m_Target: 0 speed: 2 @@ -929,7 +859,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &17 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -997,7 +927,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1029,7 +959,7 @@ MonoBehaviour: m_XRRenderMode: -1 m_RenderTexture: {fileID: 0} m_showToolbar: 1 ---- !u!114 &18 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1053,7 +983,7 @@ MonoBehaviour: x: 407 y: 73 width: 1468 - height: 562 + height: 766 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1064,7 +994,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &19 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1099,7 +1029,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &20 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1145,7 +1075,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Runtime/YooAsset/WindowLogic + - Assets/Samples/YooAsset m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1153,16 +1083,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Scripts/Runtime/YooAsset/WindowLogic + - Assets/Samples/YooAsset m_LastFoldersGridSize: 16 m_LastProjectPath: C:\UnityProject\BlueArchiveMiniGame m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 105} - m_SelectedIDs: 2a840000 - m_LastClickedID: 33834 - m_ExpandedIDs: 00000000788300009083000096830000d4830000d6830000dc830000e8830000008400001e8400002884000000ca9a3bffffff7f + scrollPos: {x: 0, y: 79} + m_SelectedIDs: b48c0000 + m_LastClickedID: 36020 + m_ExpandedIDs: 000000008a8a00006c8c0000ae8c0000b08c0000b28c0000b48c000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1190,7 +1120,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000078830000 + m_ExpandedIDs: 000000008a8a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1217,22 +1147,22 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000068f1200828d00000c8d0000121d050042e40400b2930000c4fa0400ae0e0500f2ef0400682a4200802a42008a17420050a10000ee090500bc130500eccd000032030000bef80000c2a300000000000040f500007a860000647c0600f2b606001cb7060010170100b6290100e8ae00000aae0400447f0000d283000082ae0000d4beffff66c70000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: PatchWindow - m_OriginalName: PatchWindow + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 33874 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: @@ -1246,7 +1176,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &21 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1370,7 +1300,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &22 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1408,7 +1338,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_LastSelectedObjectID: 130480 ---- !u!114 &23 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1591,7 +1521,7 @@ MonoBehaviour: m_ShowReferencedBuses: 1 m_ShowBusConnections: 0 m_ShowBusConnectionsOfSelection: 0 ---- !u!114 &24 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1639,7 +1569,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &25 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0}