From cbb5825c2071750deab5530c95bed59acb868a16 Mon Sep 17 00:00:00 2001 From: CharlieTinley Date: Wed, 24 Feb 2021 15:21:44 +0000 Subject: [PATCH 1/3] Added SpikePit trap with the associated textures. Also did a small lighting change: added fog, some post processing effects etc --- game/Assets/ASSETS.meta | 8 + game/Assets/ASSETS/TRAPS.meta | 8 + game/Assets/ASSETS/TRAPS/SPIKE PIT.meta | 8 + .../ASSETS/TRAPS/SPIKE PIT/M_SpikeTrap.mat | 124 +++ .../TRAPS/SPIKE PIT/M_SpikeTrap.mat.meta | 8 + .../ASSETS/TRAPS/SPIKE PIT/SpikeTrap_low.fbx | 3 + .../TRAPS/SPIKE PIT/SpikeTrap_low.fbx.meta | 107 +++ .../TRAPS/SPIKE PIT/lambert1_Base_Color.jpg | 3 + .../SPIKE PIT/lambert1_Base_Color.jpg.meta | 144 ++++ .../TRAPS/SPIKE PIT/lambert1_Height.jpg | 3 + .../TRAPS/SPIKE PIT/lambert1_Height.jpg.meta | 144 ++++ .../TRAPS/SPIKE PIT/lambert1_Metallic.jpg | 3 + .../SPIKE PIT/lambert1_Metallic.jpg.meta | 144 ++++ .../TRAPS/SPIKE PIT/lambert1_Mixed_AO.jpg | 3 + .../SPIKE PIT/lambert1_Mixed_AO.jpg.meta | 144 ++++ .../SPIKE PIT/lambert1_Normal_DirectX.jpg | 3 + .../lambert1_Normal_DirectX.jpg.meta | 144 ++++ .../TRAPS/SPIKE PIT/lambert1_Roughness.jpg | 3 + .../SPIKE PIT/lambert1_Roughness.jpg.meta | 144 ++++ .../FMOD/Cache/Editor/FMODStudioCache.asset | 787 ++++++++++++++++-- game/Assets/Scenes/DevLevel.meta | 8 + game/Assets/Scenes/DevLevel.unity | 102 ++- .../DevLevel/Global Volume Profile.asset | 144 ++++ .../DevLevel/Global Volume Profile.asset.meta | 8 + 24 files changed, 2123 insertions(+), 74 deletions(-) create mode 100644 game/Assets/ASSETS.meta create mode 100644 game/Assets/ASSETS/TRAPS.meta create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT.meta create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/M_SpikeTrap.mat create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/M_SpikeTrap.mat.meta create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/SpikeTrap_low.fbx create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/SpikeTrap_low.fbx.meta create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Base_Color.jpg create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Base_Color.jpg.meta create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Height.jpg create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Height.jpg.meta create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Metallic.jpg create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Metallic.jpg.meta create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Mixed_AO.jpg create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Mixed_AO.jpg.meta create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Normal_DirectX.jpg create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Normal_DirectX.jpg.meta create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Roughness.jpg create mode 100644 game/Assets/ASSETS/TRAPS/SPIKE PIT/lambert1_Roughness.jpg.meta create mode 100644 game/Assets/Scenes/DevLevel.meta create mode 100644 game/Assets/Scenes/DevLevel/Global Volume Profile.asset create mode 100644 game/Assets/Scenes/DevLevel/Global Volume Profile.asset.meta 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/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset b/game/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset index 8067ac8..bf15a4e 100644 --- a/game/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset +++ b/game/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset @@ -81,6 +81,26 @@ MonoBehaviour: - Name: Desktop Value: 38560 Exists: 1 +--- !u!114 &-8107776111782790193 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Health/Health + m_EditorClassIdentifier: + Name: Health + Min: 0 + Max: 100 + Default: 100 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-7803813789219444754 MonoBehaviour: m_ObjectHideFlags: 0 @@ -116,7 +136,7 @@ MonoBehaviour: Path: event:/Character/Enemy Footsteps guid: 3f29b5149ef6e548a7aece02710ca3d9 Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 1 IsOneShot: 1 @@ -144,6 +164,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &-7599294145349895854 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Forest/Rain + m_EditorClassIdentifier: + Name: Rain + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-7545483045301536161 MonoBehaviour: m_ObjectHideFlags: 0 @@ -159,12 +199,12 @@ MonoBehaviour: Path: event:/Music/Level 02 guid: fd46f9c795d69b49a820752799c4921d Banks: - - {fileID: -5810968061649293014} + - {fileID: -1922226504436482688} IsStream: 1 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: 5677789806569608499} + - {fileID: -4523548979560329619} MinDistance: 0 MaxDistance: 0 Length: 56888 @@ -243,7 +283,7 @@ MonoBehaviour: Path: snapshot:/Slow-Motion guid: 098d8d6ee012cf48b620f9cc3bc478a3 Banks: - - {fileID: 8958818033594522944} + - {fileID: 4502669718827288096} IsStream: 0 Is3D: 0 IsOneShot: 0 @@ -266,14 +306,14 @@ MonoBehaviour: Path: event:/Ambience/Forest guid: e51074476d4a2e46bd1e4d558ce488ec Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 1 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: 7910736127753344473} - - {fileID: 3066922598506942344} - - {fileID: 8637360193677881062} + - {fileID: -4298135529615831635} + - {fileID: 1097660226666491223} + - {fileID: -7599294145349895854} MinDistance: 0 MaxDistance: 0 Length: 0 @@ -292,12 +332,12 @@ MonoBehaviour: Path: event:/Ambience/Country guid: 4ec79a24a46e484681da206c4e22b801 Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 1 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: -7248799967418030207} + - {fileID: 3129750621694550160} MinDistance: 0 MaxDistance: 0 Length: 0 @@ -316,15 +356,35 @@ MonoBehaviour: Path: event:/Interactables/Wooden Collision guid: d80362bed8c8c5418ce6bce0de95807b Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 1 IsOneShot: 1 Parameters: - - {fileID: -7277886014121453884} + - {fileID: 1068449109924852423} MinDistance: 1 MaxDistance: 20 Length: 0 +--- !u!114 &-6676639545244773519 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Car Engine/RPM + m_EditorClassIdentifier: + Name: RPM + Min: 0 + Max: 10000 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-6445015509329371517 MonoBehaviour: m_ObjectHideFlags: 0 @@ -345,6 +405,46 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &-6384113787744196732 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Radio Station/Freq + m_EditorClassIdentifier: + Name: Freq + Min: 0 + Max: 3 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &-6305103508836537920 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Radio Station/Spatializer + m_EditorClassIdentifier: + Name: Spatializer + Min: 0 + Max: 2 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-6112239449709538351 MonoBehaviour: m_ObjectHideFlags: 0 @@ -360,12 +460,12 @@ MonoBehaviour: Path: event:/Weapons/Machine Gun guid: faaab7e9f02d9341b32ea74e5753cfa0 Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: -3493712513132075446} + - {fileID: 4232292365762076042} MinDistance: 1 MaxDistance: 20 Length: 78 @@ -405,7 +505,7 @@ MonoBehaviour: Path: event:/Character/Door Close guid: 448f10435c287748a7854ae97ed0fb3d Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 1 IsOneShot: 1 @@ -448,12 +548,12 @@ MonoBehaviour: Path: event:/Character/Player Footsteps guid: 01d405e9f5764147a885f7844b244671 Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 1 IsOneShot: 1 Parameters: - - {fileID: 4367476332520521904} + - {fileID: -4451914256763874097} MinDistance: 1 MaxDistance: 20 Length: 0 @@ -537,6 +637,84 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &-4628093923534315852 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Dialogue_EN.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Dialogue_EN.bank + Name: Dialogue_EN + StudioPath: bank:/Dialogue_EN + lastModified: 637497321900000000 + LoadResult: 0 + FileSizes: [] + Exists: 1 +--- !u!114 &-4626606665776557874 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Dialogue_CN.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Dialogue_CN.bank + Name: Dialogue_CN + StudioPath: bank:/Dialogue_CN + lastModified: 637497321900000000 + LoadResult: 0 + FileSizes: [] + Exists: 1 +--- !u!114 &-4523548979560329619 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Level 02/Area + m_EditorClassIdentifier: + Name: Area + Min: 0 + Max: 80 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &-4451914256763874097 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Player Footsteps/Surface + m_EditorClassIdentifier: + Name: Surface + Min: 0 + Max: 2 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-4363186268740097967 MonoBehaviour: m_ObjectHideFlags: 0 @@ -557,6 +735,66 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &-4298135529615831635 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Forest/Wind + m_EditorClassIdentifier: + Name: Wind + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &-4065198266019637791 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Level 03/Stinger + m_EditorClassIdentifier: + Name: Stinger + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &-3847200452325327491 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Ride-on Mower/RPM + m_EditorClassIdentifier: + Name: RPM + Min: 0 + Max: 2000 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-3767169846847778110 MonoBehaviour: m_ObjectHideFlags: 0 @@ -572,7 +810,7 @@ MonoBehaviour: Path: snapshot:/Pause guid: 98a405e3182b1d46b35c6eaea45fafd6 Banks: - - {fileID: 8958818033594522944} + - {fileID: 4502669718827288096} IsStream: 0 Is3D: 0 IsOneShot: 0 @@ -600,6 +838,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &-2866243360323498868 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/City/Walla + m_EditorClassIdentifier: + Name: Walla + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-2776990974051642223 MonoBehaviour: m_ObjectHideFlags: 0 @@ -615,13 +873,13 @@ MonoBehaviour: Path: event:/Music/Level 03 guid: 5a1416ec12371c4b9944ce26875a548b Banks: - - {fileID: -5810968061649293014} + - {fileID: -1922226504436482688} IsStream: 1 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: -5220439912511036330} - - {fileID: -1949990878170830} + - {fileID: -4065198266019637791} + - {fileID: 5540402172180489547} MinDistance: 0 MaxDistance: 0 Length: 150857 @@ -681,12 +939,12 @@ MonoBehaviour: Path: event:/Interactables/Barrel Roll guid: 40222cc4b6c4ed42a4731a47f19945ea Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: 1793265207329793385} + - {fileID: 7801454863927635152} MinDistance: 1 MaxDistance: 20 Length: 0 @@ -705,7 +963,7 @@ MonoBehaviour: Path: snapshot:/Reverb/Sewer Reverb guid: 8ee207c13b87aa4c949268fe72210c48 Banks: - - {fileID: 8958818033594522944} + - {fileID: 4502669718827288096} IsStream: 0 Is3D: 0 IsOneShot: 0 @@ -728,13 +986,13 @@ MonoBehaviour: Path: event:/Vehicles/Car Engine guid: b463830caf239c4faf4b0951bfd37d84 Banks: - - {fileID: 5884682174564844121} + - {fileID: 3946142406373235813} IsStream: 0 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: -4363186268740097967} - - {fileID: 4398004947105728974} + - {fileID: -6676639545244773519} + - {fileID: 1024451891171784297} MinDistance: 1 MaxDistance: 20 Length: 0 @@ -758,6 +1016,25 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 0 +--- !u!114 &-1922226504436482688 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Music.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Music.bank + Name: Music + StudioPath: bank:/Music + lastModified: 637497321940000000 + LoadResult: 0 + FileSizes: [] + Exists: 1 --- !u!114 &-1815433723513422642 MonoBehaviour: m_ObjectHideFlags: 0 @@ -813,12 +1090,12 @@ MonoBehaviour: Path: event:/Character/Health guid: d6fef322452bff4faa855351bc5fe9cd Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: 6098634058503677813} + - {fileID: -8107776111782790193} MinDistance: 0 MaxDistance: 0 Length: 0 @@ -837,7 +1114,7 @@ MonoBehaviour: Path: event:/UI/Cancel guid: e6483e2afc946343946833d2dd4d7b00 Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 0 IsOneShot: 1 @@ -880,12 +1157,12 @@ MonoBehaviour: Path: event:/Weapons/Explosion guid: 3871681f6ce0f5409bac57f84bbcedd3 Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 1 IsOneShot: 1 Parameters: - - {fileID: -5637953553718496753} + - {fileID: 2255991646505678025} MinDistance: 1 MaxDistance: 100 Length: 0 @@ -904,7 +1181,7 @@ MonoBehaviour: Path: event:/Character/Dialogue guid: c5eca29a4beabe4e85c3054b11b21dcd Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 1 IsOneShot: 1 @@ -945,15 +1222,15 @@ MonoBehaviour: m_Name: FMODStudioCache m_EditorClassIdentifier: EditorBanks: - - {fileID: -2443445598607337504} - - {fileID: 1646827598670020794} - - {fileID: 631280102866359407} - - {fileID: 8999275565678618086} - - {fileID: 8958818033594522944} - - {fileID: -5810968061649293014} - - {fileID: 1507566728776054511} - - {fileID: 5884682174564844121} - - {fileID: -8122538359583372443} + - {fileID: 8678739312597520172} + - {fileID: 472370651274016649} + - {fileID: 3946142406373235813} + - {fileID: -4626606665776557874} + - {fileID: -4628093923534315852} + - {fileID: 8661215118039298952} + - {fileID: 4502669718827288096} + - {fileID: -1922226504436482688} + - {fileID: 1726863447887207953} EditorEvents: - {fileID: -6915515647060395114} - {fileID: 592172348792374910} @@ -987,11 +1264,51 @@ MonoBehaviour: - {fileID: 1922969843971877521} EditorParameters: [] MasterBanks: - - {fileID: 8958818033594522944} + - {fileID: 4502669718827288096} StringsBanks: - - {fileID: -2443445598607337504} - stringsBankWriteTime: 637495997822260983 + - {fileID: 8678739312597520172} + stringsBankWriteTime: 637497321920000000 cacheVersion: 6 +--- !u!114 &19753007302427363 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Level 01/Progression + m_EditorClassIdentifier: + Name: Progression + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &32657518470924354 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Ride-on Mower/Load + m_EditorClassIdentifier: + Name: Load + Min: -1 + Max: 1 + Default: -1 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &399717647629584186 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1027,16 +1344,35 @@ MonoBehaviour: Path: event:/Music/Level 01 guid: 7cbabb74e8768c489cf967f000df1ffd Banks: - - {fileID: -5810968061649293014} + - {fileID: -1922226504436482688} IsStream: 0 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: 6340825763965355649} - - {fileID: -4794246568588122348} + - {fileID: 6620938711164291739} + - {fileID: 19753007302427363} MinDistance: 0 MaxDistance: 0 Length: 54339 +--- !u!114 &472370651274016649 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Dialogue_JP.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Dialogue_JP.bank + Name: Dialogue_JP + StudioPath: bank:/Dialogue_JP + lastModified: 637497321900000000 + LoadResult: 0 + FileSizes: [] + Exists: 1 --- !u!114 &534779890368919493 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1072,8 +1408,8 @@ MonoBehaviour: Path: snapshot:/Health Low guid: 3441ea87f1ff9d4e8f8b294a2b518223 Banks: - - {fileID: 8958818033594522944} - - {fileID: 1507566728776054511} + - {fileID: 4502669718827288096} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 0 IsOneShot: 0 @@ -1102,6 +1438,66 @@ MonoBehaviour: - Name: Desktop Value: 61120 Exists: 1 +--- !u!114 &1024451891171784297 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Car Engine/Load + m_EditorClassIdentifier: + Name: Load + Min: -1 + Max: 1 + Default: -1 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &1068449109924852423 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Wooden Collision/Speed + m_EditorClassIdentifier: + Name: Speed + Min: 0 + Max: 8 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &1097660226666491223 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Forest/Cover + m_EditorClassIdentifier: + Name: Cover + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &1173496622369213996 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1117,7 +1513,7 @@ MonoBehaviour: Path: event:/UI/Okay guid: 979e4792c69464459e33efbeec59b34a Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 0 IsOneShot: 1 @@ -1140,13 +1536,13 @@ MonoBehaviour: Path: event:/Music/Radio Station guid: 9faf6ab3142f454c8cf0fc622a0ea38a Banks: - - {fileID: -5810968061649293014} + - {fileID: -1922226504436482688} IsStream: 1 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: -8666466107650256711} - - {fileID: -7803813789219444754} + - {fileID: -6305103508836537920} + - {fileID: -6384113787744196732} MinDistance: 0 MaxDistance: 0 Length: 0 @@ -1207,15 +1603,34 @@ MonoBehaviour: Path: event:/Character/Radio Dialogue guid: 871fc4431f70254ca9a1c619ca106412 Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: 3818681919422599891} + - {fileID: 7518334125834843746} MinDistance: 0 MaxDistance: 0 Length: 999 +--- !u!114 &1726863447887207953 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/SFX.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/SFX.bank + Name: SFX + StudioPath: bank:/SFX + lastModified: 637497321960000000 + LoadResult: 0 + FileSizes: [] + Exists: 1 --- !u!114 &1793265207329793385 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1251,7 +1666,7 @@ MonoBehaviour: Path: event:/VO/Welcome guid: 29bbead7d9ab5740b408eef937d66f2a Banks: - - {fileID: -8122538359583372443} + - {fileID: 8661215118039298952} IsStream: 0 Is3D: 0 IsOneShot: 1 @@ -1279,6 +1694,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 0 +--- !u!114 &2255991646505678025 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Explosion/Size + m_EditorClassIdentifier: + Name: Size + Min: 0 + Max: 3 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &2439352594547126499 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1294,7 +1729,7 @@ MonoBehaviour: Path: event:/Character/Door Open guid: 18528562f3a80f47ab7a8af8f7df77bb Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 1 IsOneShot: 1 @@ -1322,6 +1757,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &3129750621694550160 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Country/Hour + m_EditorClassIdentifier: + Name: Hour + Min: 0 + Max: 3 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &3182253762112364102 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1417,7 +1872,7 @@ MonoBehaviour: Path: event:/Weapons/Pistol guid: cf5dc803ebc4944083c77839b5d058e8 Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 0 Is3D: 1 IsOneShot: 1 @@ -1425,6 +1880,45 @@ MonoBehaviour: MinDistance: 1 MaxDistance: 20 Length: 345 +--- !u!114 &3946142406373235813 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Vehicles.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Vehicles.bank + Name: Vehicles + StudioPath: bank:/Vehicles + lastModified: 637497321900000000 + LoadResult: 0 + FileSizes: [] + Exists: 1 +--- !u!114 &4232292365762076042 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Machine Gun/Auto-Stop + m_EditorClassIdentifier: + Name: Auto-Stop + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &4247688449534627133 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1525,6 +2019,25 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &4502669718827288096 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Master.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Master.bank + Name: Master + StudioPath: bank:/Master + lastModified: 637497321900000000 + LoadResult: 0 + FileSizes: [] + Exists: 1 --- !u!114 &5233580542034508407 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1540,16 +2053,36 @@ MonoBehaviour: Path: event:/Vehicles/Ride-on Mower guid: f1e8a57ac28ec642b4651241a603a055 Banks: - - {fileID: 5884682174564844121} + - {fileID: 3946142406373235813} IsStream: 0 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: -8940783032877342582} - - {fileID: -6445015509329371517} + - {fileID: 32657518470924354} + - {fileID: -3847200452325327491} MinDistance: 1 MaxDistance: 20 Length: 0 +--- !u!114 &5540402172180489547 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Level 03/Intensity + m_EditorClassIdentifier: + Name: Intensity + Min: 0 + Max: 4 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &5677789806569608499 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1585,7 +2118,7 @@ MonoBehaviour: Path: snapshot:/Reverb/Cave Reverb guid: c0ee95b678fe5547b8069690c06dfc0b Banks: - - {fileID: 8958818033594522944} + - {fileID: 4502669718827288096} IsStream: 0 Is3D: 0 IsOneShot: 0 @@ -1714,6 +2247,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 0 +--- !u!114 &6620938711164291739 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Level 01/Stinger + m_EditorClassIdentifier: + Name: Stinger + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &6896638216189553869 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1729,7 +2282,7 @@ MonoBehaviour: Path: event:/VO/Main Menu guid: 1612b8a70bfb9c4b9e7db897825d9821 Banks: - - {fileID: -8122538359583372443} + - {fileID: 8661215118039298952} IsStream: 0 Is3D: 0 IsOneShot: 1 @@ -1737,6 +2290,46 @@ MonoBehaviour: MinDistance: 0 MaxDistance: 0 Length: 1859 +--- !u!114 &7518334125834843746 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Radio Dialogue/VO Sidechain + m_EditorClassIdentifier: + Name: VO Sidechain + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &7801454863927635152 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Barrel Roll/Speed + m_EditorClassIdentifier: + Name: Speed + Min: 0 + Max: 8 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &7910736127753344473 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1792,13 +2385,13 @@ MonoBehaviour: Path: event:/Ambience/City guid: 7e9198bb5bd6f041a0cac50756da3f0e Banks: - - {fileID: 1507566728776054511} + - {fileID: 1726863447887207953} IsStream: 1 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: -7625393254389082378} - - {fileID: -6992756556786915566} + - {fileID: -2866243360323498868} + - {fileID: 8817200839501251354} MinDistance: 0 MaxDistance: 0 Length: 0 @@ -1822,6 +2415,66 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &8661215118039298952 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/VO.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/VO.bank + Name: VO + StudioPath: bank:/VO + lastModified: 637497321900000000 + LoadResult: 0 + FileSizes: [] + Exists: 1 +--- !u!114 &8678739312597520172 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Master.strings.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Master.strings.bank + Name: Master.strings + StudioPath: bank:/Master.strings + lastModified: 637497321920000000 + LoadResult: 0 + FileSizes: + - Name: Desktop + Value: 4002 + Exists: 1 +--- !u!114 &8817200839501251354 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/City/Traffic + m_EditorClassIdentifier: + Name: Traffic + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &8958818033594522944 MonoBehaviour: m_ObjectHideFlags: 0 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..474eb9e --- /dev/null +++ b/game/Assets/Scenes/DevLevel/Global Volume Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93af5de7f484a0d4b8f5d6d7c3f46245 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: From 7e06b98577c22e30f3cbaffa81acef20642e51c2 Mon Sep 17 00:00:00 2001 From: Novvator Date: Thu, 25 Feb 2021 14:21:35 +0000 Subject: [PATCH 2/3] Added Artefact inheritance PowerArtefacts now can unlock PlayerPowers --- .../FMOD/Cache/Editor/FMODStudioCache.asset | 787 ++++++++++++++++-- ...rtefact.prefab => PhysicalArtefact.prefab} | 17 +- ...efab.meta => PhysicalArtefact.prefab.meta} | 0 .../Prefabs/Artefacts/PowerArtefact.prefab | 209 +++++ .../Artefacts/PowerArtefact.prefab.meta} | 5 +- .../Prefabs/Artefacts/WrittenArtefact.prefab | 209 +++++ .../Artefacts/WrittenArtefact.prefab.meta | 7 + game/Assets/Scenes/Main.unity | 89 ++ game/Assets/Scripts/Artefacts/Artefact.cs | 1 - .../Scripts/Artefacts/ArtefactControl.cs | 18 +- .../Artefacts/ArtefactObjects/Artefact2.asset | 16 - game/Assets/Scripts/Artefacts/EventHandler.cs | 8 +- .../Scripts/Artefacts/EventHandler.cs.meta | 3 +- .../{ArtefactObjects.meta => Objects.meta} | 0 .../Scripts/Artefacts/Objects/Physical.meta | 8 + .../Scripts/Artefacts/Objects/Power.meta | 8 + .../Power/Power1.asset} | 4 +- .../Power/Power1.asset.meta} | 2 +- .../Scripts/Artefacts/Objects/Written.meta | 8 + game/Assets/Scripts/Artefacts/Physical.meta | 8 + .../Artefacts/Physical/PhysicalArtefact.cs | 9 + .../Physical/PhysicalArtefact.cs.meta | 11 + .../Physical/PhysicalArtefactControl.cs | 8 + .../Physical/PhysicalArtefactControl.cs.meta | 11 + game/Assets/Scripts/Artefacts/Power.meta | 8 + .../Scripts/Artefacts/Power/PowerArtefact.cs | 9 + .../Artefacts/Power/PowerArtefact.cs.meta | 11 + .../Artefacts/Power/PowerArtefactControl.cs | 19 + .../Power/PowerArtefactControl.cs.meta | 11 + game/Assets/Scripts/Artefacts/Written.meta | 8 + .../Artefacts/Written/WrittenArtefact.cs | 9 + .../Artefacts/Written/WrittenArtefact.cs.meta | 11 + .../Written/WrittenArtefactControl.cs | 23 + .../Written/WrittenArtefactControl.cs.meta | 11 + .../Scripts/Artefacts/nearbyArtefactID.asset | 2 +- 35 files changed, 1450 insertions(+), 118 deletions(-) rename game/Assets/Prefabs/Artefacts/{Artefact.prefab => PhysicalArtefact.prefab} (91%) rename game/Assets/Prefabs/Artefacts/{Artefact.prefab.meta => PhysicalArtefact.prefab.meta} (100%) create mode 100644 game/Assets/Prefabs/Artefacts/PowerArtefact.prefab rename game/Assets/{Scripts/Artefacts/ArtefactObjects/Artefact1.asset.meta => Prefabs/Artefacts/PowerArtefact.prefab.meta} (52%) create mode 100644 game/Assets/Prefabs/Artefacts/WrittenArtefact.prefab create mode 100644 game/Assets/Prefabs/Artefacts/WrittenArtefact.prefab.meta delete mode 100644 game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact2.asset rename game/Assets/Scripts/Artefacts/{ArtefactObjects.meta => Objects.meta} (100%) create mode 100644 game/Assets/Scripts/Artefacts/Objects/Physical.meta create mode 100644 game/Assets/Scripts/Artefacts/Objects/Power.meta rename game/Assets/Scripts/Artefacts/{ArtefactObjects/Artefact1.asset => Objects/Power/Power1.asset} (77%) rename game/Assets/Scripts/Artefacts/{ArtefactObjects/Artefact2.asset.meta => Objects/Power/Power1.asset.meta} (79%) create mode 100644 game/Assets/Scripts/Artefacts/Objects/Written.meta create mode 100644 game/Assets/Scripts/Artefacts/Physical.meta create mode 100644 game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs create mode 100644 game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs.meta create mode 100644 game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs create mode 100644 game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs.meta create mode 100644 game/Assets/Scripts/Artefacts/Power.meta create mode 100644 game/Assets/Scripts/Artefacts/Power/PowerArtefact.cs create mode 100644 game/Assets/Scripts/Artefacts/Power/PowerArtefact.cs.meta create mode 100644 game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs create mode 100644 game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs.meta create mode 100644 game/Assets/Scripts/Artefacts/Written.meta create mode 100644 game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs create mode 100644 game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs.meta create mode 100644 game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs create mode 100644 game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs.meta diff --git a/game/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset b/game/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset index 8067ac8..35b4e97 100644 --- a/game/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset +++ b/game/Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset @@ -1,5 +1,45 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-9162346529055570663 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Wooden Collision/Speed + m_EditorClassIdentifier: + Name: Speed + Min: 0 + Max: 8 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &-9138413194456374795 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Level 01/Stinger + m_EditorClassIdentifier: + Name: Stinger + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-8940783032877342582 MonoBehaviour: m_ObjectHideFlags: 0 @@ -60,6 +100,25 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &-8198042947115044348 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Dialogue_CN.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Dialogue_CN.bank + Name: Dialogue_CN + StudioPath: bank:/Dialogue_CN + lastModified: 637496141797458778 + LoadResult: 0 + FileSizes: [] + Exists: 1 --- !u!114 &-8122538359583372443 MonoBehaviour: m_ObjectHideFlags: 0 @@ -116,7 +175,7 @@ MonoBehaviour: Path: event:/Character/Enemy Footsteps guid: 3f29b5149ef6e548a7aece02710ca3d9 Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 1 IsOneShot: 1 @@ -159,12 +218,12 @@ MonoBehaviour: Path: event:/Music/Level 02 guid: fd46f9c795d69b49a820752799c4921d Banks: - - {fileID: -5810968061649293014} + - {fileID: -4774549283329154417} IsStream: 1 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: 5677789806569608499} + - {fileID: -1591768334567720355} MinDistance: 0 MaxDistance: 0 Length: 56888 @@ -243,7 +302,7 @@ MonoBehaviour: Path: snapshot:/Slow-Motion guid: 098d8d6ee012cf48b620f9cc3bc478a3 Banks: - - {fileID: 8958818033594522944} + - {fileID: -4771440917401850555} IsStream: 0 Is3D: 0 IsOneShot: 0 @@ -266,14 +325,14 @@ MonoBehaviour: Path: event:/Ambience/Forest guid: e51074476d4a2e46bd1e4d558ce488ec Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 1 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: 7910736127753344473} - - {fileID: 3066922598506942344} - - {fileID: 8637360193677881062} + - {fileID: -3754493946088613614} + - {fileID: 4054379143639024438} + - {fileID: -1813614722416669484} MinDistance: 0 MaxDistance: 0 Length: 0 @@ -292,12 +351,12 @@ MonoBehaviour: Path: event:/Ambience/Country guid: 4ec79a24a46e484681da206c4e22b801 Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 1 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: -7248799967418030207} + - {fileID: -6312251826192194122} MinDistance: 0 MaxDistance: 0 Length: 0 @@ -316,12 +375,12 @@ MonoBehaviour: Path: event:/Interactables/Wooden Collision guid: d80362bed8c8c5418ce6bce0de95807b Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 1 IsOneShot: 1 Parameters: - - {fileID: -7277886014121453884} + - {fileID: -9162346529055570663} MinDistance: 1 MaxDistance: 20 Length: 0 @@ -345,6 +404,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &-6312251826192194122 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Country/Hour + m_EditorClassIdentifier: + Name: Hour + Min: 0 + Max: 3 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-6112239449709538351 MonoBehaviour: m_ObjectHideFlags: 0 @@ -360,12 +439,12 @@ MonoBehaviour: Path: event:/Weapons/Machine Gun guid: faaab7e9f02d9341b32ea74e5753cfa0 Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: -3493712513132075446} + - {fileID: 7027161187940006325} MinDistance: 1 MaxDistance: 20 Length: 78 @@ -405,7 +484,7 @@ MonoBehaviour: Path: event:/Character/Door Close guid: 448f10435c287748a7854ae97ed0fb3d Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 1 IsOneShot: 1 @@ -448,12 +527,12 @@ MonoBehaviour: Path: event:/Character/Player Footsteps guid: 01d405e9f5764147a885f7844b244671 Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 1 IsOneShot: 1 Parameters: - - {fileID: 4367476332520521904} + - {fileID: -1813731822676802977} MinDistance: 1 MaxDistance: 20 Length: 0 @@ -497,6 +576,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &-5151192256197713334 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Radio Station/Freq + m_EditorClassIdentifier: + Name: Freq + Min: 0 + Max: 3 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-5057676734624866493 MonoBehaviour: m_ObjectHideFlags: 0 @@ -537,6 +636,64 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &-4789475148003667851 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Barrel Roll/Speed + m_EditorClassIdentifier: + Name: Speed + Min: 0 + Max: 8 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &-4774549283329154417 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Music.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Music.bank + Name: Music + StudioPath: bank:/Music + lastModified: 637496141815382268 + LoadResult: 0 + FileSizes: [] + Exists: 1 +--- !u!114 &-4771440917401850555 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Master.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Master.bank + Name: Master + StudioPath: bank:/Master + lastModified: 637496141808646390 + LoadResult: 0 + FileSizes: [] + Exists: 1 --- !u!114 &-4363186268740097967 MonoBehaviour: m_ObjectHideFlags: 0 @@ -572,7 +729,7 @@ MonoBehaviour: Path: snapshot:/Pause guid: 98a405e3182b1d46b35c6eaea45fafd6 Banks: - - {fileID: 8958818033594522944} + - {fileID: -4771440917401850555} IsStream: 0 Is3D: 0 IsOneShot: 0 @@ -580,6 +737,26 @@ MonoBehaviour: MinDistance: 0 MaxDistance: 0 Length: 0 +--- !u!114 &-3754493946088613614 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Forest/Wind + m_EditorClassIdentifier: + Name: Wind + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-3493712513132075446 MonoBehaviour: m_ObjectHideFlags: 0 @@ -600,6 +777,25 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &-3190805963708177302 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/SFX.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/SFX.bank + Name: SFX + StudioPath: bank:/SFX + lastModified: 637496141831026908 + LoadResult: 0 + FileSizes: [] + Exists: 1 --- !u!114 &-2776990974051642223 MonoBehaviour: m_ObjectHideFlags: 0 @@ -615,16 +811,36 @@ MonoBehaviour: Path: event:/Music/Level 03 guid: 5a1416ec12371c4b9944ce26875a548b Banks: - - {fileID: -5810968061649293014} + - {fileID: -4774549283329154417} IsStream: 1 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: -5220439912511036330} - - {fileID: -1949990878170830} + - {fileID: 5928980643685309775} + - {fileID: -727741192842300855} MinDistance: 0 MaxDistance: 0 Length: 150857 +--- !u!114 &-2666916623036860121 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Level 01/Progression + m_EditorClassIdentifier: + Name: Progression + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-2475653733262150197 MonoBehaviour: m_ObjectHideFlags: 0 @@ -681,12 +897,12 @@ MonoBehaviour: Path: event:/Interactables/Barrel Roll guid: 40222cc4b6c4ed42a4731a47f19945ea Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: 1793265207329793385} + - {fileID: -4789475148003667851} MinDistance: 1 MaxDistance: 20 Length: 0 @@ -705,7 +921,7 @@ MonoBehaviour: Path: snapshot:/Reverb/Sewer Reverb guid: 8ee207c13b87aa4c949268fe72210c48 Banks: - - {fileID: 8958818033594522944} + - {fileID: -4771440917401850555} IsStream: 0 Is3D: 0 IsOneShot: 0 @@ -728,13 +944,13 @@ MonoBehaviour: Path: event:/Vehicles/Car Engine guid: b463830caf239c4faf4b0951bfd37d84 Banks: - - {fileID: 5884682174564844121} + - {fileID: 1682239819653491388} IsStream: 0 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: -4363186268740097967} - - {fileID: 4398004947105728974} + - {fileID: 8974326248168718068} + - {fileID: 8549189876140475706} MinDistance: 1 MaxDistance: 20 Length: 0 @@ -758,6 +974,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 0 +--- !u!114 &-2139931120125946114 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Ride-on Mower/RPM + m_EditorClassIdentifier: + Name: RPM + Min: 0 + Max: 2000 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-1815433723513422642 MonoBehaviour: m_ObjectHideFlags: 0 @@ -778,6 +1014,66 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 0 +--- !u!114 &-1813731822676802977 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Player Footsteps/Surface + m_EditorClassIdentifier: + Name: Surface + Min: 0 + Max: 2 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &-1813614722416669484 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Forest/Rain + m_EditorClassIdentifier: + Name: Rain + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &-1591768334567720355 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Level 02/Area + m_EditorClassIdentifier: + Name: Area + Min: 0 + Max: 80 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-1531617232923243339 MonoBehaviour: m_ObjectHideFlags: 0 @@ -798,6 +1094,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 0 +--- !u!114 &-1376384281128435857 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Radio Station/Spatializer + m_EditorClassIdentifier: + Name: Spatializer + Min: 0 + Max: 2 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-1175729122596764943 MonoBehaviour: m_ObjectHideFlags: 0 @@ -813,12 +1129,12 @@ MonoBehaviour: Path: event:/Character/Health guid: d6fef322452bff4faa855351bc5fe9cd Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: 6098634058503677813} + - {fileID: 5061477806646582657} MinDistance: 0 MaxDistance: 0 Length: 0 @@ -837,7 +1153,7 @@ MonoBehaviour: Path: event:/UI/Cancel guid: e6483e2afc946343946833d2dd4d7b00 Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 0 IsOneShot: 1 @@ -865,6 +1181,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 0 +--- !u!114 &-727741192842300855 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Level 03/Intensity + m_EditorClassIdentifier: + Name: Intensity + Min: 0 + Max: 4 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &-151957624795533979 MonoBehaviour: m_ObjectHideFlags: 0 @@ -880,12 +1216,12 @@ MonoBehaviour: Path: event:/Weapons/Explosion guid: 3871681f6ce0f5409bac57f84bbcedd3 Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 1 IsOneShot: 1 Parameters: - - {fileID: -5637953553718496753} + - {fileID: 3897549076456720910} MinDistance: 1 MaxDistance: 100 Length: 0 @@ -904,7 +1240,7 @@ MonoBehaviour: Path: event:/Character/Dialogue guid: c5eca29a4beabe4e85c3054b11b21dcd Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 1 IsOneShot: 1 @@ -945,15 +1281,15 @@ MonoBehaviour: m_Name: FMODStudioCache m_EditorClassIdentifier: EditorBanks: - - {fileID: -2443445598607337504} - - {fileID: 1646827598670020794} - - {fileID: 631280102866359407} - - {fileID: 8999275565678618086} - - {fileID: 8958818033594522944} - - {fileID: -5810968061649293014} - - {fileID: 1507566728776054511} - - {fileID: 5884682174564844121} - - {fileID: -8122538359583372443} + - {fileID: 1309093476401300118} + - {fileID: -8198042947115044348} + - {fileID: 1891587757440762109} + - {fileID: 6971744336387367682} + - {fileID: -4771440917401850555} + - {fileID: -4774549283329154417} + - {fileID: -3190805963708177302} + - {fileID: 1682239819653491388} + - {fileID: 1328477972104872594} EditorEvents: - {fileID: -6915515647060395114} - {fileID: 592172348792374910} @@ -987,10 +1323,10 @@ MonoBehaviour: - {fileID: 1922969843971877521} EditorParameters: [] MasterBanks: - - {fileID: 8958818033594522944} + - {fileID: -4771440917401850555} StringsBanks: - - {fileID: -2443445598607337504} - stringsBankWriteTime: 637495997822260983 + - {fileID: 1309093476401300118} + stringsBankWriteTime: 637496141818957156 cacheVersion: 6 --- !u!114 &399717647629584186 MonoBehaviour: @@ -1027,13 +1363,13 @@ MonoBehaviour: Path: event:/Music/Level 01 guid: 7cbabb74e8768c489cf967f000df1ffd Banks: - - {fileID: -5810968061649293014} + - {fileID: -4774549283329154417} IsStream: 0 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: 6340825763965355649} - - {fileID: -4794246568588122348} + - {fileID: -9138413194456374795} + - {fileID: -2666916623036860121} MinDistance: 0 MaxDistance: 0 Length: 54339 @@ -1072,8 +1408,8 @@ MonoBehaviour: Path: snapshot:/Health Low guid: 3441ea87f1ff9d4e8f8b294a2b518223 Banks: - - {fileID: 8958818033594522944} - - {fileID: 1507566728776054511} + - {fileID: -4771440917401850555} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 0 IsOneShot: 0 @@ -1117,7 +1453,7 @@ MonoBehaviour: Path: event:/UI/Okay guid: 979e4792c69464459e33efbeec59b34a Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 0 IsOneShot: 1 @@ -1125,6 +1461,46 @@ MonoBehaviour: MinDistance: 0 MaxDistance: 0 Length: 917 +--- !u!114 &1309093476401300118 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Master.strings.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Master.strings.bank + Name: Master.strings + StudioPath: bank:/Master.strings + lastModified: 637496141818957156 + LoadResult: 0 + FileSizes: + - Name: Desktop + Value: 4002 + Exists: 1 +--- !u!114 &1328477972104872594 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/VO.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/VO.bank + Name: VO + StudioPath: bank:/VO + lastModified: 637496141834207342 + LoadResult: 0 + FileSizes: [] + Exists: 1 --- !u!114 &1425378673241245563 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1140,13 +1516,13 @@ MonoBehaviour: Path: event:/Music/Radio Station guid: 9faf6ab3142f454c8cf0fc622a0ea38a Banks: - - {fileID: -5810968061649293014} + - {fileID: -4774549283329154417} IsStream: 1 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: -8666466107650256711} - - {fileID: -7803813789219444754} + - {fileID: -1376384281128435857} + - {fileID: -5151192256197713334} MinDistance: 0 MaxDistance: 0 Length: 0 @@ -1192,6 +1568,25 @@ MonoBehaviour: - Name: Desktop Value: 52416 Exists: 1 +--- !u!114 &1682239819653491388 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Vehicles.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Vehicles.bank + Name: Vehicles + StudioPath: bank:/Vehicles + lastModified: 637496141832261910 + LoadResult: 0 + FileSizes: [] + Exists: 1 --- !u!114 &1713486663294413426 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1207,12 +1602,12 @@ MonoBehaviour: Path: event:/Character/Radio Dialogue guid: 871fc4431f70254ca9a1c619ca106412 Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 0 IsOneShot: 0 Parameters: - - {fileID: 3818681919422599891} + - {fileID: 6003596800331140666} MinDistance: 0 MaxDistance: 0 Length: 999 @@ -1236,6 +1631,25 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &1891587757440762109 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Dialogue_EN.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Dialogue_EN.bank + Name: Dialogue_EN + StudioPath: bank:/Dialogue_EN + lastModified: 637496141797094352 + LoadResult: 0 + FileSizes: [] + Exists: 1 --- !u!114 &1922969843971877521 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1251,7 +1665,7 @@ MonoBehaviour: Path: event:/VO/Welcome guid: 29bbead7d9ab5740b408eef937d66f2a Banks: - - {fileID: -8122538359583372443} + - {fileID: 1328477972104872594} IsStream: 0 Is3D: 0 IsOneShot: 1 @@ -1294,7 +1708,7 @@ MonoBehaviour: Path: event:/Character/Door Open guid: 18528562f3a80f47ab7a8af8f7df77bb Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 1 IsOneShot: 1 @@ -1302,6 +1716,26 @@ MonoBehaviour: MinDistance: 1 MaxDistance: 20 Length: 1274 +--- !u!114 &2816091355947022307 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Ride-on Mower/Load + m_EditorClassIdentifier: + Name: Load + Min: -1 + Max: 1 + Default: -1 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &3066922598506942344 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1382,6 +1816,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 0 +--- !u!114 &3794469447382366130 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/City/Traffic + m_EditorClassIdentifier: + Name: Traffic + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &3818681919422599891 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1417,7 +1871,7 @@ MonoBehaviour: Path: event:/Weapons/Pistol guid: cf5dc803ebc4944083c77839b5d058e8 Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 0 Is3D: 1 IsOneShot: 1 @@ -1425,6 +1879,46 @@ MonoBehaviour: MinDistance: 1 MaxDistance: 20 Length: 345 +--- !u!114 &3897549076456720910 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Explosion/Size + m_EditorClassIdentifier: + Name: Size + Min: 0 + Max: 3 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &4054379143639024438 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Forest/Cover + m_EditorClassIdentifier: + Name: Cover + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &4247688449534627133 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1525,6 +2019,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &5061477806646582657 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Health/Health + m_EditorClassIdentifier: + Name: Health + Min: 0 + Max: 100 + Default: 100 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &5233580542034508407 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1540,13 +2054,13 @@ MonoBehaviour: Path: event:/Vehicles/Ride-on Mower guid: f1e8a57ac28ec642b4651241a603a055 Banks: - - {fileID: 5884682174564844121} + - {fileID: 1682239819653491388} IsStream: 0 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: -8940783032877342582} - - {fileID: -6445015509329371517} + - {fileID: 2816091355947022307} + - {fileID: -2139931120125946114} MinDistance: 1 MaxDistance: 20 Length: 0 @@ -1585,7 +2099,7 @@ MonoBehaviour: Path: snapshot:/Reverb/Cave Reverb guid: c0ee95b678fe5547b8069690c06dfc0b Banks: - - {fileID: 8958818033594522944} + - {fileID: -4771440917401850555} IsStream: 0 Is3D: 0 IsOneShot: 0 @@ -1614,6 +2128,46 @@ MonoBehaviour: - Name: Desktop Value: 222368 Exists: 1 +--- !u!114 &5928980643685309775 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Level 03/Stinger + m_EditorClassIdentifier: + Name: Stinger + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 +--- !u!114 &6003596800331140666 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Radio Dialogue/VO Sidechain + m_EditorClassIdentifier: + Name: VO Sidechain + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &6098634058503677813 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1729,7 +2283,7 @@ MonoBehaviour: Path: event:/VO/Main Menu guid: 1612b8a70bfb9c4b9e7db897825d9821 Banks: - - {fileID: -8122538359583372443} + - {fileID: 1328477972104872594} IsStream: 0 Is3D: 0 IsOneShot: 1 @@ -1737,6 +2291,45 @@ MonoBehaviour: MinDistance: 0 MaxDistance: 0 Length: 1859 +--- !u!114 &6971744336387367682 +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: c18180ecb35941f4682ae60107b85b7c, type: 3} + m_Name: bank:/Dialogue_JP.bank + m_EditorClassIdentifier: + Path: FMOD Project/Build/Desktop/Dialogue_JP.bank + Name: Dialogue_JP + StudioPath: bank:/Dialogue_JP + lastModified: 637496141795879502 + LoadResult: 0 + FileSizes: [] + Exists: 1 +--- !u!114 &7027161187940006325 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Machine Gun/Auto-Stop + m_EditorClassIdentifier: + Name: Auto-Stop + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &7910736127753344473 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1757,6 +2350,26 @@ MonoBehaviour: data1: 0 data2: 0 Exists: 1 +--- !u!114 &8233090230614129249 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/City/Walla + m_EditorClassIdentifier: + Name: Walla + Min: 0 + Max: 1 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &8432126479874434312 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1792,16 +2405,36 @@ MonoBehaviour: Path: event:/Ambience/City guid: 7e9198bb5bd6f041a0cac50756da3f0e Banks: - - {fileID: 1507566728776054511} + - {fileID: -3190805963708177302} IsStream: 1 Is3D: 1 IsOneShot: 0 Parameters: - - {fileID: -7625393254389082378} - - {fileID: -6992756556786915566} + - {fileID: 8233090230614129249} + - {fileID: 3794469447382366130} MinDistance: 0 MaxDistance: 0 Length: 0 +--- !u!114 &8549189876140475706 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Car Engine/Load + m_EditorClassIdentifier: + Name: Load + Min: -1 + Max: 1 + Default: -1 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &8637360193677881062 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1843,6 +2476,26 @@ MonoBehaviour: - Name: Desktop Value: 15340 Exists: 1 +--- !u!114 &8974326248168718068 +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: fecb8ef7f94ca804a8ab72049b86782e, type: 3} + m_Name: parameter:/Car Engine/RPM + m_EditorClassIdentifier: + Name: RPM + Min: 0 + Max: 10000 + Default: 0 + ID: + data1: 0 + data2: 0 + Exists: 1 --- !u!114 &8999275565678618086 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/game/Assets/Prefabs/Artefacts/Artefact.prefab b/game/Assets/Prefabs/Artefacts/PhysicalArtefact.prefab similarity index 91% rename from game/Assets/Prefabs/Artefacts/Artefact.prefab rename to game/Assets/Prefabs/Artefacts/PhysicalArtefact.prefab index 87ae9cd..2935656 100644 --- a/game/Assets/Prefabs/Artefacts/Artefact.prefab +++ b/game/Assets/Prefabs/Artefacts/PhysicalArtefact.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 8781564213167799767} - component: {fileID: 8781564213167799766} - component: {fileID: 8781564213167799761} - - component: {fileID: 8781564214016862072} m_Layer: 0 m_Name: Artefact m_TagString: Untagged @@ -98,20 +97,6 @@ CapsuleCollider: m_Height: 2 m_Direction: 1 m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} ---- !u!114 &8781564214016862072 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8781564213167799763} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7d3ed39e75807bc4d865f39b2ef9ea69, type: 3} - m_Name: - m_EditorClassIdentifier: - data: {fileID: 0} - _nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2} --- !u!1 &8781564214893312975 GameObject: m_ObjectHideFlags: 0 @@ -221,4 +206,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/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/PowerArtefact.prefab b/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab new file mode 100644 index 0000000..2935656 --- /dev/null +++ b/game/Assets/Prefabs/Artefacts/PowerArtefact.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/Scripts/Artefacts/ArtefactObjects/Artefact1.asset.meta b/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab.meta similarity index 52% rename from game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact1.asset.meta rename to game/Assets/Prefabs/Artefacts/PowerArtefact.prefab.meta index dc14766..a7ae71e 100644 --- a/game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact1.asset.meta +++ b/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 38f76e60d5df1d445a455c63a88da8e1 -NativeFormatImporter: +guid: b3a3678d38e60164dbd4f343e28f69e1 +PrefabImporter: externalObjects: {} - mainObjectFileID: 11400000 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/Main.unity b/game/Assets/Scenes/Main.unity index dda3c83..1c47415 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -407,6 +407,87 @@ Transform: m_Father: {fileID: 1509348081} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &697904763 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8781564213167799763, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} + propertyPath: m_Name + value: PowerArtefact + 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: -28.2 + 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: 5.5 + 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: 697904765} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} +--- !u!1 &697904764 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8781564213167799763, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} + m_PrefabInstance: {fileID: 697904763} + m_PrefabAsset: {fileID: 0} +--- !u!114 &697904765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697904764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ab47b1902ffb4e4eaa7743e63d675a2, type: 3} + m_Name: + m_EditorClassIdentifier: + data: {fileID: 11400000, guid: 8882f0bc24a2179459b1e851f8645241, type: 2} + _nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2} + _power: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2} --- !u!1 &1148358018 GameObject: m_ObjectHideFlags: 0 @@ -876,5 +957,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 0dd12c1..76b17bb 100644 --- a/game/Assets/Scripts/Artefacts/Artefact.cs +++ b/game/Assets/Scripts/Artefacts/Artefact.cs @@ -2,7 +2,6 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -[CreateAssetMenu(fileName = "New Artefact", menuName = "Artefact", order = 51)] public class Artefact : ScriptableObject { diff --git a/game/Assets/Scripts/Artefacts/ArtefactControl.cs b/game/Assets/Scripts/Artefacts/ArtefactControl.cs index f1601aa..c1968d7 100644 --- a/game/Assets/Scripts/Artefacts/ArtefactControl.cs +++ b/game/Assets/Scripts/Artefacts/ArtefactControl.cs @@ -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,12 @@ public class ArtefactControl : MonoBehaviour } //here put 'show artifact dialogue' if (this.gameObject != null) + { + _nearbyArtefactID.Value = -1; + _canInteract = false; + //_show = false; Destroy(this.gameObject); - _nearbyArtefactID.Value = -1; - //PlayerInputHandler.id = 0; - - + } } } diff --git a/game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact2.asset b/game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact2.asset deleted file mode 100644 index b7b438e..0000000 --- a/game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact2.asset +++ /dev/null @@ -1,16 +0,0 @@ -%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: e26cf8dbdb474db49ac6dadf49ceade2, type: 3} - m_Name: Artefact2 - m_EditorClassIdentifier: - _artefactID: 2 - _artefactDialogue: 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/ArtefactObjects.meta b/game/Assets/Scripts/Artefacts/Objects.meta similarity index 100% rename from game/Assets/Scripts/Artefacts/ArtefactObjects.meta rename to game/Assets/Scripts/Artefacts/Objects.meta diff --git a/game/Assets/Scripts/Artefacts/Objects/Physical.meta b/game/Assets/Scripts/Artefacts/Objects/Physical.meta new file mode 100644 index 0000000..5463e82 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Objects/Physical.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 63acf82d359db164181b8ae5ec8b27f2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Objects/Power.meta b/game/Assets/Scripts/Artefacts/Objects/Power.meta new file mode 100644 index 0000000..5551bc9 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Objects/Power.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d68e3f7b2f04a194f9747c28b15a56ce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact1.asset b/game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset similarity index 77% rename from game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact1.asset rename to game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset index 4f059fd..9ab40a1 100644 --- a/game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact1.asset +++ b/game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset @@ -9,8 +9,8 @@ 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: _artefactID: 1 _artefactDialogue: diff --git a/game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact2.asset.meta b/game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset.meta similarity index 79% rename from game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact2.asset.meta rename to game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset.meta index bd46cf9..23a8b54 100644 --- a/game/Assets/Scripts/Artefacts/ArtefactObjects/Artefact2.asset.meta +++ b/game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4c18fa3513891124282e56285b09c211 +guid: 8882f0bc24a2179459b1e851f8645241 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/game/Assets/Scripts/Artefacts/Objects/Written.meta b/game/Assets/Scripts/Artefacts/Objects/Written.meta new file mode 100644 index 0000000..5bc07d3 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Objects/Written.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 54b0c4f43a5d72245a87cdfecfc30396 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Physical.meta b/game/Assets/Scripts/Artefacts/Physical.meta new file mode 100644 index 0000000..f77c379 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Physical.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c5b8d2b878408247b1be99bc82e9211 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs b/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs new file mode 100644 index 0000000..a3d32d1 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs @@ -0,0 +1,9 @@ +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/Physical/PhysicalArtefact.cs.meta b/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs.meta new file mode 100644 index 0000000..fda232c --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Physical/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/Physical/PhysicalArtefactControl.cs b/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs new file mode 100644 index 0000000..6f3cfe4 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PhysicalArtefactControl : ArtefactControl +{ + +} diff --git a/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs.meta b/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs.meta new file mode 100644 index 0000000..e62cf53 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 654aeb2b756db3d4d94f3548d07aaf04 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Power.meta b/game/Assets/Scripts/Artefacts/Power.meta new file mode 100644 index 0000000..58f16cd --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Power.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46e47d8ef1e7fa742a8ff185947670a5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Power/PowerArtefact.cs b/game/Assets/Scripts/Artefacts/Power/PowerArtefact.cs new file mode 100644 index 0000000..3901fef --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Power/PowerArtefact.cs @@ -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 +{ + +} diff --git a/game/Assets/Scripts/Artefacts/Power/PowerArtefact.cs.meta b/game/Assets/Scripts/Artefacts/Power/PowerArtefact.cs.meta new file mode 100644 index 0000000..2c2a77c --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Power/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/Power/PowerArtefactControl.cs b/game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs new file mode 100644 index 0000000..6d79a61 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PowerArtefactControl : ArtefactControl +{ + [SerializeField] private PlayerPower _power; + + protected override void PickUp(int id) + { + if (_canInteract == true) + { + _power.Unlock(); + Debug.Log("overrided physical"); + } + base.PickUp(id); + + } +} diff --git a/game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs.meta b/game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs.meta new file mode 100644 index 0000000..6483787 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8ab47b1902ffb4e4eaa7743e63d675a2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Written.meta b/game/Assets/Scripts/Artefacts/Written.meta new file mode 100644 index 0000000..5404e08 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Written.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36aaf65ad3fc24447a597a2fcc067ab3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs b/game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs new file mode 100644 index 0000000..6991719 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs @@ -0,0 +1,9 @@ +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/Written/WrittenArtefact.cs.meta b/game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs.meta new file mode 100644 index 0000000..6c6afa5 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0ac91480061a1ea419ea525eb0a42807 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs b/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs new file mode 100644 index 0000000..6e449f4 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WrittenArtefactControl : ArtefactControl +{ + protected override void Start() + { + base.Start(); + + } + + private void enablePower() + { + //enable power from playerinput + } + + protected override void PickUp(int id) + { + base.PickUp(id); + Debug.Log("overrided written"); + } +} diff --git a/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs.meta b/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs.meta new file mode 100644 index 0000000..4956d33 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2a5ec10e04c618440bb79b9de31e75a8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/nearbyArtefactID.asset b/game/Assets/Scripts/Artefacts/nearbyArtefactID.asset index 4d28f6f..2138e16 100644 --- a/game/Assets/Scripts/Artefacts/nearbyArtefactID.asset +++ b/game/Assets/Scripts/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 From a8d79c2b1027cd14cc9d56b5c6994f6e74b511e0 Mon Sep 17 00:00:00 2001 From: Novvator Date: Thu, 25 Feb 2021 20:12:08 +0000 Subject: [PATCH 3/3] Changes in Artefact inheritance --- .../Prefabs/Artefacts/PowerArtefact.prefab | 17 +- game/Assets/Scenes/Main.unity | 221 ++++++++++++------ game/Assets/Scripts/Artefacts/Artefact.cs | 6 + .../Scripts/Artefacts/ArtefactControl.cs | 1 + .../Physical/New Physical Artefact.asset | 17 ++ .../Physical/New Physical Artefact.asset.meta | 8 + .../Artefacts/Objects/Power/Power1.asset | 1 + .../Artefacts/Objects/Power/Power2.asset | 17 ++ .../Artefacts/Objects/Power/Power2.asset.meta | 8 + .../Artefacts/Physical/PhysicalArtefact.cs | 5 +- .../Physical/PhysicalArtefactControl.cs | 8 - .../Physical/PhysicalArtefactControl.cs.meta | 11 - .../Artefacts/Power/PowerArtefactControl.cs | 19 -- .../Power/PowerArtefactControl.cs.meta | 11 - .../Artefacts/Written/WrittenArtefact.cs | 5 +- .../Written/WrittenArtefactControl.cs | 23 -- .../Written/WrittenArtefactControl.cs.meta | 11 - 17 files changed, 228 insertions(+), 161 deletions(-) create mode 100644 game/Assets/Scripts/Artefacts/Objects/Physical/New Physical Artefact.asset create mode 100644 game/Assets/Scripts/Artefacts/Objects/Physical/New Physical Artefact.asset.meta create mode 100644 game/Assets/Scripts/Artefacts/Objects/Power/Power2.asset create mode 100644 game/Assets/Scripts/Artefacts/Objects/Power/Power2.asset.meta delete mode 100644 game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs delete mode 100644 game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs.meta delete mode 100644 game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs delete mode 100644 game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs.meta delete mode 100644 game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs delete mode 100644 game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs.meta diff --git a/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab b/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab index 2935656..56a96a4 100644 --- a/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab +++ b/game/Assets/Prefabs/Artefacts/PowerArtefact.prefab @@ -12,8 +12,9 @@ GameObject: - component: {fileID: 8781564213167799767} - component: {fileID: 8781564213167799766} - component: {fileID: 8781564213167799761} + - component: {fileID: 3201523991801391447} m_Layer: 0 - m_Name: Artefact + m_Name: PowerArtefact m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -97,6 +98,20 @@ CapsuleCollider: m_Height: 2 m_Direction: 1 m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} +--- !u!114 &3201523991801391447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8781564213167799763} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7d3ed39e75807bc4d865f39b2ef9ea69, type: 3} + m_Name: + m_EditorClassIdentifier: + data: {fileID: 0} + _nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2} --- !u!1 &8781564214893312975 GameObject: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 1c47415..890e31f 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -407,87 +407,17 @@ Transform: m_Father: {fileID: 1509348081} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &697904763 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8781564213167799763, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} - propertyPath: m_Name - value: PowerArtefact - 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: -28.2 - 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: 5.5 - 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: 697904765} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} ---- !u!1 &697904764 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8781564213167799763, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} - m_PrefabInstance: {fileID: 697904763} - m_PrefabAsset: {fileID: 0} ---- !u!114 &697904765 +--- !u!114 &898399640 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 3201523991801391447, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} + m_PrefabInstance: {fileID: 2138848574} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 697904764} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ab47b1902ffb4e4eaa7743e63d675a2, type: 3} + m_Script: {fileID: 11500000, guid: 7d3ed39e75807bc4d865f39b2ef9ea69, type: 3} m_Name: m_EditorClassIdentifier: - data: {fileID: 11400000, guid: 8882f0bc24a2179459b1e851f8645241, type: 2} - _nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2} - _power: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2} --- !u!1 &1148358018 GameObject: m_ObjectHideFlags: 0 @@ -668,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 @@ -807,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 @@ -902,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 diff --git a/game/Assets/Scripts/Artefacts/Artefact.cs b/game/Assets/Scripts/Artefacts/Artefact.cs index 76b17bb..1045c1c 100644 --- a/game/Assets/Scripts/Artefacts/Artefact.cs +++ b/game/Assets/Scripts/Artefacts/Artefact.cs @@ -4,6 +4,7 @@ using UnityEngine; public class Artefact : ScriptableObject { + [SerializeField] private PlayerPower _power; public int artefactID => _artefactID; [SerializeField] private int _artefactID; @@ -15,4 +16,9 @@ public class Artefact : ScriptableObject public bool canInteract => _canInteract; private bool _canInteract = false; + public virtual void PowerUnlock() + { + _power.Unlock(); + } + } \ No newline at end of file diff --git a/game/Assets/Scripts/Artefacts/ArtefactControl.cs b/game/Assets/Scripts/Artefacts/ArtefactControl.cs index c1968d7..67f47cd 100644 --- a/game/Assets/Scripts/Artefacts/ArtefactControl.cs +++ b/game/Assets/Scripts/Artefacts/ArtefactControl.cs @@ -66,6 +66,7 @@ public class ArtefactControl : MonoBehaviour //here put 'show artifact dialogue' if (this.gameObject != null) { + data.PowerUnlock(); _nearbyArtefactID.Value = -1; _canInteract = false; //_show = false; diff --git a/game/Assets/Scripts/Artefacts/Objects/Physical/New Physical Artefact.asset b/game/Assets/Scripts/Artefacts/Objects/Physical/New Physical Artefact.asset new file mode 100644 index 0000000..e6cecdf --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Objects/Physical/New Physical 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: bbf8d803b740a954fbfd10443ef1afdf, type: 3} + m_Name: New Physical Artefact + m_EditorClassIdentifier: + _power: {fileID: 0} + _artefactID: 0 + _artefactDialogue: diff --git a/game/Assets/Scripts/Artefacts/Objects/Physical/New Physical Artefact.asset.meta b/game/Assets/Scripts/Artefacts/Objects/Physical/New Physical Artefact.asset.meta new file mode 100644 index 0000000..8bd4742 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Objects/Physical/New Physical Artefact.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e62a0b30dca3396448ca1d5fed7f01f7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset b/game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset index 9ab40a1..8cbe811 100644 --- a/game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset +++ b/game/Assets/Scripts/Artefacts/Objects/Power/Power1.asset @@ -12,5 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0228856d50ce2a845abd7b3eda114390, type: 3} m_Name: Power1 m_EditorClassIdentifier: + _power: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2} _artefactID: 1 _artefactDialogue: diff --git a/game/Assets/Scripts/Artefacts/Objects/Power/Power2.asset b/game/Assets/Scripts/Artefacts/Objects/Power/Power2.asset new file mode 100644 index 0000000..b6ac8df --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Objects/Power/Power2.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/Scripts/Artefacts/Objects/Power/Power2.asset.meta b/game/Assets/Scripts/Artefacts/Objects/Power/Power2.asset.meta new file mode 100644 index 0000000..736a7b8 --- /dev/null +++ b/game/Assets/Scripts/Artefacts/Objects/Power/Power2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a071ae87c1fc7554db6ae524b4a6d115 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs b/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs index a3d32d1..82c6292 100644 --- a/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs +++ b/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefact.cs @@ -5,5 +5,8 @@ using UnityEngine; [CreateAssetMenu(fileName = "New Physical Artefact", menuName = "Artefact/PhysicalArtefact")] public class PhysicalArtefact : Artefact { - + public override void PowerUnlock() + { + + } } diff --git a/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs b/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs deleted file mode 100644 index 6f3cfe4..0000000 --- a/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PhysicalArtefactControl : ArtefactControl -{ - -} diff --git a/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs.meta b/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs.meta deleted file mode 100644 index e62cf53..0000000 --- a/game/Assets/Scripts/Artefacts/Physical/PhysicalArtefactControl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 654aeb2b756db3d4d94f3548d07aaf04 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs b/game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs deleted file mode 100644 index 6d79a61..0000000 --- a/game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PowerArtefactControl : ArtefactControl -{ - [SerializeField] private PlayerPower _power; - - protected override void PickUp(int id) - { - if (_canInteract == true) - { - _power.Unlock(); - Debug.Log("overrided physical"); - } - base.PickUp(id); - - } -} diff --git a/game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs.meta b/game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs.meta deleted file mode 100644 index 6483787..0000000 --- a/game/Assets/Scripts/Artefacts/Power/PowerArtefactControl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8ab47b1902ffb4e4eaa7743e63d675a2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs b/game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs index 6991719..b56847d 100644 --- a/game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs +++ b/game/Assets/Scripts/Artefacts/Written/WrittenArtefact.cs @@ -5,5 +5,8 @@ using UnityEngine; [CreateAssetMenu(fileName = "New Written Artefact", menuName = "Artefact/WrittenArtefact")] public class WrittenArtefact : Artefact { - + public override void PowerUnlock() + { + + } } diff --git a/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs b/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs deleted file mode 100644 index 6e449f4..0000000 --- a/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class WrittenArtefactControl : ArtefactControl -{ - protected override void Start() - { - base.Start(); - - } - - private void enablePower() - { - //enable power from playerinput - } - - protected override void PickUp(int id) - { - base.PickUp(id); - Debug.Log("overrided written"); - } -} diff --git a/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs.meta b/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs.meta deleted file mode 100644 index 4956d33..0000000 --- a/game/Assets/Scripts/Artefacts/Written/WrittenArtefactControl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2a5ec10e04c618440bb79b9de31e75a8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: