ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'artefact_inheritance' into 'main' 

Added Artefact inheritance

See merge request kernel-panic/revival!13
This commit is contained in:
Cat Flynn 2021-02-26 17:32:37 +00:00
parent c540e2c7cb 51f32cc70f
commit 4a504f2d7f
31 changed files with 770 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
game/Assets/Prefabs/Artefacts/PhysicalArtefact.prefab Normal file
View File

@ -0,0 +1,209 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8781564213167799763
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8781564213167799764}
- component: {fileID: 8781564213167799767}
- component: {fileID: 8781564213167799766}
- component: {fileID: 8781564213167799761}
m_Layer: 0
m_Name: Artefact
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8781564213167799764
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564213167799763}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.38, y: 0.5, z: 38.53155}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children:
- {fileID: 8781564214893312960}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8781564213167799767
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564213167799763}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8781564213167799766
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564213167799763}
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!136 &8781564213167799761
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564213167799763}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5000001
m_Height: 2
m_Direction: 1
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
--- !u!1 &8781564214893312975
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8781564214893312960}
- component: {fileID: 8781564214893312963}
- component: {fileID: 8781564214893312962}
- component: {fileID: 8781564214893312973}
- component: {fileID: 8781564214893312972}
m_Layer: 0
m_Name: Sphere
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8781564214893312960
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564214893312975}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_Children: []
m_Father: {fileID: 8781564213167799764}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8781564214893312963
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564214893312975}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8781564214893312962
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564214893312975}
m_Enabled: 0
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!135 &8781564214893312973
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564214893312975}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 4
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &8781564214893312972
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564214893312975}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 44966bb2b773ce145a9d6c7c9f42aeba, type: 3}
m_Name:
m_EditorClassIdentifier:
_nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2}
_artefact: {fileID: 0}

0
game/Assets/Prefabs/Artefacts/Artefact.prefab.meta → game/Assets/Prefabs/Artefacts/PhysicalArtefact.prefab.meta
View File

8
game/Assets/Prefabs/Artefacts/Artefact.prefab → game/Assets/Prefabs/Artefacts/PowerArtefact.prefab
View File

@ -12,9 +12,9 @@ GameObject:
- component: {fileID: 8781564213167799767}
- component: {fileID: 8781564213167799766}
- component: {fileID: 8781564213167799761}
- component: {fileID: 8781564214016862072}
- component: {fileID: 3201523991801391447}
m_Layer: 0
m_Name: Artefact
m_Name: PowerArtefact
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -98,7 +98,7 @@ CapsuleCollider:
m_Height: 2
m_Direction: 1
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
--- !u!114 &8781564214016862072
--- !u!114 &3201523991801391447
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -221,4 +221,4 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2}
_artefact: {fileID: 8781564214016862072}
_artefact: {fileID: 0}

7
game/Assets/Prefabs/Artefacts/PowerArtefact.prefab.meta Normal file
View File

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

209
game/Assets/Prefabs/Artefacts/WrittenArtefact.prefab Normal file
View File

@ -0,0 +1,209 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8781564213167799763
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8781564213167799764}
- component: {fileID: 8781564213167799767}
- component: {fileID: 8781564213167799766}
- component: {fileID: 8781564213167799761}
m_Layer: 0
m_Name: Artefact
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8781564213167799764
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564213167799763}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.38, y: 0.5, z: 38.53155}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children:
- {fileID: 8781564214893312960}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8781564213167799767
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564213167799763}
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8781564213167799766
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564213167799763}
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!136 &8781564213167799761
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564213167799763}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5000001
m_Height: 2
m_Direction: 1
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
--- !u!1 &8781564214893312975
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8781564214893312960}
- component: {fileID: 8781564214893312963}
- component: {fileID: 8781564214893312962}
- component: {fileID: 8781564214893312973}
- component: {fileID: 8781564214893312972}
m_Layer: 0
m_Name: Sphere
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8781564214893312960
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564214893312975}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_Children: []
m_Father: {fileID: 8781564213167799764}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8781564214893312963
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564214893312975}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8781564214893312962
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564214893312975}
m_Enabled: 0
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!135 &8781564214893312973
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564214893312975}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 4
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &8781564214893312972
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8781564214893312975}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 44966bb2b773ce145a9d6c7c9f42aeba, type: 3}
m_Name:
m_EditorClassIdentifier:
_nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2}
_artefact: {fileID: 0}

7
game/Assets/Prefabs/Artefacts/WrittenArtefact.prefab.meta Normal file
View File

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

160
game/Assets/Scenes/Main.unity
View File

@ -407,6 +407,17 @@ Transform:
m_Father: {fileID: 1509348081}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &898399640 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3201523991801391447, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
m_PrefabInstance: {fileID: 2138848574}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7d3ed39e75807bc4d865f39b2ef9ea69, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1148358018
GameObject:
m_ObjectHideFlags: 0
@ -587,6 +598,17 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1515549004 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3201523991801391447, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
m_PrefabInstance: {fileID: 1814555656}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7d3ed39e75807bc4d865f39b2ef9ea69, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1551303224
GameObject:
m_ObjectHideFlags: 0
@ -726,6 +748,71 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1814555656
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3201523991801391447, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: data
value:
objectReference: {fileID: 11400000, guid: 8882f0bc24a2179459b1e851f8645241, type: 2}
- target: {fileID: 8781564213167799763, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_Name
value: PowerArtefactBlink
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalPosition.x
value: -22.3
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalPosition.z
value: 38.53155
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564214893312972, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: _artefact
value:
objectReference: {fileID: 1515549004}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
--- !u!1 &1908415559
GameObject:
m_ObjectHideFlags: 0
@ -821,6 +908,71 @@ Transform:
m_Father: {fileID: 1509348081}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2138848574
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3201523991801391447, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: data
value:
objectReference: {fileID: 11400000, guid: a071ae87c1fc7554db6ae524b4a6d115, type: 2}
- target: {fileID: 8781564213167799763, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_Name
value: PowerArtefactBoost
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalPosition.x
value: -3.4
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalPosition.z
value: 38.53155
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8781564214893312972, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
propertyPath: _artefact
value:
objectReference: {fileID: 898399640}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3}
--- !u!1001 &13726837176080777
PrefabInstance:
m_ObjectHideFlags: 0
@ -876,5 +1028,13 @@ PrefabInstance:
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 13726837176080779, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: _cheatBlink
value: 0
objectReference: {fileID: 0}
- target: {fileID: 13726837176080779, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
propertyPath: _cheatBoost
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}

7
game/Assets/Scripts/Artefacts/Artefact.cs
View File

@ -2,9 +2,9 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
[CreateAssetMenu(fileName = "New Artefact", menuName = "Artefact", order = 51)]
public class Artefact : ScriptableObject
{
[SerializeField] private PlayerPower _power;
public int artefactID => _artefactID;
[SerializeField] private int _artefactID;
@ -16,4 +16,9 @@ public class Artefact : ScriptableObject
public bool canInteract => _canInteract;
private bool _canInteract = false;
public virtual void PowerUnlock()
{
_power.Unlock();
}
}

19
game/Assets/Scripts/Artefacts/ArtefactControl.cs
View File

@ -8,7 +8,7 @@ public class ArtefactControl : MonoBehaviour
private bool _show;
private bool _canInteract;
protected bool _canInteract;
[SerializeField]
private Artefact data;
@ -17,7 +17,7 @@ public class ArtefactControl : MonoBehaviour
private string _artefactDialogue;
[SerializeField] private SerialInt _nearbyArtefactID;
private void Start()
protected virtual void Start()
{
_artefactID = data.artefactID;
_artefactDialogue = data.artefactDialogue;
@ -44,13 +44,14 @@ public class ArtefactControl : MonoBehaviour
if (id == this._artefactID)
{
_show = false;
this._canInteract = false;
_canInteract = false;
}
}
private void PickUp(int id)
protected virtual void PickUp(int id)
{
if (id == this._artefactID)
{
if (_canInteract == true)
@ -64,11 +65,13 @@ public class ArtefactControl : MonoBehaviour
}
//here put 'show artifact dialogue'
if (this.gameObject != null)
{
data.PowerUnlock();
_nearbyArtefactID.Value = -1;
_canInteract = false;
//_show = false;
Destroy(this.gameObject);
_nearbyArtefactID.Value = -1;
//PlayerInputHandler.id = 0;
}
}
}

8
game/Assets/Scripts/Artefacts/EventHandler.cs
View File

@ -1,3 +1,4 @@
using Ktyl.Util;
using System;
using System.Collections;
using System.Collections.Generic;
@ -5,7 +6,7 @@ using UnityEngine;
public class EventHandler : MonoBehaviour
{
//[SerializeField] private SerialInt nearbyArtefactID;
public static EventHandler current;
private void Awake()
@ -38,7 +39,10 @@ public class EventHandler : MonoBehaviour
{
if (onArtefactPickUp != null)
{
onArtefactPickUp(id);
//if(nearbyArtefactID != -1)
// {
onArtefactPickUp(id);
//}
}
}

3
game/Assets/Scripts/Artefacts/EventHandler.cs.meta
View File

@ -3,7 +3,8 @@ guid: 005bf73dff204914c9e1bbd60c843451
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
defaultReferences:
- nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2}
executionOrder: 0
icon: {instanceID: 0}
userData:

0
game/Assets/Scripts/Artefacts/ArtefactObjects.meta → game/Assets/Scripts/Artefacts/Objects.meta
View File

8
game/Assets/Scripts/Artefacts/Objects/Physical.meta Normal file
View File

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

7
game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact1.asset → game/Assets/Scripts/Artefacts/Objects/Physical/New Physical Artefact.asset
View File

@ -9,8 +9,9 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e26cf8dbdb474db49ac6dadf49ceade2, type: 3}
m_Name: Artefact1
m_Script: {fileID: 11500000, guid: bbf8d803b740a954fbfd10443ef1afdf, type: 3}
m_Name: New Physical Artefact
m_EditorClassIdentifier:
_artefactID: 1
_power: {fileID: 0}
_artefactID: 0
_artefactDialogue:

2
game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact2.asset.meta → game/Assets/Scripts/Artefacts/Objects/Physical/New Physical Artefact.asset.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4c18fa3513891124282e56285b09c211
guid: e62a0b30dca3396448ca1d5fed7f01f7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

8
game/Assets/Scripts/Artefacts/Objects/Power.meta Normal file
View File

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

17
game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset Normal file
View File

@ -0,0 +1,17 @@
%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: 0228856d50ce2a845abd7b3eda114390, type: 3}
m_Name: Power1
m_EditorClassIdentifier:
_power: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2}
_artefactID: 1
_artefactDialogue:

2
game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact1.asset.meta → game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 38f76e60d5df1d445a455c63a88da8e1
guid: 8882f0bc24a2179459b1e851f8645241
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

5
game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact2.asset → game/Assets/Scripts/Artefacts/Objects/Power/Power2.asset
View File

@ -9,8 +9,9 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e26cf8dbdb474db49ac6dadf49ceade2, type: 3}
m_Name: Artefact2
m_Script: {fileID: 11500000, guid: 0228856d50ce2a845abd7b3eda114390, type: 3}
m_Name: Power2
m_EditorClassIdentifier:
_power: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2}
_artefactID: 2
_artefactDialogue:

8
game/Assets/Scripts/Artefacts/Objects/Power/Power2.asset.meta Normal file
View File

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

8
game/Assets/Scripts/Artefacts/Objects/Written.meta Normal file
View File

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

8
game/Assets/Scripts/Artefacts/Physical.meta Normal file
View File

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

12
game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs Normal file
View File

@ -0,0 +1,12 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
[CreateAssetMenu(fileName = "New Physical Artefact", menuName = "Artefact/PhysicalArtefact")]
public class PhysicalArtefact : Artefact
{
public override void PowerUnlock()
{
}
}

11
game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs.meta Normal file
View File

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

8
game/Assets/Scripts/Artefacts/Power.meta Normal file
View File

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

9
game/Assets/Scripts/Artefacts/Power/PowerArtefact.cs Normal file
View File

@ -0,0 +1,9 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
[CreateAssetMenu(fileName = "New Power Artefact", menuName = "Artefact/PowerArtefact")]
public class PowerArtefact : Artefact
{
}

11
game/Assets/Scripts/Artefacts/Power/PowerArtefact.cs.meta Normal file
View File

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

8
game/Assets/Scripts/Artefacts/Written.meta Normal file
View File

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

12
game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs Normal file
View File

@ -0,0 +1,12 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
[CreateAssetMenu(fileName = "New Written Artefact", menuName = "Artefact/WrittenArtefact")]
public class WrittenArtefact : Artefact
{
public override void PowerUnlock()
{
}
}

11
game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs.meta Normal file
View File

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

2
game/Assets/Scripts/Artefacts/nearbyArtefactID.asset
View File

@ -12,5 +12,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cc38ab5b9e594a344a8eb1635487d5eb, type: 3}
m_Name: nearbyArtefactID
m_EditorClassIdentifier:
_initialValue: 0
_initialValue: -1
_readOnly: 0