Merge branch 'feature/menus' into 'main'

created artefact preview screen.

See merge request kernel-panic/revival!42
This commit is contained in:
Cat Flynn 2021-03-11 20:33:08 +00:00
commit aad2389939
39 changed files with 4095 additions and 1126 deletions

View File

@ -15,3 +15,4 @@ MonoBehaviour:
_artefactID: 0 _artefactID: 0
_dialogueKey: _dialogueKey:
_name: _name:
_prefab: {fileID: 3799998566341120319, guid: e48f46564bce92e4aa707fd447afd68e, type: 3}

View File

@ -15,4 +15,5 @@ MonoBehaviour:
_artefactID: 10 _artefactID: 10
_dialogueKey: PA_DASH _dialogueKey: PA_DASH
_name: Blink _name: Blink
_prefab: {fileID: 3799998566341120319, guid: e48f46564bce92e4aa707fd447afd68e, type: 3}
_power: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2} _power: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2}

View File

@ -15,4 +15,5 @@ MonoBehaviour:
_artefactID: 11 _artefactID: 11
_dialogueKey: PA_BOOST _dialogueKey: PA_BOOST
_name: Boost _name: Boost
_prefab: {fileID: 3799998566341120319, guid: e48f46564bce92e4aa707fd447afd68e, type: 3}
_power: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2} _power: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2}

View File

@ -15,3 +15,4 @@ MonoBehaviour:
_artefactID: 20 _artefactID: 20
_dialogueKey: WA_0 _dialogueKey: WA_0
_name: Widget _name: Widget
_prefab: {fileID: 3799998566341120319, guid: e48f46564bce92e4aa707fd447afd68e, type: 3}

View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3a977303773797047b37664649362484, type: 3}
m_Name: UIClose
m_EditorClassIdentifier:
_logRaised: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d8c4272694282b64e9cd1d4a42477262
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3a977303773797047b37664649362484, type: 3}
m_Name: UIOpen
m_EditorClassIdentifier:
_logRaised: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0fc36e00903fc7047b48bb1844e6f12b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,456 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6189151120382770278
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6189151120382770279}
- component: {fileID: 6189151120382770202}
- component: {fileID: 6189151120382770200}
m_Layer: 0
m_Name: Camera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6189151120382770279
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151120382770278}
m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607}
m_LocalPosition: {x: 0, y: 1.4, z: -2.75}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6189151121097661531}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0}
--- !u!20 &6189151120382770202
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151120382770278}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
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: 40
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 8400000, guid: 0fc273c76f186624c8278e4fc863187c, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!114 &6189151120382770200
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151120382770278}
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: 0
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
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 &6189151120632183869
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6189151120632183870}
- component: {fileID: 6189151120632183857}
- component: {fileID: 6189151120632183856}
- component: {fileID: 6189151120632183871}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &6189151120632183870
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151120632183869}
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: 6189151121097661531}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6189151120632183857
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151120632183869}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &6189151120632183856
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151120632183869}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
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!65 &6189151120632183871
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151120632183869}
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!1 &6189151121097661530
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6189151121097661531}
- component: {fileID: 6189151121097661532}
- component: {fileID: 6189151121097661533}
m_Layer: 0
m_Name: ArtefactPreview
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6189151121097661531
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151121097661530}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1337, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6189151120382770279}
- {fileID: 6189151120632183870}
- {fileID: 6189151121150595526}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6189151121097661532
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151121097661530}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5d5a3b7abfa891b45a3fee95bb3f212d, type: 3}
m_Name:
m_EditorClassIdentifier:
_inputSettings: {fileID: 11400000, guid: 09b165d6ce14f86459be7213da9688a7, type: 2}
_playerInput: {fileID: 6189151121097661533}
--- !u!114 &6189151121097661533
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151121097661530}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: d4d9eb5db7beac84ca3cb36cfc09cd0a, type: 3}
m_NotificationBehavior: 2
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6189151121097661532}
m_TargetAssemblyTypeName: ArtefactPreview, Assembly-CSharp
m_MethodName: ChangeInput
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionEvents:
- m_PersistentCalls:
m_Calls: []
m_ActionId: 5c440996-60ec-4084-9223-75d39638108a
m_ActionName: CoreMap/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d]
- m_PersistentCalls:
m_Calls: []
m_ActionId: d271942b-8516-4550-88ae-552350feb4b1
m_ActionName: CoreMap/Look[/Mouse/delta]
- m_PersistentCalls:
m_Calls: []
m_ActionId: da936947-fcfa-4872-a4e3-15763afe56b6
m_ActionName: CoreMap/Jump[/Keyboard/space]
- m_PersistentCalls:
m_Calls: []
m_ActionId: 2bbc2e93-6016-4544-8399-0c4ee222850c
m_ActionName: CoreMap/Use[/Keyboard/e]
- m_PersistentCalls:
m_Calls: []
m_ActionId: 0eb55067-1328-4b0a-9494-b427befe049a
m_ActionName: CoreMap/Blink[/Keyboard/shift]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6189151121097661532}
m_TargetAssemblyTypeName: ArtefactPreview, Assembly-CSharp
m_MethodName: PreviewEnable
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 5b0a923b-469a-4829-8f31-6fcd7cb49281
m_ActionName: ArtefactPreview/StartLook[/Mouse/leftButton]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6189151121097661532}
m_TargetAssemblyTypeName: ArtefactPreview, Assembly-CSharp
m_MethodName: PreviewVelocity
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 0a5c2191-e93e-44ba-880e-189b8b33e10a
m_ActionName: ArtefactPreview/LookVelocity[/Mouse/delta]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 6189151121097661532}
m_TargetAssemblyTypeName: ArtefactPreview, Assembly-CSharp
m_MethodName: PreviewDelta
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: b118302a-6162-4223-8a6c-38ff2d6b4133
m_ActionName: ArtefactPreview/New action
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: ArtefactPreview
m_SplitScreenIndex: -1
m_Camera: {fileID: 6189151120382770202}
--- !u!1 &6189151121150595525
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6189151121150595526}
- component: {fileID: 6189151121150595527}
m_Layer: 0
m_Name: Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6189151121150595526
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151121150595525}
m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607}
m_LocalPosition: {x: 0, y: 1.2, z: -2.75}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6189151121097661531}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0}
--- !u!108 &6189151121150595527
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6189151121150595525}
m_Enabled: 1
serializedVersion: 10
m_Type: 0
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 10
m_Range: 6.5
m_SpotAngle: 140
m_InnerSpotAngle: 35
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.02
m_NormalBias: 0.1
m_NearPlane: 0.1
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_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1c743cd25da7f2e4991d052bf248b59d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e261fff7e0dfd7f47b136d01ed657ca9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,83 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3799998566341120319
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3799998566341123779}
- component: {fileID: 3799998566341123778}
- component: {fileID: 3799998566341123777}
m_Layer: 0
m_Name: TestArtefact
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3799998566341123779
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3799998566341120319}
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: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3799998566341123778
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3799998566341120319}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &3799998566341123777
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3799998566341120319}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
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}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e48f46564bce92e4aa707fd447afd68e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -59,8 +59,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5661344207112327339} m_GameObject: {fileID: 5661344207112327339}
m_LocalRotation: {x: 0.12069755, y: 0.045786913, z: -0.005573086, w: 0.9916172} m_LocalRotation: {x: 0.24549931, y: -0.09786305, z: 0.024919359, w: 0.9641224}
m_LocalPosition: {x: 0, y: 0.110000014, z: -3.7200003} m_LocalPosition: {x: 0.86600876, y: 0.109996796, z: -3.592285}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 5661344206969957946} m_Father: {fileID: 5661344206969957946}
@ -207,7 +207,7 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5661344207311831626} m_GameObject: {fileID: 5661344207311831626}
m_LocalRotation: {x: 0.12082608, y: 0.000000030494466, z: -0.00000000371172, w: 0.9926737} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
@ -281,7 +281,7 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5661344207439169723} m_GameObject: {fileID: 5661344207439169723}
m_LocalRotation: {x: 0.12082611, y: -3.7677753e-15, z: 1.0303356e-15, w: 0.9926737} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
@ -595,6 +595,8 @@ GameObject:
- component: {fileID: 5661344207789115489} - component: {fileID: 5661344207789115489}
- component: {fileID: 5661344207789115422} - component: {fileID: 5661344207789115422}
- component: {fileID: 5661344207789115423} - component: {fileID: 5661344207789115423}
- component: {fileID: 7951179702612018041}
- component: {fileID: 4646968772435671935}
m_Layer: 0 m_Layer: 0
m_Name: CM_ThirdPerson m_Name: CM_ThirdPerson
m_TagString: Untagged m_TagString: Untagged
@ -609,8 +611,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5661344207789115490} m_GameObject: {fileID: 5661344207789115490}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0.24655113, y: 0.044697862, z: -0.011384245, w: 0.9680315}
m_LocalPosition: {x: 0, y: 0.110000014, z: -3.7200003} m_LocalPosition: {x: 0, y: 0.109996796, z: -3.720001}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 5661344207439169721} - {fileID: 5661344207439169721}
@ -765,6 +767,62 @@ MonoBehaviour:
m_Damping: 0 m_Damping: 0
m_DampingWhenOccluded: 0 m_DampingWhenOccluded: 0
m_OptimalTargetDistance: 0 m_OptimalTargetDistance: 0
--- !u!114 &7951179702612018041
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5661344207789115490}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: d8c4272694282b64e9cd1d4a42477262, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5661344207789115422}
m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
m_MethodName: set_enabled
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!114 &4646968772435671935
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5661344207789115490}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: 0fc36e00903fc7047b48bb1844e6f12b, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5661344207789115422}
m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
m_MethodName: set_enabled
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &5661344207849762654 --- !u!1 &5661344207849762654
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -789,7 +847,7 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5661344207849762654} m_GameObject: {fileID: 5661344207849762654}
m_LocalRotation: {x: 0.12069752, y: 0.04578691, z: -0.005573085, w: 0.9916172} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:

View File

@ -99,6 +99,8 @@ GameObject:
- component: {fileID: 4397130014773710380} - component: {fileID: 4397130014773710380}
- component: {fileID: 4537570682397675320} - component: {fileID: 4537570682397675320}
- component: {fileID: 2167937473989734407} - component: {fileID: 2167937473989734407}
- component: {fileID: 6606601648879830728}
- component: {fileID: 6685677556849761150}
m_Layer: 0 m_Layer: 0
m_Name: Player m_Name: Player
m_TagString: Player m_TagString: Player
@ -386,6 +388,62 @@ MonoBehaviour:
m_StringArgument: m_StringArgument:
m_BoolArgument: 1 m_BoolArgument: 1
m_CallState: 2 m_CallState: 2
--- !u!114 &6606601648879830728
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13726836969441781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: d8c4272694282b64e9cd1d4a42477262, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 13726836969441780}
m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
m_MethodName: set_enabled
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!114 &6685677556849761150
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 13726836969441781}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: 0fc36e00903fc7047b48bb1844e6f12b, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 13726836969441780}
m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
m_MethodName: set_enabled
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &13726837642651461 --- !u!1 &13726837642651461
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c2de9a6eb50967e4cbd6d654a8ecbcf1
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,566 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!225 &6808448286050050398
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3941142919679305061}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &6808448287154422775
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6808448287154422776}
- component: {fileID: 6808448287154422779}
- component: {fileID: 6808448287154422778}
- component: {fileID: 6808448287154422773}
- component: {fileID: 6808448287154422772}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6808448287154422776
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6808448287154422775}
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_Children:
- {fileID: 6808448285566310704}
- {fileID: 1833095292628238768}
- {fileID: 2469130771264784599}
m_Father: {fileID: 0}
m_RootOrder: 0
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!223 &6808448287154422779
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6808448287154422775}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 1
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &6808448287154422778
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6808448287154422775}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 1
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!114 &6808448287154422773
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6808448287154422775}
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: 4294967295
--- !u!114 &6808448287154422772
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6808448287154422775}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3a23aff835e2352469e34bfc2c4b683c, type: 3}
m_Name:
m_EditorClassIdentifier:
_fadeInElements:
- Delay: 0
Duration: 1
Renderer: {fileID: 3239557012103347769}
- Delay: 0.5
Duration: 1
Renderer: {fileID: 225077497674743764}
- Delay: 1.5
Duration: 1.5
Renderer: {fileID: 6808448286966862353}
- Delay: 3
Duration: 1.5
Renderer: {fileID: 6808448285521735247}
- Delay: 4
Duration: 1.5
Renderer: {fileID: 6808448286050050398}
_fadeOutElements:
- Delay: 0
Duration: 0.5
Renderer: {fileID: 3239557012103347769}
_dialogueDelay: 3.5
_unlockedSfx: event:/Environment/Interactables/Artefact
_unlockedSfxDelay: 1.5
artefactUI: {fileID: 6808448285566310707}
artefactText: {fileID: 5377945582605113368}
dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2}
artefacts: {fileID: 11400000, guid: f523ac0d77530064b8b41c627b13fae0, type: 2}
_preview: {fileID: 0}
_uiOpen: {fileID: 11400000, guid: 0fc36e00903fc7047b48bb1844e6f12b, type: 2}
_uiClose: {fileID: 11400000, guid: d8c4272694282b64e9cd1d4a42477262, type: 2}
--- !u!225 &225077497674743764
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7079158281513557909}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 0
m_BlocksRaycasts: 0
m_IgnoreParentGroups: 0
--- !u!225 &6808448285521735247
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8562108854734193733}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!225 &6808448286966862353
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8799019244820908981}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 0
m_BlocksRaycasts: 0
m_IgnoreParentGroups: 0
--- !u!1001 &225077497674743761
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6808448287154422776}
m_Modifications:
- target: {fileID: 3868137226220198582, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 6808448287154422772}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341474, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_Name
value: ArtefactUI
objectReference: {fileID: 0}
- target: {fileID: 6729456937636341474, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7745116228229598630, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_Color.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7745116228229598630, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_Color.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7745116228229598630, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_Color.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8488469911096441748, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
--- !u!1 &6808448285566310707 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6729456937636341474, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
m_PrefabInstance: {fileID: 225077497674743761}
m_PrefabAsset: {fileID: 0}
--- !u!224 &6808448285566310704 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6729456937636341473, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
m_PrefabInstance: {fileID: 225077497674743761}
m_PrefabAsset: {fileID: 0}
--- !u!225 &3239557012103347769 stripped
CanvasGroup:
m_CorrespondingSourceObject: {fileID: 3452736144697819624, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
m_PrefabInstance: {fileID: 225077497674743761}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7079158281513557909 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6999044867958988868, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
m_PrefabInstance: {fileID: 225077497674743761}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8799019244820908981 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8720032831859225700, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
m_PrefabInstance: {fileID: 225077497674743761}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5377945582605113368 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5313666782728890313, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
m_PrefabInstance: {fileID: 225077497674743761}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8562108854734193733 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8488469911096441748, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
m_PrefabInstance: {fileID: 225077497674743761}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3941142919679305061 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3868137226220198580, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3}
m_PrefabInstance: {fileID: 225077497674743761}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6808448286065587779
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6808448287154422776}
m_Modifications:
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_AnchorMax.x
value: 0.95
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_AnchorMax.y
value: 0.95
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_AnchorMin.x
value: 0.05
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_AnchorMin.y
value: 0.05
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5119468870989674484, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
propertyPath: m_Name
value: Dialogue UI
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
--- !u!224 &1833095292628238768 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3}
m_PrefabInstance: {fileID: 6808448286065587779}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6808448286438378636
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6808448287154422776}
m_Modifications:
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8951021900398560348, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
propertyPath: m_Name
value: Fade
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
--- !u!224 &2469130771264784599 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8951021900398560347, guid: 8b2275700cf2cc5448873b7f1aa592b6, type: 3}
m_PrefabInstance: {fileID: 6808448286438378636}
m_PrefabAsset: {fileID: 0}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8a3f2b3b16275e540b349897292a42ac
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -35,7 +35,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -600, y: 150} m_SizeDelta: {x: -550, y: 150}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!222 &5119468870461405385 --- !u!222 &5119468870461405385
CanvasRenderer: CanvasRenderer:

File diff suppressed because it is too large Load Diff

View File

@ -5644,7 +5644,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &1914762248 --- !u!224 &1914762248
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -12,6 +12,9 @@ public class Artefact : ScriptableObject
public string Name => _name; public string Name => _name;
[SerializeField] private string _name; [SerializeField] private string _name;
public GameObject Prefab => _prefab;
[SerializeField] private GameObject _prefab;
public bool show => _show; public bool show => _show;
private bool _show = false; private bool _show = false;

View File

@ -0,0 +1,96 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Security.Cryptography;
using UnityEngine;
using UnityEngine.InputSystem;
public class ArtefactPreview : MonoBehaviour
{
[SerializeField]
private PlayerInputSettings _inputSettings;
[SerializeField]
private PlayerInput _playerInput;
private GameObject _artefactInstance;
private Quaternion _artefactRotation = Quaternion.identity;
private bool _isPressed = false;
private bool _useVelocity = false;
private Vector2 _velocity = Vector2.zero;
private bool Active => gameObject.activeSelf && ( _isPressed && !_useVelocity );
public const string PCMR = "PCMR";
public const string GAMEPAD = "Gamepad";
private void OnEnable()
{
ChangeInput( _playerInput );
}
public void Preview( GameObject artefact )
{
if ( _artefactInstance )
Destroy( _artefactInstance );
_artefactInstance = Instantiate( artefact, transform );
_playerInput.enabled = true;
}
public void Dismiss()
{
_playerInput.enabled = false;
}
public void PreviewEnable( InputAction.CallbackContext context )
{
_isPressed = context.ReadValueAsButton();
}
public void PreviewVelocity(InputAction.CallbackContext context)
{
_velocity = context.ReadValue<Vector2>();
}
public void PreviewDelta(InputAction.CallbackContext context)
{
if ( _artefactInstance && Active )
{
Rotate( context.ReadValue<Vector2>() * _inputSettings.MouseSensitivity );
}
}
private void Rotate( Vector2 delta )
{
var axes = new Vector3( delta.y, -delta.x, 0f );
_artefactInstance.transform.Rotate( axes, Space.World );
}
public void ChangeInput( PlayerInput playerInput )
{
switch ( playerInput.currentControlScheme )
{
case PCMR:
_useVelocity = false;
break;
case GAMEPAD:
_useVelocity = true;
break;
default:
_useVelocity = false;
break;
}
}
void Update()
{
if ( gameObject.activeSelf && _useVelocity )
{
Rotate( _velocity * ( Time.deltaTime * _inputSettings.JoypadSensitivity ) );
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5d5a3b7abfa891b45a3fee95bb3f212d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,56 +1,203 @@
using System; using System;
using System.Collections;
using Ktyl.Util; using Ktyl.Util;
using System.Collections.Generic; using System.Collections.Generic;
using FMODUnity;
using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.InputSystem; using UnityEngine.InputSystem;
using UnityEngine.Serialization;
using UnityEngine.UI; using UnityEngine.UI;
public class PickUpDisplay : MonoBehaviour public class PickUpDisplay : MonoBehaviour
{ {
public bool paused => _paused; [System.Serializable]
[SerializeField] private static bool _paused; struct FadeElement
{
public float Delay;
public float Duration;
public CanvasGroup Renderer;
public float GetAlpha( float t )
=> Mathf.Clamp01( ( t - Delay ) / Duration );
public float GetAlphaInverse( float t )
=> 1f - GetAlpha( t );
}
[FormerlySerializedAs( "_elements" )] [SerializeField]
private FadeElement[] _fadeInElements;
[SerializeField]
private FadeElement[] _fadeOutElements;
[SerializeField]
private float _dialogueDelay;
[SerializeField]
[EventRef]
private string _unlockedSfx;
[SerializeField]
private float _unlockedSfxDelay;
[SerializeField] private GameObject artefactUI; [SerializeField] private GameObject artefactUI;
[SerializeField] private GameObject Player; [SerializeField] private TMP_Text artefactText;
[SerializeField] private Text artefactText;
[SerializeField] private InputSettings inputSettings;
[SerializeField] private DialogueSystem dialogue; [SerializeField] private DialogueSystem dialogue;
[SerializeField] private ArtefactSystem artefacts; [SerializeField] private ArtefactSystem artefacts;
[SerializeField] private ArtefactPreview _preview;
private Artefact chosenArtefact; [SerializeField]
private GameEvent _uiOpen;
[SerializeField]
private GameEvent _uiClose;
private Artefact _chosenArtefact;
private Coroutine _currentFade;
private void Start() private void Start()
{ {
EventHandler.current.onArtefactUI += PopUpOn; EventHandler.current.onArtefactUI += PopUpOn;
} }
private IEnumerator AnimateIn()
{
_uiOpen.Raise();
artefactText.text = _chosenArtefact.Name;
// inputSettings.updateMode = (InputSettings.UpdateMode)1;
_preview.Preview( _chosenArtefact.Prefab );
bool isComplete = false;
bool hasSpoken = false;
bool hasClinged = false;
foreach ( var fader in _fadeInElements )
{
fader.Renderer.alpha = 0f;
}
artefactUI.SetActive(true);
yield return null;
float t = 0;
while ( true )
{
t += Time.deltaTime;
isComplete = true;
foreach ( var fader in _fadeInElements )
{
float alpha = fader.GetAlpha( t );
float oneMinusAlpha = 1f - alpha;
fader.Renderer.alpha = 1f - oneMinusAlpha * oneMinusAlpha;
if ( alpha < 1f )
{
isComplete = false;
}
}
if ( t < _dialogueDelay )
{
isComplete = false;
}
else if (!hasSpoken)
{
hasSpoken = true;
dialogue.PlayLine( _chosenArtefact.dialogueKey );
}
if ( t < _unlockedSfxDelay )
{
isComplete = false;
}
else if ( !hasClinged )
{
hasClinged = true;
RuntimeManager.PlayOneShot( _unlockedSfx );
}
if ( isComplete )
break;
yield return null;
}
}
private IEnumerator AnimateOut()
{
yield return null;
bool isComplete = false;
foreach ( var fader in _fadeInElements )
{
fader.Renderer.alpha = 1f;
}
yield return null;
_preview.Dismiss();
_uiClose.Raise();
float t = 0;
while ( true )
{
t += Time.deltaTime;
isComplete = true;
foreach ( var fader in _fadeInElements )
{
float alpha = fader.GetAlphaInverse( t );
float oneMinusAlpha = 1f - alpha;
fader.Renderer.alpha = 1f - oneMinusAlpha * oneMinusAlpha;
if ( alpha > 0f )
{
isComplete = false;
}
}
yield return null;
if ( isComplete )
break;
}
artefactUI.SetActive( false );
_chosenArtefact = null;
yield return null;
}
private void Update() private void Update()
{ {
var artefact = artefacts.GetNearbyArtefact(); var artefact = artefacts.GetNearbyArtefact();
if (!artefact) return; if (!artefact) return;
chosenArtefact = artefact; _chosenArtefact = artefact;
} }
public void PopUpOn() public void PopUpOn()
{ {
_paused = true; if (_currentFade != null)
artefactUI.SetActive(true); StopCoroutine( _currentFade );
Player.GetComponent<PlayerInput>().enabled = false;
artefactText.text = "You have unlocked " + chosenArtefact.Name + "!"; _currentFade = StartCoroutine( AnimateIn() );
inputSettings.updateMode = (InputSettings.UpdateMode)1;
Time.timeScale = 0f;
} }
public void PopUpOff() public void PopUpOff()
{ {
_paused = false; if (_currentFade != null)
artefactUI.SetActive(false); StopCoroutine( _currentFade );
inputSettings.updateMode = (InputSettings.UpdateMode)2;
Player.GetComponent<PlayerInput>().enabled = true; _currentFade = StartCoroutine( AnimateOut() );
Time.timeScale = 1.0f; // inputSettings.updateMode = (InputSettings.UpdateMode)2;
dialogue.PlayLine(chosenArtefact.dialogueKey);
chosenArtefact = null;
} }
} }

View File

@ -8,6 +8,9 @@ public class PlayerInputSettings : ScriptableObject
public float JumpBufferTime => _jumpBufferTime; public float JumpBufferTime => _jumpBufferTime;
public float BlinkBufferTime => _blinkBufferTime; public float BlinkBufferTime => _blinkBufferTime;
public float UseBufferTime => _useBufferTime; public float UseBufferTime => _useBufferTime;
public float MouseSensitivity => _mouseSens;
public float JoypadSensitivity => _joypadSens;
[SerializeField] [SerializeField]
private float _jumpBufferTime; private float _jumpBufferTime;
@ -17,4 +20,10 @@ public class PlayerInputSettings : ScriptableObject
[SerializeField] [SerializeField]
private float _useBufferTime; private float _useBufferTime;
[SerializeField]
private float _mouseSens;
[SerializeField]
private float _joypadSens;
} }

View File

@ -202,6 +202,71 @@
"isPartOfComposite": false "isPartOfComposite": false
} }
] ]
},
{
"name": "ArtefactPreview",
"id": "409607a1-d519-4157-b903-1be98c88f97d",
"actions": [
{
"name": "LookEnable",
"type": "Button",
"id": "5b0a923b-469a-4829-8f31-6fcd7cb49281",
"expectedControlType": "Button",
"processors": "",
"interactions": ""
},
{
"name": "LookVelocity",
"type": "Value",
"id": "0a5c2191-e93e-44ba-880e-189b8b33e10a",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
},
{
"name": "LookDelta",
"type": "Value",
"id": "b118302a-6162-4223-8a6c-38ff2d6b4133",
"expectedControlType": "Vector2",
"processors": "",
"interactions": ""
}
],
"bindings": [
{
"name": "",
"id": "b83097ff-024e-4b65-be41-3ba7efba3860",
"path": "<Gamepad>/leftStick",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "LookVelocity",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8f6aaeba-bba9-4d7f-b719-ed34d2b3c6ba",
"path": "<Mouse>/leftButton",
"interactions": "",
"processors": "",
"groups": "PCMR",
"action": "LookEnable",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "5117809e-ac3c-4c2e-a974-33d5b2a98710",
"path": "<Mouse>/delta",
"interactions": "",
"processors": "",
"groups": "PCMR",
"action": "LookDelta",
"isComposite": false,
"isPartOfComposite": false
}
]
} }
], ],
"controlSchemes": [ "controlSchemes": [

View File

@ -15,3 +15,5 @@ MonoBehaviour:
_jumpBufferTime: 0.1 _jumpBufferTime: 0.1
_blinkBufferTime: 0.1 _blinkBufferTime: 0.1
_useBufferTime: 0.1 _useBufferTime: 0.1
_mouseSens: 0.15
_joypadSens: 1

View File

@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!84 &8400000
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PreviewImage
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 3
m_Width: 960
m_Height: 600
m_AntiAliasing: 2
m_MipCount: -1
m_DepthFormat: 2
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 0
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0fc273c76f186624c8278e4fc863187c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ff6a469406c65fd4eba2aa5602c3375d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 366b7750e8bf3a7499c859758754a762
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/UI/Buttons/buttons.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,144 @@
fileFormatVersion: 2
guid: 445260a895bbbc74cbde61be5a1fe903
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: 2
mipBias: -100
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
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: 8192
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: 8192
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: 8192
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: 8192
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:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant: