diff --git a/Assets/AddressableAssetsData/AssetGroups/Jelycho Core.asset b/Assets/AddressableAssetsData/AssetGroups/Jelycho Core.asset index ebff96d..b4dc57a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Jelycho Core.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Jelycho Core.asset @@ -37,11 +37,6 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: f991e9abd9a53ee4b94b329a5ce96cb2 - m_Address: Assets/jelycho/Input/controls_jelycho.inputactions - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 93969247b34433f44bfa755967945828, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin index eefca1e..d3b90d2 100644 Binary files a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin and b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin differ diff --git a/Assets/DefaultNetworkPrefabs.asset b/Assets/DefaultNetworkPrefabs.asset index 2f57015..a817937 100644 --- a/Assets/DefaultNetworkPrefabs.asset +++ b/Assets/DefaultNetworkPrefabs.asset @@ -29,3 +29,13 @@ MonoBehaviour: SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 611922230303722876, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 3913326941885152303, guid: d8656ef49bb69e647b019ff5e4d68209, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} diff --git a/Assets/RebootKit b/Assets/RebootKit index e561647..dca9f88 160000 --- a/Assets/RebootKit +++ b/Assets/RebootKit @@ -1 +1 @@ -Subproject commit e5616474f1139c073de0696489612219c6c74b30 +Subproject commit dca9f8883ae094cd1600089ba3e3c59405621d21 diff --git a/Assets/Scenes/scn_main.unity b/Assets/Scenes/scn_main.unity index 57e972a..fddd4a6 100755 --- a/Assets/Scenes/scn_main.unity +++ b/Assets/Scenes/scn_main.unity @@ -186,7 +186,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 55 + m_Bits: 4294967295 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -206,12 +206,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0.51805025, y: -0.000028805633, z: 0.000017435377, w: 0.8553502} - m_LocalPosition: {x: 0.000034506433, y: 1.454766, z: 0.33647728} + m_LocalRotation: {x: 0.51805025, y: -0.000028491486, z: 0.000016934791, w: 0.8553502} + m_LocalPosition: {x: 0.000034647062, y: 1.4547659, z: 0.33647728} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1847488074} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &330585547 @@ -230,8 +229,7 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_Cameras: - - {fileID: 1847488070} + m_Cameras: [] m_RendererIndex: -1 m_VolumeLayerMask: serializedVersion: 2 @@ -644,167 +642,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Document: {fileID: 1809244331} ---- !u!1 &1847488069 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1847488074} - - component: {fileID: 1847488070} - - component: {fileID: 1847488072} - - component: {fileID: 1847488071} - m_Layer: 0 - m_Name: camera_viewmodel - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!20 &1847488070 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1847488069} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 4 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.12 - far clip plane: 500 - field of view: 70 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 64 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &1847488071 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1847488069} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} - m_Name: - m_EditorClassIdentifier: - ShowDebugText: 0 - ShowCameraFrustum: 1 - IgnoreTimeScale: 0 - WorldUpOverride: {fileID: 0} - ChannelMask: -1 - UpdateMethod: 1 - BlendUpdateMethod: 1 - LensModeOverride: - Enabled: 0 - DefaultMode: 2 - DefaultBlend: - Style: 1 - Time: 2 - CustomCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - CustomBlends: {fileID: 0} ---- !u!114 &1847488072 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1847488069} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 1 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 1 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - m_Quality: 3 - m_FrameInfluence: 0.1 - m_JitterScale: 1 - m_MipBias: 0 - m_VarianceClampScale: 0.9 - m_ContrastAdaptiveSharpening: 0 ---- !u!4 &1847488074 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1847488069} - serializedVersion: 2 - m_LocalRotation: {x: -0.000018543842, y: -0.000039251816, z: 0.000018001865, 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: 330585546} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/SampleSceneProfile.asset index c1b0f63..dff2ff3 100644 --- a/Assets/Settings/SampleSceneProfile.asset +++ b/Assets/Settings/SampleSceneProfile.asset @@ -18,10 +18,10 @@ MonoBehaviour: m_Value: 0 threshold: m_OverrideState: 1 - m_Value: 1 + m_Value: 0.9 intensity: m_OverrideState: 1 - m_Value: 0.25 + m_Value: 0.5 scatter: m_OverrideState: 1 m_Value: 0.5 @@ -32,7 +32,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} highQualityFiltering: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 1 downscale: m_OverrideState: 0 diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index f3bfd20..bf1fa81 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 7613102744023597192 - - rid: 7613102744023597193 + - rid: 6725239873051295845 + - rid: 6725239873051295846 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 7613102744023597194 - - rid: 7613102744023597195 + - rid: 6725239873051295847 + - rid: 6725239873051295848 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 7613102744023597196 - - rid: 7613102744023597197 - - rid: 7613102744023597198 - - rid: 7613102744023597199 - - rid: 7613102744023597200 - - rid: 7613102744023597201 + - rid: 6725239873051295849 + - rid: 6725239873051295850 + - rid: 6725239873051295851 + - rid: 6725239873051295852 + - rid: 6725239873051295853 + - rid: 6725239873051295854 - rid: 6852985685364965392 - - rid: 7613102744023597202 + - rid: 6725239873051295855 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 260979669776728064 - - rid: 7613102744023597203 + - rid: 6725239873051295856 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -103,6 +103,114 @@ MonoBehaviour: m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3} m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3} m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} + - rid: 6725239873051295845 + type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 1 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + - rid: 6725239873051295846 + type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} + m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} + m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} + m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} + m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} + - rid: 6725239873051295847 + type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3} + m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} + m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} + m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} + m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3} + m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} + m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3} + m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} + - rid: 6725239873051295848 + type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} + m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} + m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - rid: 6725239873051295849 + type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} + data: + m_Version: 0 + m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2, type: 3} + m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef, type: 3} + m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b, type: 3} + m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114, type: 3} + m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da, type: 3} + m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c, type: 3} + m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} + m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} + m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} + - rid: 6725239873051295850 + type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} + m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} + m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} + - rid: 6725239873051295851 + type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3} + subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3} + voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3} + traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} + traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} + skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} + skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} + renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} + renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} + - rid: 6725239873051295852 + type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_ProbeVolumeDisableStreamingAssets: 0 + - rid: 6725239873051295853 + type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + probeVolumeDebugShader: {fileID: 4800000, guid: 3b21275fd12d65f49babb5286f040f2d, type: 3} + probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 3a80877c579b9144ebdcc6d923bca303, type: 3} + probeVolumeSamplingDebugShader: {fileID: 4800000, guid: bf54e6528c79a224e96346799064c393, type: 3} + probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} + probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} + numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} + - rid: 6725239873051295854 + type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_IncludeReferencedInScenes: 0 + m_IncludeAssetsByLabel: 0 + m_LabelToInclude: + - rid: 6725239873051295855 + type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} + probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} + probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} + - rid: 6725239873051295856 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - rid: 6852985685364965378 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -159,114 +267,6 @@ MonoBehaviour: m_version: 0 m_EnableCompilationCaching: 1 m_EnableValidityChecks: 1 - - rid: 7613102744023597192 - type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_StripUnusedPostProcessingVariants: 1 - m_StripUnusedVariants: 1 - m_StripScreenCoordOverrideVariants: 1 - - rid: 7613102744023597193 - type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} - m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} - m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} - m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} - m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} - m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 7613102744023597194 - type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3} - m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} - m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} - m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} - m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3} - m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} - m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3} - m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 7613102744023597195 - type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} - m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} - m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} - m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} - m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 7613102744023597196 - type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} - data: - m_Version: 0 - m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2, type: 3} - m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef, type: 3} - m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b, type: 3} - m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114, type: 3} - m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da, type: 3} - m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c, type: 3} - m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} - m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} - m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 7613102744023597197 - type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} - m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} - m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - - rid: 7613102744023597198 - type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3} - subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3} - voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3} - traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} - traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} - skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} - skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} - renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 7613102744023597199 - type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 7613102744023597200 - type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - probeVolumeDebugShader: {fileID: 4800000, guid: 3b21275fd12d65f49babb5286f040f2d, type: 3} - probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 3a80877c579b9144ebdcc6d923bca303, type: 3} - probeVolumeSamplingDebugShader: {fileID: 4800000, guid: bf54e6528c79a224e96346799064c393, type: 3} - probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} - probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} - numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 7613102744023597201 - type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_version: 0 - m_IncludeReferencedInScenes: 0 - m_IncludeAssetsByLabel: 0 - m_LabelToInclude: - - rid: 7613102744023597202 - type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 1 - probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} - probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} - probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 7613102744023597203 - type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - rid: 8712630790384254976 type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} data: diff --git a/Assets/jelycho/Code/Beacons/BaseManager.cs b/Assets/jelycho/Code/Beacons/BaseManager.cs new file mode 100644 index 0000000..a559de3 --- /dev/null +++ b/Assets/jelycho/Code/Beacons/BaseManager.cs @@ -0,0 +1,47 @@ +using System.Collections.Generic; +using RebootKit.Engine.Main; +using Unity.Netcode; +using UnityEngine; + +namespace RebootReality.jelycho.Beacons { + public class BaseManager : NetworkBehaviour { + [SerializeField] Beacon m_BeaconPrefab; + [SerializeField] float m_ConnectionRopeLength = 10.0f; + [SerializeField] float m_BeaconSpawnRadius = 15.0f; + + readonly List m_Beacons = new List(); + + public IReadOnlyList Beacons => m_Beacons; + + [ServerRpc(RequireOwnership = false)] + public void SpawnBeaconServerRpc(Vector3 position) { + if (!IsServer) { + Debug.LogWarning("Only the server can spawn beacons."); + return; + } + + Beacon beacon = Instantiate(m_BeaconPrefab, position, Quaternion.identity); + beacon.NetworkObject.Spawn(); + beacon.GrowClientRpc(); + + foreach (Beacon otherBeacon in m_Beacons) { + if ((otherBeacon.transform.position - beacon.transform.position).sqrMagnitude < + m_BeaconSpawnRadius * m_BeaconSpawnRadius) { + + Vector3 startPosition = otherBeacon.RopeConnectionPoint.position; + Vector3 endPosition = beacon.RopeConnectionPoint.position; + SpawnRopeRpc(startPosition, endPosition); + } + } + + m_Beacons.Add(beacon); + } + + [Rpc(SendTo.Everyone)] + void SpawnRopeRpc(Vector3 startPosition, Vector3 endPosition) { + if (RR.World.Context is WorldContext worldContext) { + worldContext.RopesManager.SpawnLockedRope(m_ConnectionRopeLength, startPosition, endPosition); + } + } + } +} \ No newline at end of file diff --git a/Assets/jelycho/Code/Beacons/BaseManager.cs.meta b/Assets/jelycho/Code/Beacons/BaseManager.cs.meta new file mode 100644 index 0000000..6f10c8b --- /dev/null +++ b/Assets/jelycho/Code/Beacons/BaseManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ac767dd7ed4c424ebad060b7149afac8 +timeCreated: 1751317007 \ No newline at end of file diff --git a/Assets/jelycho/Code/Beacons/Beacon.cs b/Assets/jelycho/Code/Beacons/Beacon.cs new file mode 100644 index 0000000..0bf59c4 --- /dev/null +++ b/Assets/jelycho/Code/Beacons/Beacon.cs @@ -0,0 +1,14 @@ +using Unity.Netcode; +using UnityEngine; + +namespace RebootReality.jelycho.Beacons { + public class Beacon : NetworkBehaviour { + [SerializeField] BeaconGraphics m_Graphics; + [field: SerializeField] public Transform RopeConnectionPoint { get; private set; } + + [ClientRpc] + public void GrowClientRpc() { + m_Graphics.Grow(); + } + } +} \ No newline at end of file diff --git a/Assets/jelycho/Code/Beacons/BeaconActor.cs.meta b/Assets/jelycho/Code/Beacons/Beacon.cs.meta similarity index 100% rename from Assets/jelycho/Code/Beacons/BeaconActor.cs.meta rename to Assets/jelycho/Code/Beacons/Beacon.cs.meta diff --git a/Assets/jelycho/Code/Beacons/BeaconActor.cs b/Assets/jelycho/Code/Beacons/BeaconActor.cs deleted file mode 100644 index caf5e95..0000000 --- a/Assets/jelycho/Code/Beacons/BeaconActor.cs +++ /dev/null @@ -1,10 +0,0 @@ -using RebootKit.Engine.Services.Simulation; -using RebootKit.Engine.Simulation; - -namespace RebootReality.jelycho.Beacons { - public class BeaconActor : Actor { - - - - } -} \ No newline at end of file diff --git a/Assets/jelycho/Code/Beacons/BeaconGraphics.cs b/Assets/jelycho/Code/Beacons/BeaconGraphics.cs new file mode 100644 index 0000000..a26ae01 --- /dev/null +++ b/Assets/jelycho/Code/Beacons/BeaconGraphics.cs @@ -0,0 +1,123 @@ +using System; +using Unity.Mathematics; +using UnityEngine; + +namespace RebootReality.jelycho.Beacons { + public class BeaconGraphics : MonoBehaviour { + [SerializeField] BeaconElement[] m_BeaconElements; + + [Range(0.0f, 1.0f)] public float growAmount = 0.5f; + [SerializeField] public float growSpeed = 0.5f; + + float m_CurrentGrowAmount = 0.0f; + + void Update() { + if (m_CurrentGrowAmount >= 1.0f) { + foreach (BeaconElement beaconElement in m_BeaconElements) { + if (!beaconElement.usePulsing) { + continue; + } + + float t = (Mathf.Sin(Time.time * beaconElement.pulsingSpeed) + 1.0f) * 0.5f; + float scale = Mathf.Lerp(beaconElement.pulsingMinScale, + beaconElement.pulsingMaxScale, + t); + beaconElement.transform.localScale = Vector3.one * scale; + } + } + + if (Mathf.Approximately(m_CurrentGrowAmount, growAmount)) { + return; + } + + m_CurrentGrowAmount = Mathf.MoveTowards(m_CurrentGrowAmount, + growAmount, + growSpeed * Time.deltaTime); + UpdateElements(m_CurrentGrowAmount); + } + + void UpdateElements(float amount) { + foreach (BeaconElement element in m_BeaconElements) { + if (element.useLocalPosition && element.transform is not null) { + float localPositionT = math.remap(element.startLocalPositionAt, + element.endLocalPositionAt, + 0.0f, + 1.0f, + amount); + Vector3 localPosition = + Vector3.Lerp(element.minLocalPosition, element.maxLocalPosition, Mathf.Clamp01(localPositionT)); + element.transform.localPosition = localPosition; + } + + if (element.useScale && element.transform is not null) { + float scaleT = math.remap(element.startScaleAt, + element.endScaleAt, + 0.0f, + 1.0f, + amount); + Vector3 scale = Vector3.Lerp(element.minScale, element.maxScale, Mathf.Clamp01(scaleT)); + element.transform.localScale = scale; + } + + if (element.useCutoff && element.meshRenderer is not null) { + float cutoffT = math.remap(element.startCutoffAt, + element.endCutoffAt, + 0.0f, + 1.0f, + amount); + float cutoff = Mathf.Lerp(0.0f, 1.0f, Mathf.Clamp01(cutoffT)); + + if (element.flipCutoffDirection) { + cutoff = 1.0f - cutoff; + } + + Material material = element.meshRenderer.materials[element.materialIndex]; + material.SetFloat("_Cutoff", cutoff); + } + } + } + + public void Grow() { + m_CurrentGrowAmount = 0.0f; + UpdateElements(m_CurrentGrowAmount); + growAmount = 1.0f; + } + + [Serializable] + struct BeaconElement { + public Transform transform; + public MeshRenderer meshRenderer; + + [Header("Local Position(Transform)")] + public bool useLocalPosition; + + public Vector3 minLocalPosition; + public Vector3 maxLocalPosition; + public float startLocalPositionAt; + public float endLocalPositionAt; + + [Header("Scale (Transform)")] + public bool useScale; + public Vector3 minScale; + public Vector3 maxScale; + + public float startScaleAt; + public float endScaleAt; + + [Header("Mesh Cutoff (MeshRenderer)")] + public bool useCutoff; + public bool flipCutoffDirection; + + public float startCutoffAt; + public float endCutoffAt; + + public int materialIndex; + + [Header("Pulsing (Transform)")] + public bool usePulsing; + public float pulsingSpeed; + public float pulsingMinScale; + public float pulsingMaxScale; + } + } +} \ No newline at end of file diff --git a/Assets/jelycho/Code/Beacons/BeaconGraphics.cs.meta b/Assets/jelycho/Code/Beacons/BeaconGraphics.cs.meta new file mode 100644 index 0000000..fb638a3 --- /dev/null +++ b/Assets/jelycho/Code/Beacons/BeaconGraphics.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7db2986869814a7495d4f30cbd35d713 +timeCreated: 1751312364 \ No newline at end of file diff --git a/Assets/jelycho/Code/Main/GameWorldController.cs b/Assets/jelycho/Code/Main/GameWorldController.cs new file mode 100644 index 0000000..bdaaee6 --- /dev/null +++ b/Assets/jelycho/Code/Main/GameWorldController.cs @@ -0,0 +1,35 @@ +using System; +using RebootKit.Engine.Main; +using RebootReality.jelycho.Beacons; +using Unity.Netcode; +using UnityEngine; +using Logger = RebootKit.Engine.Foundation.Logger; + +namespace RebootReality.jelycho.Main { + public class GameWorldController : NetworkWorldController { + static readonly Logger s_Logger = new Logger(nameof(GameWorldController)); + + public static GameWorldController Instance { get; private set; } + + [SerializeField] BaseManager m_BaseManager; + + void Awake() { + Instance = this; + } + + public override void OnDestroy() { + Instance = null; + base.OnDestroy(); + } + + [Rpc(SendTo.Server)] + public void RequestBeaconSpawnRpc(Vector3 position) { + if (!IsServer) { + s_Logger.Error("Only the server can spawn beacons."); + return; + } + + m_BaseManager.SpawnBeaconServerRpc(position); + } + } +} \ No newline at end of file diff --git a/Assets/jelycho/Code/Main/GameWorldController.cs.meta b/Assets/jelycho/Code/Main/GameWorldController.cs.meta new file mode 100644 index 0000000..8375950 --- /dev/null +++ b/Assets/jelycho/Code/Main/GameWorldController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3d6f280a434549d99d5c2b7f178ba6b6 +timeCreated: 1751377186 \ No newline at end of file diff --git a/Assets/jelycho/Code/Main/JelychoGame.cs b/Assets/jelycho/Code/Main/JelychoGame.cs index 60c1455..f298eaa 100755 --- a/Assets/jelycho/Code/Main/JelychoGame.cs +++ b/Assets/jelycho/Code/Main/JelychoGame.cs @@ -21,12 +21,17 @@ namespace RebootReality.jelycho.Main { public class JelychoGame : Game { static readonly Logger s_Logger = new Logger(nameof(JelychoGame)); + + [Header("Gameplay")] + [SerializeField] GameWorldController m_GameWorldControllerPrefab; + + public GameWorldController m_GameWorldController; + [Header("Player")] [SerializeField] PlayerController m_PlayerControllerPrefab; [SerializeField] PlayerActor m_PlayerActorPrefab; - [SerializeField] string m_MainWorldID = "dev"; - List m_PlayerStates = new List(); + readonly List m_PlayerStates = new List(); void Awake() { } @@ -81,9 +86,23 @@ namespace RebootReality.jelycho.Main { public override void OnWorldLoaded() { base.OnWorldLoaded(); + + if (IsServer) { + m_GameWorldController = Instantiate(m_GameWorldControllerPrefab); + m_GameWorldController.NetworkObject.Spawn(); + } OnPlayerReadyRpc(NetworkManager.Singleton.LocalClientId); } + + public override void OnWorldUnload() { + base.OnWorldUnload(); + + if (IsServer) { + m_GameWorldController.NetworkObject.Despawn(); + Destroy(m_GameWorldController.gameObject); + } + } [Rpc(SendTo.Server)] void OnPlayerReadyRpc(ulong clientID) { @@ -111,12 +130,6 @@ namespace RebootReality.jelycho.Main { s_Logger.Error($"Player state for client {clientID} not found"); return null; } - - public override void OnWorldUnload() { - base.OnWorldUnload(); - - if (IsServer) { } - } } public static class JelychoConsoleCommands { @@ -142,12 +155,16 @@ namespace RebootReality.jelycho.Main { RR.WriteToConsole("Connecting to server..."); - // if (args.Length != 2) { - // RR.Console.WriteToOutput($"Usage: {args[0]} "); - // return; - // } + if (args.Length != 2) { + RR.WriteToConsole($"Usage: {args[0]} "); + return; + } - RR.Connect(); + if (ulong.TryParse(args[1], out ulong steamID)) { + RR.ConnectWithSteamID(steamID); + } else { + RR.WriteToConsole($"Invalid Steam ID: {args[1]}"); + } } [RCCMD("disconnect", "Disconnects from the current server")] diff --git a/Assets/jelycho/Code/Player/FPPCamera.cs b/Assets/jelycho/Code/Player/FPPCamera.cs index c1ed179..e26419a 100644 --- a/Assets/jelycho/Code/Player/FPPCamera.cs +++ b/Assets/jelycho/Code/Player/FPPCamera.cs @@ -1,6 +1,7 @@ using System; using RebootKit.Engine.Foundation; using RebootKit.Engine.Services.Simulation.Sensors; +using RebootKit.Engine.Simulation.Sensors; using RebootReality.jelycho.Main; using Unity.Cinemachine; using UnityEngine; diff --git a/Assets/jelycho/Code/Player/PlayerActor.cs b/Assets/jelycho/Code/Player/PlayerActor.cs index 84227a9..5f8bbe6 100755 --- a/Assets/jelycho/Code/Player/PlayerActor.cs +++ b/Assets/jelycho/Code/Player/PlayerActor.cs @@ -2,7 +2,10 @@ using RebootKit.Engine.Foundation; using RebootKit.Engine.Main; using RebootKit.Engine.Services.Simulation; +using RebootKit.Engine.Services.Simulation.Sensors; using RebootKit.Engine.Simulation; +using RebootKit.Engine.Simulation.Sensors; +using RebootReality.jelycho.Main; using Unity.Collections; using Unity.Mathematics; using Unity.Netcode; @@ -68,6 +71,11 @@ namespace RebootReality.jelycho.Player { [SerializeField] PhysicsObjectDragger m_PhysicsDragger; [SerializeField] FloatRange m_DragDistanceRange = new FloatRange(1.0f, 5.0f); + [Header("Beacon location picking")] + [SerializeField] LayerMask m_BeaconPlacementLayerMask = 0; + [SerializeField] float m_BeaconPlacementMaxDistance = 15.0f; + [SerializeField] float m_NormalDotUpThreshold = 0.5f; + [Header("Network")] [SerializeField] float m_MinTeleportDistance = 0.5f; @@ -302,13 +310,44 @@ namespace RebootReality.jelycho.Player { } public void PrimaryAction() { - m_Animator.SetTrigger(AnimatorParamHashes.Attack); + if (!IsOwner) { + s_Logger.Error("Only the owner can perform primary actions."); + return; + } + + if (TryGetBeaconPosition(out Vector3 beaconPosition)) { + SetAnimatorTriggerRpc(AnimatorParamHashes.Throw); + + GameWorldController.Instance.RequestBeaconSpawnRpc(beaconPosition); + } } public void SecondaryAction() { + if (!IsOwner) { + s_Logger.Error("Only the owner can perform secondary actions."); + return; + } + m_Animator.SetTrigger(AnimatorParamHashes.Block); } + [Rpc(SendTo.Everyone)] + void SetAnimatorTriggerRpc(int hash) { + m_Animator.SetTrigger(hash); + } + + bool TryGetBeaconPosition(out Vector3 position) { + Ray ray = new Ray(m_Camera.Camera.transform.position, m_Camera.Camera.transform.forward); + if (Physics.Raycast(ray, out RaycastHit hit, m_BeaconPlacementMaxDistance, m_BeaconPlacementLayerMask) && + Vector3.Dot(hit.normal, Vector3.up) >= m_NormalDotUpThreshold) { + position = hit.point; + return true; + } + + position = Vector3.zero; + return false; + } + struct AnimatorParamHashes { public static readonly int VelocityForwardNormalized = Animator.StringToHash("VelocityForwardNormalized"); public static readonly int VelocityRightNormalized = Animator.StringToHash("VelocityRightNormalized"); @@ -317,6 +356,9 @@ namespace RebootReality.jelycho.Player { public static readonly int Attack = Animator.StringToHash("Attack"); public static readonly int Block = Animator.StringToHash("Block"); + public static readonly int Throw = Animator.StringToHash("Throw"); + + public static readonly int Holding = Animator.StringToHash("Holding"); } void UpdateAnimator(Vector3 velocity) { @@ -336,6 +378,7 @@ namespace RebootReality.jelycho.Player { m_Animator.SetFloat(AnimatorParamHashes.TurnVelocity, turnVelocity); m_Animator.SetBool(AnimatorParamHashes.IsGrounded, m_Locomotion.IsGrounded); + m_Animator.SetInteger(AnimatorParamHashes.Holding, 1); } } } \ No newline at end of file diff --git a/Assets/jelycho/Code/Ropes/RopesManager.cs b/Assets/jelycho/Code/Ropes/RopesManager.cs index 1c71550..1b330b4 100644 --- a/Assets/jelycho/Code/Ropes/RopesManager.cs +++ b/Assets/jelycho/Code/Ropes/RopesManager.cs @@ -125,6 +125,21 @@ namespace RebootReality.jelycho.Ropes { m_Ropes.Add(rope); } + public void SpawnLockedRope(float ropeLength, float3 start, float3 end) { + int segmentsCount = (int)(ropeLength / m_RopeSegmentLength) + 1; + NativeArray positions = new NativeArray(segmentsCount, Allocator.Temp); + + for (int i = 0; i < segmentsCount; ++i) { + float t = (float)i / (segmentsCount - 1); + positions[i] = math.lerp(start, end, t); + } + + RopeData rope = new RopeData(positions); + rope.IsLocked[0] = true; + rope.IsLocked[rope.SegmentCount - 1] = true; + m_Ropes.Add(rope); + } + // @NOTE: Do not dispose the returned array, it is managed by the RopesManager. public NativeArray PeekRopePositions(int index) { return m_Ropes[index].Positions; diff --git a/Assets/jelycho/Code/WorldContext.cs b/Assets/jelycho/Code/WorldContext.cs index d5abcc9..48fddd2 100644 --- a/Assets/jelycho/Code/WorldContext.cs +++ b/Assets/jelycho/Code/WorldContext.cs @@ -1,5 +1,4 @@ -using RebootKit.Engine.Services.Simulation; -using RebootKit.Engine.Simulation; +using RebootKit.Engine.Simulation; using RebootReality.jelycho.Ropes; using UnityEngine; diff --git a/Assets/jelycho/Materials/m_beacon_egg.mat b/Assets/jelycho/Materials/m_beacon_egg.mat new file mode 100644 index 0000000..fb09f0d --- /dev/null +++ b/Assets/jelycho/Materials/m_beacon_egg.mat @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8522174566643758713 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: m_beacon_egg + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.6558154, g: 0.745283, b: 0.2988163, a: 1} + - _Color: {r: 0.6558154, g: 0.745283, b: 0.29881626, a: 1} + - _EmissionColor: {r: 0.043091122, g: 0.0070683784, b: 0.1152689, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/jelycho/Materials/m_beacon_egg.mat.meta b/Assets/jelycho/Materials/m_beacon_egg.mat.meta new file mode 100644 index 0000000..1bc8a1d --- /dev/null +++ b/Assets/jelycho/Materials/m_beacon_egg.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1dcb462ac201aad49aa87147ab03c936 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/jelycho/Materials/m_beacon_ground.mat b/Assets/jelycho/Materials/m_beacon_ground.mat new file mode 100644 index 0000000..e94dd59 --- /dev/null +++ b/Assets/jelycho/Materials/m_beacon_ground.mat @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8522174566643758713 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: m_beacon_ground + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.33962262, g: 0.11196829, b: 0.056069765, a: 1} + - _Color: {r: 0.3396226, g: 0.11196826, b: 0.056069747, a: 1} + - _EmissionColor: {r: 0.043091122, g: 0.0070683784, b: 0.1152689, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/jelycho/Materials/m_beacon_ground.mat.meta b/Assets/jelycho/Materials/m_beacon_ground.mat.meta new file mode 100644 index 0000000..4b51aca --- /dev/null +++ b/Assets/jelycho/Materials/m_beacon_ground.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 770429b7774033845bc58804ec3b0a1d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/jelycho/Materials/m_beacon_roots.mat b/Assets/jelycho/Materials/m_beacon_roots.mat new file mode 100644 index 0000000..17d9ac1 --- /dev/null +++ b/Assets/jelycho/Materials/m_beacon_roots.mat @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1507851795189920883 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: m_beacon_roots + m_Shader: {fileID: -6465566751694194690, guid: 3402019627a499241baf572675179174, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0.048 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.167 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.31863177, g: 0.4339623, b: 0.21902815, 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: [] + m_AllowLocking: 1 diff --git a/Assets/jelycho/Materials/m_beacon_roots.mat.meta b/Assets/jelycho/Materials/m_beacon_roots.mat.meta new file mode 100644 index 0000000..65ed8ca --- /dev/null +++ b/Assets/jelycho/Materials/m_beacon_roots.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1aac56c5fa7159c4b8a00dde50c2f259 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/jelycho/Materials/m_beacon_spore.mat b/Assets/jelycho/Materials/m_beacon_spore.mat new file mode 100644 index 0000000..7bc0d00 --- /dev/null +++ b/Assets/jelycho/Materials/m_beacon_spore.mat @@ -0,0 +1,140 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8522174566643758713 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: m_beacon_spore + m_Shader: {fileID: -6465566751694194690, guid: d9c78e38255d16147af11b628d123819, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0.051 + - _NoiseScale: 2000 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _PulsingSpeed: 1 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.116 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.26708704, g: 0.120149516, b: 0.33962262, a: 1} + - _Color: {r: 0.24940081, g: 0.11044855, b: 0.3207547, a: 1} + - _ColorB: {r: 0.7075472, g: 0.14351194, b: 0.18760704, a: 1} + - _EmissionColor: {r: 0.043091122, g: 0.0070683784, b: 0.1152689, a: 1} + - _PulsingScale: {r: -0.01, g: -0.05, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/jelycho/Materials/m_beacon_spore.mat.meta b/Assets/jelycho/Materials/m_beacon_spore.mat.meta new file mode 100644 index 0000000..ef287d1 --- /dev/null +++ b/Assets/jelycho/Materials/m_beacon_spore.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c5888e37a2d991468514090f5a02c44 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/jelycho/Materials/m_beacon_spore_spike.mat b/Assets/jelycho/Materials/m_beacon_spore_spike.mat new file mode 100644 index 0000000..e478ed6 --- /dev/null +++ b/Assets/jelycho/Materials/m_beacon_spore_spike.mat @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8522174566643758713 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: m_beacon_spore_spike + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0.525 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.17853892, g: 0.034264863, b: 0.20754719, a: 1} + - _Color: {r: 0.17853889, g: 0.034264863, b: 0.20754716, 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: [] + m_AllowLocking: 1 diff --git a/Assets/jelycho/Materials/m_beacon_spore_spike.mat.meta b/Assets/jelycho/Materials/m_beacon_spore_spike.mat.meta new file mode 100644 index 0000000..b575c91 --- /dev/null +++ b/Assets/jelycho/Materials/m_beacon_spore_spike.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1926cfba2666a314ca441435bb583f39 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/jelycho/Materials/sg_beacon_roots.shadergraph b/Assets/jelycho/Materials/sg_beacon_roots.shadergraph new file mode 100644 index 0000000..7e57c1f --- /dev/null +++ b/Assets/jelycho/Materials/sg_beacon_roots.shadergraph @@ -0,0 +1,1524 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "c127e2c466c840cc968edb4851557a2c", + "m_Properties": [ + { + "m_Id": "23027db1aa9c4f62b8918653a3e9143f" + }, + { + "m_Id": "3a82b1b5e1584c848fafeca1fa16ef0a" + }, + { + "m_Id": "53327eb0262a45e6bcdad6a1046f9654" + }, + { + "m_Id": "3ed70cfe8165449d93a4cf08b17b6920" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "7fc26cea5ba5417d88b5dc060c75998a" + } + ], + "m_Nodes": [ + { + "m_Id": "e5bbf195478d4595a394fe9da1be5c45" + }, + { + "m_Id": "5b4918cc318840f0b4cd8fc848b77a1f" + }, + { + "m_Id": "5fc3d87062114843a37749fca7024576" + }, + { + "m_Id": "fa3293effeb042a08298b650815e35dd" + }, + { + "m_Id": "5f3f7c75f16d422689d55b3fa3899b93" + }, + { + "m_Id": "4b5e18740ff245188f22798588bc61c5" + }, + { + "m_Id": "03d3d5087f224c8ab93890a378982acc" + }, + { + "m_Id": "79bd632e4906486bb197de27b6bcff1e" + }, + { + "m_Id": "079ba6ee6eef46728a7082e0708a6112" + }, + { + "m_Id": "bd1a3abeda9f41669050ad2a4e9c1fd9" + }, + { + "m_Id": "d9a73c277499438e840599f072e2a61d" + }, + { + "m_Id": "a741660d995c4199b35f5be3fce72f58" + }, + { + "m_Id": "0540ce8fcfba4f82916304ab2b74be2e" + }, + { + "m_Id": "920646e7674340d8ad29678d62e1e6ed" + }, + { + "m_Id": "b0866f38bef243b7b232946a4eddd998" + }, + { + "m_Id": "da21569e176647a991c5eea2e9c8769f" + }, + { + "m_Id": "7bd8b4593d0e442c9541aae859c90c18" + }, + { + "m_Id": "1662183aec424d37b31e3d40936e3fb3" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1662183aec424d37b31e3d40936e3fb3" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "0540ce8fcfba4f82916304ab2b74be2e" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7bd8b4593d0e442c9541aae859c90c18" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "920646e7674340d8ad29678d62e1e6ed" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a741660d995c4199b35f5be3fce72f58" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "03d3d5087f224c8ab93890a378982acc" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b0866f38bef243b7b232946a4eddd998" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "da21569e176647a991c5eea2e9c8769f" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "bd1a3abeda9f41669050ad2a4e9c1fd9" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "fa3293effeb042a08298b650815e35dd" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d9a73c277499438e840599f072e2a61d" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4b5e18740ff245188f22798588bc61c5" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "da21569e176647a991c5eea2e9c8769f" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1662183aec424d37b31e3d40936e3fb3" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [ + { + "m_Id": "e5bbf195478d4595a394fe9da1be5c45" + }, + { + "m_Id": "5b4918cc318840f0b4cd8fc848b77a1f" + }, + { + "m_Id": "5fc3d87062114843a37749fca7024576" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 200.0 + }, + "m_Blocks": [ + { + "m_Id": "fa3293effeb042a08298b650815e35dd" + }, + { + "m_Id": "5f3f7c75f16d422689d55b3fa3899b93" + }, + { + "m_Id": "4b5e18740ff245188f22798588bc61c5" + }, + { + "m_Id": "03d3d5087f224c8ab93890a378982acc" + }, + { + "m_Id": "79bd632e4906486bb197de27b6bcff1e" + }, + { + "m_Id": "079ba6ee6eef46728a7082e0708a6112" + }, + { + "m_Id": "0540ce8fcfba4f82916304ab2b74be2e" + }, + { + "m_Id": "920646e7674340d8ad29678d62e1e6ed" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "90fa41c3dd3a403e85c3a8007cf09dee" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "03d3d5087f224c8ab93890a378982acc", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Smoothness", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "0e9bd85f5f36498b97d8a0ad0783e65d" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Smoothness" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "0540ce8fcfba4f82916304ab2b74be2e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "34edfc0004404110adb3d91d9681b79f" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "079ba6ee6eef46728a7082e0708a6112", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Occlusion", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "a0cc21f004b7489aa9c8d173d8ec5f50" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Occlusion" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "0c717c75c64349fd9cdc15e691c7346a", + "m_Id": 0, + "m_DisplayName": "Normal (Tangent Space)", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalTS", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 3 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0e9bd85f5f36498b97d8a0ad0783e65d", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Smoothness", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "11351abae28f45d29febb0f3e1ded9a5", + "m_Id": 0, + "m_DisplayName": "Color", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "11dd288c5d1c4f76a515262d5af298fb", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.OneMinusNode", + "m_ObjectId": "1662183aec424d37b31e3d40936e3fb3", + "m_Group": { + "m_Id": "" + }, + "m_Name": "One Minus", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -292.0, + "y": 421.0, + "width": 128.00001525878907, + "height": 94.0 + } + }, + "m_Slots": [ + { + "m_Id": "a7d234635a5947e692a39f42bacb43b0" + }, + { + "m_Id": "6a38c5046b2d46f29625e1a11dbe2e82" + } + ], + "synonyms": [ + "complement", + "invert", + "opposite" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "23027db1aa9c4f62b8918653a3e9143f", + "m_Guid": { + "m_GuidSerialized": "a7d1fcbb-5738-4041-a2ec-b2c953606760" + }, + "m_Name": "Cutoff", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Cutoff", + "m_DefaultReferenceName": "_Cutoff", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", + "m_ObjectId": "2d03fe444f664c6d9b6e952d5aba1349", + "m_WorkflowMode": 1, + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false, + "m_BlendModePreserveSpecular": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3106164d24d444e0a146cf560aebaa16", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "34edfc0004404110adb3d91d9681b79f", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "366f7d15e025401494fb72b3e3a414d5", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "3a82b1b5e1584c848fafeca1fa16ef0a", + "m_Guid": { + "m_GuidSerialized": "23f980dd-6909-47c0-82cc-6de300ac0539" + }, + "m_Name": "Color", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Color", + "m_DefaultReferenceName": "_Color", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.08410465717315674, + "g": 0.5094339847564697, + "b": 0.1979856789112091, + "a": 1.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "3ed70cfe8165449d93a4cf08b17b6920", + "m_Guid": { + "m_GuidSerialized": "0c2b7e1b-09e2-42e1-85a4-e9d8f6d8b064" + }, + "m_Name": "Smoothness", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Smoothness", + "m_DefaultReferenceName": "_Smoothness", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.0, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "4697b930e3314ef3b1d4822961cae137", + "m_Id": 0, + "m_DisplayName": "Metallic", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Metallic", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "4b5e18740ff245188f22798588bc61c5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Metallic", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "4697b930e3314ef3b1d4822961cae137" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Metallic" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "4dab31bcdc61462daf596d1c17a70c73", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "53327eb0262a45e6bcdad6a1046f9654", + "m_Guid": { + "m_GuidSerialized": "6c554e3f-38f8-40d3-87c3-627f21d9d46a" + }, + "m_Name": "Metallic", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Metallic", + "m_DefaultReferenceName": "_Metallic", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.0, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5b4918cc318840f0b4cd8fc848b77a1f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "f2d322545f9a41018ce37b63edfe260d" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5f3f7c75f16d422689d55b3fa3899b93", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.NormalTS", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "0c717c75c64349fd9cdc15e691c7346a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.NormalTS" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5fc3d87062114843a37749fca7024576", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "11dd288c5d1c4f76a515262d5af298fb" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "654f89df51a9489d912976ccb692384b", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "6a38c5046b2d46f29625e1a11dbe2e82", + "m_Id": 1, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "79bd632e4906486bb197de27b6bcff1e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "93023041957941feb7b0ab7a956ea529" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "7bd8b4593d0e442c9541aae859c90c18", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -187.9999542236328, + "y": 541.9999389648438, + "width": 107.9999771118164, + "height": 34.00006103515625 + } + }, + "m_Slots": [ + { + "m_Id": "d7f9fa260ab34b1eb25775c37c86c78d" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "23027db1aa9c4f62b8918653a3e9143f" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7c5d3d87bab34c839e4abeed6f3daea9", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "7fc26cea5ba5417d88b5dc060c75998a", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "23027db1aa9c4f62b8918653a3e9143f" + }, + { + "m_Id": "3a82b1b5e1584c848fafeca1fa16ef0a" + }, + { + "m_Id": "53327eb0262a45e6bcdad6a1046f9654" + }, + { + "m_Id": "3ed70cfe8165449d93a4cf08b17b6920" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "887039a35a53426a806882e468b984f1", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "90fa41c3dd3a403e85c3a8007cf09dee", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "2d03fe444f664c6d9b6e952d5aba1349" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 0, + "m_AlphaClip": true, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "920646e7674340d8ad29678d62e1e6ed", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "3106164d24d444e0a146cf560aebaa16" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "93023041957941feb7b0ab7a956ea529", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "936459393f1543bfa4b305cf17d843b7", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "9f3f27d6e7c0476e9bbc04f6870758f1", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a0cc21f004b7489aa9c8d173d8ec5f50", + "m_Id": 0, + "m_DisplayName": "Ambient Occlusion", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Occlusion", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a741660d995c4199b35f5be3fce72f58", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -304.0, + "y": 337.0, + "width": 140.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "4dab31bcdc61462daf596d1c17a70c73" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "3ed70cfe8165449d93a4cf08b17b6920" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "a7d234635a5947e692a39f42bacb43b0", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVNode", + "m_ObjectId": "b0866f38bef243b7b232946a4eddd998", + "m_Group": { + "m_Id": "" + }, + "m_Name": "UV", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -615.9999389648438, + "y": 359.0, + "width": 144.99996948242188, + "height": 128.99996948242188 + } + }, + "m_Slots": [ + { + "m_Id": "c51c59ecff2742babc82b5e00efa9d41" + } + ], + "synonyms": [ + "texcoords", + "coords", + "coordinates" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_OutputChannel": 1 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "bd1a3abeda9f41669050ad2a4e9c1fd9", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -280.0, + "y": 226.00003051757813, + "width": 104.99996948242188, + "height": 33.999969482421878 + } + }, + "m_Slots": [ + { + "m_Id": "11351abae28f45d29febb0f3e1ded9a5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "3a82b1b5e1584c848fafeca1fa16ef0a" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "c51c59ecff2742babc82b5e00efa9d41", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "d7f5e5bf739f48a984f22ee93821fbff", + "m_Id": 0, + "m_DisplayName": "Metallic", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "d7f9fa260ab34b1eb25775c37c86c78d", + "m_Id": 0, + "m_DisplayName": "Cutoff", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "d9a73c277499438e840599f072e2a61d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -280.0, + "y": 284.0000305175781, + "width": 116.0, + "height": 33.999969482421878 + } + }, + "m_Slots": [ + { + "m_Id": "d7f5e5bf739f48a984f22ee93821fbff" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "53327eb0262a45e6bcdad6a1046f9654" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "da21569e176647a991c5eea2e9c8769f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -433.9999694824219, + "y": 395.0, + "width": 120.0, + "height": 148.99993896484376 + } + }, + "m_Slots": [ + { + "m_Id": "654f89df51a9489d912976ccb692384b" + }, + { + "m_Id": "366f7d15e025401494fb72b3e3a414d5" + }, + { + "m_Id": "9f3f27d6e7c0476e9bbc04f6870758f1" + }, + { + "m_Id": "887039a35a53426a806882e468b984f1" + }, + { + "m_Id": "7c5d3d87bab34c839e4abeed6f3daea9" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "e5bbf195478d4595a394fe9da1be5c45", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "936459393f1543bfa4b305cf17d843b7" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "ea0de4f80bf54c558e5177fe54ae19ff", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "f2d322545f9a41018ce37b63edfe260d", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "fa3293effeb042a08298b650815e35dd", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "ea0de4f80bf54c558e5177fe54ae19ff" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + diff --git a/Assets/jelycho/Materials/sg_beacon_roots.shadergraph.meta b/Assets/jelycho/Materials/sg_beacon_roots.shadergraph.meta new file mode 100644 index 0000000..bab07ff --- /dev/null +++ b/Assets/jelycho/Materials/sg_beacon_roots.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3402019627a499241baf572675179174 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/jelycho/Materials/sg_beacon_spore.shadergraph b/Assets/jelycho/Materials/sg_beacon_spore.shadergraph new file mode 100644 index 0000000..f0f5638 --- /dev/null +++ b/Assets/jelycho/Materials/sg_beacon_spore.shadergraph @@ -0,0 +1,1261 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "d631fc823cef427ca57aed507ce860ea", + "m_Properties": [ + { + "m_Id": "3c1ff46ac3fe4ac3aea3fcbbbb7fde55" + }, + { + "m_Id": "330087c46323450cb43230d0ad3ac916" + }, + { + "m_Id": "19f8b60671764e678f2195f8c8bfa769" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "2997a22026544bacb38c734dd62018ac" + } + ], + "m_Nodes": [ + { + "m_Id": "133638f8fbe1429e88b5460c4f2146bf" + }, + { + "m_Id": "81bc28abeb3c4fbd9f951c551e2faee9" + }, + { + "m_Id": "f597414cc8c040d5bc3a5171bc19103a" + }, + { + "m_Id": "e02fe1ba071b49c48c618b38c2ae09ac" + }, + { + "m_Id": "0fc419fb79dd477d85eeb601ce06311b" + }, + { + "m_Id": "6904da4d4b14439382e3549d7a7c9ce3" + }, + { + "m_Id": "a5b4eb2ba18546c5b7bcfd7d2a809d73" + }, + { + "m_Id": "4e5064fab1694338ae8421213848eb5b" + }, + { + "m_Id": "3faee6e81e3e49e9a44511a96b612240" + }, + { + "m_Id": "501d5970f6324b459e520a58948f2376" + }, + { + "m_Id": "4c350f1bfcac4d919ad9c88d434a3c52" + }, + { + "m_Id": "cd4aa7d8688c4b53b9272541b7e6ec2a" + }, + { + "m_Id": "e74cfd36e3ad4efcb5b7fa79d2a43580" + }, + { + "m_Id": "7688d672ef1b4cfab4a36754b2449d7e" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "4c350f1bfcac4d919ad9c88d434a3c52" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e74cfd36e3ad4efcb5b7fa79d2a43580" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "501d5970f6324b459e520a58948f2376" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e74cfd36e3ad4efcb5b7fa79d2a43580" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "7688d672ef1b4cfab4a36754b2449d7e" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4c350f1bfcac4d919ad9c88d434a3c52" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "cd4aa7d8688c4b53b9272541b7e6ec2a" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e74cfd36e3ad4efcb5b7fa79d2a43580" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e74cfd36e3ad4efcb5b7fa79d2a43580" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e02fe1ba071b49c48c618b38c2ae09ac" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [ + { + "m_Id": "133638f8fbe1429e88b5460c4f2146bf" + }, + { + "m_Id": "81bc28abeb3c4fbd9f951c551e2faee9" + }, + { + "m_Id": "f597414cc8c040d5bc3a5171bc19103a" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 200.0 + }, + "m_Blocks": [ + { + "m_Id": "e02fe1ba071b49c48c618b38c2ae09ac" + }, + { + "m_Id": "0fc419fb79dd477d85eeb601ce06311b" + }, + { + "m_Id": "6904da4d4b14439382e3549d7a7c9ce3" + }, + { + "m_Id": "a5b4eb2ba18546c5b7bcfd7d2a809d73" + }, + { + "m_Id": "4e5064fab1694338ae8421213848eb5b" + }, + { + "m_Id": "3faee6e81e3e49e9a44511a96b612240" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "9c72658da4c74ef1a0cc30fd564eb7d6" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "0260d05ce7fb4cd093104a5827690e8c", + "m_Id": 0, + "m_DisplayName": "Color", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "03a49fa3c08d4df095188af394b5d35b", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0c31bae69b9c4009920315c12a9f4c83", + "m_Id": 0, + "m_DisplayName": "Ambient Occlusion", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Occlusion", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "0fc419fb79dd477d85eeb601ce06311b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.NormalTS", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "d05a271c031041f7b2e96199aaea8099" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.NormalTS" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "133638f8fbe1429e88b5460c4f2146bf", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "40d05eb88c4940108e08d969b337daed" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "19f8b60671764e678f2195f8c8bfa769", + "m_Guid": { + "m_GuidSerialized": "e6b8ef24-33c9-4128-a0d1-cdd58d4c4b94" + }, + "m_Name": "NoiseScale", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "NoiseScale", + "m_DefaultReferenceName": "_NoiseScale", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "2997a22026544bacb38c734dd62018ac", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "3c1ff46ac3fe4ac3aea3fcbbbb7fde55" + }, + { + "m_Id": "330087c46323450cb43230d0ad3ac916" + }, + { + "m_Id": "19f8b60671764e678f2195f8c8bfa769" + } + ] +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "330087c46323450cb43230d0ad3ac916", + "m_Guid": { + "m_GuidSerialized": "7fca1fec-92a1-4024-9ac8-fbd51cd8ed32" + }, + "m_Name": "ColorB", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "ColorB", + "m_DefaultReferenceName": "_ColorB", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "344d50199ed84b4aa60da526c63b4112", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "3c1ff46ac3fe4ac3aea3fcbbbb7fde55", + "m_Guid": { + "m_GuidSerialized": "42c6c99b-88bf-42e7-a7de-2a23c62fdbc0" + }, + "m_Name": "Color", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Color", + "m_DefaultReferenceName": "_Color", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "3faee6e81e3e49e9a44511a96b612240", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Occlusion", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "0c31bae69b9c4009920315c12a9f4c83" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Occlusion" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "40d05eb88c4940108e08d969b337daed", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "444d773797de48b7a802b8bb16e46276", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Smoothness", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.NoiseNode", + "m_ObjectId": "4c350f1bfcac4d919ad9c88d434a3c52", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Simple Noise", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -735.0, + "y": 284.99993896484377, + "width": 147.00006103515626, + "height": 153.0 + } + }, + "m_Slots": [ + { + "m_Id": "d57458eac0c845118e9fafae0d85c84a" + }, + { + "m_Id": "bee92050fd004c22adb97677bf87cab7" + }, + { + "m_Id": "8f646e578df24bcea3bb5459f222b974" + } + ], + "synonyms": [ + "value noise" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_HashType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "4e5064fab1694338ae8421213848eb5b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "344d50199ed84b4aa60da526c63b4112" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "501d5970f6324b459e520a58948f2376", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -783.0, + "y": 112.0, + "width": 105.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "0260d05ce7fb4cd093104a5827690e8c" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "3c1ff46ac3fe4ac3aea3fcbbbb7fde55" + } +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", + "m_ObjectId": "55d01b4a094c4d19a36a9bdfb2780af9", + "m_WorkflowMode": 1, + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false, + "m_BlendModePreserveSpecular": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "605dd09de15349a790973a41678b6933", + "m_Id": 0, + "m_DisplayName": "ColorB", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "6904da4d4b14439382e3549d7a7c9ce3", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Metallic", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "dade324999504916b24c02b6ea6845d6" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Metallic" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "69613080844140fd918b536756dd02a9", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "7688d672ef1b4cfab4a36754b2449d7e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1052.0, + "y": 421.0, + "width": 134.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "c2aa664258b94e73955b40fab4d4c4b1" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "19f8b60671764e678f2195f8c8bfa769" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "81bc28abeb3c4fbd9f951c551e2faee9", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "968dd87e13b04339830153fdc3327c2a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "864c80d167e445fbb5e7372df283801c", + "m_Id": 2, + "m_DisplayName": "T", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "T", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8f646e578df24bcea3bb5459f222b974", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "968dd87e13b04339830153fdc3327c2a", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "98c3c14bbde047e3babe258622d00c39", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "9c72658da4c74ef1a0cc30fd564eb7d6", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "55d01b4a094c4d19a36a9bdfb2780af9" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "9e36ecf786da4caa8ba686b57b8d50d1", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "a5b4eb2ba18546c5b7bcfd7d2a809d73", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Smoothness", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "444d773797de48b7a802b8bb16e46276" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Smoothness" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "bee92050fd004c22adb97677bf87cab7", + "m_Id": 1, + "m_DisplayName": "Scale", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Scale", + "m_StageCapability": 3, + "m_Value": 500.0, + "m_DefaultValue": 500.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c2aa664258b94e73955b40fab4d4c4b1", + "m_Id": 0, + "m_DisplayName": "NoiseScale", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ca743c08a0e24c2b9d86641d0310de91", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "cd4aa7d8688c4b53b9272541b7e6ec2a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -791.0, + "y": 200.0, + "width": 113.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "605dd09de15349a790973a41678b6933" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "330087c46323450cb43230d0ad3ac916" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "d05a271c031041f7b2e96199aaea8099", + "m_Id": 0, + "m_DisplayName": "Normal (Tangent Space)", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalTS", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 3 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "d57458eac0c845118e9fafae0d85c84a", + "m_Id": 0, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "dade324999504916b24c02b6ea6845d6", + "m_Id": 0, + "m_DisplayName": "Metallic", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Metallic", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "e02fe1ba071b49c48c618b38c2ae09ac", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "03a49fa3c08d4df095188af394b5d35b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.LerpNode", + "m_ObjectId": "e74cfd36e3ad4efcb5b7fa79d2a43580", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Lerp", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -526.9999389648438, + "y": 199.99998474121095, + "width": 129.99993896484376, + "height": 141.99998474121095 + } + }, + "m_Slots": [ + { + "m_Id": "98c3c14bbde047e3babe258622d00c39" + }, + { + "m_Id": "ca743c08a0e24c2b9d86641d0310de91" + }, + { + "m_Id": "864c80d167e445fbb5e7372df283801c" + }, + { + "m_Id": "9e36ecf786da4caa8ba686b57b8d50d1" + } + ], + "synonyms": [ + "mix", + "blend", + "linear interpolate" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "f597414cc8c040d5bc3a5171bc19103a", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "69613080844140fd918b536756dd02a9" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + diff --git a/Assets/jelycho/Materials/sg_beacon_spore.shadergraph.meta b/Assets/jelycho/Materials/sg_beacon_spore.shadergraph.meta new file mode 100644 index 0000000..135b91a --- /dev/null +++ b/Assets/jelycho/Materials/sg_beacon_spore.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d9c78e38255d16147af11b628d123819 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/jelycho/Models/Beacon/Beacon.fbx b/Assets/jelycho/Models/Beacon/Beacon.fbx index af2c5ca..99c3b06 100644 Binary files a/Assets/jelycho/Models/Beacon/Beacon.fbx and b/Assets/jelycho/Models/Beacon/Beacon.fbx differ diff --git a/Assets/jelycho/Prefabs/beacon_0.prefab b/Assets/jelycho/Prefabs/beacon_0.prefab new file mode 100644 index 0000000..6a67ac6 --- /dev/null +++ b/Assets/jelycho/Prefabs/beacon_0.prefab @@ -0,0 +1,501 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &611922230303722876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5368312062609190479} + - component: {fileID: 4051450131610750715} + - component: {fileID: 1553563146403112987} + - component: {fileID: 2346714148002668394} + m_Layer: 0 + m_Name: beacon_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5368312062609190479 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 611922230303722876} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.2, y: 0.47, z: 12.07} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 303763981901140674} + - {fileID: 6137122062910868373} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4051450131610750715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 611922230303722876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalObjectIdHash: 4066693613 + InScenePlacedSourceGlobalObjectIdHash: 0 + DeferredDespawnTick: 0 + Ownership: 1 + AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 1 + ActiveSceneSynchronization: 0 + SceneMigrationSynchronization: 1 + SpawnWithObservers: 1 + DontDestroyWithOwner: 0 + AutoObjectParentSync: 1 + SyncOwnerTransformWhenParented: 1 + AllowOwnerToParent: 0 +--- !u!114 &1553563146403112987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 611922230303722876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f5b1ca118d5b4d689660039de71a6625, type: 3} + m_Name: + m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 + m_Graphics: {fileID: 2346714148002668394} + k__BackingField: {fileID: 6137122062910868373} +--- !u!114 &2346714148002668394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 611922230303722876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7db2986869814a7495d4f30cbd35d713, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BeaconElements: + - transform: {fileID: 303763981901140674} + meshRenderer: {fileID: 0} + useLocalPosition: 0 + minLocalPosition: {x: 0, y: 0, z: 0} + maxLocalPosition: {x: 0, y: 0, z: 0} + startLocalPositionAt: 0 + endLocalPositionAt: 0 + useScale: 1 + minScale: {x: 1, y: 0, z: 1} + maxScale: {x: 1, y: 1, z: 1} + startScaleAt: 0 + endScaleAt: 0.2 + useCutoff: 0 + flipCutoffDirection: 0 + startCutoffAt: 0 + endCutoffAt: 1 + materialIndex: 0 + usePulsing: 0 + pulsingSpeed: 0 + pulsingMinScale: 0 + pulsingMaxScale: 0 + - transform: {fileID: 0} + meshRenderer: {fileID: 8972167519025179630} + useLocalPosition: 0 + minLocalPosition: {x: 0, y: 0, z: 0} + maxLocalPosition: {x: 0, y: 0, z: 0} + startLocalPositionAt: 0 + endLocalPositionAt: 0 + useScale: 0 + minScale: {x: 0, y: 0, z: 0} + maxScale: {x: 1, y: 1, z: 1} + startScaleAt: 0 + endScaleAt: 0.075 + useCutoff: 1 + flipCutoffDirection: 1 + startCutoffAt: 0 + endCutoffAt: 1 + materialIndex: 0 + usePulsing: 0 + pulsingSpeed: 0 + pulsingMinScale: 0 + pulsingMaxScale: 0 + - transform: {fileID: 0} + meshRenderer: {fileID: 9111140545799501785} + useLocalPosition: 0 + minLocalPosition: {x: 0, y: 0, z: 0} + maxLocalPosition: {x: 0, y: 0, z: 0} + startLocalPositionAt: 0 + endLocalPositionAt: 0 + useScale: 0 + minScale: {x: 0, y: 0, z: 0} + maxScale: {x: 1, y: 1, z: 1} + startScaleAt: 0 + endScaleAt: 0.075 + useCutoff: 1 + flipCutoffDirection: 1 + startCutoffAt: 0 + endCutoffAt: 1 + materialIndex: 0 + usePulsing: 0 + pulsingSpeed: 0 + pulsingMinScale: 0 + pulsingMaxScale: 0 + - transform: {fileID: 5773841490848072598} + meshRenderer: {fileID: 0} + useLocalPosition: 0 + minLocalPosition: {x: 0, y: 0, z: 0} + maxLocalPosition: {x: 0, y: 0, z: 0} + startLocalPositionAt: 0 + endLocalPositionAt: 0 + useScale: 1 + minScale: {x: 0, y: 0, z: 0} + maxScale: {x: 1, y: 1, z: 1} + startScaleAt: 0.5 + endScaleAt: 1 + useCutoff: 0 + flipCutoffDirection: 0 + startCutoffAt: 0 + endCutoffAt: 1 + materialIndex: 0 + usePulsing: 1 + pulsingSpeed: 0.6 + pulsingMinScale: 1 + pulsingMaxScale: 1.07 + - transform: {fileID: 4013230659676766657} + meshRenderer: {fileID: 0} + useLocalPosition: 0 + minLocalPosition: {x: 0, y: 0, z: 0} + maxLocalPosition: {x: 0, y: 0, z: 0} + startLocalPositionAt: 0 + endLocalPositionAt: 0 + useScale: 1 + minScale: {x: 0, y: 0, z: 0} + maxScale: {x: 1, y: 1, z: 1} + startScaleAt: 0.6 + endScaleAt: 1 + useCutoff: 0 + flipCutoffDirection: 0 + startCutoffAt: 0 + endCutoffAt: 1 + materialIndex: 0 + usePulsing: 1 + pulsingSpeed: 1 + pulsingMinScale: 0.95 + pulsingMaxScale: 1.05 + - transform: {fileID: 7180679603859951833} + meshRenderer: {fileID: 0} + useLocalPosition: 0 + minLocalPosition: {x: 0, y: 0, z: 0} + maxLocalPosition: {x: 0, y: 0, z: 0} + startLocalPositionAt: 0 + endLocalPositionAt: 0 + useScale: 1 + minScale: {x: 0, y: 0, z: 0} + maxScale: {x: 1, y: 1, z: 1} + startScaleAt: 0.55 + endScaleAt: 0.86 + useCutoff: 0 + flipCutoffDirection: 0 + startCutoffAt: 0 + endCutoffAt: 1 + materialIndex: 0 + usePulsing: 1 + pulsingSpeed: 0.5 + pulsingMinScale: 1 + pulsingMaxScale: 1.1 + - transform: {fileID: 5925535488367145327} + meshRenderer: {fileID: 0} + useLocalPosition: 0 + minLocalPosition: {x: 0, y: 0, z: 0} + maxLocalPosition: {x: 0, y: 0, z: 0} + startLocalPositionAt: 0 + endLocalPositionAt: 0 + useScale: 1 + minScale: {x: 0, y: 0, z: 0} + maxScale: {x: 1, y: 1, z: 1} + startScaleAt: 0.4 + endScaleAt: 0.9 + useCutoff: 0 + flipCutoffDirection: 0 + startCutoffAt: 0 + endCutoffAt: 1 + materialIndex: 0 + usePulsing: 1 + pulsingSpeed: 2 + pulsingMinScale: 1 + pulsingMaxScale: 1.1 + - transform: {fileID: 7072176201810835756} + meshRenderer: {fileID: 0} + useLocalPosition: 0 + minLocalPosition: {x: 0, y: 0, z: 0} + maxLocalPosition: {x: 0, y: 0, z: 0} + startLocalPositionAt: 0 + endLocalPositionAt: 0 + useScale: 1 + minScale: {x: 0, y: 0, z: 0} + maxScale: {x: 1, y: 1, z: 1} + startScaleAt: 0.7 + endScaleAt: 1 + useCutoff: 0 + flipCutoffDirection: 0 + startCutoffAt: 0 + endCutoffAt: 1 + materialIndex: 0 + usePulsing: 1 + pulsingSpeed: 1 + pulsingMinScale: 1 + pulsingMaxScale: 1.1 + - transform: {fileID: 7001465727540282535} + meshRenderer: {fileID: 0} + useLocalPosition: 0 + minLocalPosition: {x: 0, y: 0, z: 0} + maxLocalPosition: {x: 0, y: 0, z: 0} + startLocalPositionAt: 0 + endLocalPositionAt: 0 + useScale: 1 + minScale: {x: 0, y: 0, z: 0} + maxScale: {x: 1, y: 1, z: 1} + startScaleAt: 0.5 + endScaleAt: 0.8 + useCutoff: 0 + flipCutoffDirection: 0 + startCutoffAt: 0 + endCutoffAt: 1 + materialIndex: 0 + usePulsing: 1 + pulsingSpeed: 1.5 + pulsingMinScale: 1 + pulsingMaxScale: 1.1 + - transform: {fileID: 3590141156393107861} + meshRenderer: {fileID: 0} + useLocalPosition: 0 + minLocalPosition: {x: 0, y: 0, z: 0.0000003833224} + maxLocalPosition: {x: 0, y: 5.077259, z: 0.0000003833224} + startLocalPositionAt: 0 + endLocalPositionAt: 1 + useScale: 1 + minScale: {x: 0, y: 0, z: 0} + maxScale: {x: 1, y: 1, z: 1} + startScaleAt: 0.8 + endScaleAt: 1 + useCutoff: 0 + flipCutoffDirection: 0 + startCutoffAt: 0 + endCutoffAt: 1 + materialIndex: 0 + usePulsing: 0 + pulsingSpeed: 0 + pulsingMinScale: 0 + pulsingMaxScale: 0 + growAmount: 0 + growSpeed: 1 +--- !u!1 &2389798089962338827 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6137122062910868373} + m_Layer: 0 + m_Name: rope_connection_point + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6137122062910868373 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2389798089962338827} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.001, y: 6.086, z: 0.054} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5368312062609190479} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &269537330169902377 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5368312062609190479} + m_Modifications: + - target: {fileID: -8932214267722588972, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 0c5888e37a2d991468514090f5a02c44, type: 2} + - target: {fileID: -8679921383154817045, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000003774895 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8433376283225481895, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 0c5888e37a2d991468514090f5a02c44, type: 2} + - target: {fileID: -7511558181221131132, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 770429b7774033845bc58804ec3b0a1d, type: 2} + - target: {fileID: -7473489963570430640, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 1926cfba2666a314ca441435bb583f39, type: 2} + - target: {fileID: -4430112815281056333, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 0c5888e37a2d991468514090f5a02c44, type: 2} + - target: {fileID: -2767412827795229325, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 0c5888e37a2d991468514090f5a02c44, type: 2} + - target: {fileID: -2194311349705698323, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 1926cfba2666a314ca441435bb583f39, type: 2} + - target: {fileID: -2072753907991560270, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 0c5888e37a2d991468514090f5a02c44, type: 2} + - target: {fileID: -1833491477096314617, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 0c5888e37a2d991468514090f5a02c44, type: 2} + - target: {fileID: -158522313859251472, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 1aac56c5fa7159c4b8a00dde50c2f259, type: 2} + - target: {fileID: -112283163336082354, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 1926cfba2666a314ca441435bb583f39, type: 2} + - target: {fileID: -54575271131423033, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 1aac56c5fa7159c4b8a00dde50c2f259, type: 2} + - target: {fileID: 75491895046491531, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 1dcb462ac201aad49aa87147ab03c936, type: 2} + - target: {fileID: 919132149155446097, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: m_Name + value: Beacon + objectReference: {fileID: 0} + - target: {fileID: 1338196921616364246, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 1926cfba2666a314ca441435bb583f39, type: 2} + - target: {fileID: 6555793902199746532, guid: d45f4c581513f044689eb22d4704c151, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 1926cfba2666a314ca441435bb583f39, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d45f4c581513f044689eb22d4704c151, type: 3} +--- !u!4 &303763981901140674 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d45f4c581513f044689eb22d4704c151, type: 3} + m_PrefabInstance: {fileID: 269537330169902377} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3590141156393107861 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5589203969274956612, guid: d45f4c581513f044689eb22d4704c151, type: 3} + m_PrefabInstance: {fileID: 269537330169902377} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4013230659676766657 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3750454793450452200, guid: d45f4c581513f044689eb22d4704c151, type: 3} + m_PrefabInstance: {fileID: 269537330169902377} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5773841490848072598 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -3198302335083039041, guid: d45f4c581513f044689eb22d4704c151, type: 3} + m_PrefabInstance: {fileID: 269537330169902377} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5925535488367145327 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -3348938799212936122, guid: d45f4c581513f044689eb22d4704c151, type: 3} + m_PrefabInstance: {fileID: 269537330169902377} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7001465727540282535 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2119043414763261554, guid: d45f4c581513f044689eb22d4704c151, type: 3} + m_PrefabInstance: {fileID: 269537330169902377} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7072176201810835756 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7032647959688514565, guid: d45f4c581513f044689eb22d4704c151, type: 3} + m_PrefabInstance: {fileID: 269537330169902377} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7180679603859951833 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6925252856770258416, guid: d45f4c581513f044689eb22d4704c151, type: 3} + m_PrefabInstance: {fileID: 269537330169902377} + m_PrefabAsset: {fileID: 0} +--- !u!23 &8972167519025179630 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: -54575271131423033, guid: d45f4c581513f044689eb22d4704c151, type: 3} + m_PrefabInstance: {fileID: 269537330169902377} + m_PrefabAsset: {fileID: 0} +--- !u!23 &9111140545799501785 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: -158522313859251472, guid: d45f4c581513f044689eb22d4704c151, type: 3} + m_PrefabInstance: {fileID: 269537330169902377} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/jelycho/Prefabs/beacon_0.prefab.meta b/Assets/jelycho/Prefabs/beacon_0.prefab.meta new file mode 100644 index 0000000..6567950 --- /dev/null +++ b/Assets/jelycho/Prefabs/beacon_0.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2fb503c7c7d54464f9bc16d97113b9e8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/jelycho/Prefabs/jelycho_game.prefab b/Assets/jelycho/Prefabs/jelycho_game.prefab index 661315f..5b1480a 100644 --- a/Assets/jelycho/Prefabs/jelycho_game.prefab +++ b/Assets/jelycho/Prefabs/jelycho_game.prefab @@ -71,6 +71,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ShowTopMostFoldoutHeaderGroup: 1 + m_GameWorldControllerPrefab: {fileID: 1572199447229334512, guid: d8656ef49bb69e647b019ff5e4d68209, type: 3} m_PlayerControllerPrefab: {fileID: 4106369065237924727, guid: d15ca0257a10a034e826a60fba11989b, type: 3} m_PlayerActorPrefab: {fileID: -6995192488338000116, guid: be292ae0883a3be4090cdc42a4c7c131, type: 3} - m_MainWorldID: dev diff --git a/Assets/jelycho/Prefabs/world_controller.prefab b/Assets/jelycho/Prefabs/world_controller.prefab new file mode 100644 index 0000000..f9f40a2 --- /dev/null +++ b/Assets/jelycho/Prefabs/world_controller.prefab @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3913326941885152303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2741906689682899247} + - component: {fileID: 2643100152184703979} + - component: {fileID: 1572199447229334512} + - component: {fileID: 7146739840348581686} + m_Layer: 0 + m_Name: world_controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2741906689682899247 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3913326941885152303} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2643100152184703979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3913326941885152303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + GlobalObjectIdHash: 3059872542 + InScenePlacedSourceGlobalObjectIdHash: 0 + DeferredDespawnTick: 0 + Ownership: 1 + AlwaysReplicateAsRoot: 0 + SynchronizeTransform: 0 + ActiveSceneSynchronization: 0 + SceneMigrationSynchronization: 0 + SpawnWithObservers: 1 + DontDestroyWithOwner: 0 + AutoObjectParentSync: 0 + SyncOwnerTransformWhenParented: 0 + AllowOwnerToParent: 0 +--- !u!114 &1572199447229334512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3913326941885152303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d6f280a434549d99d5c2b7f178ba6b6, type: 3} + m_Name: + m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 + m_BaseManager: {fileID: 7146739840348581686} +--- !u!114 &7146739840348581686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3913326941885152303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac767dd7ed4c424ebad060b7149afac8, type: 3} + m_Name: + m_EditorClassIdentifier: + ShowTopMostFoldoutHeaderGroup: 1 + m_BeaconPrefab: {fileID: 1553563146403112987, guid: 2fb503c7c7d54464f9bc16d97113b9e8, type: 3} + m_ConnectionRopeLength: 8 + m_BeaconSpawnRadius: 15 diff --git a/Assets/jelycho/Prefabs/world_controller.prefab.meta b/Assets/jelycho/Prefabs/world_controller.prefab.meta new file mode 100644 index 0000000..6cc1da0 --- /dev/null +++ b/Assets/jelycho/Prefabs/world_controller.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d8656ef49bb69e647b019ff5e4d68209 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/jelycho/Worlds/dev/scn_map_dev.unity b/Assets/jelycho/Worlds/dev/scn_map_dev.unity index 7829c73..df2e446 100644 --- a/Assets/jelycho/Worlds/dev/scn_map_dev.unity +++ b/Assets/jelycho/Worlds/dev/scn_map_dev.unity @@ -695,6 +695,63 @@ MonoBehaviour: m_GutMeshGenerationConfig: radius: 0.075 resolution: 6 +--- !u!1001 &324646069 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalPosition.x + value: 1.9038281 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalPosition.y + value: 1.478 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalPosition.z + value: 0.255 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000003774895 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_Name + value: Beacon_Seed + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -2023,7 +2080,7 @@ GameObject: - component: {fileID: 1109886928} - component: {fileID: 1109886927} m_Layer: 0 - m_Name: context + m_Name: world_context m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3779,3 +3836,4 @@ SceneRoots: - {fileID: 1949892186} - {fileID: 1142960582} - {fileID: 2023481773} + - {fileID: 324646069} diff --git a/Assets/jelycho/actors/player/Character_Player.fbx b/Assets/jelycho/actors/player/Character_Player.fbx index f54dbac..94d3c6f 100644 Binary files a/Assets/jelycho/actors/player/Character_Player.fbx and b/Assets/jelycho/actors/player/Character_Player.fbx differ diff --git a/Assets/jelycho/actors/player/Character_Player.fbx.meta b/Assets/jelycho/actors/player/Character_Player.fbx.meta index eaddcf7..10be2b1 100644 --- a/Assets/jelycho/actors/player/Character_Player.fbx.meta +++ b/Assets/jelycho/actors/player/Character_Player.fbx.meta @@ -17,7 +17,17 @@ ModelImporter: removeConstantScaleCurves: 0 motionNodeName: animationImportErrors: - animationImportWarnings: + animationImportWarnings: "\nClip 'Right_Hand_Hold_Idle' has import animation + warnings that might lower retargeting quality:\nNote: Activate translation + DOF on avatar to improve retargeting quality.\n\t'mixamorig:RightHandIndex2' + has translation animation that will be discarded.\n\t'mixamorig:RightHandIndex3' + has translation animation that will be discarded.\n\t'mixamorig:RightHandMiddle2' + has translation animation that will be discarded.\n\t'mixamorig:RightHandMiddle3' + has translation animation that will be discarded.\n\t'mixamorig:RightHandRing2' + has translation animation that will be discarded.\n\t'mixamorig:RightHandRing3' + has translation animation that will be discarded.\n\t'mixamorig:RightHandPinky2' + has translation animation that will be discarded.\n\t'mixamorig:RightHandPinky3' + has translation animation that will be discarded.\n" animationRetargetingWarnings: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 @@ -118,11 +128,69 @@ ModelImporter: maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 - serializedVersion: 16 - name: Hands_Attack_Hand - takeName: Hands_Attack_Hand + name: Right_Hand_Hold_Throw + takeName: Right_Hand_Hold_Throw internalID: -4474010965065293577 firstFrame: 0 - lastFrame: 39 + lastFrame: 10 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Right_Hand_Hold_Idle + takeName: Right_Hand_Hold_Idle + internalID: -6266143223895913638 + firstFrame: 0 + lastFrame: 999 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Right_Hand_Hold_Charged + takeName: Right_Hand_Hold_Charged + internalID: -3347519175819947890 + firstFrame: 0 + lastFrame: 23 wrapMode: 0 orientationOffsetY: 0 level: 0 diff --git a/Assets/jelycho/actors/player/a_player.prefab b/Assets/jelycho/actors/player/a_player.prefab index e499861..347823f 100755 --- a/Assets/jelycho/actors/player/a_player.prefab +++ b/Assets/jelycho/actors/player/a_player.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 6571213259623585189} - component: {fileID: 8234754035766840722} - m_Layer: 0 + m_Layer: 7 m_Name: Spine Aim m_TagString: Untagged m_Icon: {fileID: 0} @@ -96,7 +96,7 @@ GameObject: m_Component: - component: {fileID: 9040948788970653221} - component: {fileID: 143787432510631202} - m_Layer: 0 + m_Layer: 7 m_Name: Spine2 Aim Y m_TagString: Untagged m_Icon: {fileID: 0} @@ -182,7 +182,7 @@ GameObject: m_Component: - component: {fileID: 5437679932855165607} - component: {fileID: 4313988819192367553} - m_Layer: 0 + m_Layer: 7 m_Name: Character Rotation m_TagString: Untagged m_Icon: {fileID: 0} @@ -260,7 +260,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3101520456674294019} - m_Layer: 0 + m_Layer: 7 m_Name: Target m_TagString: Untagged m_Icon: {fileID: 0} @@ -292,7 +292,7 @@ GameObject: m_Component: - component: {fileID: 9181414832138245197} - component: {fileID: 2863764702303138330} - m_Layer: 0 + m_Layer: 7 m_Name: cam_spring m_TagString: Untagged m_Icon: {fileID: 0} @@ -342,7 +342,7 @@ GameObject: m_Component: - component: {fileID: 5180453452427343145} - component: {fileID: 5599261108857672463} - m_Layer: 0 + m_Layer: 7 m_Name: Rig m_TagString: Untagged m_Icon: {fileID: 0} @@ -395,7 +395,7 @@ GameObject: m_Component: - component: {fileID: 513146667100434375} - component: {fileID: 5599727776239019374} - m_Layer: 0 + m_Layer: 7 m_Name: Spine1 Aim m_TagString: Untagged m_Icon: {fileID: 0} @@ -481,7 +481,7 @@ GameObject: m_Component: - component: {fileID: 251474513533033394} - component: {fileID: 4951634161058535334} - m_Layer: 0 + m_Layer: 7 m_Name: Spine2 Aim X m_TagString: Untagged m_Icon: {fileID: 0} @@ -567,7 +567,7 @@ GameObject: m_Component: - component: {fileID: 8014384043901115190} - component: {fileID: 8531226034841258401} - m_Layer: 0 + m_Layer: 7 m_Name: Left Arm Rest m_TagString: Untagged m_Icon: {fileID: 0} @@ -661,7 +661,7 @@ GameObject: - component: {fileID: 3055557605397218987} - component: {fileID: 447378847805683535} - component: {fileID: 7994225944200444124} - m_Layer: 0 + m_Layer: 7 m_Name: a_player m_TagString: Untagged m_Icon: {fileID: 0} @@ -746,6 +746,11 @@ MonoBehaviour: m_DragDistanceRange: min: 1 max: 5 + m_BeaconPlacementLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_BeaconPlacementMaxDistance: 15 + m_MinTeleportDistance: 0.5 --- !u!114 &7282522638044830840 MonoBehaviour: m_ObjectHideFlags: 0 @@ -907,7 +912,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6151351464099511810} - m_Layer: 0 + m_Layer: 7 m_Name: Head Aim Target m_TagString: Untagged m_Icon: {fileID: 0} @@ -938,7 +943,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 639102448347793678} - m_Layer: 0 + m_Layer: 7 m_Name: Character Forward m_TagString: Untagged m_Icon: {fileID: 0} @@ -971,7 +976,7 @@ GameObject: - component: {fileID: 3547307509376589031} - component: {fileID: 8557190970217331903} - component: {fileID: 1387897054540036977} - m_Layer: 0 + m_Layer: 7 m_Name: cc_fpp m_TagString: Untagged m_Icon: {fileID: 0} @@ -1064,7 +1069,7 @@ GameObject: m_Component: - component: {fileID: 7407697071334405563} - component: {fileID: 5585348471662392271} - m_Layer: 0 + m_Layer: 7 m_Name: Head Aim m_TagString: Untagged m_Icon: {fileID: 0} @@ -1149,7 +1154,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3084798835676300500} - m_Layer: 0 + m_Layer: 7 m_Name: Arm Target m_TagString: Untagged m_Icon: {fileID: 0} @@ -1171,6 +1176,72 @@ Transform: m_Children: [] m_Father: {fileID: 8014384043901115190} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1338042420296184100 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5261224098978168883} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalPosition.x + value: 0.0011811987 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalPosition.y + value: 0.10607707 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalPosition.z + value: 0.027564129 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalRotation.w + value: 0.047073513 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7665415 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalRotation.y + value: 0.63801706 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalRotation.z + value: -0.0559693 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_Name + value: Beacon_Seed + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} +--- !u!4 &1520834590260139727 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d6704d8f0eeb04445b8093b9b7662474, type: 3} + m_PrefabInstance: {fileID: 1338042420296184100} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5815892847420407803 PrefabInstance: m_ObjectHideFlags: 0 @@ -1179,6 +1250,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7761779135599839476} m_Modifications: + - target: {fileID: -9070493210130169274, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1223,6 +1298,14 @@ PrefabInstance: propertyPath: m_UpdateWhenOffscreen value: 1 objectReference: {fileID: 0} + - target: {fileID: -8006009767450596044, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7657966619581158213, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: -7547733204030175338, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1231,6 +1314,14 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: f7f24b7c2c04b4e4c83b667f297f31f0, type: 2} + - target: {fileID: -7360747449169001873, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -7121769801107515815, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: -6658497938237567018, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1239,6 +1330,10 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: d8118a5a95cec6d4fbf607714e8a2997, type: 2} + - target: {fileID: -6621945745981909287, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: -6442368477639947363, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1247,6 +1342,42 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 40059039dc965cf48ab8a11bbabf65bf, type: 2} + - target: {fileID: -6370085079684087283, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6234591296559379751, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6170625038081293824, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6091572578137625569, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -6056541330796499132, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -5561550452697079657, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -5195048882033904264, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -5002453598556046594, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -4977968359372665659, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: -4790141867476305986, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1255,10 +1386,106 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 625e6f763a93cb644a90bf3dc9b32a73, type: 2} + - target: {fileID: -4728426434207774260, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -4332706925441422008, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3799395697873186154, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3542885339558904099, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3499613539700318821, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3478013746326755454, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3214267034143217929, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -3086436065929644917, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -2868411622826080051, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2084811680363313996, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -1781356600409242780, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -1425791611860619382, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -1268151995469589007, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: -1094870013247265488, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 objectReference: {fileID: 0} + - target: {fileID: -938983531534324846, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -751476226918971245, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -552831747908440785, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -290750445479886849, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -259972160606440404, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -203856693384778745, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: -76546954072915012, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 9171100556185337, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 291606427768416478, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 342413542054669853, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 414117464747255840, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 579163500693744052, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1267,6 +1494,10 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 193f9063c91417f478feb53e13f8f486, type: 2} + - target: {fileID: 710183102880238943, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 740220410705241247, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1279,6 +1510,30 @@ PrefabInstance: propertyPath: m_Name value: Character_Player objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1064914028055504534, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1082271958561512970, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1339101018200438765, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1500937377208012460, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1711505207429034123, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 1751384141052031026, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1287,6 +1542,14 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 81d4d9bf7808f7c4d8f04c5d6d4e24f8, type: 2} + - target: {fileID: 2158975759703390516, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2586065998465600510, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 2674498840362988503, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1295,6 +1558,14 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 193f9063c91417f478feb53e13f8f486, type: 2} + - target: {fileID: 2704082784192306828, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2715566404302941441, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 2729413168405115760, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1311,10 +1582,66 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 094d2de13e8a92e4caf3313c9e14d9d0, type: 2} + - target: {fileID: 3047284246813455858, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3135921509060577837, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3229974624025153192, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3588849560313704984, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3641397698559495349, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3844593680406075547, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3882815353823017779, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3948933247560734027, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4114030615378554161, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4237274458221626025, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4441848305933595309, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4549111882529890269, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4579671374381230136, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 4691356734749045086, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 objectReference: {fileID: 0} + - target: {fileID: 4716888685388451424, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 5866666021909216657, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_Enabled value: 1 @@ -1339,10 +1666,22 @@ PrefabInstance: propertyPath: m_ApplyRootMotion value: 0 objectReference: {fileID: 0} + - target: {fileID: 6371836146868173509, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6408958986112759965, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 6445470562081106951, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 0cc2f3d0e3d9930439e2533e10afdf95, type: 2} + - target: {fileID: 6514210125699187276, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 6647190717571849481, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1351,14 +1690,30 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 40059039dc965cf48ab8a11bbabf65bf, type: 2} + - target: {fileID: 6665061660520709789, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 6777337534489714065, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 objectReference: {fileID: 0} + - target: {fileID: 7363479242261063072, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 7470169179194899816, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 objectReference: {fileID: 0} + - target: {fileID: 7732535366517880319, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7776229726456038893, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 7833282959318594594, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1367,6 +1722,14 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 094d2de13e8a92e4caf3313c9e14d9d0, type: 2} + - target: {fileID: 8030707958198045491, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8331603097011181245, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 8335907118470890241, guid: e74130c49b009364f90d176af44766be, type: 3} propertyPath: m_UpdateWhenOffscreen value: 1 @@ -1387,6 +1750,22 @@ PrefabInstance: propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 0cc2f3d0e3d9930439e2533e10afdf95, type: 2} + - target: {fileID: 8817898888258712963, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8953972740105248388, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8995019436906131058, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 9037727976738196030, guid: e74130c49b009364f90d176af44766be, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -1396,6 +1775,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -3321919801592875672, guid: e74130c49b009364f90d176af44766be, type: 3} insertIndex: -1 addedObject: {fileID: 9181414832138245197} + - targetCorrespondingSourceObject: {fileID: 1852576806548013000, guid: e74130c49b009364f90d176af44766be, type: 3} + insertIndex: -1 + addedObject: {fileID: 1520834590260139727} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e74130c49b009364f90d176af44766be, type: 3} insertIndex: -1 diff --git a/Assets/jelycho/actors/player/animator_player.controller b/Assets/jelycho/actors/player/animator_player.controller index e5c27b2..9ab937d 100755 --- a/Assets/jelycho/actors/player/animator_player.controller +++ b/Assets/jelycho/actors/player/animator_player.controller @@ -124,6 +124,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-7519564327104386826 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Right_Hand_Hold_Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3118027288805498438} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -6266143223895913638, guid: e74130c49b009364f90d176af44766be, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-6699781001232014494 AnimatorState: serializedVersion: 6 @@ -199,6 +226,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-4711396281542594421 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Throw + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8662526277064250497} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-4592225796506358761 AnimatorStateMachine: serializedVersion: 6 @@ -258,6 +310,53 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-3118027288805498438 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: Holding + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 400375029870675044} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.984985 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3062724450661704150 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!206 &-2366610759373995002 BlendTree: m_ObjectHideFlags: 1 @@ -308,19 +407,26 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 400375029870675044} - m_Position: {x: 340, y: 130, z: 0} + m_Position: {x: 350, y: 50, z: 0} - serializedVersion: 1 m_State: {fileID: -8396421346802500550} m_Position: {x: 360, y: 380, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7519564327104386826} + m_Position: {x: 350, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8662526277064250497} + m_Position: {x: 360, y: 480, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 1582007811057979629} + - {fileID: -4711396281542594421} m_EntryTransitions: - {fileID: 6343792522304449684} m_StateMachineTransitions: {} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 20, y: 380, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} + m_EntryPosition: {x: 60, y: 50, z: 0} m_ExitPosition: {x: 640, y: 380, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 400375029870675044} @@ -448,6 +554,18 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: Throw + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Holding + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -495,7 +613,8 @@ AnimatorState: m_Name: Hands Locomotion m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 3784344539730930853} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -562,6 +681,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &3784344539730930853 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: Holding + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7519564327104386826} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &5935865335456089982 AnimatorState: serializedVersion: 6 @@ -708,3 +852,30 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &8662526277064250497 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Right_Hand_Hold_Throw + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3062724450661704150} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -4474010965065293577, guid: e74130c49b009364f90d176af44766be, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 7157364..b81dc55 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -142,7 +142,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1.39 + bundleVersion: 0.1.41 preloadedAssets: - {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} - {fileID: 11400000, guid: 5e0d3796a45800e429656e78e50c710e, type: 2} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index ee1f10e..38187cf 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -12,7 +12,7 @@ TagManager: - Water - UI - Viewmodel - - + - Player - - -