From 423ad80303440dd00d352b21d902e37bf002a53c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=B3=95=E6=89=8B=E7=88=B1=E4=B8=BD?= =?UTF-8?q?=E4=B8=9D?= <1747715394@qq.com> Date: Thu, 25 Sep 2025 07:54:42 +0800 Subject: [PATCH] inputsystem --- .../Input System/{1.11.2.meta => 1.14.2.meta} | 2 +- .../On-Screen Controls.meta | 2 +- .../On-Screen Controls/.sample.json | 0 .../On-Screen Controls/Button.prefab | 0 .../On-Screen Controls/Button.prefab.meta | 0 .../OnScreenControlsSample.unity | 84 +++++-- .../OnScreenControlsSample.unity.meta | 0 .../1.14.2/On-Screen Controls/ScreenTest.cs | 25 ++ .../On-Screen Controls/ScreenTest.cs.meta | 11 + .../ScreenTest.inputactions | 90 +++++++ .../ScreenTest.inputactions.meta | 14 ++ .../On-Screen Controls/Stick.prefab | 0 .../On-Screen Controls/Stick.prefab.meta | 0 .../virtual joystick(inner_direction).png | Bin 0 -> 5920 bytes ...virtual joystick(inner_direction).png.meta | 140 +++++++++++ .../virtual joystick(inner_stick).png | Bin 0 -> 5205 bytes .../virtual joystick(inner_stick).png.meta | 140 +++++++++++ .../virtual joystick(outer).png | Bin 0 -> 6764 bytes .../virtual joystick(outer).png.meta | 140 +++++++++++ .../FsmNode/FsmInitializePackage.cs | 3 +- Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- UserSettings/EditorUserSettings.asset | 4 +- UserSettings/Layouts/default-2022.dwlt | 236 +++++++++--------- 24 files changed, 755 insertions(+), 140 deletions(-) rename Assets/Samples/Input System/{1.11.2.meta => 1.14.2.meta} (77%) rename Assets/Samples/Input System/{1.11.2 => 1.14.2}/On-Screen Controls.meta (77%) rename Assets/Samples/Input System/{1.11.2 => 1.14.2}/On-Screen Controls/.sample.json (100%) rename Assets/Samples/Input System/{1.11.2 => 1.14.2}/On-Screen Controls/Button.prefab (100%) rename Assets/Samples/Input System/{1.11.2 => 1.14.2}/On-Screen Controls/Button.prefab.meta (100%) rename Assets/Samples/Input System/{1.11.2 => 1.14.2}/On-Screen Controls/OnScreenControlsSample.unity (95%) rename Assets/Samples/Input System/{1.11.2 => 1.14.2}/On-Screen Controls/OnScreenControlsSample.unity.meta (100%) create mode 100644 Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.cs create mode 100644 Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.cs.meta create mode 100644 Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.inputactions create mode 100644 Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.inputactions.meta rename Assets/Samples/Input System/{1.11.2 => 1.14.2}/On-Screen Controls/Stick.prefab (100%) rename Assets/Samples/Input System/{1.11.2 => 1.14.2}/On-Screen Controls/Stick.prefab.meta (100%) create mode 100644 Assets/Samples/Input System/1.14.2/On-Screen Controls/virtual joystick(inner_direction).png create mode 100644 Assets/Samples/Input System/1.14.2/On-Screen Controls/virtual joystick(inner_direction).png.meta create mode 100644 Assets/Samples/Input System/1.14.2/On-Screen Controls/virtual joystick(inner_stick).png create mode 100644 Assets/Samples/Input System/1.14.2/On-Screen Controls/virtual joystick(inner_stick).png.meta create mode 100644 Assets/Samples/Input System/1.14.2/On-Screen Controls/virtual joystick(outer).png create mode 100644 Assets/Samples/Input System/1.14.2/On-Screen Controls/virtual joystick(outer).png.meta diff --git a/Assets/Samples/Input System/1.11.2.meta b/Assets/Samples/Input System/1.14.2.meta similarity index 77% rename from Assets/Samples/Input System/1.11.2.meta rename to Assets/Samples/Input System/1.14.2.meta index fea2062..2cfccd8 100644 --- a/Assets/Samples/Input System/1.11.2.meta +++ b/Assets/Samples/Input System/1.14.2.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 33d1d1de2b08eeb428c8fede1d72d491 +guid: c7c7eca2bbe1dc942a123f6a5fe5a311 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/Input System/1.11.2/On-Screen Controls.meta b/Assets/Samples/Input System/1.14.2/On-Screen Controls.meta similarity index 77% rename from Assets/Samples/Input System/1.11.2/On-Screen Controls.meta rename to Assets/Samples/Input System/1.14.2/On-Screen Controls.meta index 318c82f..d719043 100644 --- a/Assets/Samples/Input System/1.11.2/On-Screen Controls.meta +++ b/Assets/Samples/Input System/1.14.2/On-Screen Controls.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 52f5ef460eb812f45aea704521436394 +guid: ef0dcdc7afabd48488f6b1fdac696b67 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/Input System/1.11.2/On-Screen Controls/.sample.json b/Assets/Samples/Input System/1.14.2/On-Screen Controls/.sample.json similarity index 100% rename from Assets/Samples/Input System/1.11.2/On-Screen Controls/.sample.json rename to Assets/Samples/Input System/1.14.2/On-Screen Controls/.sample.json diff --git a/Assets/Samples/Input System/1.11.2/On-Screen Controls/Button.prefab b/Assets/Samples/Input System/1.14.2/On-Screen Controls/Button.prefab similarity index 100% rename from Assets/Samples/Input System/1.11.2/On-Screen Controls/Button.prefab rename to Assets/Samples/Input System/1.14.2/On-Screen Controls/Button.prefab diff --git a/Assets/Samples/Input System/1.11.2/On-Screen Controls/Button.prefab.meta b/Assets/Samples/Input System/1.14.2/On-Screen Controls/Button.prefab.meta similarity index 100% rename from Assets/Samples/Input System/1.11.2/On-Screen Controls/Button.prefab.meta rename to Assets/Samples/Input System/1.14.2/On-Screen Controls/Button.prefab.meta diff --git a/Assets/Samples/Input System/1.11.2/On-Screen Controls/OnScreenControlsSample.unity b/Assets/Samples/Input System/1.14.2/On-Screen Controls/OnScreenControlsSample.unity similarity index 95% rename from Assets/Samples/Input System/1.11.2/On-Screen Controls/OnScreenControlsSample.unity rename to Assets/Samples/Input System/1.14.2/On-Screen Controls/OnScreenControlsSample.unity index 0a9dde7..979769f 100644 --- a/Assets/Samples/Input System/1.11.2/On-Screen Controls/OnScreenControlsSample.unity +++ b/Assets/Samples/Input System/1.14.2/On-Screen Controls/OnScreenControlsSample.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +103,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +116,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -128,7 +127,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 1993296955} m_Modifications: - target: {fileID: 1613174875475300, guid: f77f88b14a477764bb65a49d28c02d33, type: 3} @@ -140,6 +139,16 @@ PrefabInstance: propertyPath: m_Behaviour value: 2 objectReference: {fileID: 0} + - target: {fileID: 114480945186419424, guid: f77f88b14a477764bb65a49d28c02d33, + type: 3} + propertyPath: m_MovementRange + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 114480945186419424, guid: f77f88b14a477764bb65a49d28c02d33, + type: 3} + propertyPath: m_DynamicOriginRange + value: 300 + objectReference: {fileID: 0} - target: {fileID: 114480945186419424, guid: f77f88b14a477764bb65a49d28c02d33, type: 3} propertyPath: m_DynamicOriginClickable @@ -236,14 +245,16 @@ PrefabInstance: value: -129 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f77f88b14a477764bb65a49d28c02d33, type: 3} --- !u!1001 &213445084 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 1993296955} m_Modifications: - target: {fileID: 1728513650105062, guid: 05f32eddd3e41fd4597ada617b785928, type: 3} @@ -351,7 +362,9 @@ PrefabInstance: value: 172 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 05f32eddd3e41fd4597ada617b785928, type: 3} --- !u!224 &223523015 stripped RectTransform: @@ -364,7 +377,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 1993296955} m_Modifications: - target: {fileID: 1728513650105062, guid: 05f32eddd3e41fd4597ada617b785928, type: 3} @@ -472,7 +485,9 @@ PrefabInstance: value: 27 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 05f32eddd3e41fd4597ada617b785928, type: 3} --- !u!224 &334844326 stripped RectTransform: @@ -520,9 +535,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -556,13 +579,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!224 &703313166 stripped RectTransform: @@ -575,7 +598,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 1993296955} m_Modifications: - target: {fileID: 1728513650105062, guid: 05f32eddd3e41fd4597ada617b785928, type: 3} @@ -693,7 +716,9 @@ PrefabInstance: value: 102 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 05f32eddd3e41fd4597ada617b785928, type: 3} --- !u!224 &827737258 stripped RectTransform: @@ -706,7 +731,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 1993296955} m_Modifications: - target: {fileID: 1728513650105062, guid: 05f32eddd3e41fd4597ada617b785928, type: 3} @@ -814,7 +839,9 @@ PrefabInstance: value: 102 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 05f32eddd3e41fd4597ada617b785928, type: 3} --- !u!224 &1467932573 stripped RectTransform: @@ -852,6 +879,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_MoveRepeatDelay: 0.5 m_MoveRepeatRate: 0.1 m_XRTrackingOrigin: {fileID: 0} @@ -880,6 +908,7 @@ MonoBehaviour: m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 --- !u!114 &1554469710 MonoBehaviour: m_ObjectHideFlags: 0 @@ -902,20 +931,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1554469708} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1763776550 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 1993296955} m_Modifications: - target: {fileID: 1613174875475300, guid: f77f88b14a477764bb65a49d28c02d33, type: 3} @@ -1023,7 +1052,9 @@ PrefabInstance: value: -129 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f77f88b14a477764bb65a49d28c02d33, type: 3} --- !u!224 &1763776551 stripped RectTransform: @@ -1043,6 +1074,7 @@ GameObject: - component: {fileID: 1993296954} - component: {fileID: 1993296953} - component: {fileID: 1993296952} + - component: {fileID: 1993296956} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -1107,6 +1139,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 @@ -1131,13 +1164,26 @@ RectTransform: - {fileID: 223523015} - {fileID: 1763776551} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1993296956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1993296951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 767ac046d7548884fbcdf52387051c95, type: 3} + m_Name: + m_EditorClassIdentifier: + inputAction: {fileID: 2145626033925996126, guid: efc74d62e0aa605438ae41c388786ef8, + type: 3} --- !u!850595691 &2075976824 LightingSettings: m_ObjectHideFlags: 0 @@ -1145,7 +1191,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 5 + serializedVersion: 6 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -1154,7 +1200,7 @@ LightingSettings: m_AlbedoBoost: 1 m_IndirectOutputScale: 1 m_UsingShadowmask: 1 - m_BakeBackend: 0 + m_BakeBackend: 1 m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 @@ -1201,3 +1247,11 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRTiledBaking: 0 m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 519420032} + - {fileID: 1993296955} + - {fileID: 1554469711} diff --git a/Assets/Samples/Input System/1.11.2/On-Screen Controls/OnScreenControlsSample.unity.meta b/Assets/Samples/Input System/1.14.2/On-Screen Controls/OnScreenControlsSample.unity.meta similarity index 100% rename from Assets/Samples/Input System/1.11.2/On-Screen Controls/OnScreenControlsSample.unity.meta rename to Assets/Samples/Input System/1.14.2/On-Screen Controls/OnScreenControlsSample.unity.meta diff --git a/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.cs b/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.cs new file mode 100644 index 0000000..e7deb65 --- /dev/null +++ b/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.InputSystem; +public class ScreenTest : MonoBehaviour +{ + public InputActionReference inputAction; + // Start is called before the first frame update + void Start() + { + inputAction.action.Enable(); + inputAction.action.performed += ScreenTouchTest; + } + + private void ScreenTouchTest(InputAction.CallbackContext obj) + { + Debug.Log(obj); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.cs.meta b/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.cs.meta new file mode 100644 index 0000000..00c5dc1 --- /dev/null +++ b/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 767ac046d7548884fbcdf52387051c95 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.inputactions b/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.inputactions new file mode 100644 index 0000000..d4ff511 --- /dev/null +++ b/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.inputactions @@ -0,0 +1,90 @@ +{ + "version": 1, + "name": "ScreenTest", + "maps": [ + { + "name": "Test1", + "id": "af853643-22ee-4a20-af5b-1bfce4074a19", + "actions": [ + { + "name": "New action", + "type": "PassThrough", + "id": "f7d941e0-1a68-4aad-8070-04ae19623849", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "7694cafd-b08a-4f65-83db-30b62c848ddf", + "path": "", + "interactions": "", + "processors": "", + "groups": "", + "action": "New action", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "2D Vector", + "id": "a81e4b4c-1ab8-4e1b-a6bb-2be79b84c847", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "New action", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "f9d730e1-24c4-4952-aa00-332bace15ef5", + "path": "/leftStick/up", + "interactions": "", + "processors": "", + "groups": "", + "action": "New action", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "59625d4b-3852-460c-b0c5-a43546c0022d", + "path": "/dpad/down", + "interactions": "", + "processors": "", + "groups": "", + "action": "New action", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "faa80873-2ac6-49ee-b9c3-19db00071e41", + "path": "/dpad/left", + "interactions": "", + "processors": "", + "groups": "", + "action": "New action", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "f11b129c-1693-4f8a-9cdd-9108a1b3fdb5", + "path": "/dpad/right", + "interactions": "", + "processors": "", + "groups": "", + "action": "New action", + "isComposite": false, + "isPartOfComposite": true + } + ] + } + ], + "controlSchemes": [] +} \ No newline at end of file diff --git a/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.inputactions.meta b/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.inputactions.meta new file mode 100644 index 0000000..5e2260f --- /dev/null +++ b/Assets/Samples/Input System/1.14.2/On-Screen Controls/ScreenTest.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: efc74d62e0aa605438ae41c388786ef8 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Assets/Samples/Input System/1.11.2/On-Screen Controls/Stick.prefab b/Assets/Samples/Input System/1.14.2/On-Screen Controls/Stick.prefab similarity index 100% rename from Assets/Samples/Input System/1.11.2/On-Screen Controls/Stick.prefab rename to Assets/Samples/Input System/1.14.2/On-Screen Controls/Stick.prefab diff --git a/Assets/Samples/Input System/1.11.2/On-Screen Controls/Stick.prefab.meta b/Assets/Samples/Input System/1.14.2/On-Screen Controls/Stick.prefab.meta similarity index 100% rename from Assets/Samples/Input System/1.11.2/On-Screen Controls/Stick.prefab.meta rename to Assets/Samples/Input System/1.14.2/On-Screen Controls/Stick.prefab.meta diff --git a/Assets/Samples/Input System/1.14.2/On-Screen Controls/virtual joystick(inner_direction).png b/Assets/Samples/Input System/1.14.2/On-Screen Controls/virtual joystick(inner_direction).png new file mode 100644 index 0000000000000000000000000000000000000000..5771216fe1e5f7a427c4302dc9721ef1378c4fb8 GIT binary patch literal 5920 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 literal 0 HcmV?d00001 diff --git a/Assets/Samples/Input System/1.14.2/On-Screen Controls/virtual joystick(outer).png.meta b/Assets/Samples/Input System/1.14.2/On-Screen Controls/virtual joystick(outer).png.meta new file mode 100644 index 0000000..0fa57fd --- /dev/null +++ b/Assets/Samples/Input System/1.14.2/On-Screen Controls/virtual joystick(outer).png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 894062b635dc9a54bb9df1c208d32c79 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Runtime/YooAsset/PatchLogic/FsmNode/FsmInitializePackage.cs b/Assets/Scripts/Runtime/YooAsset/PatchLogic/FsmNode/FsmInitializePackage.cs index 50adf09..39b4d70 100644 --- a/Assets/Scripts/Runtime/YooAsset/PatchLogic/FsmNode/FsmInitializePackage.cs +++ b/Assets/Scripts/Runtime/YooAsset/PatchLogic/FsmNode/FsmInitializePackage.cs @@ -119,7 +119,8 @@ internal class FsmInitializePackage : IStateNode string appVersion = "v1"; #if UNITY_EDITOR if (UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.Android) - return $"{hostServerIP}/CDN/Android/{packageName}/{appVersion}"; + // return $"{hostServerIP}/CDN/Android/{packageName}/{appVersion}"; + return $"{hostServerIP}/CDN/PC/{packageName}/{appVersion}"; else if (UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.iOS) return $"{hostServerIP}/CDN/IPhone/{packageName}/{appVersion}"; else if (UnityEditor.EditorUserBuildSettings.activeBuildTarget == UnityEditor.BuildTarget.WebGL) diff --git a/Packages/manifest.json b/Packages/manifest.json index 200e2a5..7bba2ee 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.ide.rider": "3.0.36", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.14.0", + "com.unity.inputsystem": "1.14.2", "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.render-pipelines.universal": "14.0.12", "com.unity.test-framework": "1.1.33", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 68164d8..fef5e49 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -78,7 +78,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.14.0", + "version": "1.14.2", "depth": 0, "source": "registry", "dependencies": { diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f722bc0..7f22b6b 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 550256005d025d58090c082113735e4447164c7b797925672b2f1935e1b6326b flags: 0 RecentlyUsedSceneGuid-1: - value: 5300050454035b5f590a0d2341705c441715487929717231297d4a31bab26160 + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedSceneGuid-2: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 5300050454035b5f590a0d2341705c441715487929717231297d4a31bab26160 flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index dbc73ac..05d4aef 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -15,9 +15,9 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43.2 - width: 2048 - height: 1188.8 + y: 43 + width: 2560 + height: 1349 m_ShowMode: 4 m_Title: Hierarchy m_RootView: {fileID: 2} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2048 - height: 1188.8 + width: 2560 + height: 1349 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2048 + width: 2560 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1168.8 - width: 2048 + y: 1329 + width: 2560 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 2048 - height: 1138.8 + width: 2560 + height: 1299 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 41 + controlID: 88 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1502.4 - height: 1138.8 + width: 1877 + height: 1299 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 42 + controlID: 43 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -166,12 +166,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1502.4 - height: 748 + width: 1877 + height: 853 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 43 + controlID: 44 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -190,8 +190,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 326.4 - height: 748 + width: 407 + height: 853 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -209,18 +209,18 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 326.4 + x: 407 y: 0 - width: 1176 - height: 748 + width: 1470 + height: 853 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 14} - {fileID: 12} @@ -229,8 +229,8 @@ MonoBehaviour: - {fileID: 17} - {fileID: 18} - {fileID: 19} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -247,9 +247,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 748 - width: 1502.4 - height: 390.80005 + y: 853 + width: 1877 + height: 446 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 20} @@ -275,12 +275,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1502.4 + x: 1877 y: 0 - width: 545.6 - height: 1138.8 - m_MinSize: {x: 275, y: 100} - m_MaxSize: {x: 4000, y: 4000} + width: 683 + height: 1299 + m_MinSize: {x: 276, y: 121} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 24} m_Panes: - {fileID: 24} @@ -303,15 +303,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 326.4 - y: 73.6 - width: 1174 - height: 727 + x: 407 + y: 73 + width: 1468 + height: 832 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -343,10 +343,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -1024 - m_HBaseRangeMax: 1024 - m_VBaseRangeMin: -576 - m_VBaseRangeMax: 576 + m_HBaseRangeMin: -1280 + m_HBaseRangeMax: 1280 + m_VBaseRangeMin: -720 + m_VBaseRangeMax: 720 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -364,23 +364,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1174 - height: 706 - m_Scale: {x: 0.5732422, y: 0.5732422} - m_Translation: {x: 587, y: 353} + width: 1468 + height: 811 + m_Scale: {x: 0.56319445, y: 0.56319445} + m_Translation: {x: 734, y: 405.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1024 - y: -615.7956 - width: 2048 - height: 1231.5912 + x: -1303.2799 + y: -720 + width: 2606.5598 + height: 1440 m_MinimalGUI: 1 - m_defaultScale: 0.5732422 - m_LastWindowPixelSize: {x: 1467.5, y: 908.75} + m_defaultScale: 0.56319445 + m_LastWindowPixelSize: {x: 1468, y: 832} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000000000000 @@ -403,15 +403,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 73.6 - width: 325.4 - height: 727 + y: 73 + width: 406 + height: 832 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -427,7 +427,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 387bffff108affff268bffff2092ffff2aa1ffff3ea2ffff1ca9ffff0abbffff1ebcffff18c3ffffe6d4ffffd8d5ffffd2dcffffb6eeffffa6efffffa0f6ffff08fbffff + m_ExpandedIDs: b094fffff894ffffde97ffff8ec9ffff6eedffff88eeffff82f5ffff08fbffff86a6000072ae0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -467,15 +467,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 326.4 - y: 73.6 - width: 1174 - height: 727 + x: 407 + y: 73 + width: 1468 + height: 832 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -793,7 +793,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay - index: 11 + index: 9 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -842,14 +842,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 19.634562, y: 9998.109, z: 120.83349} + m_Target: {x: -0.15164621, y: -1.1396797, z: 115.78405} speed: 2 - m_Value: {x: 19.634562, y: 9998.109, z: 120.83349} + m_Value: {x: -0.2894786, y: -1.0637867, z: 106.75397} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -877,7 +877,7 @@ MonoBehaviour: m_Size: {x: 1, y: 1} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} @@ -885,9 +885,9 @@ MonoBehaviour: m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 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} @@ -895,17 +895,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.06827203, y: 0.9264379, z: -0.30805007, w: 0.20532306} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0.06827201, y: 0.92643756, z: -0.30804995, w: 0.20532298} + m_Value: {x: -0.000000010135608, y: 0.00000012578514, z: -0.000000018235706, w: -1} m_Size: - m_Target: 11.781026 + m_Target: 3.1849651 speed: 2 - m_Value: 11.781026 + m_Value: 3.0478134 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 0.8805599 m_SpeedNormalized: 0.43999997 @@ -919,7 +919,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 0 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: -0.06971626, y: 0.86519414, z: -0.12543157, w: -0.48053786} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -942,15 +942,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Package Manager - m_Image: {fileID: 5076950121296946556, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -2824328813065806953, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 326.4 - y: 73.6 - width: 1174 - height: 727 + x: 407 + y: 73 + width: 1468 + height: 832 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1041,18 +1041,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e68462a09b6ba104abce11d2d157d0b2, type: 3} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 650, y: 450} + m_MinSize: {x: 740, y: 450} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: MyActions (Input Actions Editor) + m_Text: ScreenTest (Input Actions Editor) m_Image: {fileID: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 408 + x: 407 y: 73 width: 1468 - height: 834 + height: 832 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1064,7 +1064,7 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 m_AssetObjectForEditing: {fileID: 0} - m_AssetGUID: 73b73f25311e73948bdb9379c3dc8d14 + m_AssetGUID: efc74d62e0aa605438ae41c388786ef8 --- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1081,7 +1081,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Asset Store - m_Image: {fileID: -7444545952099596278, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1116,15 +1116,15 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 821.60004 - width: 1501.4 - height: 369.80005 + y: 926 + width: 1876 + height: 425 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1146,7 +1146,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Runtime + - Assets/Samples/Input System/1.14.2/On-Screen Controls m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1154,16 +1154,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Scripts/Runtime + - Assets/Samples/Input System/1.14.2/On-Screen Controls m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\UnityProject\BlueArchiveMiniGame + m_LastProjectPath: C:\UnityProject\BlueArchiveMiniGame m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 98.19995} - m_SelectedIDs: 34ae0000 - m_LastClickedID: 44596 - m_ExpandedIDs: 0000000024810000de900000209a0000229a0000289a0000809a000000ca9a3bffffff7f + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 16ae0000 + m_LastClickedID: 44566 + m_ExpandedIDs: 00000000348100001ea6000020a600002ca600002ea6000030a600003ea6000042a6000012ae000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1191,7 +1191,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000024810000 + m_ExpandedIDs: 0000000034810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1219,21 +1219,21 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000068f1200828d00000c8d0000121d050042e40400b2930000c4fa0400ae0e0500f2ef0400682a4200802a42008a17420050a10000ee090500bc130500eccd000032030000bef80000c2a300000000000040f500007a860000647c0600f2b606001cb7060010170100b6290100e8ae00000aae0400447f0000d2830000 + m_ExpandedInstanceIDs: c6230000068f1200828d00000c8d0000121d050042e40400b2930000c4fa0400ae0e0500f2ef0400682a4200802a42008a17420050a10000ee090500bc130500eccd000032030000bef80000c2a300000000000040f500007a860000647c0600f2b606001cb7060010170100b6290100e8ae00000aae0400447f0000d283000082ae0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: link - m_OriginalName: link + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 42312 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: @@ -1263,7 +1263,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1387,7 +1387,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: @@ -1408,7 +1408,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 44556 + m_LastSelectedObjectID: 44658 --- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1425,15 +1425,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 821.60004 - width: 1501.4 - height: 369.80005 + y: 926 + width: 1876 + height: 425 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1460,15 +1460,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1502.4 - y: 73.6 - width: 544.6 - height: 1117.8 + x: 1877 + y: 73 + width: 682 + height: 1278 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1508,7 +1508,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Lighting - m_Image: {fileID: -1477008817101679558, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: