From 9e27d0f29fcb1e88af86b1d892f192910c955f3b Mon Sep 17 00:00:00 2001 From: M1_IDMhan Date: Sat, 12 Aug 2023 01:21:26 +0900 Subject: [PATCH] Closed #17 InShipCam --- BlueWater/Assets/01.Scenes/02.Main.unity | 49 +- .../Assets/02.Scripts/AssaultMode/Boat.cs | 5 + BlueWater/Assets/02.Scripts/BlueWater.cs | 60 + .../Assets/02.Scripts/BlueWater.inputactions | 40 + .../Assets/02.Scripts/CameraController.cs | 11 +- .../Assets/02.Scripts/CaperMovie.inputactions | 1706 +++++++++++++++++ .../02.Scripts/CaperMovie.inputactions.meta | 14 + BlueWater/Assets/02.Scripts/GameManager.cs | 12 + .../Gerstner wave/GerstnerWave.cs | 7 +- .../Assets/02.Scripts/WaterAndShip/Player.cs | 96 +- .../URP Unlit Materials.unitypackage.meta | 7 + .../FeelTemplatesDemo.unitypackage.meta | 7 + .../NiceVibrations-v-1-7.unitypackage.meta | 7 + .../NiceVibrations-v-2-0-1.unitypackage.meta | 7 + .../NiceVibrations-v-3-9-0.unitypackage.meta | 7 + ...ender Pipeline] Built-In.unitypackage.meta | 7 + ...ipeline] Universal (URP).unitypackage.meta | 7 + .../DemoMaterials/MainBuilding/Brackets.mat | 2 +- ...emple-BuiltInRP-UModeler.unitypackage.meta | 7 + ...LostTemple-HDRP-UModeler.unitypackage.meta | 7 + .../LostTemple-HDRP.unitypackage.meta | 7 + .../LostTemple-URP-UModeler.unitypackage.meta | 7 + .../LostTemple-URP.unitypackage.meta | 7 + .../Models/Ships/Racer/Materials/SI-7DE.mat | 2 +- .../Models/Ships/Racer/Materials/SILVERDE.mat | 2 +- .../Models/Ships/Racer/Materials/SILVERIZ.mat | 2 +- ...tom Attribute Processors.unitypackage.meta | 7 + .../Demos/Custom Drawers.unitypackage.meta | 7 + .../Demos/Editor Windows.unitypackage.meta | 7 + .../Sample - RPG Editor.unitypackage.meta | 7 + ...olygonPirates_Characters_Material_01_A.mat | 2 +- .../ProjectSettings/EditorBuildSettings.asset | 2 + 32 files changed, 2061 insertions(+), 63 deletions(-) create mode 100644 BlueWater/Assets/02.Scripts/CaperMovie.inputactions create mode 100644 BlueWater/Assets/02.Scripts/CaperMovie.inputactions.meta create mode 100644 BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta create mode 100644 BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta create mode 100644 BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta create mode 100644 BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta create mode 100644 BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta create mode 100644 BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta create mode 100644 BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index 0127c9e1a..64024d2e1 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -17,7 +17,7 @@ RenderSettings: m_Fog: 1 m_FogColor: {r: 0.56163496, g: 0.75237745, b: 0.7794118, a: 1} m_FogMode: 3 - m_FogDensity: 0.003 + m_FogDensity: 0.007 m_LinearFogStart: 0 m_LinearFogEnd: 300 m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} @@ -5833,8 +5833,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 168896972} serializedVersion: 2 - m_LocalRotation: {x: 0.19897528, y: 0.00000008940697, z: -0, w: 0.98000455} - m_LocalPosition: {x: -0.0000002384187, y: 10.32, z: -10.000001} + m_LocalRotation: {x: 0.22591954, y: 0.000000029802322, z: -0.000000014901161, w: 0.974146} + m_LocalPosition: {x: -0.0000002384187, y: 11, z: -10.000001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -10909,7 +10909,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 10.32, z: -10} + m_FollowOffset: {x: 0, y: 11, z: -10} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -12063,7 +12063,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.07, y: 3.39, z: -1.81} - m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 476261175} @@ -18566,7 +18566,7 @@ GameObject: - component: {fileID: 519038851} - component: {fileID: 519038852} m_Layer: 0 - m_Name: InBoatCam + m_Name: InShipCam m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -18580,8 +18580,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519038850} serializedVersion: 2 - m_LocalRotation: {x: 0.3006428, y: -0.6400109, z: 0.30064273, w: 0.640011} - m_LocalPosition: {x: 19.93, y: 27.5, z: -1.8100033} + m_LocalRotation: {x: 0.30631077, y: -0.6373176, z: 0.3063107, w: 0.6373177} + m_LocalPosition: {x: 19.93, y: 28.39, z: -1.8100033} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -18604,12 +18604,12 @@ MonoBehaviour: - m_Script m_LockStageInInspector: m_StreamingVersion: 20170927 - m_Priority: 2 + m_Priority: 0 m_StandbyUpdate: 2 m_LookAt: {fileID: 304932851} m_Follow: {fileID: 304932851} m_Lens: - FieldOfView: 10 + FieldOfView: 7 OrthographicSize: 5 NearClipPlane: 0.1 FarClipPlane: 300 @@ -20055,9 +20055,9 @@ Transform: m_GameObject: {fileID: 550759579} 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_LocalPosition: {x: 0, y: 0.57, z: 0} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 551002327} - {fileID: 550907091} @@ -32019,7 +32019,7 @@ Camera: height: 1 near clip plane: 0.1 far clip plane: 300 - field of view: 10 + field of view: 80 orthographic: 0 orthographic size: 5 m_Depth: -1 @@ -32045,8 +32045,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 776161953} serializedVersion: 2 - m_LocalRotation: {x: 0.42517304, y: 0.000000086318224, z: -0.000000040547665, w: 0.9051121} - m_LocalPosition: {x: -39.110004, y: 25.92, z: -19.929998} + m_LocalRotation: {x: 0.15974922, y: 0.68882525, z: -0.15974924, w: 0.6888252} + m_LocalPosition: {x: -47.3, y: 9.42, z: 0.0000011920929} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -32142,8 +32142,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eba32823f7fae4b7886c2fe6ee08123f, type: 3} m_Name: m_EditorClassIdentifier: - dredgeCam: {fileID: 1437521088} - assaultCam: {fileID: 1880081303} + dredgeCam: {fileID: 168896974} + assaultCam: {fileID: 1871370247} + InShipCam: {fileID: 519038852} --- !u!1001 &776462965 PrefabInstance: m_ObjectHideFlags: 0 @@ -60369,8 +60370,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2} m_PivotOffset: {x: 0, y: 0, z: 0} - m_AmplitudeGain: 1 - m_FrequencyGain: 1 + m_AmplitudeGain: 0.5 + m_FrequencyGain: 0.5 mNoiseOffsets: {x: 0, y: 0, z: 0} --- !u!114 &1385621424 MonoBehaviour: @@ -60385,7 +60386,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 1 - m_FollowOffset: {x: 20, y: 24.11, z: 0} + m_FollowOffset: {x: 20, y: 25, z: 0} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -63134,13 +63135,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1461171523} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + 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: 476261175} - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1461171525 MeshRenderer: m_ObjectHideFlags: 0 @@ -70720,7 +70721,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 5, y: 1, z: 5} + m_LocalScale: {x: 10, y: 1, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} diff --git a/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs b/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs index cefd3b747..f34ffaf31 100644 --- a/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs +++ b/BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs @@ -12,6 +12,9 @@ public class Boat : MonoBehaviour private GameObject spot; private Coroutine draw; + + public delegate void LandedEventHandler(); + public event LandedEventHandler OnLanded; private void Awake() { @@ -49,6 +52,8 @@ public class Boat : MonoBehaviour lineRenderer.enabled = false; if (draw != null) StopCoroutine(draw); + + OnLanded?.Invoke(); } } diff --git a/BlueWater/Assets/02.Scripts/BlueWater.cs b/BlueWater/Assets/02.Scripts/BlueWater.cs index b3d78732c..5275e4b9a 100644 --- a/BlueWater/Assets/02.Scripts/BlueWater.cs +++ b/BlueWater/Assets/02.Scripts/BlueWater.cs @@ -44,6 +44,24 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""processors"": """", ""interactions"": """", ""initialStateCheck"": false + }, + { + ""name"": ""Interaction"", + ""type"": ""Button"", + ""id"": ""367e7267-d329-439d-9806-5e960b8114b5"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": ""Tap"", + ""initialStateCheck"": false + }, + { + ""name"": ""InteractionHold"", + ""type"": ""Button"", + ""id"": ""a28fe5f5-b2a2-4794-8f99-fa2494aedfc3"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": ""Hold(duration=1)"", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -112,6 +130,28 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ""action"": ""AssaultMode"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""334d8c88-f0ee-43d9-b62d-a1fdbd1bc338"", + ""path"": ""/f"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Keyboard"", + ""action"": ""Interaction"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""df7a5259-c313-4b14-9cca-9e1acfc0a31a"", + ""path"": ""/f"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Keyboard"", + ""action"": ""InteractionHold"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] }, @@ -198,6 +238,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable m_Player = asset.FindActionMap("Player", throwIfNotFound: true); m_Player_Move = m_Player.FindAction("Move", throwIfNotFound: true); m_Player_AssaultMode = m_Player.FindAction("AssaultMode", throwIfNotFound: true); + m_Player_Interaction = m_Player.FindAction("Interaction", throwIfNotFound: true); + m_Player_InteractionHold = m_Player.FindAction("InteractionHold", throwIfNotFound: true); // Camera m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true); m_Camera_Zoom = m_Camera.FindAction("Zoom", throwIfNotFound: true); @@ -265,12 +307,16 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable private List m_PlayerActionsCallbackInterfaces = new List(); private readonly InputAction m_Player_Move; private readonly InputAction m_Player_AssaultMode; + private readonly InputAction m_Player_Interaction; + private readonly InputAction m_Player_InteractionHold; public struct PlayerActions { private @BlueWater m_Wrapper; public PlayerActions(@BlueWater wrapper) { m_Wrapper = wrapper; } public InputAction @Move => m_Wrapper.m_Player_Move; public InputAction @AssaultMode => m_Wrapper.m_Player_AssaultMode; + public InputAction @Interaction => m_Wrapper.m_Player_Interaction; + public InputAction @InteractionHold => m_Wrapper.m_Player_InteractionHold; public InputActionMap Get() { return m_Wrapper.m_Player; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -286,6 +332,12 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable @AssaultMode.started += instance.OnAssaultMode; @AssaultMode.performed += instance.OnAssaultMode; @AssaultMode.canceled += instance.OnAssaultMode; + @Interaction.started += instance.OnInteraction; + @Interaction.performed += instance.OnInteraction; + @Interaction.canceled += instance.OnInteraction; + @InteractionHold.started += instance.OnInteractionHold; + @InteractionHold.performed += instance.OnInteractionHold; + @InteractionHold.canceled += instance.OnInteractionHold; } private void UnregisterCallbacks(IPlayerActions instance) @@ -296,6 +348,12 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable @AssaultMode.started -= instance.OnAssaultMode; @AssaultMode.performed -= instance.OnAssaultMode; @AssaultMode.canceled -= instance.OnAssaultMode; + @Interaction.started -= instance.OnInteraction; + @Interaction.performed -= instance.OnInteraction; + @Interaction.canceled -= instance.OnInteraction; + @InteractionHold.started -= instance.OnInteractionHold; + @InteractionHold.performed -= instance.OnInteractionHold; + @InteractionHold.canceled -= instance.OnInteractionHold; } public void RemoveCallbacks(IPlayerActions instance) @@ -380,6 +438,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable { void OnMove(InputAction.CallbackContext context); void OnAssaultMode(InputAction.CallbackContext context); + void OnInteraction(InputAction.CallbackContext context); + void OnInteractionHold(InputAction.CallbackContext context); } public interface ICameraActions { diff --git a/BlueWater/Assets/02.Scripts/BlueWater.inputactions b/BlueWater/Assets/02.Scripts/BlueWater.inputactions index 84d6e5f76..05e0bd288 100644 --- a/BlueWater/Assets/02.Scripts/BlueWater.inputactions +++ b/BlueWater/Assets/02.Scripts/BlueWater.inputactions @@ -22,6 +22,24 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Interaction", + "type": "Button", + "id": "367e7267-d329-439d-9806-5e960b8114b5", + "expectedControlType": "Button", + "processors": "", + "interactions": "Tap", + "initialStateCheck": false + }, + { + "name": "InteractionHold", + "type": "Button", + "id": "a28fe5f5-b2a2-4794-8f99-fa2494aedfc3", + "expectedControlType": "Button", + "processors": "", + "interactions": "Hold(duration=1)", + "initialStateCheck": false } ], "bindings": [ @@ -90,6 +108,28 @@ "action": "AssaultMode", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "334d8c88-f0ee-43d9-b62d-a1fdbd1bc338", + "path": "/f", + "interactions": "", + "processors": "", + "groups": "Keyboard", + "action": "Interaction", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "df7a5259-c313-4b14-9cca-9e1acfc0a31a", + "path": "/f", + "interactions": "", + "processors": "", + "groups": "Keyboard", + "action": "InteractionHold", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/BlueWater/Assets/02.Scripts/CameraController.cs b/BlueWater/Assets/02.Scripts/CameraController.cs index 04642ec16..d481fd560 100644 --- a/BlueWater/Assets/02.Scripts/CameraController.cs +++ b/BlueWater/Assets/02.Scripts/CameraController.cs @@ -10,11 +10,13 @@ public class CameraController : MonoBehaviour public CinemachineVirtualCamera dredgeCam; [Required("습격모드 카메라를 넣어주세요.")] public CinemachineVirtualCamera assaultCam; + [Required("보트내부 카메라를 넣어주세요.")] + public CinemachineVirtualCamera InShipCam; public void CamAssaultMode() { - dredgeCam.Priority = 0; assaultCam.Priority = 1; + dredgeCam.Priority = 0; } public void CamDredgeMode() @@ -22,4 +24,11 @@ public class CameraController : MonoBehaviour dredgeCam.Priority = 1; assaultCam.Priority = 0; } + + public void CamInShipMode() + { + InShipCam.Priority = 1; + dredgeCam.Priority = 0; + assaultCam.Priority = 0; + } } diff --git a/BlueWater/Assets/02.Scripts/CaperMovie.inputactions b/BlueWater/Assets/02.Scripts/CaperMovie.inputactions new file mode 100644 index 000000000..834cf503d --- /dev/null +++ b/BlueWater/Assets/02.Scripts/CaperMovie.inputactions @@ -0,0 +1,1706 @@ +{ + "name": "CaperMovie", + "maps": [ + { + "name": "Player", + "id": "fcc8c55a-bad7-4262-85b3-84e4c0992949", + "actions": [ + { + "name": "Move", + "type": "Value", + "id": "76090523-feda-4445-b7dd-214c415349e5", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Look", + "type": "Value", + "id": "1eb412b1-360d-4357-97cd-c14936e4780a", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Fire", + "type": "Button", + "id": "4bf06dd7-0971-4218-a942-e147845536a6", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "FirstPlayer", + "type": "Button", + "id": "e73892b1-4972-457d-b5b3-547dc237bc18", + "expectedControlType": "Button", + "processors": "", + "interactions": "Tap", + "initialStateCheck": false + }, + { + "name": "FirstPlayerHold", + "type": "Button", + "id": "9c78f900-e358-49d4-bfc0-c44e72a51564", + "expectedControlType": "Button", + "processors": "", + "interactions": "Hold(duration=1)", + "initialStateCheck": false + }, + { + "name": "SecondPlayer", + "type": "Button", + "id": "16868631-611e-4b20-8ac8-ac54f1deb52f", + "expectedControlType": "Button", + "processors": "", + "interactions": "Tap", + "initialStateCheck": false + }, + { + "name": "SecondPlayerHold", + "type": "Button", + "id": "f0b89eff-e45e-4817-944e-6af8b160a97c", + "expectedControlType": "Button", + "processors": "", + "interactions": "Hold(duration=1)", + "initialStateCheck": false + }, + { + "name": "ThirdPlayer", + "type": "Button", + "id": "9b48cd01-ebff-40f0-968a-924192b17282", + "expectedControlType": "Button", + "processors": "", + "interactions": "Tap", + "initialStateCheck": false + }, + { + "name": "ThirdPlayerHold", + "type": "Button", + "id": "06fa5d26-0610-4c32-9e4d-304a604c96ac", + "expectedControlType": "Button", + "processors": "", + "interactions": "Hold(duration=1)", + "initialStateCheck": false + }, + { + "name": "FourthPlayer", + "type": "Button", + "id": "c630fb79-28e3-495f-a598-1ccd54f74f15", + "expectedControlType": "Button", + "processors": "", + "interactions": "Tap", + "initialStateCheck": false + }, + { + "name": "FourthPlayerHold", + "type": "Button", + "id": "d2886932-b1ef-482b-a063-cfbb8457b5f7", + "expectedControlType": "Button", + "processors": "", + "interactions": "Hold(duration=1)", + "initialStateCheck": false + }, + { + "name": "Rewind", + "type": "Button", + "id": "7a755732-6e97-47e7-bee3-38a6ea0c05ba", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "InteractionE", + "type": "Button", + "id": "f9d053fe-3fa2-4623-9fc8-02036f17ef7f", + "expectedControlType": "Button", + "processors": "", + "interactions": "Tap", + "initialStateCheck": false + }, + { + "name": "InteractionQ", + "type": "Button", + "id": "3ff1bc9c-0ca3-44cc-9f31-d556b7518a5e", + "expectedControlType": "Button", + "processors": "", + "interactions": "Tap", + "initialStateCheck": false + }, + { + "name": "InteractionE_Hold", + "type": "Button", + "id": "2919468b-8ad0-4d48-84ff-efed94733a13", + "expectedControlType": "Button", + "processors": "", + "interactions": "Hold(duration=1)", + "initialStateCheck": false + }, + { + "name": "InteractionQ_Hold", + "type": "Button", + "id": "b2c446f2-2917-4eab-a48b-39cfd0e17695", + "expectedControlType": "Button", + "processors": "", + "interactions": "Hold(duration=1)", + "initialStateCheck": false + }, + { + "name": "Tenet", + "type": "Button", + "id": "3ee83e98-f5e4-464d-a605-5396dec81b43", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Sit", + "type": "Button", + "id": "06538a32-1701-480e-94c3-da8e1a238d43", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "L3", + "type": "Button", + "id": "d1efdfb3-bdb5-483f-af85-c272e363206c", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "R3", + "type": "Button", + "id": "1aed1e81-343d-499e-9075-e5c9f79b6637", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "SpecialSkill", + "type": "Button", + "id": "f65a0051-3c47-4304-9f5f-c5b7db92cbe9", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "L1", + "type": "Button", + "id": "953692a1-57ed-4479-93ff-eb5af0c1327c", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "R1", + "type": "Button", + "id": "d82a7aff-3fab-4f78-8b43-06add0254e79", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "L2", + "type": "Button", + "id": "0c7f4402-df60-4302-b74b-fbdf952f1bc2", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "R2", + "type": "Button", + "id": "413edc33-f50f-476b-9aaf-2df6535254ee", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Skill1", + "type": "Button", + "id": "820180c4-4cee-4d15-b385-21eb47351b98", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Skill2", + "type": "Button", + "id": "05247481-d3b3-4401-801a-c1258eb57ae0", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", + "path": "/leftStick", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f837eb58-0bf5-431f-97f1-c219324fc5a3", + "path": "/leftStick", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "WASD", + "id": "00ca640b-d935-4593-8157-c05846ea39b3", + "path": "Dpad", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", + "path": "/w", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", + "path": "/s", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", + "path": "/a", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", + "path": "/d", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", + "path": "/{Primary2DAxis}", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3ea4d645-4504-4529-b061-ab81934c3752", + "path": "/stick", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", + "path": "/rightStick", + "interactions": "", + "processors": "", + "groups": ";Gamepad_PS", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ba4979a1-8167-47ac-96cf-466bcf1da969", + "path": "/rightStick", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8c8e490b-c610-4785-884f-f04217b23ca4", + "path": "/delta", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7d5062e9-c0ab-46af-9f72-a8545eaa4348", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3e5f5442-8668-4b27-a940-df99bad7e831", + "path": "/{Hatswitch}", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Fire", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", + "path": "/primaryTouch/tap", + "interactions": "", + "processors": "", + "groups": ";Touch", + "action": "Fire", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Fire", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8255d333-5683-4943-a58a-ccb207ff1dce", + "path": "/{PrimaryAction}", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Fire", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "eb76f433-1801-46ea-808d-7312c4868315", + "path": "/1", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "FirstPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "a753e644-2bd2-4166-8c6f-a7767121085d", + "path": "/dpad/left", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "FirstPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "d134a5aa-ef67-42dc-b67e-abfa772587f3", + "path": "/dpad/left", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "FirstPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "62e61451-1f9b-4e31-ab6a-8259cf32717b", + "path": "/2", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "SecondPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "015fe95b-84fb-4e3b-af9e-3427582673ad", + "path": "/dpad/up", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "SecondPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "45ef6309-3949-48fe-8df7-7f4b928a40f7", + "path": "/dpad/up", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "SecondPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e531ceb3-177f-422f-9ca8-cdd30d0c78a6", + "path": "/3", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "ThirdPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "257f22aa-14a9-4061-ae8f-e6f2a442356b", + "path": "/dpad/right", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "ThirdPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "88ea05fd-6cc1-40b9-bf1d-aaacde8fdd03", + "path": "/dpad/right", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "ThirdPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "6462cce3-e169-4b8c-9af9-f9c48e0f6b0a", + "path": "/4", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "FourthPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8ed02d6a-846c-4143-9009-51bfe5096b92", + "path": "/dpad/down", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "FourthPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4ad23d7e-649d-4343-bcd0-8d81fa347a84", + "path": "/dpad/down", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "FourthPlayer", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "07cb6ed7-4573-4de2-8e42-077756d0c38a", + "path": "/z", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Rewind", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "70f483ad-37f7-4e7d-935d-e8117644240d", + "path": "/e", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "InteractionE", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f2f3a2b4-404b-4bdb-b881-921d0a801391", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "InteractionE", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "234038ce-6785-43ad-8534-4298b4b4ea19", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "InteractionE", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ac188366-5209-456d-814d-de5d45ad1b0a", + "path": "/q", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "InteractionQ_Hold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e2d21c9a-0ac8-4f6f-863f-950dfa5aafc9", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "InteractionQ_Hold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "76230ab1-39e7-4f7e-be70-dee65f1ba233", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "InteractionQ_Hold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "68a3c38a-d19e-465b-bfc8-65da2ab016ca", + "path": "/q", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "InteractionQ", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "93720c96-8710-463e-9e11-421b373b76a1", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "InteractionQ", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "6045bf67-26f1-4d6c-b0cc-6540e7a78f40", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "InteractionQ", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7bdf0e39-1a1b-48a0-ae67-c37e51b411e5", + "path": "/e", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "InteractionE_Hold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "299d1e0a-5c38-4bce-bf1b-cbe62ac8a9f4", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "InteractionE_Hold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "268166ba-9f59-4da4-94d5-a3e1c2c61054", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "InteractionE_Hold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c92d85c4-aa35-4a05-b5fc-b205942d0577", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Tenet", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "09e05812-caf9-4a99-ae0c-52596a887737", + "path": "/1", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "FirstPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7c57c28c-eea0-49b3-87f6-8113051cd4d8", + "path": "/dpad/left", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "FirstPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "69615bb7-87e5-42b1-80c8-f5d09018643c", + "path": "/dpad/left", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "FirstPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "bbd84960-c45b-4fde-8063-e70e1cef2b5a", + "path": "/2", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "SecondPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "02ed7166-ab0e-4f3c-a24a-f694904695b6", + "path": "/dpad/up", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "SecondPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "35351a31-9f47-4090-b0e8-b32f7115379a", + "path": "/dpad/up", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "SecondPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "70712e98-1c80-4476-9bc1-9df1b99af3ef", + "path": "/3", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "ThirdPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "438ef2b6-4ce5-4633-91ef-46368d6979a8", + "path": "/dpad/right", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "ThirdPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "a25cc65a-0fe8-483e-b3d6-34a694c863e8", + "path": "/dpad/right", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "ThirdPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "92586fac-bed3-42a9-a333-7b09460cf9ac", + "path": "/4", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "FourthPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "19d24f2b-e3f1-4a71-8d38-f4f1581eaa9b", + "path": "/dpad/down", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "FourthPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "fc9f4c0f-6583-441f-8e1e-6d6e6e41ae52", + "path": "/dpad/down", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "FourthPlayerHold", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "6f5146b9-a814-4649-a61b-5ba411a8495c", + "path": "/ctrl", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Sit", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c98923fb-0df0-4f28-aa1c-ede4d476e9be", + "path": "/leftStickPress", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "L3", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "bd79a3d4-5022-4032-96ff-160ae40dd832", + "path": "/leftStickPress", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "L3", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "0af2c280-c0b9-4930-88c9-337c4073c3b9", + "path": "/rightStickPress", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "R3", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "994c6d7a-df5c-47d0-94ba-353d5ab5b541", + "path": "/rightStickPress", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "R3", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c4f5317d-0b01-4c56-a79d-126baef79f12", + "path": "/leftShoulder", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "L1", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "1e4f4d7b-3d4c-4dbe-9275-0fa080f1b862", + "path": "/leftShoulder", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "L1", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5b79fd12-aacd-4da1-b52d-20b8adfe6324", + "path": "/rightShoulder", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "R1", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f9e2d448-4288-4e6b-834f-6160b4b766d2", + "path": "/rightShoulder", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "R1", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f49a1508-3dba-4666-bd53-b5c18cff9f8b", + "path": "/f", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "SpecialSkill", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "fab336df-3162-41d5-a26b-f78e7360efc1", + "path": "/leftTrigger", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "L2", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5a635214-e9cd-4528-8f21-7244c83b6636", + "path": "/leftTrigger", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "L2", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b85ae943-9c81-4222-91ec-81e74ef178a3", + "path": "/rightTrigger", + "interactions": "", + "processors": "", + "groups": "Gamepad_PS", + "action": "R2", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "883c89c1-1f71-4bff-85de-7f98eb3eae7e", + "path": "/rightTrigger", + "interactions": "", + "processors": "", + "groups": "Gamepad_XBOX", + "action": "R2", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "2cb47c06-0ff9-4d09-b89c-46310d01598b", + "path": "/c", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Skill1", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "fb29295f-e74f-4122-9823-03050b3287ee", + "path": "/v", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Skill2", + "isComposite": false, + "isPartOfComposite": false + } + ] + }, + { + "name": "UI", + "id": "534afcb9-fced-4306-93be-b68f22a4e86f", + "actions": [ + { + "name": "Navigate", + "type": "PassThrough", + "id": "8eba8df0-1133-4fc6-a62f-62123480cc14", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Submit", + "type": "Button", + "id": "1565bae0-5024-4292-826c-c999ec7a4602", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Cancel", + "type": "Button", + "id": "26cf9833-9f68-4965-a1f0-90f7b89e6472", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Point", + "type": "PassThrough", + "id": "b9454332-da4e-4164-bc8b-e0f09de07016", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Click", + "type": "PassThrough", + "id": "ced2b5c6-1a0b-433e-a741-dc19db563681", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ScrollWheel", + "type": "PassThrough", + "id": "873b8ec8-5a63-4659-b79d-0216a3f92eb5", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "MiddleClick", + "type": "PassThrough", + "id": "84a58935-656d-47be-9113-281e0cdf724d", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "RightClick", + "type": "PassThrough", + "id": "7a987069-2db3-4fc8-99ea-0be9d0d3fd87", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDevicePosition", + "type": "PassThrough", + "id": "998352d1-087c-4390-9c78-2bf4d6ff6a2c", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDeviceOrientation", + "type": "PassThrough", + "id": "4d65861e-9ca3-480c-83a7-352d7eaffca9", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ClosePopup", + "type": "Button", + "id": "d11d6c84-30f3-44bc-8555-75f6da00f005", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "Gamepad", + "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", + "path": "/leftStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad_PS", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", + "path": "/rightStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad_PS", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2db08d65-c5fb-421b-983f-c71163608d67", + "path": "/leftStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad_PS", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "58748904-2ea9-4a80-8579-b500e6a76df8", + "path": "/rightStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad_PS", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", + "path": "/leftStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad_PS", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", + "path": "/rightStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad_PS", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcd248ae-a788-4676-a12e-f4d81205600b", + "path": "/leftStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad_PS", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", + "path": "/rightStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad_PS", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", + "path": "/dpad", + "interactions": "", + "processors": "", + "groups": ";Gamepad_PS", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Joystick", + "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "3db53b26-6601-41be-9887-63ac74e79d19", + "path": "/stick/up", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", + "path": "/stick/down", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", + "path": "/stick/left", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", + "path": "/stick/right", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Keyboard", + "id": "ff527021-f211-4c02-933e-5976594c46ed", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "74214943-c580-44e4-98eb-ad7eebe17902", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "cea9b045-a000-445b-95b8-0c171af70a3b", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "8607c725-d935-4808-84b1-8354e29bab63", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", + "path": "*/{Submit}", + "interactions": "", + "processors": "", + "groups": "", + "action": "Submit", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", + "path": "*/{Cancel}", + "interactions": "", + "processors": "", + "groups": "", + "action": "Cancel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", + "path": "/touch*/position", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", + "path": "/tip", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", + "path": "/touch*/press", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "38c99815-14ea-4617-8627-164d27641299", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", + "path": "/middleButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "MiddleClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4c191405-5738-4d4b-a523-c6a301dbf754", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "RightClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", + "path": "/devicePosition", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDevicePosition", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", + "path": "/deviceRotation", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDeviceOrientation", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8796470a-3b49-425d-8bb9-6f59704e8f93", + "path": "/escape", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "ClosePopup", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [ + { + "name": "Keyboard&Mouse", + "bindingGroup": "Keyboard&Mouse", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Gamepad_PS", + "bindingGroup": "Gamepad_PS", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Touch", + "bindingGroup": "Touch", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Joystick", + "bindingGroup": "Joystick", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "XR", + "bindingGroup": "XR", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Gamepad_XBOX", + "bindingGroup": "Gamepad_XBOX", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + } + ] +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/CaperMovie.inputactions.meta b/BlueWater/Assets/02.Scripts/CaperMovie.inputactions.meta new file mode 100644 index 000000000..8c4948b5c --- /dev/null +++ b/BlueWater/Assets/02.Scripts/CaperMovie.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 5f244dcf6ceaa485386636610bf0edb8 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/BlueWater/Assets/02.Scripts/GameManager.cs b/BlueWater/Assets/02.Scripts/GameManager.cs index de3e843db..3e8a2ab9a 100644 --- a/BlueWater/Assets/02.Scripts/GameManager.cs +++ b/BlueWater/Assets/02.Scripts/GameManager.cs @@ -1,16 +1,28 @@ using System.Collections; using System.Collections.Generic; +using _02.Scripts.WaterAndShip; +using Sirenix.OdinInspector; using UnityEngine; public class GameManager : Singleton { + [Title("Manager")] + public DataManager DataManager { get; private set; } + + [Title("Controller")] public CameraController CameraController { get; private set; } public UiController UiController { get; private set; } + public Player player; + private void Init() { + DataManager = FindObjectOfType(); + CameraController = FindObjectOfType(); UiController = FindObjectOfType(); + + player = FindObjectOfType(); } protected override void OnAwake() { diff --git a/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/GerstnerWave.cs b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/GerstnerWave.cs index a4562f1d9..5806a2003 100644 --- a/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/GerstnerWave.cs +++ b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/GerstnerWave.cs @@ -1,15 +1,20 @@ using System.Collections; using System.Collections.Generic; +using Sirenix.OdinInspector; using UnityEngine; public class GerstnerWave : MonoBehaviour { + [InfoBox("파도의 길이를 결정, 값이 클수록 파도 간의 간격이 커짐")] public float waveLength = 0.1f; + [InfoBox("파도의 높이를 결정, 값이 클수록 파도의 높이가 커짐")] public float amplitude = 0.1f; + [InfoBox("파도의 속도를 결정, 값이 클수록 파도의 속도가 오름")] public float speed = 1f; + [InfoBox("파도의 방향을 결정")] public Vector2 direction = new Vector2(1.0f, 0.0f); - void Update() + private void Update() { var mesh = GetComponent().mesh; var vertices = mesh.vertices; diff --git a/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs b/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs index 3f0903ab9..055c2622c 100644 --- a/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs +++ b/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs @@ -9,6 +9,7 @@ namespace _02.Scripts.WaterAndShip [RequireComponent(typeof(PlayerInput))] public class Player : MonoBehaviour { + [Title("쉽의 기본 설정")] [InfoBox("최대 스피드")] public float maxSpeed = 10f; [InfoBox("가속 수치")] @@ -17,9 +18,12 @@ namespace _02.Scripts.WaterAndShip public float deceleration = 2f; [InfoBox("회전 속도")] public float turnSpeed = 10f; + private Rigidbody rb; private Vector2 movementInput; - private bool isAssaultMode; + public bool IsAssaultMode { get; set; } + public bool IsInShipMode { get; set; } + public bool IsdredgeMode { get; set; } private void Awake() { @@ -31,37 +35,7 @@ namespace _02.Scripts.WaterAndShip MovePlayer(); RotatePlayer(); } - - #region AssaultMode/DreadgeMode Switch - - public void OnAssaultMode(InputValue value) - { - if (isAssaultMode) - { - SwitchToDredgeMode(); - } - else - { - SwitchToAssaultMode(); - } - } - - private void SwitchToDredgeMode() - { - GameManager.Inst.CameraController.CamDredgeMode(); - GameManager.Inst.UiController.uiAnimator.Reverse(); - isAssaultMode = false; - } - - private void SwitchToAssaultMode() - { - GameManager.Inst.CameraController.CamAssaultMode(); - GameManager.Inst.UiController.uiAnimator.Play(); - isAssaultMode = true; - } - - #endregion - + #region Movement public void OnMove(InputValue value) @@ -85,5 +59,63 @@ namespace _02.Scripts.WaterAndShip #endregion + #region AssaultMode/DreadgeMode Switch + + private void OnAssaultMode(InputValue value) + { + if (IsAssaultMode) + { + SwitchToDredgeMode(); + } + else + { + SwitchToAssaultMode(); + } + } + + private void SwitchToDredgeMode() + { + GameManager.Inst.CameraController.CamDredgeMode(); + GameManager.Inst.UiController.uiAnimator.Reverse(); + IsAssaultMode = false; + IsdredgeMode = true; + } + + private void SwitchToAssaultMode() + { + GameManager.Inst.CameraController.CamAssaultMode(); + GameManager.Inst.UiController.uiAnimator.Play(); + IsAssaultMode = true; + IsdredgeMode = false; + } + + #endregion + + #region Interaction Key + + private void OnInteraction(InputValue value) + { + + } + + private void OnInteractionHold(InputValue value) + { + if (IsInShipMode) + { + GameManager.Inst.CameraController.CamDredgeMode(); + IsdredgeMode = true; + IsAssaultMode = false; + IsInShipMode = false; + } + else + { + GameManager.Inst.CameraController.CamInShipMode(); + IsInShipMode = true; + IsAssaultMode = false; + IsdredgeMode = false; + } + } + + #endregion } } \ No newline at end of file diff --git a/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta b/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta new file mode 100644 index 000000000..cdb770faa --- /dev/null +++ b/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4ff1f29eab234cf4490d9bb383892c44 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta b/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta new file mode 100644 index 000000000..508065e3b --- /dev/null +++ b/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta new file mode 100644 index 000000000..b4ec97874 --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 078b8f13a17171b49892ad10426d5af0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta new file mode 100644 index 000000000..2ac65e5d2 --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f9406a33814af9c47b352e77f079d798 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta new file mode 100644 index 000000000..69d7b56dd --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9aacf6f3043624194bb6f6fe9a580786 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta new file mode 100644 index 000000000..be555027e --- /dev/null +++ b/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f4227764308e84f89a765fbf315e2945 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta new file mode 100644 index 000000000..350ee4c64 --- /dev/null +++ b/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 41e59f562b69648719f2424c438758f3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/GolemiteGames/GridBuilder2/Demo/DemoMaterials/MainBuilding/Brackets.mat b/BlueWater/Assets/GolemiteGames/GridBuilder2/Demo/DemoMaterials/MainBuilding/Brackets.mat index 538f5b77b..5b8d0d06f 100644 --- a/BlueWater/Assets/GolemiteGames/GridBuilder2/Demo/DemoMaterials/MainBuilding/Brackets.mat +++ b/BlueWater/Assets/GolemiteGames/GridBuilder2/Demo/DemoMaterials/MainBuilding/Brackets.mat @@ -116,7 +116,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.23584905, g: 0.23584905, b: 0.23584905, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.23584902, g: 0.23584902, b: 0.23584902, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta new file mode 100644 index 000000000..d7e559c52 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b044a2387a61dac41bdf204adffdce9d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta new file mode 100644 index 000000000..8ac8bbf10 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd287c84e887ea24a8679e67aac7c074 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta new file mode 100644 index 000000000..589ee74d0 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta new file mode 100644 index 000000000..e22c323d5 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f211254f5bfad224ba88868f2c75432c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta new file mode 100644 index 000000000..ea9dafacc --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4368c9be31b3c174dbfd80f2caf98889 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SI-7DE.mat b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SI-7DE.mat index 8eb7b53b9..d10d00fdf 100644 --- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SI-7DE.mat +++ b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SI-7DE.mat @@ -117,7 +117,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.13725486, g: 0.16862741, b: 0.29411763, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.13725483, g: 0.16862738, b: 0.2941176, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SILVERDE.mat b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SILVERDE.mat index 76d28dccb..e1811d46b 100644 --- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SILVERDE.mat +++ b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SILVERDE.mat @@ -130,7 +130,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.003921569, g: 0.015686275, b: 0.050980374, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.003921569, g: 0.015686275, b: 0.05098036, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SILVERIZ.mat b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SILVERIZ.mat index 9f4c34882..feebb6fb9 100644 --- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SILVERIZ.mat +++ b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Racer/Materials/SILVERIZ.mat @@ -130,7 +130,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta new file mode 100644 index 000000000..1eadf09a3 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f597f19f656ba56eae4f6a3a7cc528f4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta new file mode 100644 index 000000000..f073d2ab4 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48e08dc33330d11e9d4a1b246c52e4f6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta new file mode 100644 index 000000000..130722af7 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed09910c0094cb27be8f3ca264680da3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta new file mode 100644 index 000000000..f9b8ed82b --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc355dd4cf1e6173beaeb22c2858cbe1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Characters_Material_01_A.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Characters_Material_01_A.mat index 3f09e1f64..d960d2e70 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Characters_Material_01_A.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Characters_Material_01_A.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6fa6e3a289a54da4387f58e1eb847ef8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/BlueWater/ProjectSettings/EditorBuildSettings.asset b/BlueWater/ProjectSettings/EditorBuildSettings.asset index 2732353ea..68a3123be 100644 --- a/BlueWater/ProjectSettings/EditorBuildSettings.asset +++ b/BlueWater/ProjectSettings/EditorBuildSettings.asset @@ -11,3 +11,5 @@ EditorBuildSettings: m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: 52ef95baf252a46f2979b3dff5d5a7fa, type: 2} + com.unity.input.settings: {fileID: 11400000, guid: e0caac234b4984d92bb375ffa95898bf, + type: 2}