diff --git a/game/Assets/ASSETS.meta b/game/Assets/ASSETS.meta new file mode 100644 index 0000000..5ceeb92 --- /dev/null +++ b/game/Assets/ASSETS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 60993d5f9e9023d4bb248b08a6d05b52 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/ASSETS/TRAPS.meta b/game/Assets/ASSETS/TRAPS.meta new file mode 100644 index 0000000..2ee0278 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf766f3c26f293e40b3c96efb6cef0f3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT.meta b/game/Assets/ASSETS/TRAPS/SPIKE PIT.meta new file mode 100644 index 0000000..e65a9b0 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c335bdbe5e53cc84a85658ef741465bf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/M_SpikeTrap.mat b/game/Assets/ASSETS/TRAPS/SPIKE PIT/M_SpikeTrap.mat new file mode 100644 index 0000000..87bf64d --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/M_SpikeTrap.mat @@ -0,0 +1,124 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4779797363588052304 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_SpikeTrap + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _METALLICSPECGLOSSMAP _NORMALMAP _PARALLAXMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 9296623aedff56844bc440e6dfe0f237, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 994194f11782143408ddd843802a5547, type: 3} + 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: 2800000, guid: 9296623aedff56844bc440e6dfe0f237, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: d0a0dd6083cf3b448a150f69b62fc3a4, type: 3} + 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: 2800000, guid: b2948c72182287044be27597430b0a4d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1.3 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.22 + - _SmoothnessTextureChannel: 1 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/M_SpikeTrap.mat.meta b/game/Assets/ASSETS/TRAPS/SPIKE PIT/M_SpikeTrap.mat.meta new file mode 100644 index 0000000..12f77b7 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/M_SpikeTrap.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3ae7ea7d5f3baa40afc5d7fa0b3bbf3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/SpikeTrap_low.fbx b/game/Assets/ASSETS/TRAPS/SPIKE PIT/SpikeTrap_low.fbx new file mode 100644 index 0000000..00e9102 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/SpikeTrap_low.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a53fb3f419ed7f643fbb5a03a90c625082393663b4727e447f966939f8aba33e +size 272448 diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/SpikeTrap_low.fbx.meta b/game/Assets/ASSETS/TRAPS/SPIKE PIT/SpikeTrap_low.fbx.meta new file mode 100644 index 0000000..cc1ebd8 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/SpikeTrap_low.fbx.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: c05280569c267224f87de839cb102b18 +ModelImporter: + serializedVersion: 20200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: lambert1 + second: {fileID: 2100000, guid: e3ae7ea7d5f3baa40afc5d7fa0b3bbf3, type: 2} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Base_Color.jpg b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Base_Color.jpg new file mode 100644 index 0000000..8aafcda --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Base_Color.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:235e1fc46f3adf07345aef9a20e620e36cd9b7bb3a9bfaff41dd4c9d038dd885 +size 78803 diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Base_Color.jpg.meta b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Base_Color.jpg.meta new file mode 100644 index 0000000..f7e60a7 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Base_Color.jpg.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 9296623aedff56844bc440e6dfe0f237 +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: diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Height.jpg b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Height.jpg new file mode 100644 index 0000000..3410aa7 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Height.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1eef27ac6e8d5441f75e86f2b5af1be8d95e4eb5219d9fcc34ee9cb6dad5088e +size 11221 diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Height.jpg.meta b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Height.jpg.meta new file mode 100644 index 0000000..4580436 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Height.jpg.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: b2948c72182287044be27597430b0a4d +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: diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Metallic.jpg b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Metallic.jpg new file mode 100644 index 0000000..a090601 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Metallic.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65dcaa041cecc318a5c54caedb3e65fc9f21452e52187c919c1dda9ccf2a8972 +size 25175 diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Metallic.jpg.meta b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Metallic.jpg.meta new file mode 100644 index 0000000..3543a50 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Metallic.jpg.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 0df3426d208058742b0adabc18a78b6f +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: diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Mixed_AO.jpg b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Mixed_AO.jpg new file mode 100644 index 0000000..6b8d4c1 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Mixed_AO.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:895e82bab1cd098bc258ea4d687d6c743c3ce7ba419405e41af6bed120348e2a +size 52066 diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Mixed_AO.jpg.meta b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Mixed_AO.jpg.meta new file mode 100644 index 0000000..16fd696 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Mixed_AO.jpg.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: d0a0dd6083cf3b448a150f69b62fc3a4 +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: diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Normal_DirectX.jpg b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Normal_DirectX.jpg new file mode 100644 index 0000000..31f3b79 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Normal_DirectX.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd2fb9ceaff55c3f34159e486560b75ceaa46f6ddb531e5ad1fe2958a30d0d8a +size 95464 diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Normal_DirectX.jpg.meta b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Normal_DirectX.jpg.meta new file mode 100644 index 0000000..33f0776 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Normal_DirectX.jpg.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 994194f11782143408ddd843802a5547 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + 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: 1 + 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: diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Roughness.jpg b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Roughness.jpg new file mode 100644 index 0000000..df2224e --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Roughness.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43e2a80eaf577bb57ee2441d5bcfe28ebcd63c110b9a6564fd3e59c779dde5a8 +size 118342 diff --git a/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Roughness.jpg.meta b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Roughness.jpg.meta new file mode 100644 index 0000000..9ff59a5 --- /dev/null +++ b/game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Roughness.jpg.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: d54c2297922035b4dad59e2685a405e4 +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: diff --git a/game/Assets/Data/Artefacts/ArtefactObjects.meta b/game/Assets/Data/Artefacts/ArtefactObjects.meta index a24305e..e7df16b 100644 --- a/game/Assets/Data/Artefacts/ArtefactObjects.meta +++ b/game/Assets/Data/Artefacts/ArtefactObjects.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 73c4cfa51bc2a6b40810cb5b784f15a8 +guid: eb638c77968ab764bb7f2d4d8a8567d0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Physical.meta b/game/Assets/Data/Artefacts/ArtefactObjects/Physical.meta new file mode 100644 index 0000000..5463e82 --- /dev/null +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Physical.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 63acf82d359db164181b8ae5ec8b27f2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Artefact2.asset b/game/Assets/Data/Artefacts/ArtefactObjects/Physical/Physical Artefact.asset similarity index 63% rename from game/Assets/Data/Artefacts/ArtefactObjects/Artefact2.asset rename to game/Assets/Data/Artefacts/ArtefactObjects/Physical/Physical Artefact.asset index 15d302c..caa98dc 100644 --- a/game/Assets/Data/Artefacts/ArtefactObjects/Artefact2.asset +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Physical/Physical Artefact.asset @@ -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: bbf8d803b740a954fbfd10443ef1afdf, type: 3} + m_Name: New Physical Artefact m_EditorClassIdentifier: - _artefactID: 2 - _dialogueKey: ARTEFACT_1_0 + _power: {fileID: 0} + _artefactID: 0 + _dialogueKey: diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Artefact1.asset.meta b/game/Assets/Data/Artefacts/ArtefactObjects/Physical/Physical Artefact.asset.meta similarity index 79% rename from game/Assets/Data/Artefacts/ArtefactObjects/Artefact1.asset.meta rename to game/Assets/Data/Artefacts/ArtefactObjects/Physical/Physical Artefact.asset.meta index dc14766..b383f2f 100644 --- a/game/Assets/Data/Artefacts/ArtefactObjects/Artefact1.asset.meta +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Physical/Physical Artefact.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 38f76e60d5df1d445a455c63a88da8e1 +guid: d42faaff5f6b66d4ca9b7fddcb55fcc6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Power.meta b/game/Assets/Data/Artefacts/ArtefactObjects/Power.meta new file mode 100644 index 0000000..5551bc9 --- /dev/null +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Power.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d68e3f7b2f04a194f9747c28b15a56ce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Artefact1.asset b/game/Assets/Data/Artefacts/ArtefactObjects/Power/Blink Artefact.asset similarity index 66% rename from game/Assets/Data/Artefacts/ArtefactObjects/Artefact1.asset rename to game/Assets/Data/Artefacts/ArtefactObjects/Power/Blink Artefact.asset index dcf9f39..d50f64d 100644 --- a/game/Assets/Data/Artefacts/ArtefactObjects/Artefact1.asset +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Power/Blink Artefact.asset @@ -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: 0228856d50ce2a845abd7b3eda114390, type: 3} + m_Name: Power1 m_EditorClassIdentifier: + _power: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2} _artefactID: 1 _dialogueKey: ARTEFACT_0_0 diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Artefact2.asset.meta b/game/Assets/Data/Artefacts/ArtefactObjects/Power/Blink Artefact.asset.meta similarity index 79% rename from game/Assets/Data/Artefacts/ArtefactObjects/Artefact2.asset.meta rename to game/Assets/Data/Artefacts/ArtefactObjects/Power/Blink Artefact.asset.meta index bd46cf9..23a8b54 100644 --- a/game/Assets/Data/Artefacts/ArtefactObjects/Artefact2.asset.meta +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Power/Blink Artefact.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4c18fa3513891124282e56285b09c211 +guid: 8882f0bc24a2179459b1e851f8645241 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Power/Boost Artefact.asset b/game/Assets/Data/Artefacts/ArtefactObjects/Power/Boost Artefact.asset new file mode 100644 index 0000000..b6ac8df --- /dev/null +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Power/Boost Artefact.asset @@ -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: Power2 + m_EditorClassIdentifier: + _power: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2} + _artefactID: 2 + _artefactDialogue: diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Power/Boost Artefact.asset.meta b/game/Assets/Data/Artefacts/ArtefactObjects/Power/Boost Artefact.asset.meta new file mode 100644 index 0000000..736a7b8 --- /dev/null +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Power/Boost Artefact.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a071ae87c1fc7554db6ae524b4a6d115 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Written.meta b/game/Assets/Data/Artefacts/ArtefactObjects/Written.meta new file mode 100644 index 0000000..5bc07d3 --- /dev/null +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Written.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 54b0c4f43a5d72245a87cdfecfc30396 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Data/Artefacts/nearbyArtefactID.asset b/game/Assets/Data/Artefacts/nearbyArtefactID.asset index 4d28f6f..2138e16 100644 --- a/game/Assets/Data/Artefacts/nearbyArtefactID.asset +++ b/game/Assets/Data/Artefacts/nearbyArtefactID.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cc38ab5b9e594a344a8eb1635487d5eb, type: 3} m_Name: nearbyArtefactID m_EditorClassIdentifier: - _initialValue: 0 + _initialValue: -1 _readOnly: 0 diff --git a/game/Assets/Prefabs/Artefacts/PhysicalArtefact.prefab b/game/Assets/Prefabs/Artefacts/PhysicalArtefact.prefab new file mode 100644 index 0000000..2935656 --- /dev/null +++ b/game/Assets/Prefabs/Artefacts/PhysicalArtefact.prefab @@ -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} diff --git a/game/Assets/Prefabs/Artefacts/Artefact.prefab.meta b/game/Assets/Prefabs/Artefacts/PhysicalArtefact.prefab.meta similarity index 100% rename from game/Assets/Prefabs/Artefacts/Artefact.prefab.meta rename to game/Assets/Prefabs/Artefacts/PhysicalArtefact.prefab.meta diff --git a/game/Assets/Prefabs/Artefacts/Artefact.prefab b/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab similarity index 98% rename from game/Assets/Prefabs/Artefacts/Artefact.prefab rename to game/Assets/Prefabs/Artefacts/PowerArtefact.prefab index 9930110..39e3118 100644 --- a/game/Assets/Prefabs/Artefacts/Artefact.prefab +++ b/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab @@ -93,9 +93,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 @@ -180,7 +180,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} @@ -304,4 +304,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2} - _artefact: {fileID: 8781564214016862072} + _artefact: {fileID: 0} diff --git a/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab.meta b/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab.meta new file mode 100644 index 0000000..a7ae71e --- /dev/null +++ b/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b3a3678d38e60164dbd4f343e28f69e1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Artefacts/WrittenArtefact.prefab b/game/Assets/Prefabs/Artefacts/WrittenArtefact.prefab new file mode 100644 index 0000000..2935656 --- /dev/null +++ b/game/Assets/Prefabs/Artefacts/WrittenArtefact.prefab @@ -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} diff --git a/game/Assets/Prefabs/Artefacts/WrittenArtefact.prefab.meta b/game/Assets/Prefabs/Artefacts/WrittenArtefact.prefab.meta new file mode 100644 index 0000000..9fc1242 --- /dev/null +++ b/game/Assets/Prefabs/Artefacts/WrittenArtefact.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 36a18fd6dc3c2744cb8c010191e31ca4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scenes/DevLevel.meta b/game/Assets/Scenes/DevLevel.meta new file mode 100644 index 0000000..0fec6ca --- /dev/null +++ b/game/Assets/Scenes/DevLevel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57bbaddc7929ffa4dab31d68d21abd38 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scenes/DevLevel.unity b/game/Assets/Scenes/DevLevel.unity index 939bbd7..ddd4a69 100644 --- a/game/Assets/Scenes/DevLevel.unity +++ b/game/Assets/Scenes/DevLevel.unity @@ -14,12 +14,12 @@ OcclusionCullingSettings: RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 + m_Fog: 1 + m_FogColor: {r: 0.990566, g: 0.7735317, b: 0.40650588, a: 1} + m_FogMode: 1 m_FogDensity: 0.01 m_LinearFogStart: 0 - m_LinearFogEnd: 300 + m_LinearFogEnd: 180 m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} @@ -27,13 +27,13 @@ RenderSettings: m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 + m_HaloStrength: 0.277 m_FlareStrength: 1 m_FlareFadeSpeed: 3 m_HaloTexture: {fileID: 0} m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 + m_DefaultReflectionResolution: 256 m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} @@ -371,6 +371,54 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 583d11a2e9a775b4ab5856298bc4e087, type: 3} m_PrefabInstance: {fileID: 101288869} m_PrefabAsset: {fileID: 0} +--- !u!1 &116740232 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 116740234} + - component: {fileID: 116740233} + m_Layer: 0 + m_Name: Global Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &116740233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 116740232} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + isGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 93af5de7f484a0d4b8f5d6d7c3f46245, type: 2} +--- !u!4 &116740234 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 116740232} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 32.03435, y: 7.5974865, z: 28.157104} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &164281672 PrefabInstance: m_ObjectHideFlags: 0 @@ -841,7 +889,14 @@ MonoBehaviour: m_EditorClassIdentifier: _movementSettings: {fileID: 0} _inputHandler: {fileID: 0} - _rigidbody: {fileID: 0} + _controller: {fileID: 0} + _powers: {fileID: 0} + _graphics: {fileID: 0} + _renderers: [] + _groundedColor: {r: 0, g: 0, b: 0, a: 0} + _jumpColor: {r: 0, g: 0, b: 0, a: 0} + _boostColor: {r: 0, g: 0, b: 0, a: 0} + _exhaustedColor: {r: 0, g: 0, b: 0, a: 0} --- !u!1 &483929148 GameObject: m_ObjectHideFlags: 0 @@ -1347,6 +1402,7 @@ GameObject: - component: {fileID: 715887967} - component: {fileID: 715887966} - component: {fileID: 715887965} + - component: {fileID: 715887968} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1419,6 +1475,38 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &715887968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715887964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 1 + m_Antialiasing: 1 + 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 &763823300 GameObject: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scenes/DevLevel/Global Volume Profile.asset b/game/Assets/Scenes/DevLevel/Global Volume Profile.asset new file mode 100644 index 0000000..7c109cc --- /dev/null +++ b/game/Assets/Scenes/DevLevel/Global Volume Profile.asset @@ -0,0 +1,144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5570351197341779660 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 66f335fb1ffd8684294ad653bf1c7564, type: 3} + m_Name: ColorAdjustments + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + postExposure: + m_OverrideState: 0 + m_Value: 0 + contrast: + m_OverrideState: 1 + m_Value: 2 + min: -100 + max: 100 + colorFilter: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 + hueShift: + m_OverrideState: 0 + m_Value: 0 + min: -180 + max: 180 + saturation: + m_OverrideState: 1 + m_Value: -6 + min: -100 + max: 100 +--- !u!114 &-3221784028794307151 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 899c54efeace73346a0a16faa3afe726, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + color: + m_OverrideState: 1 + m_Value: {r: 0.5943396, g: 0.4273375, b: 0.08130119, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 + center: + m_OverrideState: 0 + m_Value: {x: 0.5, y: 0.5} + intensity: + m_OverrideState: 1 + m_Value: 0.446 + min: 0 + max: 1 + smoothness: + m_OverrideState: 0 + m_Value: 0.2 + min: 0.01 + max: 1 + rounded: + m_OverrideState: 0 + m_Value: 0 +--- !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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: Global Volume Profile + m_EditorClassIdentifier: + components: + - {fileID: 3843783281951604669} + - {fileID: -3221784028794307151} + - {fileID: -5570351197341779660} +--- !u!114 &3843783281951604669 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + threshold: + m_OverrideState: 1 + m_Value: 0.7 + min: 0 + intensity: + m_OverrideState: 1 + m_Value: 1 + min: 0 + scatter: + m_OverrideState: 0 + m_Value: 0.7 + min: 0 + max: 1 + clamp: + m_OverrideState: 0 + m_Value: 65472 + min: 0 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + skipIterations: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 16 + dirtTexture: + m_OverrideState: 0 + m_Value: {fileID: 0} + dirtIntensity: + m_OverrideState: 0 + m_Value: 0 + min: 0 diff --git a/game/Assets/Scenes/DevLevel/Global Volume Profile.asset.meta b/game/Assets/Scenes/DevLevel/Global Volume Profile.asset.meta new file mode 100644 index 0000000..039c695 --- /dev/null +++ b/game/Assets/Scenes/DevLevel/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1562abc0384262d49adaaed6a66b2d62 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index dda3c83..890e31f 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -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} diff --git a/game/Assets/Scripts/Artefacts/Artefact.cs b/game/Assets/Scripts/Artefacts/Artefact.cs index 7a9e2da..88d77d3 100644 --- a/game/Assets/Scripts/Artefacts/Artefact.cs +++ b/game/Assets/Scripts/Artefacts/Artefact.cs @@ -2,9 +2,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -[CreateAssetMenu(fileName = "New Artefact", menuName = "KernelPanic/Artefacts/Artefact")] public class Artefact : ScriptableObject { + public int artefactID => _artefactID; [SerializeField] private int _artefactID; public string dialogueKey => _dialogueKey; @@ -15,4 +15,7 @@ public class Artefact : ScriptableObject public bool canInteract => _canInteract; private bool _canInteract = false; + public virtual void Pickup() + { + } } \ No newline at end of file diff --git a/game/Assets/Scripts/Artefacts/ArtefactControl.cs b/game/Assets/Scripts/Artefacts/ArtefactControl.cs index f0a6afa..1989fe9 100644 --- a/game/Assets/Scripts/Artefacts/ArtefactControl.cs +++ b/game/Assets/Scripts/Artefacts/ArtefactControl.cs @@ -9,7 +9,7 @@ public class ArtefactControl : MonoBehaviour private bool _show; - private bool _canInteract; + protected bool _canInteract; [SerializeField] private Artefact data; @@ -19,7 +19,7 @@ public class ArtefactControl : MonoBehaviour [SerializeField] private ArtefactSystem _artefacts; - private void Start() + protected virtual void Start() { _artefactID = data.artefactID; _show = data.show; @@ -45,13 +45,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) @@ -61,11 +62,13 @@ public class ArtefactControl : MonoBehaviour } if (this.gameObject != null) + { + data.Pickup(); + _nearbyArtefactID.Value = -1; + _canInteract = false; + //_show = false; Destroy(this.gameObject); - _nearbyArtefactID.Value = -1; - //PlayerInputHandler.id = 0; - - + } } } diff --git a/game/Assets/Scripts/Artefacts/EventHandler.cs b/game/Assets/Scripts/Artefacts/EventHandler.cs index ec427b2..5fdf33c 100644 --- a/game/Assets/Scripts/Artefacts/EventHandler.cs +++ b/game/Assets/Scripts/Artefacts/EventHandler.cs @@ -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); + //} } } diff --git a/game/Assets/Scripts/Artefacts/EventHandler.cs.meta b/game/Assets/Scripts/Artefacts/EventHandler.cs.meta index 292a2f7..e86a5d8 100644 --- a/game/Assets/Scripts/Artefacts/EventHandler.cs.meta +++ b/game/Assets/Scripts/Artefacts/EventHandler.cs.meta @@ -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: diff --git a/game/Assets/Scripts/Artefacts/PhysicalArtefact.cs b/game/Assets/Scripts/Artefacts/PhysicalArtefact.cs new file mode 100644 index 0000000..41c271e --- /dev/null +++ b/game/Assets/Scripts/Artefacts/PhysicalArtefact.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "New Physical Artefact", menuName = "Artefact/PhysicalArtefact")] +public class PhysicalArtefact : Artefact +{ +} diff --git a/game/Assets/Scripts/Artefacts/PhysicalArtefact.cs.meta b/game/Assets/Scripts/Artefacts/PhysicalArtefact.cs.meta new file mode 100644 index 0000000..fda232c --- /dev/null +++ b/game/Assets/Scripts/Artefacts/PhysicalArtefact.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bbf8d803b740a954fbfd10443ef1afdf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/PowerArtefact.cs b/game/Assets/Scripts/Artefacts/PowerArtefact.cs new file mode 100644 index 0000000..f80bc36 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/PowerArtefact.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "New Power Artefact", menuName = "Artefact/PowerArtefact")] +public class PowerArtefact : Artefact +{ + [SerializeField] private PlayerPower _power; + + public override void Pickup() + { + base.Pickup(); + + _power.Unlock(); + } +} diff --git a/game/Assets/Scripts/Artefacts/PowerArtefact.cs.meta b/game/Assets/Scripts/Artefacts/PowerArtefact.cs.meta new file mode 100644 index 0000000..2c2a77c --- /dev/null +++ b/game/Assets/Scripts/Artefacts/PowerArtefact.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0228856d50ce2a845abd7b3eda114390 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/WrittenArtefact.cs b/game/Assets/Scripts/Artefacts/WrittenArtefact.cs new file mode 100644 index 0000000..4bcc7c3 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/WrittenArtefact.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "New Written Artefact", menuName = "Artefact/WrittenArtefact")] +public class WrittenArtefact : Artefact +{ +} diff --git a/game/Assets/Scripts/Artefacts/WrittenArtefact.cs.meta b/game/Assets/Scripts/Artefacts/WrittenArtefact.cs.meta new file mode 100644 index 0000000..6c6afa5 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/WrittenArtefact.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0ac91480061a1ea419ea525eb0a42807 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: