diff --git a/Assets/Materials/Soul.mat b/Assets/Materials/Soul.mat new file mode 100644 index 0000000..8676c06 --- /dev/null +++ b/Assets/Materials/Soul.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Soul + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 0, b: 0.9209471, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Soul.mat.meta b/Assets/Materials/Soul.mat.meta new file mode 100644 index 0000000..b876f58 --- /dev/null +++ b/Assets/Materials/Soul.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb1d6c599d0f2844cbc55585e6bfd7e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/soul.fbx b/Assets/Models/soul.fbx new file mode 100644 index 0000000..bc87c2b Binary files /dev/null and b/Assets/Models/soul.fbx differ diff --git a/Assets/Models/soul.fbx.meta b/Assets/Models/soul.fbx.meta new file mode 100644 index 0000000..5797742 --- /dev/null +++ b/Assets/Models/soul.fbx.meta @@ -0,0 +1,97 @@ +fileFormatVersion: 2 +guid: 3c1f772e57a552c43a0fbd4a3ad2aa8e +ModelImporter: + serializedVersion: 23 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2100000: No Name + 2300000: //RootNode + 3300000: //RootNode + 4300000: Icosphere + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + previousCalculatedGlobalScale: 1 + hasPreviousCalculatedGlobalScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index dd57dc4..ef1cb59 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -64,6 +64,7 @@ MonoBehaviour: m_Bits: 2048 horizontalRayCount: 4 verticalRayCount: 4 + maxClimbAngle: 60 --- !u!114 &5588890751565926871 MonoBehaviour: m_ObjectHideFlags: 0 @@ -79,6 +80,11 @@ MonoBehaviour: jumpHeight: 3.5 jumpDuration: 0.4 moveSpeed: 6 + accelerationTimeAirborne: 0.2 + accelerationTimeGrounded: 0.05 + hud: {fileID: 0} + soulPrefab: {fileID: 923676258187016684, guid: 80b838e4e488ed64b9ac358ee000f444, + type: 3} --- !u!1 &6383496741659177281 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Soul.prefab b/Assets/Prefabs/Soul.prefab new file mode 100644 index 0000000..77f82a3 --- /dev/null +++ b/Assets/Prefabs/Soul.prefab @@ -0,0 +1,317 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &923676258187016684 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3487225793045142114} + - component: {fileID: 945971871285315277} + - component: {fileID: 2986043981050272749} + m_Layer: 11 + m_Name: Soul + m_TagString: Soul + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3487225793045142114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 923676258187016684} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 960, y: 540, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8132939646274158128} + - {fileID: 5281988460775791226} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &945971871285315277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 923676258187016684} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c066410fbc09d284b901f00f1842586d, type: 3} + m_Name: + m_EditorClassIdentifier: + playerName: + nameText: {fileID: 3343412635193291118} + cam: {fileID: 0} +--- !u!135 &2986043981050272749 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 923676258187016684} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.25 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &2059173772660875122 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4604280620177553672} + - component: {fileID: 6542300211569968197} + - component: {fileID: 3343412635193291118} + m_Layer: 11 + m_Name: Name Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4604280620177553672 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059173772660875122} + 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_Children: [] + m_Father: {fileID: 5281988460775791226} + 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: 4, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6542300211569968197 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059173772660875122} + m_CullTransparentMesh: 0 +--- !u!114 &3343412635193291118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059173772660875122} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 8 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: '@jordanorelli' +--- !u!1 &4921059046668847460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5281988460775791226} + - component: {fileID: 323817472649017284} + - component: {fileID: 3964294279211880244} + - component: {fileID: 6841750811663349008} + m_Layer: 11 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5281988460775791226 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4921059046668847460} + 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_Children: + - {fileID: 4604280620177553672} + m_Father: {fileID: 3487225793045142114} + m_RootOrder: 1 + 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.5} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &323817472649017284 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4921059046668847460} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + 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!114 &3964294279211880244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4921059046668847460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, 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: 1400 +--- !u!114 &6841750811663349008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4921059046668847460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &8132939646274052624 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8132939646274158128} + - component: {fileID: 8132939646274960912} + - component: {fileID: 8132939646276058320} + m_Layer: 11 + m_Name: soul + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8132939646274158128 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8132939646274052624} + 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_Children: [] + m_Father: {fileID: 3487225793045142114} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8132939646274960912 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8132939646274052624} + m_Mesh: {fileID: 4300000, guid: 3c1f772e57a552c43a0fbd4a3ad2aa8e, type: 3} +--- !u!23 &8132939646276058320 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8132939646274052624} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fb1d6c599d0f2844cbc55585e6bfd7e3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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 diff --git a/Assets/Prefabs/Soul.prefab.meta b/Assets/Prefabs/Soul.prefab.meta new file mode 100644 index 0000000..8173f24 --- /dev/null +++ b/Assets/Prefabs/Soul.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 80b838e4e488ed64b9ac358ee000f444 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 0faa3f3..02283cd 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2857,6 +2857,102 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f97b2236cb22fbc46a20b65f13071959, type: 3} +--- !u!1 &534669902 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 534669905} + - component: {fileID: 534669904} + - component: {fileID: 534669903} + - component: {fileID: 534669906} + 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 &534669903 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 534669902} + m_Enabled: 1 +--- !u!20 &534669904 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 534669902} + 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_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + 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: 78.4 + 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 &534669905 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 534669902} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 8.2, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &534669906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 534669902} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af7a4f3a5c0c243498985148ee243e45, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 1063375671} --- !u!4 &573540321 stripped Transform: m_CorrespondingSourceObject: {fileID: 7525036764583245661, guid: f97b2236cb22fbc46a20b65f13071959, @@ -10926,166 +11022,161 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1410476410} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6383496741781373543 +--- !u!1001 &3972122049024678981 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 6383496741192187632, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 923676258187016684, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_Name - value: Player + value: Soul objectReference: {fileID: 0} - - target: {fileID: 6383496741192187632, guid: cd445451907d7274daea79c67e13a202, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 3487225793045142114, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 12 objectReference: {fileID: 0} - - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 3487225793045142114, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_LocalPosition.y - value: 10 + value: 6 objectReference: {fileID: 0} - - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 3487225793045142114, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 3487225793045142114, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 3487225793045142114, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 3487225793045142114, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 3487225793045142114, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 3487225793045142114, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_RootOrder - value: 5 + value: 13 objectReference: {fileID: 0} - - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 3487225793045142114, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 3487225793045142114, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 3487225793045142114, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6891912346901077427, guid: cd445451907d7274daea79c67e13a202, + - target: {fileID: 945971871285315277, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} - propertyPath: forwardRayCount - value: 2 + propertyPath: playerName + value: jordanorelli objectReference: {fileID: 0} - - target: {fileID: 5588890751565926871, guid: cd445451907d7274daea79c67e13a202, - type: 3} - propertyPath: hud - value: - objectReference: {fileID: 1522652360} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cd445451907d7274daea79c67e13a202, type: 3} ---- !u!1001 &8206000050524585146 + m_SourcePrefab: {fileID: 100100000, guid: 80b838e4e488ed64b9ac358ee000f444, type: 3} +--- !u!1001 &6383496741781373543 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 8206000050309207796, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187632, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_Name - value: Main Camera + value: Player + objectReference: {fileID: 0} + - target: {fileID: 6383496741192187632, guid: cd445451907d7274daea79c67e13a202, + type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207787, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207787, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_LocalPosition.y - value: 8.2 + value: 10 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207787, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_LocalPosition.z - value: -10 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207787, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207787, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207787, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207787, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207787, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207787, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207787, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207787, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6383496741192187647, guid: cd445451907d7274daea79c67e13a202, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207786, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 6891912346901077427, guid: cd445451907d7274daea79c67e13a202, type: 3} - propertyPath: orthographic - value: 0 + propertyPath: forwardRayCount + value: 2 objectReference: {fileID: 0} - - target: {fileID: 8206000050309207784, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, + - target: {fileID: 5588890751565926871, guid: cd445451907d7274daea79c67e13a202, type: 3} - propertyPath: player + propertyPath: hud value: - objectReference: {fileID: 1063375671} + objectReference: {fileID: 1522652360} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 212bab9eb4dc1d14ea3e5d9be33ab6f7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: cd445451907d7274daea79c67e13a202, type: 3} diff --git a/Assets/Scripts/MoveController.cs b/Assets/Scripts/MoveController.cs index 2b6bcf3..286b6be 100644 --- a/Assets/Scripts/MoveController.cs +++ b/Assets/Scripts/MoveController.cs @@ -61,6 +61,11 @@ public class MoveController : MonoBehaviour return; } + if (hit.collider.gameObject.CompareTag("Soul")) { + Destroy(hit.collider.gameObject); + return; + } + float slopeAngle = Vector3.Angle(hit.normal, Vector3.up); if (i == 0 && slopeAngle <= maxClimbAngle) { float distanceToSlopeStart = 0f; @@ -116,6 +121,11 @@ public class MoveController : MonoBehaviour return; } + if (hit.collider.gameObject.CompareTag("Soul")) { + Destroy(hit.collider.gameObject); + return; + } + velocity.y = (hit.distance - skinWidth) * directionY; // Debug.LogFormat("with RayLength {0} MinHitDist {1} setting velocity.y to {2}", rayLength, hit.distance, velocity.y); rayLength = hit.distance; diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 0b65fff..8723dc8 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -10,6 +10,7 @@ public class PlayerController : MonoBehaviour { public float accelerationTimeAirborne = 0.2f; public float accelerationTimeGrounded = 0.05f; public Canvas hud; + public GameObject soulPrefab; private Vector3 velocity; private float jumpVelocity; @@ -53,5 +54,7 @@ public class PlayerController : MonoBehaviour { if (c) { c.SetDead(true); } + GameObject soul = Instantiate(soulPrefab, transform.position + Vector3.up * 0.5f, transform.rotation); + soul.GetComponent().playerName = "fartface"; } } diff --git a/Assets/Scripts/SoulController.cs b/Assets/Scripts/SoulController.cs new file mode 100644 index 0000000..3c4182f --- /dev/null +++ b/Assets/Scripts/SoulController.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class SoulController : MonoBehaviour { + public string playerName = ""; + + public Text nameText; + public Camera cam; + + private Quaternion fixedRotation; + + // Start is called before the first frame update + void Start() { + if (cam == null) { + cam = Camera.main; + } + fixedRotation = transform.rotation; + nameText.text = "@" + playerName; + } + + // Update is called once per frame + void Update() { + transform.rotation = cam.transform.rotation * fixedRotation; + } +} diff --git a/Assets/Scripts/SoulController.cs.meta b/Assets/Scripts/SoulController.cs.meta new file mode 100644 index 0000000..0c5e512 --- /dev/null +++ b/Assets/Scripts/SoulController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c066410fbc09d284b901f00f1842586d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 12d139b..eb76d7d 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,6 +5,7 @@ TagManager: serializedVersion: 2 tags: - Fatal + - Soul layers: - Default - TransparentFX diff --git a/blender/soul.blend b/blender/soul.blend new file mode 100644 index 0000000..965ca59 Binary files /dev/null and b/blender/soul.blend differ diff --git a/blender/spike.blend b/blender/spike.blend index b89e2a6..74e7361 100644 Binary files a/blender/spike.blend and b/blender/spike.blend differ