#13 Input name change and add infobox of variable
This commit is contained in:
parent
a15e8cf91e
commit
02faf68af6
File diff suppressed because it is too large
Load Diff
@ -37,7 +37,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
""initialStateCheck"": true
|
""initialStateCheck"": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
""name"": ""ModeChange"",
|
""name"": ""AssaultMode"",
|
||||||
""type"": ""Button"",
|
""type"": ""Button"",
|
||||||
""id"": ""7d9814fb-48e0-4717-91c3-0c7b7d99972c"",
|
""id"": ""7d9814fb-48e0-4717-91c3-0c7b7d99972c"",
|
||||||
""expectedControlType"": ""Button"",
|
""expectedControlType"": ""Button"",
|
||||||
@ -109,7 +109,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
""interactions"": """",
|
""interactions"": """",
|
||||||
""processors"": """",
|
""processors"": """",
|
||||||
""groups"": ""Keyboard"",
|
""groups"": ""Keyboard"",
|
||||||
""action"": ""ModeChange"",
|
""action"": ""AssaultMode"",
|
||||||
""isComposite"": false,
|
""isComposite"": false,
|
||||||
""isPartOfComposite"": false
|
""isPartOfComposite"": false
|
||||||
}
|
}
|
||||||
@ -197,7 +197,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
// Player
|
// Player
|
||||||
m_Player = asset.FindActionMap("Player", throwIfNotFound: true);
|
m_Player = asset.FindActionMap("Player", throwIfNotFound: true);
|
||||||
m_Player_Move = m_Player.FindAction("Move", throwIfNotFound: true);
|
m_Player_Move = m_Player.FindAction("Move", throwIfNotFound: true);
|
||||||
m_Player_ModeChange = m_Player.FindAction("ModeChange", throwIfNotFound: true);
|
m_Player_AssaultMode = m_Player.FindAction("AssaultMode", throwIfNotFound: true);
|
||||||
// Camera
|
// Camera
|
||||||
m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
|
m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
|
||||||
m_Camera_Zoom = m_Camera.FindAction("Zoom", throwIfNotFound: true);
|
m_Camera_Zoom = m_Camera.FindAction("Zoom", throwIfNotFound: true);
|
||||||
@ -264,13 +264,13 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
private readonly InputActionMap m_Player;
|
private readonly InputActionMap m_Player;
|
||||||
private List<IPlayerActions> m_PlayerActionsCallbackInterfaces = new List<IPlayerActions>();
|
private List<IPlayerActions> m_PlayerActionsCallbackInterfaces = new List<IPlayerActions>();
|
||||||
private readonly InputAction m_Player_Move;
|
private readonly InputAction m_Player_Move;
|
||||||
private readonly InputAction m_Player_ModeChange;
|
private readonly InputAction m_Player_AssaultMode;
|
||||||
public struct PlayerActions
|
public struct PlayerActions
|
||||||
{
|
{
|
||||||
private @BlueWater m_Wrapper;
|
private @BlueWater m_Wrapper;
|
||||||
public PlayerActions(@BlueWater wrapper) { m_Wrapper = wrapper; }
|
public PlayerActions(@BlueWater wrapper) { m_Wrapper = wrapper; }
|
||||||
public InputAction @Move => m_Wrapper.m_Player_Move;
|
public InputAction @Move => m_Wrapper.m_Player_Move;
|
||||||
public InputAction @ModeChange => m_Wrapper.m_Player_ModeChange;
|
public InputAction @AssaultMode => m_Wrapper.m_Player_AssaultMode;
|
||||||
public InputActionMap Get() { return m_Wrapper.m_Player; }
|
public InputActionMap Get() { return m_Wrapper.m_Player; }
|
||||||
public void Enable() { Get().Enable(); }
|
public void Enable() { Get().Enable(); }
|
||||||
public void Disable() { Get().Disable(); }
|
public void Disable() { Get().Disable(); }
|
||||||
@ -283,9 +283,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
@Move.started += instance.OnMove;
|
@Move.started += instance.OnMove;
|
||||||
@Move.performed += instance.OnMove;
|
@Move.performed += instance.OnMove;
|
||||||
@Move.canceled += instance.OnMove;
|
@Move.canceled += instance.OnMove;
|
||||||
@ModeChange.started += instance.OnModeChange;
|
@AssaultMode.started += instance.OnAssaultMode;
|
||||||
@ModeChange.performed += instance.OnModeChange;
|
@AssaultMode.performed += instance.OnAssaultMode;
|
||||||
@ModeChange.canceled += instance.OnModeChange;
|
@AssaultMode.canceled += instance.OnAssaultMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UnregisterCallbacks(IPlayerActions instance)
|
private void UnregisterCallbacks(IPlayerActions instance)
|
||||||
@ -293,9 +293,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
@Move.started -= instance.OnMove;
|
@Move.started -= instance.OnMove;
|
||||||
@Move.performed -= instance.OnMove;
|
@Move.performed -= instance.OnMove;
|
||||||
@Move.canceled -= instance.OnMove;
|
@Move.canceled -= instance.OnMove;
|
||||||
@ModeChange.started -= instance.OnModeChange;
|
@AssaultMode.started -= instance.OnAssaultMode;
|
||||||
@ModeChange.performed -= instance.OnModeChange;
|
@AssaultMode.performed -= instance.OnAssaultMode;
|
||||||
@ModeChange.canceled -= instance.OnModeChange;
|
@AssaultMode.canceled -= instance.OnAssaultMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RemoveCallbacks(IPlayerActions instance)
|
public void RemoveCallbacks(IPlayerActions instance)
|
||||||
@ -379,7 +379,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
public interface IPlayerActions
|
public interface IPlayerActions
|
||||||
{
|
{
|
||||||
void OnMove(InputAction.CallbackContext context);
|
void OnMove(InputAction.CallbackContext context);
|
||||||
void OnModeChange(InputAction.CallbackContext context);
|
void OnAssaultMode(InputAction.CallbackContext context);
|
||||||
}
|
}
|
||||||
public interface ICameraActions
|
public interface ICameraActions
|
||||||
{
|
{
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
"initialStateCheck": true
|
"initialStateCheck": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ModeChange",
|
"name": "AssaultMode",
|
||||||
"type": "Button",
|
"type": "Button",
|
||||||
"id": "7d9814fb-48e0-4717-91c3-0c7b7d99972c",
|
"id": "7d9814fb-48e0-4717-91c3-0c7b7d99972c",
|
||||||
"expectedControlType": "Button",
|
"expectedControlType": "Button",
|
||||||
@ -87,7 +87,7 @@
|
|||||||
"interactions": "",
|
"interactions": "",
|
||||||
"processors": "",
|
"processors": "",
|
||||||
"groups": "Keyboard",
|
"groups": "Keyboard",
|
||||||
"action": "ModeChange",
|
"action": "AssaultMode",
|
||||||
"isComposite": false,
|
"isComposite": false,
|
||||||
"isPartOfComposite": false
|
"isPartOfComposite": false
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Sirenix.OdinInspector;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
[RequireComponent(typeof(Rigidbody))]
|
[RequireComponent(typeof(Rigidbody))]
|
||||||
public class Floater : MonoBehaviour
|
public class Floater : MonoBehaviour
|
||||||
{
|
{
|
||||||
private GerstnerWave waveGenerator;
|
private GerstnerWave waveGenerator;
|
||||||
|
[InfoBox("배가 얼마나 물에 잠길지 정합니다. 낮을수록 물에 잠깁니다.")]
|
||||||
public float boatOffset = 0.0f; // new variable
|
public float boatOffset = 0.0f; // new variable
|
||||||
private Rigidbody rb;
|
private Rigidbody rb;
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using Cinemachine;
|
using Cinemachine;
|
||||||
|
using Sirenix.OdinInspector;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
|
|
||||||
@ -8,9 +9,13 @@ namespace _02.Scripts.WaterAndShip
|
|||||||
[RequireComponent(typeof(PlayerInput))]
|
[RequireComponent(typeof(PlayerInput))]
|
||||||
public class Player : MonoBehaviour
|
public class Player : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
[InfoBox("최대 스피드")]
|
||||||
public float maxSpeed = 10f;
|
public float maxSpeed = 10f;
|
||||||
|
[InfoBox("가속 수치")]
|
||||||
public float acceleration = 2f;
|
public float acceleration = 2f;
|
||||||
|
[InfoBox("감속 수치")]
|
||||||
public float deceleration = 2f;
|
public float deceleration = 2f;
|
||||||
|
[InfoBox("회전 속도")]
|
||||||
public float turnSpeed = 10f;
|
public float turnSpeed = 10f;
|
||||||
private Rigidbody rb;
|
private Rigidbody rb;
|
||||||
private Vector2 movementInput;
|
private Vector2 movementInput;
|
||||||
@ -29,7 +34,7 @@ namespace _02.Scripts.WaterAndShip
|
|||||||
|
|
||||||
#region AssaultMode/DreadgeMode Switch
|
#region AssaultMode/DreadgeMode Switch
|
||||||
|
|
||||||
public void OnModeChange(InputValue value)
|
public void OnAssaultMode(InputValue value)
|
||||||
{
|
{
|
||||||
if (isAssaultMode)
|
if (isAssaultMode)
|
||||||
{
|
{
|
||||||
|
@ -12,8 +12,8 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
|
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
|
||||||
m_Name: PTK-URP-HighQuality
|
m_Name: PTK-URP-HighQuality
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
k_AssetVersion: 5
|
k_AssetVersion: 11
|
||||||
k_AssetPreviousVersion: 5
|
k_AssetPreviousVersion: 11
|
||||||
m_RendererType: 1
|
m_RendererType: 1
|
||||||
m_RendererData: {fileID: 0}
|
m_RendererData: {fileID: 0}
|
||||||
m_RendererDataList:
|
m_RendererDataList:
|
||||||
@ -24,8 +24,15 @@ MonoBehaviour:
|
|||||||
m_OpaqueDownsampling: 1
|
m_OpaqueDownsampling: 1
|
||||||
m_SupportsTerrainHoles: 0
|
m_SupportsTerrainHoles: 0
|
||||||
m_SupportsHDR: 1
|
m_SupportsHDR: 1
|
||||||
|
m_HDRColorBufferPrecision: 0
|
||||||
m_MSAA: 1
|
m_MSAA: 1
|
||||||
m_RenderScale: 1
|
m_RenderScale: 1
|
||||||
|
m_UpscalingFilter: 0
|
||||||
|
m_FsrOverrideSharpness: 0
|
||||||
|
m_FsrSharpness: 0.92
|
||||||
|
m_EnableLODCrossFade: 1
|
||||||
|
m_LODCrossFadeDitheringType: 1
|
||||||
|
m_ShEvalMode: 0
|
||||||
m_MainLightRenderingMode: 1
|
m_MainLightRenderingMode: 1
|
||||||
m_MainLightShadowsSupported: 1
|
m_MainLightShadowsSupported: 1
|
||||||
m_MainLightShadowmapResolution: 2048
|
m_MainLightShadowmapResolution: 2048
|
||||||
@ -33,23 +40,71 @@ MonoBehaviour:
|
|||||||
m_AdditionalLightsPerObjectLimit: 4
|
m_AdditionalLightsPerObjectLimit: 4
|
||||||
m_AdditionalLightShadowsSupported: 1
|
m_AdditionalLightShadowsSupported: 1
|
||||||
m_AdditionalLightsShadowmapResolution: 256
|
m_AdditionalLightsShadowmapResolution: 256
|
||||||
|
m_AdditionalLightsShadowResolutionTierLow: 128
|
||||||
|
m_AdditionalLightsShadowResolutionTierMedium: 128
|
||||||
|
m_AdditionalLightsShadowResolutionTierHigh: 256
|
||||||
|
m_ReflectionProbeBlending: 0
|
||||||
|
m_ReflectionProbeBoxProjection: 0
|
||||||
m_ShadowDistance: 100
|
m_ShadowDistance: 100
|
||||||
m_ShadowCascades: 0
|
m_ShadowCascadeCount: 1
|
||||||
m_Cascade2Split: 0.4167956
|
m_Cascade2Split: 0.4167956
|
||||||
|
m_Cascade3Split: {x: 0.1, y: 0.3}
|
||||||
m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
|
m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}
|
||||||
|
m_CascadeBorder: 0.1
|
||||||
m_ShadowDepthBias: 1.2
|
m_ShadowDepthBias: 1.2
|
||||||
m_ShadowNormalBias: 0.2
|
m_ShadowNormalBias: 0.2
|
||||||
|
m_AnyShadowsSupported: 1
|
||||||
m_SoftShadowsSupported: 1
|
m_SoftShadowsSupported: 1
|
||||||
|
m_ConservativeEnclosingSphere: 0
|
||||||
|
m_NumIterationsEnclosingSphere: 64
|
||||||
|
m_SoftShadowQuality: 2
|
||||||
|
m_AdditionalLightsCookieResolution: 2048
|
||||||
|
m_AdditionalLightsCookieFormat: 3
|
||||||
m_UseSRPBatcher: 1
|
m_UseSRPBatcher: 1
|
||||||
m_SupportsDynamicBatching: 0
|
m_SupportsDynamicBatching: 0
|
||||||
m_MixedLightingSupported: 1
|
m_MixedLightingSupported: 1
|
||||||
|
m_SupportsLightCookies: 1
|
||||||
|
m_SupportsLightLayers: 0
|
||||||
m_DebugLevel: 0
|
m_DebugLevel: 0
|
||||||
m_PostProcessingFeatureSet: 0
|
m_StoreActionsOptimization: 0
|
||||||
|
m_EnableRenderGraph: 0
|
||||||
|
m_UseAdaptivePerformance: 1
|
||||||
m_ColorGradingMode: 1
|
m_ColorGradingMode: 1
|
||||||
m_ColorGradingLutSize: 32
|
m_ColorGradingLutSize: 32
|
||||||
|
m_UseFastSRGBLinearConversion: 0
|
||||||
|
m_SupportDataDrivenLensFlare: 1
|
||||||
m_ShadowType: 1
|
m_ShadowType: 1
|
||||||
m_LocalShadowsSupported: 0
|
m_LocalShadowsSupported: 0
|
||||||
m_LocalShadowsAtlasResolution: 256
|
m_LocalShadowsAtlasResolution: 256
|
||||||
m_MaxPixelLights: 0
|
m_MaxPixelLights: 0
|
||||||
m_ShadowAtlasResolution: 256
|
m_ShadowAtlasResolution: 256
|
||||||
|
m_VolumeFrameworkUpdateMode: 0
|
||||||
|
m_Textures:
|
||||||
|
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
|
||||||
|
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
|
||||||
|
m_PrefilteringModeMainLightShadows: 1
|
||||||
|
m_PrefilteringModeAdditionalLight: 4
|
||||||
|
m_PrefilteringModeAdditionalLightShadows: 1
|
||||||
|
m_PrefilterXRKeywords: 0
|
||||||
|
m_PrefilteringModeForwardPlus: 1
|
||||||
|
m_PrefilteringModeDeferredRendering: 1
|
||||||
|
m_PrefilteringModeScreenSpaceOcclusion: 1
|
||||||
|
m_PrefilterDebugKeywords: 0
|
||||||
|
m_PrefilterWriteRenderingLayers: 0
|
||||||
|
m_PrefilterHDROutput: 0
|
||||||
|
m_PrefilterSSAODepthNormals: 0
|
||||||
|
m_PrefilterSSAOSourceDepthLow: 0
|
||||||
|
m_PrefilterSSAOSourceDepthMedium: 0
|
||||||
|
m_PrefilterSSAOSourceDepthHigh: 0
|
||||||
|
m_PrefilterSSAOInterleaved: 0
|
||||||
|
m_PrefilterSSAOBlueNoise: 0
|
||||||
|
m_PrefilterSSAOSampleCountLow: 0
|
||||||
|
m_PrefilterSSAOSampleCountMedium: 0
|
||||||
|
m_PrefilterSSAOSampleCountHigh: 0
|
||||||
|
m_PrefilterDBufferMRT1: 0
|
||||||
|
m_PrefilterDBufferMRT2: 0
|
||||||
|
m_PrefilterDBufferMRT3: 0
|
||||||
|
m_PrefilterScreenCoord: 0
|
||||||
|
m_PrefilterNativeRenderPass: 0
|
||||||
m_ShaderVariantLogLevel: 0
|
m_ShaderVariantLogLevel: 0
|
||||||
|
m_ShadowCascades: 0
|
||||||
|
36
BlueWater/Assets/InputSystem.inputsettings.asset
Normal file
36
BlueWater/Assets/InputSystem.inputsettings.asset
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: c46f07b5ed07e4e92aa78254188d3d10, type: 3}
|
||||||
|
m_Name: InputSystem.inputsettings
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_SupportedDevices: []
|
||||||
|
m_UpdateMode: 1
|
||||||
|
m_MaxEventBytesPerUpdate: 5242880
|
||||||
|
m_MaxQueuedEventsPerUpdate: 1000
|
||||||
|
m_CompensateForScreenOrientation: 1
|
||||||
|
m_BackgroundBehavior: 0
|
||||||
|
m_EditorInputBehaviorInPlayMode: 0
|
||||||
|
m_DefaultDeadzoneMin: 0.125
|
||||||
|
m_DefaultDeadzoneMax: 0.925
|
||||||
|
m_DefaultButtonPressPoint: 0.5
|
||||||
|
m_ButtonReleaseThreshold: 0.75
|
||||||
|
m_DefaultTapTime: 0.2
|
||||||
|
m_DefaultSlowTapTime: 0.5
|
||||||
|
m_DefaultHoldTime: 0.4
|
||||||
|
m_TapRadius: 5
|
||||||
|
m_MultiTapDelayTime: 0.75
|
||||||
|
m_DisableRedundantEventsMerging: 0
|
||||||
|
m_ShortcutKeysConsumeInputs: 0
|
||||||
|
m_iOSSettings:
|
||||||
|
m_MotionUsage:
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Description:
|
8
BlueWater/Assets/InputSystem.inputsettings.asset.meta
Normal file
8
BlueWater/Assets/InputSystem.inputsettings.asset.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e0caac234b4984d92bb375ffa95898bf
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Loading…
Reference in New Issue
Block a user