From 3c870ee22f0db5014c17e0619bf8bbdbe9289dca Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Tue, 18 Oct 2022 15:17:47 -0400 Subject: [PATCH 01/10] Base for grappling --- Assets/Scenes/Grappling.meta | 8 + Assets/Scenes/Grappling/Grappling.unity | 746 +++++++++++++++++++ Assets/Scenes/Grappling/Grappling.unity.meta | 7 + 3 files changed, 761 insertions(+) create mode 100644 Assets/Scenes/Grappling.meta create mode 100644 Assets/Scenes/Grappling/Grappling.unity create mode 100644 Assets/Scenes/Grappling/Grappling.unity.meta diff --git a/Assets/Scenes/Grappling.meta b/Assets/Scenes/Grappling.meta new file mode 100644 index 0000000..3c0fada --- /dev/null +++ b/Assets/Scenes/Grappling.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17d13e27a04a9b84ab75564e35a48c3f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Grappling/Grappling.unity b/Assets/Scenes/Grappling/Grappling.unity new file mode 100644 index 0000000..1747083 --- /dev/null +++ b/Assets/Scenes/Grappling/Grappling.unity @@ -0,0 +1,746 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &921826478 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 921826480} + - component: {fileID: 921826479} + - component: {fileID: 921826481} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &921826479 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 921826478} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &921826480 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 921826478} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &921826481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 921826478} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} +--- !u!1 &952326952 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 952326956} + - component: {fileID: 952326955} + - component: {fileID: 952326954} + - component: {fileID: 952326953} + m_Layer: 0 + m_Name: Floor_02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &952326953 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 952326952} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &952326954 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 952326952} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &952326955 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 952326952} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &952326956 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 952326952} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.5, y: 10.1, z: 0} + m_LocalScale: {x: 11.709141, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1211811536 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1211811540} + - component: {fileID: 1211811539} + - component: {fileID: 1211811538} + - component: {fileID: 1211811537} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1211811537 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211811536} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1211811538 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211811536} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1211811539 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211811536} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1211811540 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211811536} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.13, y: 3.63, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1530935835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1530935838} + - component: {fileID: 1530935837} + - component: {fileID: 1530935836} + - component: {fileID: 1530935839} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1530935836 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530935835} + m_Enabled: 1 +--- !u!20 &1530935837 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530935835} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + 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!4 &1530935838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530935835} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 5.7, z: 10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!114 &1530935839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530935835} + 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: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!1 &1547983496 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1547983500} + - component: {fileID: 1547983499} + - component: {fileID: 1547983498} + - component: {fileID: 1547983497} + m_Layer: 0 + m_Name: Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1547983497 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547983496} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1547983498 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547983496} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1547983499 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547983496} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1547983500 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547983496} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8.97, y: 1.7, z: 0} + m_LocalScale: {x: 11.709141, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1737815964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1737815968} + - component: {fileID: 1737815967} + - component: {fileID: 1737815966} + - component: {fileID: 1737815965} + m_Layer: 0 + m_Name: Floor_01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1737815965 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737815964} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1737815966 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737815964} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1737815967 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737815964} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1737815968 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737815964} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -14.64, y: 1.7, z: 0} + m_LocalScale: {x: 11.709141, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Grappling/Grappling.unity.meta b/Assets/Scenes/Grappling/Grappling.unity.meta new file mode 100644 index 0000000..5103421 --- /dev/null +++ b/Assets/Scenes/Grappling/Grappling.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5d423bbacc637604f93e3a3ea6a02a83 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From f1e247a9ec8a15e2be7282c4c525c1db2cf0ee79 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Tue, 18 Oct 2022 23:22:05 -0400 Subject: [PATCH 02/10] Grapple moves player and is represented --- Assets/32bit_jam_conjure.inputactions | 838 +++++++++++++++++++++ Assets/32bit_jam_conjure.inputactions.meta | 14 + Assets/GrappleHook.cs | 94 +++ Assets/GrappleHook.cs.meta | 11 + Assets/HitMarkerMat.mat | 129 ++++ Assets/HitMarkerMat.mat.meta | 8 + Assets/Scenes/Grappling/Grappling.unity | 289 ++++++- ProjectSettings/EditorBuildSettings.asset | 4 +- 8 files changed, 1383 insertions(+), 4 deletions(-) create mode 100644 Assets/32bit_jam_conjure.inputactions create mode 100644 Assets/32bit_jam_conjure.inputactions.meta create mode 100644 Assets/GrappleHook.cs create mode 100644 Assets/GrappleHook.cs.meta create mode 100644 Assets/HitMarkerMat.mat create mode 100644 Assets/HitMarkerMat.mat.meta diff --git a/Assets/32bit_jam_conjure.inputactions b/Assets/32bit_jam_conjure.inputactions new file mode 100644 index 0000000..6d6a8ee --- /dev/null +++ b/Assets/32bit_jam_conjure.inputactions @@ -0,0 +1,838 @@ +{ + "name": "32bit_jam_conjure", + "maps": [ + { + "name": "Player", + "id": "525e9b73-433a-4ead-a952-699d3d367244", + "actions": [ + { + "name": "Move", + "type": "Value", + "id": "7734f1a0-9df3-4716-9eca-662aefd5c1dd", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Look", + "type": "Value", + "id": "d82ebc8e-376b-41e9-9c89-2b647c51a946", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Fire", + "type": "Button", + "id": "03a30410-db6d-442c-a74e-63473aa22f8d", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", + "path": "/leftStick", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "WASD", + "id": "00ca640b-d935-4593-8157-c05846ea39b3", + "path": "Dpad", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", + "path": "/w", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", + "path": "/s", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", + "path": "/a", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", + "path": "/d", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", + "path": "/{Primary2DAxis}", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3ea4d645-4504-4529-b061-ab81934c3752", + "path": "/stick", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", + "path": "/rightStick", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8c8e490b-c610-4785-884f-f04217b23ca4", + "path": "/delta", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse;Touch", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3e5f5442-8668-4b27-a940-df99bad7e831", + "path": "/{Hatswitch}", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", + "path": "/rightTrigger", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Fire", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Fire", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", + "path": "/primaryTouch/tap", + "interactions": "", + "processors": "", + "groups": ";Touch", + "action": "Fire", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Fire", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8255d333-5683-4943-a58a-ccb207ff1dce", + "path": "/{PrimaryAction}", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Fire", + "isComposite": false, + "isPartOfComposite": false + } + ] + }, + { + "name": "UI", + "id": "aed813d5-2384-44f8-aeb2-ea6f4308c631", + "actions": [ + { + "name": "Navigate", + "type": "PassThrough", + "id": "58fa1cb4-cda6-4b26-88a2-fdef7f76018a", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Submit", + "type": "Button", + "id": "54d612ce-04f0-4fde-bb18-1825b79e553d", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Cancel", + "type": "Button", + "id": "f7d0c23b-fa96-418d-a713-afae45cefb51", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Point", + "type": "PassThrough", + "id": "52deb605-398f-4f13-bf5f-b0dc2d42d1e3", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Click", + "type": "PassThrough", + "id": "d05493aa-63c8-4b95-a0ef-bb83fe34d2e4", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "ScrollWheel", + "type": "PassThrough", + "id": "9c5a730a-19ed-495e-8531-c3bcaeae3888", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "MiddleClick", + "type": "PassThrough", + "id": "7099e7b2-0933-42c4-a62f-4ff29fe190ca", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "RightClick", + "type": "PassThrough", + "id": "e1ae5dbd-4172-4a4c-b236-34217cf22711", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDevicePosition", + "type": "PassThrough", + "id": "42ad8843-1325-45cd-bb81-b14d6b2abc1e", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDeviceOrientation", + "type": "PassThrough", + "id": "0436c988-95fe-412d-8116-008fb4e65a75", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "Gamepad", + "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", + "path": "/leftStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", + "path": "/rightStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2db08d65-c5fb-421b-983f-c71163608d67", + "path": "/leftStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "58748904-2ea9-4a80-8579-b500e6a76df8", + "path": "/rightStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", + "path": "/leftStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", + "path": "/rightStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcd248ae-a788-4676-a12e-f4d81205600b", + "path": "/leftStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", + "path": "/rightStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", + "path": "/dpad", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Joystick", + "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "3db53b26-6601-41be-9887-63ac74e79d19", + "path": "/stick/up", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", + "path": "/stick/down", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", + "path": "/stick/left", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", + "path": "/stick/right", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Keyboard", + "id": "ff527021-f211-4c02-933e-5976594c46ed", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "74214943-c580-44e4-98eb-ad7eebe17902", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "cea9b045-a000-445b-95b8-0c171af70a3b", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "8607c725-d935-4808-84b1-8354e29bab63", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", + "path": "*/{Submit}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Submit", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", + "path": "*/{Cancel}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Cancel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", + "path": "/touch*/position", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", + "path": "/tip", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", + "path": "/touch*/press", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "38c99815-14ea-4617-8627-164d27641299", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", + "path": "/middleButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "MiddleClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4c191405-5738-4d4b-a523-c6a301dbf754", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "RightClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", + "path": "/devicePosition", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDevicePosition", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", + "path": "/deviceRotation", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDeviceOrientation", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [ + { + "name": "Keyboard&Mouse", + "bindingGroup": "Keyboard&Mouse", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Gamepad", + "bindingGroup": "Gamepad", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Touch", + "bindingGroup": "Touch", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Joystick", + "bindingGroup": "Joystick", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "XR", + "bindingGroup": "XR", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + } + ] +} \ No newline at end of file diff --git a/Assets/32bit_jam_conjure.inputactions.meta b/Assets/32bit_jam_conjure.inputactions.meta new file mode 100644 index 0000000..1e3e34a --- /dev/null +++ b/Assets/32bit_jam_conjure.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 2faf170916d7d8e459e10cbfc223b3a8 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Assets/GrappleHook.cs b/Assets/GrappleHook.cs new file mode 100644 index 0000000..46442b9 --- /dev/null +++ b/Assets/GrappleHook.cs @@ -0,0 +1,94 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GrappleHook : MonoBehaviour +{ + + [SerializeField] + private float maxGrappleDist = 200; + [SerializeField] + private LayerMask grappleableLayer; // TODO create layermask + [SerializeField] + private Vector3 gunPos = new Vector3 (-0.5f, 0f, 0f); + private SpringJoint joint; + private LineRenderer lr; + RaycastHit hit; + private bool grappled = false; + [SerializeField] + private Transform hitMarker; //TODO obj this should be a sprite or something idk + // Start is called before the first frame update + void Start() + { + lr = gameObject.GetComponentInChildren(); + lr.enabled = false; + + hitMarker.gameObject.SetActive(false); + } + + // Update is called once per frame + void Update() + { + + if(Input.GetMouseButtonUp(0)){//TODO Change to correct input system + EndGrapple(); + } + if(grappled){ + DrawRope(); + if(Input.GetMouseButtonDown(1)){ + joint.minDistance = 0f; + joint.maxDistance = 0f; + } + return; + } + Aim(); + } + + private void Aim(){ + Vector3 mousePos; + mousePos = Input.mousePosition; + mousePos.z = Mathf.Abs(Camera.main.transform.position.z); + mousePos = Camera.main.ScreenToWorldPoint(mousePos); + Vector3 aimDir = (mousePos - gameObject.transform.position).normalized; + if(!hitMarker.gameObject.activeSelf)hitMarker.gameObject.SetActive(true); + hitMarker.position = gameObject.transform.position + aimDir * maxGrappleDist; + if(Physics.Raycast(gameObject.transform.position, aimDir, out hit, maxGrappleDist, grappleableLayer)){ + hitMarker.position = hit.point; + if(Input.GetMouseButtonDown(0)){ + StartGrapple(hit); + } + } + } + + private void DrawRope(){ + if(!grappled)return; + // TODO Draw gradually towards point + lr.SetPosition(0, gameObject.transform.position); + lr.SetPosition(1, hit.point); + if(!lr.enabled)lr.enabled = true; + + } + private void StartGrapple(RaycastHit hit){ + grappled = true; + + //Display + hitMarker.gameObject.SetActive(false); + + joint = gameObject.AddComponent(); + joint.anchor = gunPos; + joint.autoConfigureConnectedAnchor = false; + joint.maxDistance = hit.distance * 0.8f; + joint.minDistance = hit.distance * 0.25f; + joint.connectedAnchor = hit.point; + joint.spring = 4.5f * 5f; + joint.damper = 7f; + joint.massScale = 4.5f; + } + + private void EndGrapple(){ + grappled = false; + lr.enabled = false; + Destroy(joint); + } + +} diff --git a/Assets/GrappleHook.cs.meta b/Assets/GrappleHook.cs.meta new file mode 100644 index 0000000..cab2426 --- /dev/null +++ b/Assets/GrappleHook.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5f45bd04209bb424e8b1f5271cb16ab0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HitMarkerMat.mat b/Assets/HitMarkerMat.mat new file mode 100644 index 0000000..795ba8d --- /dev/null +++ b/Assets/HitMarkerMat.mat @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-324307558458497067 +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: 5 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HitMarkerMat + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _RECEIVE_SHADOWS_OFF + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + - _SPECULAR_SETUP + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + 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: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 0 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 1 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 0 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/HitMarkerMat.mat.meta b/Assets/HitMarkerMat.mat.meta new file mode 100644 index 0000000..25f4838 --- /dev/null +++ b/Assets/HitMarkerMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad6dbe9c8ba98c241abb07659b3fbf37 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Grappling/Grappling.unity b/Assets/Scenes/Grappling/Grappling.unity index 1747083..8af2716 100644 --- a/Assets/Scenes/Grappling/Grappling.unity +++ b/Assets/Scenes/Grappling/Grappling.unity @@ -123,6 +123,89 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &375191780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 375191781} + - component: {fileID: 375191784} + - component: {fileID: 375191783} + m_Layer: 0 + m_Name: HitMarker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &375191781 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 375191780} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1211811540} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &375191783 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 375191780} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ad6dbe9c8ba98c241abb07659b3fbf37, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &375191784 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 375191780} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &921826478 GameObject: m_ObjectHideFlags: 0 @@ -347,6 +430,9 @@ GameObject: - component: {fileID: 1211811539} - component: {fileID: 1211811538} - component: {fileID: 1211811537} + - component: {fileID: 1211811541} + - component: {fileID: 1211811542} + - component: {fileID: 1211811543} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -425,13 +511,79 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1211811536} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.13, y: 3.63, z: 0} + m_LocalPosition: {x: -1.64, y: 4.15, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1882391194} + - {fileID: 375191781} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &1211811541 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211811536} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 40 + m_CollisionDetection: 0 +--- !u!114 &1211811542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211811536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f45bd04209bb424e8b1f5271cb16ab0, type: 3} + m_Name: + m_EditorClassIdentifier: + grappleableLayer: + serializedVersion: 2 + m_Bits: 2147483647 + gunPos: {x: -0.5, y: 0, z: 0} + hitMarker: {fileID: 375191781} +--- !u!114 &1211811543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211811536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 2faf170916d7d8e459e10cbfc223b3a8, + type: 3} + m_NotificationBehavior: 0 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 1530935837} --- !u!1 &1530935835 GameObject: m_ObjectHideFlags: 0 @@ -510,7 +662,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530935835} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 5.7, z: 10} + m_LocalPosition: {x: 0, y: 5.7, z: 20.24} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -744,3 +896,134 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1882391193 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1882391194} + - component: {fileID: 1882391195} + m_Layer: 0 + m_Name: Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1882391194 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882391193} + 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: 1211811540} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!120 &1882391195 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882391193} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 0, g: 0, b: 0, a: 1} + key1: {r: 0, g: 0, b: 0, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index ea88784..9eea490 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,4 +8,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/SampleScene.unity guid: 99c9720ab356a0642a771bea13969a05 - m_configObjects: {} + m_configObjects: + com.unity.input.settings: {fileID: 11400000, guid: 83b4255e269437642ad0474a7bdb56b5, + type: 2} From a90c5c1f5463c6a26884e20c4da2731f19e278f5 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Wed, 19 Oct 2022 10:20:18 -0400 Subject: [PATCH 03/10] Added follow camera --- Assets/Scenes/Grappling/Grappling.unity | 208 +++++++++++++++++++++++- Packages/manifest.json | 1 + Packages/packages-lock.json | 9 + 3 files changed, 215 insertions(+), 3 deletions(-) diff --git a/Assets/Scenes/Grappling/Grappling.unity b/Assets/Scenes/Grappling/Grappling.unity index 8af2716..d1cd363 100644 --- a/Assets/Scenes/Grappling/Grappling.unity +++ b/Assets/Scenes/Grappling/Grappling.unity @@ -511,7 +511,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1211811536} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.64, y: 4.15, z: 0} + m_LocalPosition: {x: 4.54, y: 5.06, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -548,6 +548,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f45bd04209bb424e8b1f5271cb16ab0, type: 3} m_Name: m_EditorClassIdentifier: + maxGrappleDist: 200 grappleableLayer: serializedVersion: 2 m_Bits: 2147483647 @@ -596,6 +597,7 @@ GameObject: - component: {fileID: 1530935837} - component: {fileID: 1530935836} - component: {fileID: 1530935839} + - component: {fileID: 1530935840} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -661,8 +663,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530935835} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 5.7, z: 20.24} + m_LocalRotation: {x: 0, y: 0.9993161, z: -0.036978364, w: 1e-45} + m_LocalPosition: {x: 4.54, y: 6.64, z: 21.32} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -702,6 +704,40 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &1530935840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530935835} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowDebugText: 0 + m_ShowCameraFrustum: 0 + m_IgnoreTimeScale: 0 + m_WorldUpOverride: {fileID: 0} + m_UpdateMethod: 0 + m_BlendUpdateMethod: 1 + m_DefaultBlend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CustomBlends: {fileID: 0} + m_CameraCutEvent: + m_PersistentCalls: + m_Calls: [] + m_CameraActivatedEvent: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1547983496 GameObject: m_ObjectHideFlags: 0 @@ -896,6 +932,101 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1866383020 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1866383021} + - component: {fileID: 1866383024} + - component: {fileID: 1866383023} + - component: {fileID: 1866383025} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1866383021 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866383020} + m_LocalRotation: {x: -0.009548949, y: -0.9603454, z: 0.27667135, w: 0.03314507} + m_LocalPosition: {x: 5.325717, y: -4.3235893, z: 37.48282} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2129712289} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1866383023 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866383020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0.5 + m_VerticalDamping: 0.5 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_DeadZoneWidth: 0.67 + m_DeadZoneHeight: 0.59 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: -0.00000504347 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &1866383024 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866383020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1866383025 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866383020} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 0 + m_FollowOffset: {x: 0, y: 1.5799999, z: 21.32} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 --- !u!1 &1882391193 GameObject: m_ObjectHideFlags: 0 @@ -1027,3 +1158,74 @@ LineRenderer: generateLightingData: 0 m_UseWorldSpace: 1 m_Loop: 0 +--- !u!1 &2129712287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2129712289} + - component: {fileID: 2129712288} + m_Layer: 0 + m_Name: CM vcam1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2129712288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2129712287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1211811540} + m_Follow: {fileID: 1211811540} + m_Lens: + FieldOfView: 60 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1866383021} +--- !u!4 &2129712289 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2129712287} + m_LocalRotation: {x: 0, y: 0.9993161, z: -0.036978364, w: 1e-45} + m_LocalPosition: {x: 4.54, y: 6.64, z: 21.32} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1866383021} + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Packages/manifest.json b/Packages/manifest.json index 8d5ab3e..54aa953 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.cinemachine": "2.8.9", "com.unity.collab-proxy": "1.17.2", "com.unity.ide.rider": "3.0.16", "com.unity.ide.visualstudio": "2.0.16", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0a555a5..5450c32 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -9,6 +9,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.cinemachine": { + "version": "2.8.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.31" + }, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { "version": "1.17.2", "depth": 0, From e42f7e8f81bac423cbbfc94eacc7853eac0c1358 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Wed, 19 Oct 2022 11:18:36 -0400 Subject: [PATCH 04/10] Added grapple layer mask --- Assets/Scenes/Grappling/Grappling.unity | 236 +++++++++++++++++++++++- ProjectSettings/TagManager.asset | 2 +- 2 files changed, 233 insertions(+), 5 deletions(-) diff --git a/Assets/Scenes/Grappling/Grappling.unity b/Assets/Scenes/Grappling/Grappling.unity index d1cd363..515578e 100644 --- a/Assets/Scenes/Grappling/Grappling.unity +++ b/Assets/Scenes/Grappling/Grappling.unity @@ -206,6 +206,120 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 375191780} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &617391188 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 617391193} + - component: {fileID: 617391192} + - component: {fileID: 617391191} + - component: {fileID: 617391190} + - component: {fileID: 617391189} + m_Layer: 6 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!54 &617391189 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617391188} + serializedVersion: 2 + m_Mass: 0.1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!135 &617391190 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617391188} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &617391191 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617391188} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &617391192 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617391188} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &617391193 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617391188} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.99, y: 5.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &921826478 GameObject: m_ObjectHideFlags: 0 @@ -333,7 +447,7 @@ GameObject: - component: {fileID: 952326955} - component: {fileID: 952326954} - component: {fileID: 952326953} - m_Layer: 0 + m_Layer: 6 m_Name: Floor_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -418,6 +532,120 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1094313414 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1094313418} + - component: {fileID: 1094313417} + - component: {fileID: 1094313416} + - component: {fileID: 1094313415} + - component: {fileID: 1094313419} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1094313415 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1094313414} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1094313416 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1094313414} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1094313417 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1094313414} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1094313418 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1094313414} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 10.16, y: 6.77, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &1094313419 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1094313414} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &1211811536 GameObject: m_ObjectHideFlags: 0 @@ -551,7 +779,7 @@ MonoBehaviour: maxGrappleDist: 200 grappleableLayer: serializedVersion: 2 - m_Bits: 2147483647 + m_Bits: 64 gunPos: {x: -0.5, y: 0, z: 0} hitMarker: {fileID: 375191781} --- !u!114 &1211811543 @@ -750,7 +978,7 @@ GameObject: - component: {fileID: 1547983499} - component: {fileID: 1547983498} - component: {fileID: 1547983497} - m_Layer: 0 + m_Layer: 6 m_Name: Floor m_TagString: Untagged m_Icon: {fileID: 0} @@ -847,7 +1075,7 @@ GameObject: - component: {fileID: 1737815967} - component: {fileID: 1737815966} - component: {fileID: 1737815965} - m_Layer: 0 + m_Layer: 6 m_Name: Floor_01 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..7bdbef9 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -11,7 +11,7 @@ TagManager: - - Water - UI - - + - Grappleable - - - From 62267b6f2e795f9bcae5e8efb1aded4b6e32b51c Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Wed, 19 Oct 2022 15:14:02 -0400 Subject: [PATCH 05/10] Can grapple objects with rigidbodies --- Assets/GrappleHook.cs | 24 +++++++++++++++++++----- Assets/Scenes/Grappling/Grappling.unity | 8 ++++---- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/Assets/GrappleHook.cs b/Assets/GrappleHook.cs index 46442b9..d448ac8 100644 --- a/Assets/GrappleHook.cs +++ b/Assets/GrappleHook.cs @@ -10,7 +10,8 @@ public class GrappleHook : MonoBehaviour [SerializeField] private LayerMask grappleableLayer; // TODO create layermask [SerializeField] - private Vector3 gunPos = new Vector3 (-0.5f, 0f, 0f); + private Transform gunPos; + private Vector3 hitPosLocal; private SpringJoint joint; private LineRenderer lr; RaycastHit hit; @@ -63,8 +64,13 @@ public class GrappleHook : MonoBehaviour private void DrawRope(){ if(!grappled)return; // TODO Draw gradually towards point - lr.SetPosition(0, gameObject.transform.position); - lr.SetPosition(1, hit.point); + lr.SetPosition(0, gunPos.position); + if(hit.rigidbody != null){ + lr.SetPosition(1, hit.transform.TransformPoint(hitPosLocal)); + }else{ + lr.SetPosition(1, hit.point); + } + if(!lr.enabled)lr.enabled = true; } @@ -75,11 +81,19 @@ public class GrappleHook : MonoBehaviour hitMarker.gameObject.SetActive(false); joint = gameObject.AddComponent(); - joint.anchor = gunPos; + joint.anchor = transform.InverseTransformPoint(gunPos.position); joint.autoConfigureConnectedAnchor = false; joint.maxDistance = hit.distance * 0.8f; joint.minDistance = hit.distance * 0.25f; - joint.connectedAnchor = hit.point; + if(hit.rigidbody != null){ + Rigidbody hitRb = hit.rigidbody; + joint.connectedBody = hitRb; + joint.connectedAnchor = hit.transform.InverseTransformPoint(hit.point); + hitPosLocal = hit.transform.InverseTransformPoint(hit.point); + }else{ + joint.connectedAnchor = hit.point; + } + joint.spring = 4.5f * 5f; joint.damper = 7f; joint.massScale = 4.5f; diff --git a/Assets/Scenes/Grappling/Grappling.unity b/Assets/Scenes/Grappling/Grappling.unity index 515578e..44e2ca6 100644 --- a/Assets/Scenes/Grappling/Grappling.unity +++ b/Assets/Scenes/Grappling/Grappling.unity @@ -234,13 +234,13 @@ Rigidbody: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 617391188} serializedVersion: 2 - m_Mass: 0.1 + m_Mass: 0.01 m_Drag: 0 m_AngularDrag: 0.05 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 0 + m_Constraints: 40 m_CollisionDetection: 0 --- !u!135 &617391190 SphereCollider: @@ -623,7 +623,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1094313414} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 10.16, y: 6.77, z: 0} + m_LocalPosition: {x: 6.33, y: 6.77, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -757,7 +757,7 @@ Rigidbody: m_GameObject: {fileID: 1211811536} serializedVersion: 2 m_Mass: 1 - m_Drag: 0 + m_Drag: 0.01 m_AngularDrag: 0.05 m_UseGravity: 1 m_IsKinematic: 0 From 92be2fc57f7d73a883de348246cd288dcdef2cc3 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Wed, 19 Oct 2022 15:35:46 -0400 Subject: [PATCH 06/10] Rope lerps to grapple point --- Assets/GrappleHook.cs | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/Assets/GrappleHook.cs b/Assets/GrappleHook.cs index d448ac8..a0ee4d5 100644 --- a/Assets/GrappleHook.cs +++ b/Assets/GrappleHook.cs @@ -8,7 +8,9 @@ public class GrappleHook : MonoBehaviour [SerializeField] private float maxGrappleDist = 200; [SerializeField] - private LayerMask grappleableLayer; // TODO create layermask + private float grappleExtendSpeed = 20; + [SerializeField] + private LayerMask grappleableLayer; [SerializeField] private Transform gunPos; private Vector3 hitPosLocal; @@ -16,6 +18,7 @@ public class GrappleHook : MonoBehaviour private LineRenderer lr; RaycastHit hit; private bool grappled = false; + private Vector3 currGrappleEndPos; [SerializeField] private Transform hitMarker; //TODO obj this should be a sprite or something idk // Start is called before the first frame update @@ -35,7 +38,7 @@ public class GrappleHook : MonoBehaviour EndGrapple(); } if(grappled){ - DrawRope(); + DrawRope(Time.deltaTime); if(Input.GetMouseButtonDown(1)){ joint.minDistance = 0f; joint.maxDistance = 0f; @@ -61,16 +64,19 @@ public class GrappleHook : MonoBehaviour } } - private void DrawRope(){ + private void DrawRope(float deltaTime){ + // TODO animate a wiggle on the rope if(!grappled)return; - // TODO Draw gradually towards point lr.SetPosition(0, gunPos.position); + Vector3 endPoint; if(hit.rigidbody != null){ - lr.SetPosition(1, hit.transform.TransformPoint(hitPosLocal)); + endPoint = hit.transform.TransformPoint(hitPosLocal); + }else{ - lr.SetPosition(1, hit.point); + endPoint = hit.point; } - + currGrappleEndPos = Vector3.Lerp(currGrappleEndPos, endPoint, deltaTime * grappleExtendSpeed); + lr.SetPosition(1, currGrappleEndPos); if(!lr.enabled)lr.enabled = true; } @@ -97,11 +103,14 @@ public class GrappleHook : MonoBehaviour joint.spring = 4.5f * 5f; joint.damper = 7f; joint.massScale = 4.5f; + + currGrappleEndPos = transform.position; } private void EndGrapple(){ grappled = false; lr.enabled = false; + Destroy(joint); } From 5bbc3a40c18c23a7bfed85e4b14f66be3961fdec Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Wed, 19 Oct 2022 19:18:11 -0400 Subject: [PATCH 07/10] Change hit marker to a ui element --- Assets/GrappleHook.cs | 31 +- Assets/Scenes/Grappling/Grappling.unity | 419 ++++++++++++++++++++++-- Assets/anyrgb.com.png | Bin 0 -> 31353 bytes Assets/anyrgb.com.png.meta | 171 ++++++++++ 4 files changed, 587 insertions(+), 34 deletions(-) create mode 100644 Assets/anyrgb.com.png create mode 100644 Assets/anyrgb.com.png.meta diff --git a/Assets/GrappleHook.cs b/Assets/GrappleHook.cs index a0ee4d5..de288f7 100644 --- a/Assets/GrappleHook.cs +++ b/Assets/GrappleHook.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public class GrappleHook : MonoBehaviour { @@ -20,14 +21,15 @@ public class GrappleHook : MonoBehaviour private bool grappled = false; private Vector3 currGrappleEndPos; [SerializeField] - private Transform hitMarker; //TODO obj this should be a sprite or something idk + private RectTransform canvasRect; + [SerializeField] + private RectTransform hitMarkerRect; // Start is called before the first frame update void Start() { lr = gameObject.GetComponentInChildren(); lr.enabled = false; - - hitMarker.gameObject.SetActive(false); + hitMarkerRect.gameObject.SetActive(false); } // Update is called once per frame @@ -46,6 +48,8 @@ public class GrappleHook : MonoBehaviour return; } Aim(); + + // TODO extend and retract rope } private void Aim(){ @@ -54,13 +58,18 @@ public class GrappleHook : MonoBehaviour mousePos.z = Mathf.Abs(Camera.main.transform.position.z); mousePos = Camera.main.ScreenToWorldPoint(mousePos); Vector3 aimDir = (mousePos - gameObject.transform.position).normalized; - if(!hitMarker.gameObject.activeSelf)hitMarker.gameObject.SetActive(true); - hitMarker.position = gameObject.transform.position + aimDir * maxGrappleDist; + + if(!hitMarkerRect.gameObject.activeSelf)hitMarkerRect.gameObject.SetActive(true); + hitMarkerRect.anchoredPosition = WorldToUI(gameObject.transform.position + aimDir * maxGrappleDist); + if(Physics.Raycast(gameObject.transform.position, aimDir, out hit, maxGrappleDist, grappleableLayer)){ - hitMarker.position = hit.point; + hitMarkerRect.anchoredPosition = WorldToUI(hit.point); + hitMarkerRect.gameObject.GetComponent().color = Color.green; if(Input.GetMouseButtonDown(0)){ StartGrapple(hit); } + }else{ + hitMarkerRect.gameObject.GetComponent().color = Color.red; } } @@ -84,8 +93,9 @@ public class GrappleHook : MonoBehaviour grappled = true; //Display - hitMarker.gameObject.SetActive(false); + hitMarkerRect.gameObject.SetActive(false); + // Rope phys joint = gameObject.AddComponent(); joint.anchor = transform.InverseTransformPoint(gunPos.position); joint.autoConfigureConnectedAnchor = false; @@ -99,7 +109,6 @@ public class GrappleHook : MonoBehaviour }else{ joint.connectedAnchor = hit.point; } - joint.spring = 4.5f * 5f; joint.damper = 7f; joint.massScale = 4.5f; @@ -114,4 +123,10 @@ public class GrappleHook : MonoBehaviour Destroy(joint); } + private Vector2 WorldToUI(Vector3 point){ + Vector2 viewPortPos = Camera.main.WorldToViewportPoint(point); + Vector2 pointScreenPos = new Vector2(((viewPortPos.x*canvasRect.sizeDelta.x)-(canvasRect.sizeDelta.x*0.5f)), ((viewPortPos.y*canvasRect.sizeDelta.y)-(canvasRect.sizeDelta.y*0.5f))); + return pointScreenPos; + } + } diff --git a/Assets/Scenes/Grappling/Grappling.unity b/Assets/Scenes/Grappling/Grappling.unity index 44e2ca6..b39f6fd 100644 --- a/Assets/Scenes/Grappling/Grappling.unity +++ b/Assets/Scenes/Grappling/Grappling.unity @@ -123,6 +123,107 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &3217248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3217252} + - component: {fileID: 3217251} + - component: {fileID: 3217250} + - component: {fileID: 3217249} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &3217249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3217248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 2147483647 +--- !u!114 &3217250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3217248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &3217251 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3217248} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &3217252 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3217248} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1301531513} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &375191780 GameObject: m_ObjectHideFlags: 0 @@ -312,13 +413,117 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 617391188} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -13.99, y: 29.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &646434019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 646434022} + - component: {fileID: 646434021} + - component: {fileID: 646434020} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &646434020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 646434019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &646434021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 646434019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &646434022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 646434019} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.99, y: 5.3, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &778227309 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 778227310} + m_Layer: 0 + m_Name: Level + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &778227310 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 778227309} + 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: + - {fileID: 1547983500} + - {fileID: 1737815968} + - {fileID: 952326956} + - {fileID: 617391193} + - {fileID: 1094313418} + m_Father: {fileID: 0} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &921826478 GameObject: @@ -413,7 +618,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &921826481 MonoBehaviour: @@ -524,13 +729,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952326952} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -2.5, y: 10.1, z: 0} m_LocalScale: {x: 11.709141, y: 2.8042, z: 6.9} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 778227310} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1094313414 GameObject: @@ -622,13 +827,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1094313414} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 6.33, y: 6.77, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 + m_Father: {fileID: 778227310} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &1094313419 Rigidbody: @@ -745,8 +950,9 @@ Transform: m_Children: - {fileID: 1882391194} - {fileID: 375191781} + - {fileID: 2098497450} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &1211811541 Rigidbody: @@ -762,7 +968,7 @@ Rigidbody: m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 40 + m_Constraints: 56 m_CollisionDetection: 0 --- !u!114 &1211811542 MonoBehaviour: @@ -776,12 +982,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f45bd04209bb424e8b1f5271cb16ab0, type: 3} m_Name: m_EditorClassIdentifier: - maxGrappleDist: 200 + maxGrappleDist: 15 + grappleExtendSpeed: 20 grappleableLayer: serializedVersion: 2 m_Bits: 64 - gunPos: {x: -0.5, y: 0, z: 0} - hitMarker: {fileID: 375191781} + gunPos: {fileID: 2098497450} + canvasRect: {fileID: 3217252} + hitMarkerRect: {fileID: 1301531513} --- !u!114 &1211811543 MonoBehaviour: m_ObjectHideFlags: 0 @@ -813,6 +1021,82 @@ MonoBehaviour: m_DefaultActionMap: Player m_SplitScreenIndex: -1 m_Camera: {fileID: 1530935837} +--- !u!1 &1301531512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1301531513} + - component: {fileID: 1301531515} + - component: {fileID: 1301531514} + m_Layer: 5 + m_Name: ReticleImg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1301531513 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1301531512} + 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: 3217252} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1301531514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1301531512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: dd2cf0fc4eedc6a48a22f2470b456883, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1301531515 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1301531512} + m_CullTransparentMesh: 1 --- !u!1 &1530935835 GameObject: m_ObjectHideFlags: 0 @@ -891,8 +1175,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530935835} - m_LocalRotation: {x: 0, y: 0.9993161, z: -0.036978364, w: 1e-45} - m_LocalPosition: {x: 4.54, y: 6.64, z: 21.32} + m_LocalRotation: {x: -8.123801e-10, y: 0.9994022, z: -0.03457181, w: -0.00000002348429} + m_LocalPosition: {x: 4.54, y: 6.64, z: 22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1055,13 +1339,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1547983496} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 8.97, y: 1.7, z: 0} m_LocalScale: {x: 11.709141, y: 2.8042, z: 6.9} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_Father: {fileID: 778227310} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1737815964 GameObject: @@ -1152,13 +1436,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1737815964} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -14.64, y: 1.7, z: 0} m_LocalScale: {x: 11.709141, y: 2.8042, z: 6.9} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 778227310} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1866383020 GameObject: @@ -1246,7 +1530,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_BindingMode: 0 - m_FollowOffset: {x: 0, y: 1.5799999, z: 21.32} + m_FollowOffset: {x: 0, y: 1.5799999, z: 22.81} m_XDamping: 1 m_YDamping: 1 m_ZDamping: 1 @@ -1386,6 +1670,89 @@ LineRenderer: generateLightingData: 0 m_UseWorldSpace: 1 m_Loop: 0 +--- !u!1 &2098497449 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2098497450} + - component: {fileID: 2098497453} + - component: {fileID: 2098497452} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2098497450 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098497449} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: -0.5, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1211811540} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!23 &2098497452 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098497449} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2098497453 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098497449} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2129712287 GameObject: m_ObjectHideFlags: 0 @@ -1448,12 +1815,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2129712287} - m_LocalRotation: {x: 0, y: 0.9993161, z: -0.036978364, w: 1e-45} - m_LocalPosition: {x: 4.54, y: 6.64, z: 21.32} + m_LocalRotation: {x: -8.123801e-10, y: 0.9994022, z: -0.03457181, w: -0.00000002348429} + m_LocalPosition: {x: 4.54, y: 6.64, z: 22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1866383021} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/anyrgb.com.png b/Assets/anyrgb.com.png new file mode 100644 index 0000000000000000000000000000000000000000..1b89f83e5749a5a6a6c49c9128d58b9ebd5611c3 GIT binary patch literal 31353 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 literal 0 HcmV?d00001 diff --git a/Assets/anyrgb.com.png.meta b/Assets/anyrgb.com.png.meta new file mode 100644 index 0000000..ab00e7e --- /dev/null +++ b/Assets/anyrgb.com.png.meta @@ -0,0 +1,171 @@ +fileFormatVersion: 2 +guid: dd2cf0fc4eedc6a48a22f2470b456883 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From 5b7c6ab2e678a1f9a53a7744e0a07bf80acc4a62 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Wed, 19 Oct 2022 19:42:35 -0400 Subject: [PATCH 08/10] new test area --- Assets/Scenes/Grappling/Grappling.unity | 1378 ++++++++++++++++++++++- 1 file changed, 1375 insertions(+), 3 deletions(-) diff --git a/Assets/Scenes/Grappling/Grappling.unity b/Assets/Scenes/Grappling/Grappling.unity index b39f6fd..c8e5661 100644 --- a/Assets/Scenes/Grappling/Grappling.unity +++ b/Assets/Scenes/Grappling/Grappling.unity @@ -224,6 +224,394 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &111805105 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 111805106} + - component: {fileID: 111805109} + - component: {fileID: 111805108} + - component: {fileID: 111805107} + m_Layer: 6 + m_Name: Floor_15 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &111805106 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111805105} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -59.96, y: 20.7, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &111805107 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111805105} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &111805108 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111805105} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &111805109 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111805105} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &206662342 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 206662343} + - component: {fileID: 206662346} + - component: {fileID: 206662345} + - component: {fileID: 206662344} + m_Layer: 6 + m_Name: Floor_07 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &206662343 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 206662342} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -49.97, y: 10.1, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &206662344 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 206662342} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &206662345 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 206662342} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &206662346 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 206662342} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &284892226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 284892227} + - component: {fileID: 284892230} + - component: {fileID: 284892229} + - component: {fileID: 284892228} + m_Layer: 6 + m_Name: Floor_16 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &284892227 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 284892226} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -69.99, y: 20.7, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &284892228 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 284892226} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &284892229 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 284892226} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &284892230 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 284892226} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &335131023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 335131024} + - component: {fileID: 335131027} + - component: {fileID: 335131026} + - component: {fileID: 335131025} + m_Layer: 6 + m_Name: Floor_09 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &335131024 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 335131023} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -69.99, y: 10.1, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &335131025 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 335131023} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &335131026 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 335131023} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &335131027 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 335131023} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &375191780 GameObject: m_ObjectHideFlags: 0 @@ -307,6 +695,200 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 375191780} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &455582639 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 455582640} + - component: {fileID: 455582643} + - component: {fileID: 455582642} + - component: {fileID: 455582641} + m_Layer: 6 + m_Name: Floor_06 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &455582640 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455582639} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -39.98, y: 10.1, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &455582641 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455582639} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &455582642 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455582639} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &455582643 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 455582639} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &561001795 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 561001796} + - component: {fileID: 561001799} + - component: {fileID: 561001798} + - component: {fileID: 561001797} + m_Layer: 6 + m_Name: Floor_11 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &561001796 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 561001795} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -20.05, y: 20.7, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &561001797 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 561001795} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &561001798 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 561001795} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &561001799 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 561001795} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &617391188 GameObject: m_ObjectHideFlags: 0 @@ -414,7 +996,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 617391188} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -13.99, y: 29.3, z: 0} + m_LocalPosition: {x: -13.99, y: 6.1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -489,6 +1071,103 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &749443133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 749443134} + - component: {fileID: 749443137} + - component: {fileID: 749443136} + - component: {fileID: 749443135} + m_Layer: 6 + m_Name: Floor_08 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &749443134 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 749443133} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -59.96, y: 10.1, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &749443135 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 749443133} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &749443136 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 749443133} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &749443137 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 749443133} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &778227309 GameObject: m_ObjectHideFlags: 0 @@ -522,9 +1201,217 @@ Transform: - {fileID: 952326956} - {fileID: 617391193} - {fileID: 1094313418} + - {fileID: 840320352} + - {fileID: 899030642} + - {fileID: 1166806158} + - {fileID: 455582640} + - {fileID: 206662343} + - {fileID: 749443134} + - {fileID: 335131024} + - {fileID: 1815050699} + - {fileID: 561001796} + - {fileID: 2006523532} + - {fileID: 1070079037} + - {fileID: 1678058222} + - {fileID: 111805106} + - {fileID: 284892227} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &840320351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 840320352} + - component: {fileID: 840320355} + - component: {fileID: 840320354} + - component: {fileID: 840320353} + m_Layer: 6 + m_Name: Floor_03 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &840320352 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840320351} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -12.17, y: 10.1, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &840320353 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840320351} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &840320354 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840320351} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &840320355 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840320351} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &899030641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 899030642} + - component: {fileID: 899030645} + - component: {fileID: 899030644} + - component: {fileID: 899030643} + m_Layer: 6 + m_Name: Floor_04 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &899030642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899030641} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -20.05, y: 10.1, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &899030643 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899030641} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &899030644 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899030641} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &899030645 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899030641} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &921826478 GameObject: m_ObjectHideFlags: 0 @@ -737,6 +1624,103 @@ Transform: m_Father: {fileID: 778227310} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1070079036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1070079037} + - component: {fileID: 1070079040} + - component: {fileID: 1070079039} + - component: {fileID: 1070079038} + m_Layer: 6 + m_Name: Floor_13 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1070079037 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070079036} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -39.98, y: 20.7, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1070079038 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070079036} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1070079039 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070079036} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1070079040 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070079036} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1094313414 GameObject: m_ObjectHideFlags: 0 @@ -851,6 +1835,103 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &1166806157 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1166806158} + - component: {fileID: 1166806161} + - component: {fileID: 1166806160} + - component: {fileID: 1166806159} + m_Layer: 6 + m_Name: Floor_05 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1166806158 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1166806157} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -30.06, y: 10.1, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1166806159 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1166806157} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1166806160 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1166806157} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1166806161 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1166806157} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1211811536 GameObject: m_ObjectHideFlags: 0 @@ -1175,7 +2256,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530935835} - m_LocalRotation: {x: -8.123801e-10, y: 0.9994022, z: -0.03457181, w: -0.00000002348429} + m_LocalRotation: {x: -7.435696e-11, y: 0.9994022, z: -0.03457181, w: -0.000000002149512} m_LocalPosition: {x: 4.54, y: 6.64, z: 22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1347,6 +2428,103 @@ Transform: m_Father: {fileID: 778227310} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1678058221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1678058222} + - component: {fileID: 1678058225} + - component: {fileID: 1678058224} + - component: {fileID: 1678058223} + m_Layer: 6 + m_Name: Floor_14 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1678058222 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678058221} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -49.97, y: 20.7, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1678058223 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678058221} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1678058224 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678058221} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1678058225 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678058221} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1737815964 GameObject: m_ObjectHideFlags: 0 @@ -1444,6 +2622,103 @@ Transform: m_Father: {fileID: 778227310} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1815050698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1815050699} + - component: {fileID: 1815050702} + - component: {fileID: 1815050701} + - component: {fileID: 1815050700} + m_Layer: 6 + m_Name: Floor_10 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1815050699 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815050698} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -12.17, y: 20.7, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1815050700 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815050698} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1815050701 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815050698} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1815050702 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815050698} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1866383020 GameObject: m_ObjectHideFlags: 3 @@ -1670,6 +2945,103 @@ LineRenderer: generateLightingData: 0 m_UseWorldSpace: 1 m_Loop: 0 +--- !u!1 &2006523531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2006523532} + - component: {fileID: 2006523535} + - component: {fileID: 2006523534} + - component: {fileID: 2006523533} + m_Layer: 6 + m_Name: Floor_12 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2006523532 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2006523531} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -30.06, y: 20.7, z: 0} + m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 778227310} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2006523533 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2006523531} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &2006523534 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2006523531} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2006523535 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2006523531} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2098497449 GameObject: m_ObjectHideFlags: 0 @@ -1815,7 +3187,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2129712287} - m_LocalRotation: {x: -8.123801e-10, y: 0.9994022, z: -0.03457181, w: -0.00000002348429} + m_LocalRotation: {x: -7.435696e-11, y: 0.9994022, z: -0.03457181, w: -0.000000002149512} m_LocalPosition: {x: 4.54, y: 6.64, z: 22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 From c079a6ccbaf9a7653a6368ceb17b191ad857af75 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Wed, 19 Oct 2022 21:35:22 -0400 Subject: [PATCH 09/10] Can move up and down on rope Change boosting technique --- .../Grappling}/32bit_jam_conjure.inputactions | 0 .../32bit_jam_conjure.inputactions.meta | 0 Assets/{ => Scenes/Grappling}/GrappleHook.cs | 59 ++++++++++++------ .../Grappling}/GrappleHook.cs.meta | 0 Assets/Scenes/Grappling/Grappling.unity | 14 +++-- .../{ => Scenes/Grappling}/HitMarkerMat.mat | 0 .../Grappling}/HitMarkerMat.mat.meta | 0 Assets/{ => Scenes/Grappling}/anyrgb.com.png | Bin .../Grappling}/anyrgb.com.png.meta | 2 +- Assets/Scenes/Grappling/moveup.cs | 19 ++++++ Assets/Scenes/Grappling/moveup.cs.meta | 11 ++++ 11 files changed, 81 insertions(+), 24 deletions(-) rename Assets/{ => Scenes/Grappling}/32bit_jam_conjure.inputactions (100%) rename Assets/{ => Scenes/Grappling}/32bit_jam_conjure.inputactions.meta (100%) rename Assets/{ => Scenes/Grappling}/GrappleHook.cs (76%) rename Assets/{ => Scenes/Grappling}/GrappleHook.cs.meta (100%) rename Assets/{ => Scenes/Grappling}/HitMarkerMat.mat (100%) rename Assets/{ => Scenes/Grappling}/HitMarkerMat.mat.meta (100%) rename Assets/{ => Scenes/Grappling}/anyrgb.com.png (100%) rename Assets/{ => Scenes/Grappling}/anyrgb.com.png.meta (99%) create mode 100644 Assets/Scenes/Grappling/moveup.cs create mode 100644 Assets/Scenes/Grappling/moveup.cs.meta diff --git a/Assets/32bit_jam_conjure.inputactions b/Assets/Scenes/Grappling/32bit_jam_conjure.inputactions similarity index 100% rename from Assets/32bit_jam_conjure.inputactions rename to Assets/Scenes/Grappling/32bit_jam_conjure.inputactions diff --git a/Assets/32bit_jam_conjure.inputactions.meta b/Assets/Scenes/Grappling/32bit_jam_conjure.inputactions.meta similarity index 100% rename from Assets/32bit_jam_conjure.inputactions.meta rename to Assets/Scenes/Grappling/32bit_jam_conjure.inputactions.meta diff --git a/Assets/GrappleHook.cs b/Assets/Scenes/Grappling/GrappleHook.cs similarity index 76% rename from Assets/GrappleHook.cs rename to Assets/Scenes/Grappling/GrappleHook.cs index de288f7..1bbd7ba 100644 --- a/Assets/GrappleHook.cs +++ b/Assets/Scenes/Grappling/GrappleHook.cs @@ -6,25 +6,36 @@ using UnityEngine.UI; public class GrappleHook : MonoBehaviour { + [Header("Grapple settings")] [SerializeField] private float maxGrappleDist = 200; [SerializeField] - private float grappleExtendSpeed = 20; + private float grappleExtensionSpeed = 10; + [SerializeField] + private float grappleStrength = 4.5f * 5f; + [SerializeField] + private float grappleDamper = 7f; + [SerializeField] + private float grappleBoostSpeed = 50f; + [SerializeField] + private float grappleDrawingSpeed = 20; [SerializeField] private LayerMask grappleableLayer; + [Header("References")] [SerializeField] private Transform gunPos; - private Vector3 hitPosLocal; - private SpringJoint joint; - private LineRenderer lr; - RaycastHit hit; - private bool grappled = false; - private Vector3 currGrappleEndPos; [SerializeField] private RectTransform canvasRect; [SerializeField] private RectTransform hitMarkerRect; - // Start is called before the first frame update + private Vector3 hitPosLocal; + private SpringJoint joint; + private LineRenderer lr; + RaycastHit hit; + private bool grappled = false, boosted = false; + private Vector3 currGrappleEndPos; + + void Start() { lr = gameObject.GetComponentInChildren(); @@ -32,7 +43,7 @@ public class GrappleHook : MonoBehaviour hitMarkerRect.gameObject.SetActive(false); } - // Update is called once per frame + void Update() { @@ -42,14 +53,22 @@ public class GrappleHook : MonoBehaviour if(grappled){ DrawRope(Time.deltaTime); if(Input.GetMouseButtonDown(1)){ - joint.minDistance = 0f; - joint.maxDistance = 0f; + boosted = true; + } + if(boosted){ + joint.maxDistance -= grappleBoostSpeed * Time.deltaTime; + } + // TODO extend and retract rope + if(Input.GetKey(KeyCode.W)){ + ChangeGrappleLength(-grappleExtensionSpeed * Time.deltaTime); + }else if(Input.GetKey(KeyCode.S)){ + ChangeGrappleLength(grappleExtensionSpeed * Time.deltaTime); } return; } Aim(); - // TODO extend and retract rope + } private void Aim(){ @@ -84,7 +103,7 @@ public class GrappleHook : MonoBehaviour }else{ endPoint = hit.point; } - currGrappleEndPos = Vector3.Lerp(currGrappleEndPos, endPoint, deltaTime * grappleExtendSpeed); + currGrappleEndPos = Vector3.Lerp(currGrappleEndPos, endPoint, deltaTime * grappleDrawingSpeed); lr.SetPosition(1, currGrappleEndPos); if(!lr.enabled)lr.enabled = true; @@ -99,8 +118,7 @@ public class GrappleHook : MonoBehaviour joint = gameObject.AddComponent(); joint.anchor = transform.InverseTransformPoint(gunPos.position); joint.autoConfigureConnectedAnchor = false; - joint.maxDistance = hit.distance * 0.8f; - joint.minDistance = hit.distance * 0.25f; + joint.maxDistance = hit.distance * 0.9f; if(hit.rigidbody != null){ Rigidbody hitRb = hit.rigidbody; joint.connectedBody = hitRb; @@ -109,8 +127,8 @@ public class GrappleHook : MonoBehaviour }else{ joint.connectedAnchor = hit.point; } - joint.spring = 4.5f * 5f; - joint.damper = 7f; + joint.spring = grappleStrength; + joint.damper = grappleDamper; joint.massScale = 4.5f; currGrappleEndPos = transform.position; @@ -119,7 +137,7 @@ public class GrappleHook : MonoBehaviour private void EndGrapple(){ grappled = false; lr.enabled = false; - + boosted = false; Destroy(joint); } @@ -129,4 +147,9 @@ public class GrappleHook : MonoBehaviour return pointScreenPos; } + private void ChangeGrappleLength(float value){ + if(joint != null) + joint.maxDistance += value; + } + } diff --git a/Assets/GrappleHook.cs.meta b/Assets/Scenes/Grappling/GrappleHook.cs.meta similarity index 100% rename from Assets/GrappleHook.cs.meta rename to Assets/Scenes/Grappling/GrappleHook.cs.meta diff --git a/Assets/Scenes/Grappling/Grappling.unity b/Assets/Scenes/Grappling/Grappling.unity index c8e5661..44b69f5 100644 --- a/Assets/Scenes/Grappling/Grappling.unity +++ b/Assets/Scenes/Grappling/Grappling.unity @@ -171,7 +171,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} @@ -2064,7 +2064,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maxGrappleDist: 15 - grappleExtendSpeed: 20 + grappleExtensionSpeed: 2.5 + grappleStrength: 40 + grappleDamper: 7 + grappleBoostSpeed: 25 + grappleDrawingSpeed: 20 grappleableLayer: serializedVersion: 2 m_Bits: 64 @@ -2138,7 +2142,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 52.708637, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1301531514 MonoBehaviour: @@ -2256,7 +2260,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530935835} - m_LocalRotation: {x: -7.435696e-11, y: 0.9994022, z: -0.03457181, w: -0.000000002149512} + m_LocalRotation: {x: 0.0000000016397671, y: 0.9994022, z: -0.03457181, w: 0.0000000474024} m_LocalPosition: {x: 4.54, y: 6.64, z: 22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3187,7 +3191,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2129712287} - m_LocalRotation: {x: -7.435696e-11, y: 0.9994022, z: -0.03457181, w: -0.000000002149512} + m_LocalRotation: {x: 0.0000000016397671, y: 0.9994022, z: -0.03457181, w: 0.0000000474024} m_LocalPosition: {x: 4.54, y: 6.64, z: 22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/HitMarkerMat.mat b/Assets/Scenes/Grappling/HitMarkerMat.mat similarity index 100% rename from Assets/HitMarkerMat.mat rename to Assets/Scenes/Grappling/HitMarkerMat.mat diff --git a/Assets/HitMarkerMat.mat.meta b/Assets/Scenes/Grappling/HitMarkerMat.mat.meta similarity index 100% rename from Assets/HitMarkerMat.mat.meta rename to Assets/Scenes/Grappling/HitMarkerMat.mat.meta diff --git a/Assets/anyrgb.com.png b/Assets/Scenes/Grappling/anyrgb.com.png similarity index 100% rename from Assets/anyrgb.com.png rename to Assets/Scenes/Grappling/anyrgb.com.png diff --git a/Assets/anyrgb.com.png.meta b/Assets/Scenes/Grappling/anyrgb.com.png.meta similarity index 99% rename from Assets/anyrgb.com.png.meta rename to Assets/Scenes/Grappling/anyrgb.com.png.meta index ab00e7e..f6ee87d 100644 --- a/Assets/anyrgb.com.png.meta +++ b/Assets/Scenes/Grappling/anyrgb.com.png.meta @@ -68,7 +68,7 @@ TextureImporter: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 + resizeAlgorithm: 1 textureFormat: -1 textureCompression: 1 compressionQuality: 50 diff --git a/Assets/Scenes/Grappling/moveup.cs b/Assets/Scenes/Grappling/moveup.cs new file mode 100644 index 0000000..ce05773 --- /dev/null +++ b/Assets/Scenes/Grappling/moveup.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class moveup : MonoBehaviour +{ + private Rigidbody rb; + // Start is called before the first frame update + void Start() + { + rb = GetComponent(); + } + + // Update is called once per frame + void Update() + { + rb.MovePosition(transform.position + new Vector3(0,1,0)*Time.deltaTime); + } +} diff --git a/Assets/Scenes/Grappling/moveup.cs.meta b/Assets/Scenes/Grappling/moveup.cs.meta new file mode 100644 index 0000000..1573d4f --- /dev/null +++ b/Assets/Scenes/Grappling/moveup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6274607e1747d7342942440e01be026f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From b2c581a8d53e5c8fa516a7c77953a0dc6dbf9e37 Mon Sep 17 00:00:00 2001 From: Soulaha Balde Date: Wed, 19 Oct 2022 22:16:14 -0400 Subject: [PATCH 10/10] save scene --- Assets/Scenes/Grappling/Grappling.unity | 23 ++++++++++++++++++----- Assets/Scenes/Grappling/moveup.cs | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Assets/Scenes/Grappling/Grappling.unity b/Assets/Scenes/Grappling/Grappling.unity index 44b69f5..3deadb7 100644 --- a/Assets/Scenes/Grappling/Grappling.unity +++ b/Assets/Scenes/Grappling/Grappling.unity @@ -1734,7 +1734,8 @@ GameObject: - component: {fileID: 1094313416} - component: {fileID: 1094313415} - component: {fileID: 1094313419} - m_Layer: 0 + - component: {fileID: 1094313420} + m_Layer: 6 m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} @@ -1830,11 +1831,23 @@ Rigidbody: m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 + m_UseGravity: 0 + m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &1094313420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1094313414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6274607e1747d7342942440e01be026f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1166806157 GameObject: m_ObjectHideFlags: 0 @@ -2260,7 +2273,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530935835} - m_LocalRotation: {x: 0.0000000016397671, y: 0.9994022, z: -0.03457181, w: 0.0000000474024} + m_LocalRotation: {x: 0.000000001639493, y: 0.9994022, z: -0.03457181, w: 0.000000047394476} m_LocalPosition: {x: 4.54, y: 6.64, z: 22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3191,7 +3204,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2129712287} - m_LocalRotation: {x: 0.0000000016397671, y: 0.9994022, z: -0.03457181, w: 0.0000000474024} + m_LocalRotation: {x: 0.000000001639493, y: 0.9994022, z: -0.03457181, w: 0.000000047394476} m_LocalPosition: {x: 4.54, y: 6.64, z: 22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/Scenes/Grappling/moveup.cs b/Assets/Scenes/Grappling/moveup.cs index ce05773..68894c6 100644 --- a/Assets/Scenes/Grappling/moveup.cs +++ b/Assets/Scenes/Grappling/moveup.cs @@ -14,6 +14,6 @@ public class moveup : MonoBehaviour // Update is called once per frame void Update() { - rb.MovePosition(transform.position + new Vector3(0,1,0)*Time.deltaTime); + rb.MovePosition(transform.position + new Vector3(0,5,0)*Time.deltaTime); } }