diff --git a/Assets/Materials/Charcoal.mat b/Assets/Materials/Charcoal.mat new file mode 100644 index 0000000..6d17b4b --- /dev/null +++ b/Assets/Materials/Charcoal.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: Charcoal + 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 + - _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: 0.2264151, g: 0.2264151, b: 0.2264151, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Charcoal.mat.meta b/Assets/Materials/Charcoal.mat.meta new file mode 100644 index 0000000..0c3b3e2 --- /dev/null +++ b/Assets/Materials/Charcoal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5b620399c48df144843bdd86af8973c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Environment/BurningStick.prefab b/Assets/Prefabs/Environment/BurningStick.prefab index 1c24482..be299d8 100644 --- a/Assets/Prefabs/Environment/BurningStick.prefab +++ b/Assets/Prefabs/Environment/BurningStick.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1830340994370403595} + - component: {fileID: -5925851218717166877} m_Layer: 0 m_Name: BurningStick m_TagString: Untagged @@ -24,14 +25,124 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2086008818391599545} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.583, y: 0.964, z: -0.598} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1126355678538028640} - {fileID: 7281152459947064446} + - {fileID: 1153588192824730054} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-5925851218717166877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086008818391599545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a42ab79bb3f7ede4badb6d60155c8c48, type: 3} + m_Name: + m_EditorClassIdentifier: + Light: {fileID: 235010646391593287} + NormalColor: {r: 1, g: 0.88479936, b: 0.759434, a: 1} + PanicColor: {r: 1, g: 0.65243995, b: 0.4481132, a: 1} + Lifetime: 10 + PanicLifetimeThreshold: 5 +--- !u!1 &3363062943258591200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1153588192824730054} + - component: {fileID: 235010646391593287} + m_Layer: 0 + m_Name: Point Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1153588192824730054 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3363062943258591200} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.307, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1830340994370403595} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &235010646391593287 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3363062943258591200} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 1, g: 0.96851534, b: 0.8820755, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + 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: 0 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 --- !u!1 &6731946952526266997 GameObject: m_ObjectHideFlags: 0 @@ -4857,6 +4968,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -1504981713932161579, guid: e44ff149e18c4334b82caa71b1fae7f7, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 80996928df7a0d847bbb7a283c52976b, type: 2} + - target: {fileID: -1504981713932161579, guid: e44ff149e18c4334b82caa71b1fae7f7, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: d5b620399c48df144843bdd86af8973c, type: 2} - target: {fileID: -927199367670048503, guid: e44ff149e18c4334b82caa71b1fae7f7, type: 3} propertyPath: m_Name diff --git a/Assets/Prefabs/Environment/stick.prefab b/Assets/Prefabs/Environment/stick.prefab index 4052981..c005f77 100644 --- a/Assets/Prefabs/Environment/stick.prefab +++ b/Assets/Prefabs/Environment/stick.prefab @@ -101,13 +101,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8445609960004857605} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.0027, z: 0.2278} - m_LocalScale: {x: 0.071112804, y: 0.06466763, z: 0.479739} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.002, y: 0.1136, z: 0.0031} + m_LocalScale: {x: 0.0355564, y: 0.032333814, z: 0.2398695} m_Children: [] m_Father: {fileID: 1830340994370403595} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!65 &8953589864355665736 BoxCollider: m_ObjectHideFlags: 0 @@ -146,7 +146,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313, type: 3} @@ -161,7 +161,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313, type: 3} @@ -171,7 +171,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313, type: 3} @@ -186,17 +186,17 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313, type: 3} propertyPath: m_LocalScale.x - value: 200 + value: 100 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313, type: 3} propertyPath: m_LocalScale.y - value: 200 + value: 100 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 88768e5e916bdea47b890bb833348313, type: 3} propertyPath: m_LocalScale.z - value: 200 + value: 100 objectReference: {fileID: 0} - target: {fileID: -1504981713932161579, guid: 88768e5e916bdea47b890bb833348313, type: 3} diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab index 66dff12..6c67787 100644 --- a/Assets/Prefabs/Player/Player.prefab +++ b/Assets/Prefabs/Player/Player.prefab @@ -189,6 +189,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8433165236288212749} + - {fileID: 382824425213983027} m_Father: {fileID: 6125707630481988396} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -408,8 +409,11 @@ MonoBehaviour: m_EditorClassIdentifier: CameraTransform: {fileID: 6125707628839966534} HandTransform: {fileID: 8433165236288212749} - GrabHint: {fileID: 0} - GrabText: {fileID: 0} + TorchHandTransform: {fileID: 382824425213983027} + PrimaryIndicator: {fileID: 0} + PrimaryText: {fileID: 0} + SecondaryIndicator: {fileID: 0} + SecondaryText: {fileID: 0} ItemLayer: serializedVersion: 2 m_Bits: 1024 @@ -418,7 +422,10 @@ MonoBehaviour: m_Bits: 3895 Distance: 2 ThrowVelocity: 6 + TorchPrefab: {fileID: 2086008818391599545, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} GrabbedItem: {fileID: 0} + Torch: {fileID: 0} --- !u!114 &462937706053753531 MonoBehaviour: m_ObjectHideFlags: 0 @@ -431,6 +438,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 46a5bf268fa1368419b104ac733e1835, type: 3} m_Name: m_EditorClassIdentifier: + Options: {fileID: 0} CameraTransform: {fileID: 6125707628839966534} HeadBobCurve: serializedVersion: 2 @@ -467,10 +475,39 @@ MonoBehaviour: m_RotationOrder: 4 StepDuration: 0.5 BobMagnitude: 1 - MoveIntensity: 0 Moving: 0 InAir: 0 FootstepSource: {fileID: 827982312027890955} RightFootstepClips: [] LeftFootstepClips: [] LastStep: 0 +--- !u!1 &6687183487362402551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 382824425213983027} + m_Layer: 11 + m_Name: Torch Holder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &382824425213983027 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6687183487362402551} + m_LocalRotation: {x: -0.17101014, y: -0.17101014, z: -0.030153712, w: 0.96984625} + m_LocalPosition: {x: -0.3, y: -0.3, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6125707628839966534} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -20, y: -20, z: 0} diff --git a/Assets/Prefabs/UI/Pickup Indicator.prefab b/Assets/Prefabs/UI/Primary Indicator.prefab similarity index 97% rename from Assets/Prefabs/UI/Pickup Indicator.prefab rename to Assets/Prefabs/UI/Primary Indicator.prefab index 76aa730..94174a1 100644 --- a/Assets/Prefabs/UI/Pickup Indicator.prefab +++ b/Assets/Prefabs/UI/Primary Indicator.prefab @@ -85,7 +85,7 @@ GameObject: - component: {fileID: 7049769127320404016} - component: {fileID: 7049769127320404017} m_Layer: 5 - m_Name: Pickup Indicator + m_Name: Primary Indicator m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -135,7 +135,7 @@ GameObject: - component: {fileID: 7049769128174869207} - component: {fileID: 7049769128174869206} m_Layer: 5 - m_Name: Pickup Indicator Text + m_Name: Primary Indicator Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -158,8 +158,8 @@ RectTransform: 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: 200, y: 50} + m_AnchoredPosition: {x: 12, y: 0} + m_SizeDelta: {x: 220, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7049769128174869207 CanvasRenderer: diff --git a/Assets/Prefabs/UI/Pickup Indicator.prefab.meta b/Assets/Prefabs/UI/Primary Indicator.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Pickup Indicator.prefab.meta rename to Assets/Prefabs/UI/Primary Indicator.prefab.meta diff --git a/Assets/Prefabs/UI/Secondary Indicator.prefab b/Assets/Prefabs/UI/Secondary Indicator.prefab new file mode 100644 index 0000000..410ff8a --- /dev/null +++ b/Assets/Prefabs/UI/Secondary Indicator.prefab @@ -0,0 +1,203 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1426896476348249739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1426896476348249740} + - component: {fileID: 1426896476348249741} + m_Layer: 5 + m_Name: Secondary Indicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1426896476348249740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426896476348249739} + 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: 1426896477303368809} + m_Father: {fileID: 0} + 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: -100} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &1426896476348249741 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426896476348249739} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 +--- !u!1 &1426896477303368808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1426896477303368809} + - component: {fileID: 1426896477303368811} + - component: {fileID: 1426896477303368810} + m_Layer: 5 + m_Name: Secondary Indicator Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1426896477303368809 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426896477303368808} + 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: 8429162306386692154} + m_Father: {fileID: 1426896476348249740} + 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: 12, y: 0} + m_SizeDelta: {x: 200, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1426896477303368811 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426896477303368808} + m_CullTransparentMesh: 0 +--- !u!114 &1426896477303368810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426896477303368808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8301887, g: 0.8301887, b: 0.8301887, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: a0bb3d007c7133149bd1682bd93b776f, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Ignite stick +--- !u!1 &5080575227226812377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8429162306386692154} + - component: {fileID: 5453984970119700624} + - component: {fileID: 8373001954831564665} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8429162306386692154 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5080575227226812377} + 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: 1426896477303368809} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &5453984970119700624 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5080575227226812377} + m_CullTransparentMesh: 0 +--- !u!114 &8373001954831564665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5080575227226812377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8d66e65c66e29504199ed664979682cd, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 3286163911610860551, guid: 259e05b73303a3a489daa2e23094442a, + type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefabs/UI/Secondary Indicator.prefab.meta b/Assets/Prefabs/UI/Secondary Indicator.prefab.meta new file mode 100644 index 0000000..05e5eda --- /dev/null +++ b/Assets/Prefabs/UI/Secondary Indicator.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bd65216f03b378148860c8586ce20045 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Yee.unity b/Assets/Scenes/Yee.unity index 65a53c4..4036b06 100644 --- a/Assets/Scenes/Yee.unity +++ b/Assets/Scenes/Yee.unity @@ -336,7 +336,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -351,7 +351,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -361,7 +361,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -710,7 +710,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &237467733 GameObject: @@ -829,7 +829,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -844,7 +844,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -854,7 +854,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -885,6 +885,120 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 531861614376686525} m_PrefabAsset: {fileID: 0} +--- !u!1001 &434417508 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1830340994370403595, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalPosition.x + value: -12.767792 + objectReference: {fileID: 0} + - target: {fileID: 1830340994370403595, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.41 + objectReference: {fileID: 0} + - target: {fileID: 1830340994370403595, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalPosition.z + value: -6.575531 + objectReference: {fileID: 0} + - target: {fileID: 1830340994370403595, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1830340994370403595, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1830340994370403595, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1830340994370403595, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1830340994370403595, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1830340994370403595, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1830340994370403595, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1830340994370403595, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2086008818391599545, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_Name + value: BurningStick + objectReference: {fileID: 0} + - target: {fileID: 8445936519632671673, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.38108188 + objectReference: {fileID: 0} + - target: {fileID: 8445936519632671673, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.001458146 + objectReference: {fileID: 0} + - target: {fileID: 8445936519632671673, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.000031748743 + objectReference: {fileID: 0} + - target: {fileID: 8445936519632671673, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.92454016 + objectReference: {fileID: 0} + - target: {fileID: 8445936519632671673, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 44.801003 + objectReference: {fileID: 0} + - target: {fileID: 8445936519632671673, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.216 + objectReference: {fileID: 0} + - target: {fileID: 8445936519632671673, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.085 + objectReference: {fileID: 0} + - target: {fileID: 8445936519632671673, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.509 + objectReference: {fileID: 0} + - target: {fileID: 8445936519632671673, guid: dc8417fd4adf1fb41a9ac47d53341a6e, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.379 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dc8417fd4adf1fb41a9ac47d53341a6e, type: 3} --- !u!1001 &483093624 PrefabInstance: m_ObjectHideFlags: 0 @@ -910,7 +1024,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -925,7 +1039,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -935,7 +1049,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1267,7 +1381,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1282,7 +1396,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1292,7 +1406,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1342,7 +1456,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1357,7 +1471,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1367,7 +1481,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1417,7 +1531,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1432,7 +1546,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1442,7 +1556,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1665,7 +1779,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1680,7 +1794,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1690,7 +1804,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1860,7 +1974,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1875,7 +1989,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1885,7 +1999,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1935,7 +2049,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1950,7 +2064,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -1960,7 +2074,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2040,7 +2154,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2055,7 +2169,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2065,7 +2179,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2209,7 +2323,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2224,7 +2338,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2234,7 +2348,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2389,7 +2503,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1921606960} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2461,7 +2575,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2476,7 +2590,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2486,7 +2600,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2730,7 +2844,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2745,7 +2859,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -2755,7 +2869,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -3378,7 +3492,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -3393,7 +3507,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -3403,7 +3517,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -3453,7 +3567,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -3468,7 +3582,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -3478,7 +3592,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -3991,7 +4105,7 @@ Transform: - {fileID: 1138615643} - {fileID: 946900660} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1688796743 GameObject: @@ -4256,7 +4370,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -4271,7 +4385,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -4281,7 +4395,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -4425,7 +4539,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -4440,7 +4554,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -4450,7 +4564,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -4772,11 +4886,12 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1364366412} + - {fileID: 1615087124718553244} - {fileID: 1156509021} - {fileID: 1344354208} - {fileID: 429180126} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4870,7 +4985,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -4885,7 +5000,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -4895,7 +5010,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -4945,7 +5060,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -4960,7 +5075,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -4970,7 +5085,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -5020,7 +5135,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -5035,7 +5150,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -5045,7 +5160,7 @@ PrefabInstance: - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1830340994370403595, guid: 58a0b048688a1f944ae319d8ee9c5c34, type: 3} @@ -5228,8 +5343,127 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &406638878449368592 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1921606960} + m_Modifications: + - target: {fileID: 1426896476348249739, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_Name + value: Secondary Indicator + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -170 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bd65216f03b378148860c8586ce20045, type: 3} --- !u!1001 &531861614376686525 PrefabInstance: m_ObjectHideFlags: 0 @@ -5242,11 +5476,6 @@ PrefabInstance: propertyPath: m_Alpha value: 0 objectReference: {fileID: 0} - - target: {fileID: 452814073520004166, guid: 0a942b74adc03b248ac74ce8af504ca5, - type: 3} - propertyPath: m_Interactable - value: 0 - objectReference: {fileID: 0} - target: {fileID: 452814073520004166, guid: 0a942b74adc03b248ac74ce8af504ca5, type: 3} propertyPath: m_BlocksRaycasts @@ -5295,7 +5524,7 @@ PrefabInstance: - target: {fileID: 531861614786402147, guid: 0a942b74adc03b248ac74ce8af504ca5, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 531861614786402147, guid: 0a942b74adc03b248ac74ce8af504ca5, type: 3} @@ -5369,6 +5598,30 @@ PrefabInstance: objectReference: {fileID: 834592896} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a942b74adc03b248ac74ce8af504ca5, type: 3} +--- !u!224 &1615087124718553244 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1426896476348249740, guid: bd65216f03b378148860c8586ce20045, + type: 3} + m_PrefabInstance: {fileID: 406638878449368592} + m_PrefabAsset: {fileID: 0} +--- !u!225 &1615087124718553245 stripped +CanvasGroup: + m_CorrespondingSourceObject: {fileID: 1426896476348249741, guid: bd65216f03b378148860c8586ce20045, + type: 3} + m_PrefabInstance: {fileID: 406638878449368592} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1615087125306937978 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1426896477303368810, guid: bd65216f03b378148860c8586ce20045, + type: 3} + m_PrefabInstance: {fileID: 406638878449368592} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &5400695019531174117 PrefabInstance: m_ObjectHideFlags: 0 @@ -5449,7 +5702,7 @@ PrefabInstance: - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, type: 3} @@ -5532,6 +5785,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1660514110} m_Modifications: + - target: {fileID: 382824425213983027, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 462937706053753531, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: Options + value: + objectReference: {fileID: 5400695019531174118} - target: {fileID: 6125707628839966535, guid: 558201eae20fa5540a826edb23937665, type: 3} propertyPath: debugLayer.lightMeter.showCurves @@ -5617,6 +5880,31 @@ PrefabInstance: propertyPath: GrabText value: objectReference: {fileID: 1849724586} + - target: {fileID: 7093134810128755097, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: PrimaryIndicator + value: + objectReference: {fileID: 1364366413} + - target: {fileID: 7093134810128755097, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: PrimaryText + value: + objectReference: {fileID: 1849724586} + - target: {fileID: 7093134810128755097, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: SecondaryIndicator + value: + objectReference: {fileID: 1615087124718553245} + - target: {fileID: 7093134810128755097, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: SecondaryText + value: + objectReference: {fileID: 1615087125306937978} + - target: {fileID: 8433165236288212749, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 558201eae20fa5540a826edb23937665, type: 3} --- !u!1001 &6166170816655763453 @@ -5803,12 +6091,12 @@ PrefabInstance: - target: {fileID: 7049769127320404017, guid: 4960008b98feac24dbe12ba22a64b125, type: 3} propertyPath: m_Alpha - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7049769127320404023, guid: 4960008b98feac24dbe12ba22a64b125, type: 3} propertyPath: m_Name - value: Pickup Indicator + value: Primary Indicator objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4960008b98feac24dbe12ba22a64b125, type: 3} diff --git a/Assets/Scripts/CameraBobber.cs b/Assets/Scripts/CameraBobber.cs index 839cfff..4ee3332 100644 --- a/Assets/Scripts/CameraBobber.cs +++ b/Assets/Scripts/CameraBobber.cs @@ -9,6 +9,7 @@ public enum StepType { } public class CameraBobber : MonoBehaviour { + public Options Options; public Transform CameraTransform; public AnimationCurve HeadBobCurve = AnimationCurve.Constant(0, 1, 0); public float StepDuration; @@ -46,11 +47,13 @@ public class CameraBobber : MonoBehaviour { StepTime = 0; } - Vector3 TargetPosition; - if (InAir) { - TargetPosition = BasePosition + Vector3.up * HeadBobCurve.Evaluate(0.5f) * BobMagnitude; - } else { - TargetPosition = BasePosition + Vector3.up * HeadBobCurve.Evaluate(StepTime / StepDuration) * BobMagnitude; + Vector3 TargetPosition = BasePosition; + if (Options.CameraBobbing) { + if (InAir) { + TargetPosition = BasePosition + Vector3.up * HeadBobCurve.Evaluate(0.5f) * BobMagnitude; + } else { + TargetPosition = BasePosition + Vector3.up * HeadBobCurve.Evaluate(StepTime / StepDuration) * BobMagnitude; + } } CameraTransform.localPosition = Vector3.Lerp(CameraTransform.localPosition, TargetPosition, 10f * Time.deltaTime); diff --git a/Assets/Scripts/CameraController.cs b/Assets/Scripts/CameraController.cs index 2f07d16..1295bb8 100644 --- a/Assets/Scripts/CameraController.cs +++ b/Assets/Scripts/CameraController.cs @@ -20,11 +20,11 @@ public class CameraController : MonoBehaviour { Cursor.lockState = CursorLockMode.Locked; Vector3 Eulers = BodyTransform.localEulerAngles; - Eulers.y += Input.GetAxis("Mouse X") * Options.MouseSensitivity * (Options.InvertMouseX ? -1 : 1); + Eulers.y += GetHorizontalLookDelta() * Options.MouseSensitivity * (Options.InvertMouseX ? -1 : 1); BodyTransform.localEulerAngles = Eulers; Eulers = HeadTransform.localEulerAngles; - Eulers.x -= Input.GetAxis("Mouse Y") * Options.MouseSensitivity * (Options.InvertMouseY ? -1 : 1); + Eulers.x -= GetVerticalLookDelta() * Options.MouseSensitivity * (Options.InvertMouseY ? -1 : 1); if (Eulers.x > 90 && Eulers.x < 180) { Eulers.x = 90; } @@ -37,4 +37,12 @@ public class CameraController : MonoBehaviour { Cursor.lockState = CursorLockMode.None; } } + + private float GetHorizontalLookDelta() { + return Input.GetAxis("Mouse X"); + } + + private float GetVerticalLookDelta() { + return Input.GetAxis("Mouse Y"); + } } diff --git a/Assets/Scripts/ItemGrabber.cs b/Assets/Scripts/ItemGrabber.cs index 14acd94..7118619 100644 --- a/Assets/Scripts/ItemGrabber.cs +++ b/Assets/Scripts/ItemGrabber.cs @@ -6,27 +6,31 @@ using UnityEngine.UI; public class ItemGrabber : MonoBehaviour { public Transform CameraTransform; public Transform HandTransform; - public CanvasGroup GrabHint; - public Text GrabText; + public Transform TorchHandTransform; + public CanvasGroup PrimaryIndicator; + public Text PrimaryText; + public CanvasGroup SecondaryIndicator; + public Text SecondaryText; public LayerMask ItemLayer; public LayerMask DroppingRaycastMask; public float Distance; public float ThrowVelocity; + [Header("Prefabs")] + public GameObject TorchPrefab; + [Header("Runtime values")] public Item GrabbedItem; + public Torch Torch; - private void Awake() { - if (GrabHint == null) { - Debug.LogWarning("Player's GrabHint is not set, and pick ups will not be indicated."); - } - if (GrabText == null) { - Debug.LogWarning("Player's GrabText is not set, and pick up texts will not necessarily match the object."); - } + private void Start() { + PrimaryIndicator.alpha = 0; + SecondaryIndicator.alpha = 0; } private void Update() { Item Item = null; + Campfire Campfire = null; RaycastHit Hit; Vector3 From = CameraTransform.position; Vector3 Direction = CameraTransform.forward; @@ -41,22 +45,42 @@ public class ItemGrabber : MonoBehaviour { Item.PickUp(HandTransform); GrabbedItem = Item; } - } else if (Input.GetButtonDown("Grab")) { - Vector3 DropPosition; - if (Physics.Raycast(From, Direction, out Hit, Distance * 2f, DroppingRaycastMask)) { - DropPosition = Hit.point + Hit.normal * 0.1f; - } else { - DropPosition = From + Direction * Distance; + } else { + if (Physics.Raycast(From, Direction, out Hit, Distance * 2f, 1 << LayerMask.NameToLayer("Campfire")) && + Hit.collider.attachedRigidbody != null) { + Campfire = Hit.collider.attachedRigidbody.GetComponent(); + } + + if (Campfire != null && Torch == null && Input.GetButtonDown("Ignite")) { + GameObject TorchObj = Instantiate(TorchPrefab, GrabbedItem.transform.position, GrabbedItem.transform.rotation, TorchHandTransform); + Torch = TorchObj.GetComponent(); + Destroy(GrabbedItem.gameObject); + GrabbedItem = null; + } else if (Input.GetButtonDown("Grab")) { + Vector3 DropPosition; + if (Campfire != null) { + DropPosition = Campfire.transform.position + Vector3.up * 0.7f; + } else { + if (Physics.Raycast(From, Direction, out Hit, Distance * 2f, DroppingRaycastMask)) { + DropPosition = Hit.point + Hit.normal * 0.1f; + } else { + DropPosition = From + Direction * Distance; + } + } + GrabbedItem.Drop(DropPosition); + GrabbedItem = null; } - GrabbedItem.Drop(DropPosition); - GrabbedItem = null; } - if (GrabHint != null) { - GrabHint.alpha = Mathf.Lerp(GrabHint.alpha, Item != null ? 1 : 0, 10f * Time.deltaTime); + PrimaryIndicator.alpha = Mathf.Lerp(PrimaryIndicator.alpha, Item != null || Campfire != null ? 1 : 0, 10f * Time.deltaTime); + if (Campfire != null && GrabbedItem != null) { + PrimaryText.text = $"Burn {GrabbedItem.name.ToLower()}"; + } else if (Item != null) { + PrimaryText.text = $"Take {Item.name.ToLower()}"; } - if (Item != null && GrabText != null) { - GrabText.text = $"Take {Item.name}"; + SecondaryIndicator.alpha = Mathf.Lerp(SecondaryIndicator.alpha, Campfire != null && GrabbedItem != null && Torch == null ? 1 : 0, 10f * Time.deltaTime); + if (GrabbedItem != null) { + SecondaryText.text = $"Ignite {GrabbedItem.name.ToLower()}"; } } } diff --git a/Assets/Scripts/Torch.cs b/Assets/Scripts/Torch.cs new file mode 100644 index 0000000..b6c5641 --- /dev/null +++ b/Assets/Scripts/Torch.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Torch : MonoBehaviour { + public Light Light; + public Color NormalColor; + public Color PanicColor; + public float Lifetime = 3f; + public float PanicLifetimeThreshold; + + private void Update() { + Lifetime -= Time.deltaTime; + Light.color = Color.Lerp(Light.color, Lifetime <= PanicLifetimeThreshold ? PanicColor : NormalColor, 4f * Time.deltaTime); + transform.localPosition = Vector3.Lerp(transform.localPosition, Vector3.zero, 12f * Time.deltaTime); + transform.localRotation = Quaternion.Slerp(transform.localRotation, Quaternion.LookRotation(Vector3.forward, Vector3.up), 12f * Time.deltaTime); + if (Lifetime <= 0) { + Destroy(gameObject); + } + } +} diff --git a/Assets/Scripts/Torch.cs.meta b/Assets/Scripts/Torch.cs.meta new file mode 100644 index 0000000..5980497 --- /dev/null +++ b/Assets/Scripts/Torch.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a42ab79bb3f7ede4badb6d60155c8c48 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 14905a9..49fcca5 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -54,7 +54,7 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: Fire2 + m_Name: Ignite descriptiveName: descriptiveNegativeName: negativeButton: @@ -181,6 +181,38 @@ InputManager: type: 2 axis: 1 joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse X + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 3 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse Y + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.19 + sensitivity: 1 + snap: 0 + invert: 1 + type: 2 + axis: 4 + joyNum: 0 - serializedVersion: 3 m_Name: Grab descriptiveName: @@ -198,7 +230,7 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: Fire2 + m_Name: Ignite descriptiveName: descriptiveNegativeName: negativeButton: