From 8bf90e7827409c881320dd35539ff409b03723d2 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 4 Sep 2025 19:18:10 -0400 Subject: [PATCH] change: edited camera and ui prefabs to work with networking --- Assets/Core/Objects/CameraGroup.prefab | 46 +++++ Assets/Core/Objects/UICanvas.prefab | 235 +++++++++++++++++++++++++ 2 files changed, 281 insertions(+) diff --git a/Assets/Core/Objects/CameraGroup.prefab b/Assets/Core/Objects/CameraGroup.prefab index 7927170..7b20df3 100644 --- a/Assets/Core/Objects/CameraGroup.prefab +++ b/Assets/Core/Objects/CameraGroup.prefab @@ -48,6 +48,7 @@ GameObject: - component: {fileID: 3229831872226355039} - component: {fileID: 9145059216287897393} - component: {fileID: 3313631396256320333} + - component: {fileID: 2138014960130760179} - component: {fileID: 7070283194321853303} - component: {fileID: 4383369033389970653} m_Layer: 0 @@ -286,6 +287,51 @@ MonoBehaviour: DecelTime: 0 PlayerIndex: -1 AutoEnableInputs: 1 +--- !u!114 &2138014960130760179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3727451710788063110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 058c862723373ca43913637463aff84a, type: 3} + m_Name: + m_EditorClassIdentifier: Core::CustomInputHandler + ScanRecursively: 1 + SuppressInputWhileBlending: 1 + IgnoreTimeScale: 0 + m_ControllerManager: + Controllers: + - Name: Look Orbit X + Owner: {fileID: 4828207810450504966} + Enabled: 1 + Input: + Input: {fileID: 6185001796860367008, guid: 94c7611bb3f64b248940847af54844cf, type: 3} + InputValue: 0 + Driver: + AccelTime: 0 + DecelTime: 0 + - Name: Look Orbit Y + Owner: {fileID: 4828207810450504966} + Enabled: 1 + Input: + Input: {fileID: 6185001796860367008, guid: 94c7611bb3f64b248940847af54844cf, type: 3} + InputValue: 0 + Driver: + AccelTime: 0 + DecelTime: 0 + - Name: Orbit Scale + Owner: {fileID: 4828207810450504966} + Enabled: 1 + Input: + Input: {fileID: 6185001796860367008, guid: 94c7611bb3f64b248940847af54844cf, type: 3} + InputValue: 0 + Driver: + AccelTime: 0 + DecelTime: 0 + PlayerInput: {fileID: 0} --- !u!114 &7070283194321853303 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Core/Objects/UICanvas.prefab b/Assets/Core/Objects/UICanvas.prefab index 37c64b2..09d4ada 100644 --- a/Assets/Core/Objects/UICanvas.prefab +++ b/Assets/Core/Objects/UICanvas.prefab @@ -1,5 +1,238 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1923425736310560782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7829972065275860580} + m_Layer: 5 + m_Name: Online Controls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7829972065275860580 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1923425736310560782} + 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: 4906743167862811726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2165120551350837323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3720266224121705621} + - component: {fileID: 8662481188042117003} + - component: {fileID: 2092128092343597186} + m_Layer: 5 + m_Name: Input Selector + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3720266224121705621 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2165120551350837323} + 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: 4906743167862811726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8662481188042117003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2165120551350837323} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: UnityEngine.dll::UnityEngine.UIElements.UIDocument + m_PanelSettings: {fileID: 11400000, guid: fd99678e30619394f8e6ce439fbd7f43, type: 2} + m_ParentUI: {fileID: 0} + sourceAsset: {fileID: 9197481963319205126, guid: 0cd3ec0aaa8910b4ba34a1cf93dc7932, type: 3} + m_SortingOrder: 0 + m_Position: 0 + m_WorldSpaceSizeMode: 1 + m_WorldSpaceWidth: 1920 + m_WorldSpaceHeight: 1080 + m_PivotReferenceSize: 0 + m_Pivot: 0 + m_WorldSpaceCollider: {fileID: 0} +--- !u!114 &2092128092343597186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2165120551350837323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8fc1a1d631088814c846ef223c98f932, type: 3} + m_Name: + m_EditorClassIdentifier: Core::InputFinder + actionMap: + m_Name: Action Map + m_Id: 3cbb4a24-a9ca-401b-9c29-c0700a6de7d0 + m_Asset: {fileID: 0} + m_Actions: + - m_Name: ControllerInput + m_Type: 1 + m_ExpectedControlType: Button + m_Id: deaa3c66-877c-4ec0-bbe2-266df39325e2 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Bindings: + - m_Name: + m_Id: 825234c2-b879-4730-aeda-284e3c3c4488 + m_Path: /buttonSouth + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: db588526-e2f5-44aa-a5cc-97d62ac3109d + m_Path: /buttonWest + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: cc110141-d35b-4781-b05e-7dc849398f5a + m_Path: /buttonNorth + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: 914b4b3f-154a-4eaa-a316-bc95573c0edc + m_Path: /buttonEast + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: e68a1de1-bc4d-4d21-a490-3184d1a19f2a + m_Path: /select + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: 352257c4-8415-4b71-8be0-a9ae82109b9c + m_Path: /start + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: dab4b81b-5e5a-42bb-9297-ba10c0edb936 + m_Path: /leftShoulder + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: c72c3b88-54e5-42e5-911c-26aaa14510e2 + m_Path: /rightShoulder + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: b3264fb1-3e5d-4572-8138-2add3d3db41e + m_Path: /leftTrigger + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: 0251262a-3394-42cf-9b4a-b3bd69cf136e + m_Path: /rightTrigger + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: 3d9a59bf-a882-487c-855a-6bc8f8d4f4fe + m_Path: /dpad/up + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: cd15a34d-a60a-458a-b939-be171d47211a + m_Path: /dpad/left + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: 1922fa4a-50ee-4768-a26a-11ddf32c7759 + m_Path: /dpad/right + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 + - m_Name: + m_Id: e22821b8-6e14-4d6e-959f-1ba63ec7cf11 + m_Path: /dpad/down + m_Interactions: + m_Processors: + m_Groups: + m_Action: ControllerInput + m_Flags: 0 --- !u!1 &4652744639078698033 GameObject: m_ObjectHideFlags: 0 @@ -92,6 +325,8 @@ RectTransform: m_Children: - {fileID: 5193622694615481024} - {fileID: 3593947148071664927} + - {fileID: 3720266224121705621} + - {fileID: 7829972065275860580} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0}