From 5f45fd639c6763174a493a3227f68750a0eb8ab5 Mon Sep 17 00:00:00 2001 From: Kip Taylor Date: Tue, 23 Apr 2024 15:03:11 -0400 Subject: [PATCH 1/7] cool [anting --- Assets/Models/Materials.meta | 8 + Assets/Models/Materials/Sukh smiling 1.mat | 137 ++++++ .../Models/Materials/Sukh smiling 1.mat.meta | 8 + Assets/Models/Materials/Sukh smiling.mat | 133 +++++ Assets/Models/Materials/Sukh smiling.mat.meta | 8 + Assets/Models/Sukh smiling 1.png | 3 + Assets/Models/Sukh smiling 1.png.meta | 153 ++++++ Assets/Models/Sukh smiling.png | 3 + Assets/Models/Sukh smiling.png.meta | 153 ++++++ Assets/Models/Sukh_Popout.prefab | 234 +++++++++ Assets/Models/Sukh_Popout.prefab.meta | 7 + Assets/Pendulum.cs | 53 +- Assets/Scenes/TestControls.unity | 457 ++++++++++++++++++ 13 files changed, 1353 insertions(+), 4 deletions(-) create mode 100644 Assets/Models/Materials.meta create mode 100644 Assets/Models/Materials/Sukh smiling 1.mat create mode 100644 Assets/Models/Materials/Sukh smiling 1.mat.meta create mode 100644 Assets/Models/Materials/Sukh smiling.mat create mode 100644 Assets/Models/Materials/Sukh smiling.mat.meta create mode 100644 Assets/Models/Sukh smiling 1.png create mode 100644 Assets/Models/Sukh smiling 1.png.meta create mode 100644 Assets/Models/Sukh smiling.png create mode 100644 Assets/Models/Sukh smiling.png.meta create mode 100644 Assets/Models/Sukh_Popout.prefab create mode 100644 Assets/Models/Sukh_Popout.prefab.meta diff --git a/Assets/Models/Materials.meta b/Assets/Models/Materials.meta new file mode 100644 index 00000000..8ed110c3 --- /dev/null +++ b/Assets/Models/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b6617b6886f60d44bbb0164c5006da17 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Sukh smiling 1.mat b/Assets/Models/Materials/Sukh smiling 1.mat new file mode 100644 index 00000000..3bcc578f --- /dev/null +++ b/Assets/Models/Materials/Sukh smiling 1.mat @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4685563203374134370 +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: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sukh smiling 1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 01e261b469425204c9ebe9e039afcd80, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 01e261b469425204c9ebe9e039afcd80, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _WorkflowMode: 1 + - _ZWrite: 0 + 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/Assets/Models/Materials/Sukh smiling 1.mat.meta b/Assets/Models/Materials/Sukh smiling 1.mat.meta new file mode 100644 index 00000000..2ddbc458 --- /dev/null +++ b/Assets/Models/Materials/Sukh smiling 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f05e698744c43f49a4ff89578840e2c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Sukh smiling.mat b/Assets/Models/Materials/Sukh smiling.mat new file mode 100644 index 00000000..ed6b5402 --- /dev/null +++ b/Assets/Models/Materials/Sukh smiling.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sukh smiling + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 6511a3c43d452684aba1e66e3d807922, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 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: [] +--- !u!114 &5870784650307636738 +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: 7 diff --git a/Assets/Models/Materials/Sukh smiling.mat.meta b/Assets/Models/Materials/Sukh smiling.mat.meta new file mode 100644 index 00000000..2b8e22e5 --- /dev/null +++ b/Assets/Models/Materials/Sukh smiling.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2257bb3f89246384eb19dc7451e85382 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Sukh smiling 1.png b/Assets/Models/Sukh smiling 1.png new file mode 100644 index 00000000..532a3602 --- /dev/null +++ b/Assets/Models/Sukh smiling 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9afa50b0fd3e6c0a78a83fb39ec221f7458ac0fe8ea9e4aa17cf249496caefe8 +size 584046 diff --git a/Assets/Models/Sukh smiling 1.png.meta b/Assets/Models/Sukh smiling 1.png.meta new file mode 100644 index 00000000..1120922b --- /dev/null +++ b/Assets/Models/Sukh smiling 1.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 01e261b469425204c9ebe9e039afcd80 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Sukh smiling.png b/Assets/Models/Sukh smiling.png new file mode 100644 index 00000000..532a3602 --- /dev/null +++ b/Assets/Models/Sukh smiling.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9afa50b0fd3e6c0a78a83fb39ec221f7458ac0fe8ea9e4aa17cf249496caefe8 +size 584046 diff --git a/Assets/Models/Sukh smiling.png.meta b/Assets/Models/Sukh smiling.png.meta new file mode 100644 index 00000000..c5f0176c --- /dev/null +++ b/Assets/Models/Sukh smiling.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 6511a3c43d452684aba1e66e3d807922 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Sukh_Popout.prefab b/Assets/Models/Sukh_Popout.prefab new file mode 100644 index 00000000..04246339 --- /dev/null +++ b/Assets/Models/Sukh_Popout.prefab @@ -0,0 +1,234 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &310586699106764023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8883634209604188560} + - component: {fileID: 9088498927663917392} + - component: {fileID: 2271659229868003281} + - component: {fileID: 6877483178220830612} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8883634209604188560 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 310586699106764023} + serializedVersion: 2 + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 0, y: 5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5157295638579192060} + m_Father: {fileID: 8727449846208723036} + m_LocalEulerAnglesHint: {x: 90, y: -90, z: 0} +--- !u!33 &9088498927663917392 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 310586699106764023} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2271659229868003281 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 310586699106764023} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 2257bb3f89246384eb19dc7451e85382, 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!64 &6877483178220830612 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 310586699106764023} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &7899737824327526239 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8727449846208723036} + - component: {fileID: 3435418152655107896} + m_Layer: 0 + m_Name: Sukh_Popout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8727449846208723036 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7899737824327526239} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3.18, z: 0} + m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8883634209604188560} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3435418152655107896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7899737824327526239} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c910448bdeecffe4e9acc471c8ef2f20, type: 3} + m_Name: + m_EditorClassIdentifier: + angle: 60 + speed: 1 + delay: 1 + axis: {x: 0, y: 0, z: 1} + halfPendulum: 0 +--- !u!1001 &5153034098846805510 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8883634209604188560} + m_Modifications: + - target: {fileID: 1237612601484384, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_Name + value: SM_Prop_Camp_Stick_01 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalScale.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalScale.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalPosition.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalRotation.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} +--- !u!4 &5157295638579192060 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, + type: 3} + m_PrefabInstance: {fileID: 5153034098846805510} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Models/Sukh_Popout.prefab.meta b/Assets/Models/Sukh_Popout.prefab.meta new file mode 100644 index 00000000..937015a9 --- /dev/null +++ b/Assets/Models/Sukh_Popout.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ac76457cd04ac5b4689edc7030286ed2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Pendulum.cs b/Assets/Pendulum.cs index 162a3e6d..ae109234 100644 --- a/Assets/Pendulum.cs +++ b/Assets/Pendulum.cs @@ -8,19 +8,64 @@ public class Pendulum : MonoBehaviour [SerializeField] private float speed = 1f; // Speed of rotation + [SerializeField] + private float delay = 1f; // Delay after each cycle + + [SerializeField] + private Vector3 axis = Vector3.forward; // Axis to pendulum on + + [SerializeField] + private bool halfPendulum = false; // Whether to perform a half pendulum + private float startTime; // Time when the rotation started + private float lastCycleEndTime; // Time when the last cycle ended + private bool forwardSwing = true; // Flag to indicate the direction of swing private void Start() { startTime = Time.time; + lastCycleEndTime = Time.time; } private void Update() { // Calculate the current angle based on time and speed - float currentAngle = angle * Mathf.Sin((Time.time - startTime) * speed); + float timeElapsed = Time.time - lastCycleEndTime; + if (timeElapsed >= delay) + { + float currentAngle; - // Set the rotation - transform.localRotation = Quaternion.Euler(0f, 0f, currentAngle); + if (halfPendulum) + { + if (forwardSwing) + { + currentAngle = Mathf.Lerp(0f, angle, (Time.time - startTime) * speed); + if (currentAngle >= angle) + { + forwardSwing = false; + startTime = Time.time; + } + } + else + { + currentAngle = Mathf.Lerp(angle, 0f, (Time.time - startTime) * speed); + if (currentAngle <= 0f) + { + forwardSwing = true; + startTime = Time.time; + } + } + } + else + { + currentAngle = angle * Mathf.Sin((Time.time - startTime) * speed); + } + + // Set the rotation + transform.localRotation = Quaternion.AngleAxis(currentAngle, axis); + + // Update last cycle end time + lastCycleEndTime = Time.time; + } } -} \ No newline at end of file +} diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index 9a1da4c9..f394bfd1 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -3155,6 +3155,89 @@ Mesh: offset: 0 size: 0 path: +--- !u!1001 &1000149159 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 405047630416331516, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: delay + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 782634506160621956, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_Name + value: Control_Room + objectReference: {fileID: 0} + - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.2994604 + objectReference: {fileID: 0} + - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.049999952 + objectReference: {fileID: 0} + - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.16421078 + objectReference: {fileID: 0} + - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3539279164478180134, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 1934901309} + - target: {fileID: 8581408676546642477, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 1934901309} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7fadbf24dc7c14173a60e008099ea15f, type: 3} --- !u!1 &1028760414 GameObject: m_ObjectHideFlags: 0 @@ -3523,6 +3606,74 @@ Transform: - {fileID: 1663162369} m_Father: {fileID: 434066458} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1362902061 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2336000411939469009, guid: bd905752459ccbe418b9a94f2d9c10ed, + type: 3} + propertyPath: m_Name + value: Mavrik_Fire-Boost + objectReference: {fileID: 0} + - target: {fileID: 8928648528601610473, guid: bd905752459ccbe418b9a94f2d9c10ed, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.932 + objectReference: {fileID: 0} + - target: {fileID: 8928648528601610473, guid: bd905752459ccbe418b9a94f2d9c10ed, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.003 + objectReference: {fileID: 0} + - target: {fileID: 8928648528601610473, guid: bd905752459ccbe418b9a94f2d9c10ed, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.369 + objectReference: {fileID: 0} + - target: {fileID: 8928648528601610473, guid: bd905752459ccbe418b9a94f2d9c10ed, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8928648528601610473, guid: bd905752459ccbe418b9a94f2d9c10ed, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8928648528601610473, guid: bd905752459ccbe418b9a94f2d9c10ed, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8928648528601610473, guid: bd905752459ccbe418b9a94f2d9c10ed, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8928648528601610473, guid: bd905752459ccbe418b9a94f2d9c10ed, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8928648528601610473, guid: bd905752459ccbe418b9a94f2d9c10ed, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8928648528601610473, guid: bd905752459ccbe418b9a94f2d9c10ed, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bd905752459ccbe418b9a94f2d9c10ed, type: 3} --- !u!1001 &1443243298 PrefabInstance: m_ObjectHideFlags: 0 @@ -4742,6 +4893,11 @@ PrefabInstance: propertyPath: m_Name value: Floor_Ramp objectReference: {fileID: 0} + - target: {fileID: 8425720233487652251, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4852,6 +5008,171 @@ Transform: - {fileID: 435890339} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &1934901309 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh-23068 + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 60 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 21 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0, z: 0.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200020001000300030001000400040001000500050001000600060001000700070001000800080001000900090001000a000a0001000b000b0001000c000c0001000d000d0001000e000e0001000f000f0001001000100001001100110001001200120001001300130001001400140001000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 21 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1008 + _typelessdata: 0000003f0000000000000000000000000000803f000000000000803f0000000000000000000080bf0000003f00000000000000000000000000000000000000000000803f000000000000803f0000000000000000000080bf00000000000000007078f33e0000000078371e3e000000000000803f000000000000803f0000000000000000000080bf7078f33e78371e3ebc1bcf3e000000001879963e000000000000803f000000000000803f0000000000000000000080bfbc1bcf3e1879963e1879963e00000000bc1bcf3e000000000000803f000000000000803f0000000000000000000080bf1879963ebc1bcf3e78371e3e000000007078f33e000000000000803f000000000000803f0000000000000000000080bf78371e3e7078f33e000000b3000000000000003f000000000000803f000000000000803f0000000000000000000080bf000000b30000003f78371ebe000000007078f33e000000000000803f000000000000803f0000000000000000000080bf78371ebe7078f33e177996be00000000bc1bcf3e000000000000803f000000000000803f0000000000000000000080bf177996bebc1bcf3ebe1bcfbe000000001879963e000000000000803f000000000000803f0000000000000000000080bfbe1bcfbe1879963e7078f3be000000007c371e3e000000000000803f000000000000803f0000000000000000000080bf7078f3be7c371e3e000000bf00000000000000b3000000000000803f000000000000803f0000000000000000000080bf000000bf000000b37178f3be0000000078371ebe000000000000803f000000000000803f0000000000000000000080bf7178f3be78371ebebe1bcfbe00000000167996be000000000000803f000000000000803f0000000000000000000080bfbe1bcfbe167996be1b7996be00000000ba1bcfbe000000000000803f000000000000803f0000000000000000000080bf1b7996beba1bcfbe7d371ebe000000007078f3be000000000000803f000000000000803f0000000000000000000080bf7d371ebe7078f3be0000000000000000000000bf000000000000803f000000000000803f0000000000000000000080bf00000000000000bf7e371e3e000000007078f3be000000000000803f000000000000803f0000000000000000000080bf7e371e3e7078f3be1479963e00000000bf1bcfbe000000000000803f000000000000803f0000000000000000000080bf1479963ebf1bcfbebc1bcf3e00000000197996be000000000000803f000000000000803f0000000000000000000080bfbc1bcf3e197996be7078f33e0000000078371ebe000000000000803f000000000000803f0000000000000000000080bf7078f33e78371ebe + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0, z: 0.5} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1963320164 PrefabInstance: m_ObjectHideFlags: 0 @@ -5286,6 +5607,139 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2107043980 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2271659229868003281, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 7f05e698744c43f49a4ff89578840e2c, type: 2} + - target: {fileID: 3435418152655107896, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: delay + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3435418152655107896, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: speed + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3435418152655107896, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: axis.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435418152655107896, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: axis.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435418152655107896, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: axis.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435418152655107896, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3435418152655107896, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: fullPendulum + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3435418152655107896, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: halfPendulum + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7899737824327526239, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_Name + value: Sukh_Popout + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalScale.x + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalScale.y + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalScale.z + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.038875 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.428 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.42107582 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8727449846208723036, guid: ac76457cd04ac5b4689edc7030286ed2, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ac76457cd04ac5b4689edc7030286ed2, type: 3} --- !u!1001 &2125672841 PrefabInstance: m_ObjectHideFlags: 0 @@ -6887,3 +7341,6 @@ SceneRoots: - {fileID: 1963320164} - {fileID: 1499509886} - {fileID: 1508137126} + - {fileID: 1000149159} + - {fileID: 1362902061} + - {fileID: 2107043980} From 76e38e91f0a3cb952c2fd129e82193afadd0e5bf Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Wed, 24 Apr 2024 08:49:06 -0400 Subject: [PATCH 2/7] Final fixes --- Assets/Models/Materials/Sukh smiling.mat | 2 +- Assets/Models/Sukh_Popout.prefab | 18 ++--- .../Props/SM_Prop_Camp_Stick_01.prefab | 81 +++++++++++-------- 3 files changed, 54 insertions(+), 47 deletions(-) diff --git a/Assets/Models/Materials/Sukh smiling.mat b/Assets/Models/Materials/Sukh smiling.mat index ed6b5402..644f2d58 100644 --- a/Assets/Models/Materials/Sukh smiling.mat +++ b/Assets/Models/Materials/Sukh smiling.mat @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6511a3c43d452684aba1e66e3d807922, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/Sukh_Popout.prefab b/Assets/Models/Sukh_Popout.prefab index 04246339..76767596 100644 --- a/Assets/Models/Sukh_Popout.prefab +++ b/Assets/Models/Sukh_Popout.prefab @@ -63,7 +63,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 2257bb3f89246384eb19dc7451e85382, type: 2} + - {fileID: 2100000, guid: 7f05e698744c43f49a4ff89578840e2c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -134,8 +134,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 3.18, z: 0} - m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 8883634209604188560} m_Father: {fileID: 0} @@ -154,9 +154,9 @@ MonoBehaviour: m_EditorClassIdentifier: angle: 60 speed: 1 - delay: 1 - axis: {x: 0, y: 0, z: 1} - halfPendulum: 0 + delay: 0 + axis: {x: 1, y: 0, z: 0} + halfPendulum: 1 --- !u!1001 &5153034098846805510 PrefabInstance: m_ObjectHideFlags: 0 @@ -169,10 +169,6 @@ PrefabInstance: propertyPath: m_Name value: SM_Prop_Camp_Stick_01 objectReference: {fileID: 0} - - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} propertyPath: m_LocalScale.y value: 1 @@ -191,7 +187,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} propertyPath: m_LocalPosition.z - value: 5 + value: 5.85 objectReference: {fileID: 0} - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/PolygonDungeonRealms/Prefabs/Props/SM_Prop_Camp_Stick_01.prefab b/Assets/PolygonDungeonRealms/Prefabs/Props/SM_Prop_Camp_Stick_01.prefab index 95c1bd3d..65786f48 100644 --- a/Assets/PolygonDungeonRealms/Prefabs/Props/SM_Prop_Camp_Stick_01.prefab +++ b/Assets/PolygonDungeonRealms/Prefabs/Props/SM_Prop_Camp_Stick_01.prefab @@ -1,22 +1,12 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1237612601484384} - m_IsPrefabParent: 1 --- !u!1 &1237612601484384 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 4824902004772602} - component: {fileID: 33985483330261082} @@ -31,29 +21,46 @@ GameObject: m_IsActive: 1 --- !u!4 &4824902004772602 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1237612601484384} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 12, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33985483330261082 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1237612601484384} + m_Mesh: {fileID: 4300000, guid: 10c94e22fa4f67e4d9b42edcae19358e, type: 3} --- !u!23 &23168214457156090 MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1237612601484384} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 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: 2a12d3fc0532ba64e972160db18dfd99, type: 2} m_StaticBatchInfo: @@ -63,9 +70,11 @@ MeshRenderer: 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 @@ -74,24 +83,26 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &33985483330261082 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1237612601484384} - m_Mesh: {fileID: 4300000, guid: 10c94e22fa4f67e4d9b42edcae19358e, type: 3} + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &64119236156671362 MeshCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1237612601484384} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 5 m_Convex: 1 - m_InflateMesh: 0 - m_SkinWidth: 0.01 + m_CookingOptions: 30 m_Mesh: {fileID: 43828786835275654, guid: 50da5137ba1355c41b61e06f0b9bb85f, type: 2} From 8e5ca9b24887ffc1bd19814014d8849a26e34bbd Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Wed, 24 Apr 2024 09:10:37 -0400 Subject: [PATCH 3/7] Fixed positioning --- Assets/MoveAndReturn.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Assets/MoveAndReturn.cs b/Assets/MoveAndReturn.cs index 2bb3eb16..9898062b 100644 --- a/Assets/MoveAndReturn.cs +++ b/Assets/MoveAndReturn.cs @@ -34,7 +34,7 @@ public class MoveAndReturn : MonoBehaviour private void Start() { // Save the starting position of the object - startingPosition = transform.position; + startingPosition = transform.localPosition; // Calculate the target position based on the selected axis and distance switch (axisOfMovement) @@ -53,7 +53,6 @@ public class MoveAndReturn : MonoBehaviour // Start the movement coroutine StartCoroutine(MoveObject()); } - private IEnumerator MoveObject() { while (true) @@ -61,19 +60,19 @@ public class MoveAndReturn : MonoBehaviour // Move the object towards the target position if (movingForward) { - transform.position = Vector3.MoveTowards(transform.position, targetPosition, speed * Time.deltaTime); + transform.localPosition = Vector3.MoveTowards(transform.localPosition, targetPosition, speed * Time.deltaTime); // If the object reaches the target position, start moving back - if (transform.position == targetPosition) + if (transform.localPosition == targetPosition) movingForward = false; } // Move the object back to the starting position else { - transform.position = Vector3.MoveTowards(transform.position, startingPosition, speed * Time.deltaTime); + transform.localPosition = Vector3.MoveTowards(transform.localPosition, startingPosition, speed * Time.deltaTime); // If the object reaches the starting position, start moving forward again - if (transform.position == startingPosition) + if (transform.localPosition == startingPosition) { movingForward = true; cyclesCompleted++; @@ -87,7 +86,6 @@ public class MoveAndReturn : MonoBehaviour } } } - yield return null; // Wait for the next frame } } From 8ecd1e87b2dae2fe1ff4cf7cee6ea4ef23f85a01 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Wed, 24 Apr 2024 10:14:41 -0400 Subject: [PATCH 4/7] Move fix --- .../AR Content Control Room 1.prefab | 756 +++++++++--------- Assets/Scenes/TestControls.unity | 5 - 2 files changed, 378 insertions(+), 383 deletions(-) diff --git a/Assets/CoursePrefabs/AR Content Control Room 1.prefab b/Assets/CoursePrefabs/AR Content Control Room 1.prefab index 05ecfb64..174c4916 100644 --- a/Assets/CoursePrefabs/AR Content Control Room 1.prefab +++ b/Assets/CoursePrefabs/AR Content Control Room 1.prefab @@ -13307,6 +13307,156 @@ Transform: - {fileID: 619122468177106150} m_Father: {fileID: 5181318039997983483} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2800647840443543790 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5181318039997983483} + m_Modifications: + - target: {fileID: 4039664652352384412, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 7366463133837555126, guid: 2824aa0800b69654295ec74b77c8222a, + type: 3} + - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalScale.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalScale.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalScale.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: speed + value: 1.08 + objectReference: {fileID: 0} + - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: distance + value: -0.75 + objectReference: {fileID: 0} + - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: direction.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: direction.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: direction.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: axisOfMovement + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_Name + value: Mavrik_Moving_Floor_LR (1) + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalScale.x + value: 0.6999998 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalScale.y + value: 0.6999999 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalScale.z + value: 0.7000001 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.7439993 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.959 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.39299896 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.00000006322028 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000006322028 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} +--- !u!4 &6442521909681895137 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + m_PrefabInstance: {fileID: 2800647840443543790} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3108445661666855738 PrefabInstance: m_ObjectHideFlags: 0 @@ -13441,6 +13591,110 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3108445661666855738} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3229336748351636352 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5181318039997983483} + m_Modifications: + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalScale.x + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalScale.y + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalScale.z + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.311 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalPosition.y + value: 5.278 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.717 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4698206158612809156, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_Name + value: Mavrik_Swinging_Axe + objectReference: {fileID: 0} + - target: {fileID: 7895031319030058801, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: speed + value: 2.6 + objectReference: {fileID: 0} + - target: {fileID: 8703011543340469622, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.017 + objectReference: {fileID: 0} + - target: {fileID: 8703011543340469622, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.043 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a0e1f1c1be235b5478c4a00cbd365f2d, type: 3} +--- !u!4 &3710454984554729387 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + m_PrefabInstance: {fileID: 3229336748351636352} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3803585050017437989 PrefabInstance: m_ObjectHideFlags: 0 @@ -13510,6 +13764,130 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3803585050017437989} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5042968137534028876 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5181318039997983483} + m_Modifications: + - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9496198 + objectReference: {fileID: 0} + - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.3098105 + objectReference: {fileID: 0} + - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.04499275 + objectReference: {fileID: 0} + - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.014678513 + objectReference: {fileID: 0} + - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 36.138 + objectReference: {fileID: 0} + - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 5.425 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalScale.x + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalScale.y + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalScale.z + value: 0.7499998 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.215 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.217 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.13699938 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.70550346 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70550376 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.04758807 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.047588278 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 82.282 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8425720233487652251, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + propertyPath: m_Name + value: Floor_Ramp (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c7d059a48bc21424f9abd65c5d24b322, type: 3} +--- !u!4 &1580601176419514833 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, + type: 3} + m_PrefabInstance: {fileID: 5042968137534028876} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6681219741601790740 PrefabInstance: m_ObjectHideFlags: 0 @@ -13807,381 +14185,3 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8114781224047550409} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2800647840443543790 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5181318039997983483} - m_Modifications: - - target: {fileID: 4039664652352384412, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 7366463133837555126, guid: 2824aa0800b69654295ec74b77c8222a, - type: 3} - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalScale.x - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalScale.y - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalScale.z - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: speed - value: 1.08 - objectReference: {fileID: 0} - - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: distance - value: -0.75 - objectReference: {fileID: 0} - - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: direction.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: direction.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: direction.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: axisOfMovement - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_Name - value: Mavrik_Moving_Floor_LR (1) - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalScale.x - value: 0.6999998 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalScale.y - value: 0.6999999 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalScale.z - value: 0.7000001 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.7439993 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.y - value: 2.959 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.39299896 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.00000006322028 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.00000006322028 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} ---- !u!4 &6442521909681895137 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - m_PrefabInstance: {fileID: 2800647840443543790} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3229336748351636352 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5181318039997983483} - m_Modifications: - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalScale.x - value: 0.6 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalScale.y - value: 0.6 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalScale.z - value: 0.6 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.311 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalPosition.y - value: 5.278 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalPosition.z - value: 2.717 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.70710677 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.70710677 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 4698206158612809156, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_Name - value: Mavrik_Swinging_Axe - objectReference: {fileID: 0} - - target: {fileID: 7895031319030058801, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: speed - value: 2.6 - objectReference: {fileID: 0} - - target: {fileID: 8703011543340469622, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.017 - objectReference: {fileID: 0} - - target: {fileID: 8703011543340469622, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.043 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0e1f1c1be235b5478c4a00cbd365f2d, type: 3} ---- !u!4 &3710454984554729387 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2282981482360933419, guid: a0e1f1c1be235b5478c4a00cbd365f2d, - type: 3} - m_PrefabInstance: {fileID: 3229336748351636352} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &5042968137534028876 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5181318039997983483} - m_Modifications: - - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.9496198 - objectReference: {fileID: 0} - - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.3098105 - objectReference: {fileID: 0} - - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.04499275 - objectReference: {fileID: 0} - - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.014678513 - objectReference: {fileID: 0} - - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 36.138 - objectReference: {fileID: 0} - - target: {fileID: 1121697351334692970, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 5.425 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalScale.x - value: 0.75 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalScale.y - value: 0.75 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalScale.z - value: 0.7499998 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.215 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.217 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.13699938 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.70550346 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.70550376 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.04758807 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalRotation.z - value: -0.047588278 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 82.282 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8425720233487652251, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - propertyPath: m_Name - value: Floor_Ramp (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c7d059a48bc21424f9abd65c5d24b322, type: 3} ---- !u!4 &1580601176419514833 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5770048628783089053, guid: c7d059a48bc21424f9abd65c5d24b322, - type: 3} - m_PrefabInstance: {fileID: 5042968137534028876} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index f394bfd1..48dd6351 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -3163,11 +3163,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 405047630416331516, guid: 7fadbf24dc7c14173a60e008099ea15f, - type: 3} - propertyPath: delay - value: 0 - objectReference: {fileID: 0} - target: {fileID: 782634506160621956, guid: 7fadbf24dc7c14173a60e008099ea15f, type: 3} propertyPath: m_Name From 8df3a210832b1556261cac1b266087a78ea01ac5 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Wed, 24 Apr 2024 10:36:08 -0400 Subject: [PATCH 5/7] Colider work --- .../AR Content Control Room 1.prefab | 12 +- Assets/MoveAndReturn.cs | 32 ++-- Assets/Obstacles/Mavrik_Swinging_Axe.prefab | 3 + Assets/Obstacles/Mavrik_Trap_Axe.prefab | 154 +++++++++++++----- Assets/Scenes/TestControls.unity | 96 ++++++++++- 5 files changed, 238 insertions(+), 59 deletions(-) diff --git a/Assets/CoursePrefabs/AR Content Control Room 1.prefab b/Assets/CoursePrefabs/AR Content Control Room 1.prefab index 174c4916..1c170973 100644 --- a/Assets/CoursePrefabs/AR Content Control Room 1.prefab +++ b/Assets/CoursePrefabs/AR Content Control Room 1.prefab @@ -13369,7 +13369,7 @@ PrefabInstance: - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} propertyPath: axisOfMovement - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} @@ -13669,11 +13669,21 @@ PrefabInstance: propertyPath: m_Name value: Mavrik_Swinging_Axe objectReference: {fileID: 0} + - target: {fileID: 7895031319030058801, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: delay + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7895031319030058801, guid: a0e1f1c1be235b5478c4a00cbd365f2d, type: 3} propertyPath: speed value: 2.6 objectReference: {fileID: 0} + - target: {fileID: 8656206106810088346, guid: a0e1f1c1be235b5478c4a00cbd365f2d, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8703011543340469622, guid: a0e1f1c1be235b5478c4a00cbd365f2d, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/MoveAndReturn.cs b/Assets/MoveAndReturn.cs index 9898062b..de34a8cc 100644 --- a/Assets/MoveAndReturn.cs +++ b/Assets/MoveAndReturn.cs @@ -7,7 +7,7 @@ public class MoveAndReturn : MonoBehaviour private float distance = 5f; // Distance to move along the selected axis [SerializeField] - private Axis axisOfMovement = Axis.X; // Axis of movement (default is X axis) + private Axis axisOfMovement = Axis.Right; // Axis of movement (default is X axis) [SerializeField] private float speed = 2f; // Speed of movement @@ -26,27 +26,27 @@ public class MoveAndReturn : MonoBehaviour // Enumeration for the axis of movement public enum Axis { - X, - Y, - Z + Right, + Up, + Forward } private void Start() { // Save the starting position of the object - startingPosition = transform.localPosition; + startingPosition = transform.position; // Calculate the target position based on the selected axis and distance switch (axisOfMovement) { - case Axis.X: - targetPosition = startingPosition + new Vector3(distance, 0, 0); + case Axis.Right: + targetPosition = startingPosition + (transform.right * distance); // new Vector3(distance, 0, 0); break; - case Axis.Y: - targetPosition = startingPosition + new Vector3(0, distance, 0); + case Axis.Up: + targetPosition = startingPosition + (transform.up * distance); // new Vector3(0, distance, 0); break; - case Axis.Z: - targetPosition = startingPosition + new Vector3(0, 0, distance); + case Axis.Forward: + targetPosition = startingPosition + (transform.forward * distance); // new Vector3(0, 0, distance); break; } @@ -60,19 +60,19 @@ public class MoveAndReturn : MonoBehaviour // Move the object towards the target position if (movingForward) { - transform.localPosition = Vector3.MoveTowards(transform.localPosition, targetPosition, speed * Time.deltaTime); + transform.position = Vector3.MoveTowards(transform.position, targetPosition, speed * Time.deltaTime); // If the object reaches the target position, start moving back - if (transform.localPosition == targetPosition) + if (transform.position == targetPosition) movingForward = false; } // Move the object back to the starting position else { - transform.localPosition = Vector3.MoveTowards(transform.localPosition, startingPosition, speed * Time.deltaTime); + transform.position = Vector3.MoveTowards(transform.position, startingPosition, speed * Time.deltaTime); // If the object reaches the starting position, start moving forward again - if (transform.localPosition == startingPosition) + if (transform.position == startingPosition) { movingForward = true; cyclesCompleted++; @@ -89,4 +89,4 @@ public class MoveAndReturn : MonoBehaviour yield return null; // Wait for the next frame } } -} +} \ No newline at end of file diff --git a/Assets/Obstacles/Mavrik_Swinging_Axe.prefab b/Assets/Obstacles/Mavrik_Swinging_Axe.prefab index e665a76f..ac7ac31f 100644 --- a/Assets/Obstacles/Mavrik_Swinging_Axe.prefab +++ b/Assets/Obstacles/Mavrik_Swinging_Axe.prefab @@ -111,8 +111,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c910448bdeecffe4e9acc471c8ef2f20, type: 3} m_Name: m_EditorClassIdentifier: + angle: 60 speed: 1 + delay: 1 axis: {x: 0, y: 0, z: 1} + halfPendulum: 0 --- !u!4 &8703011543340469622 stripped Transform: m_CorrespondingSourceObject: {fileID: 475890, guid: bbc2c53a30a8f5c4981c071296e51c5f, diff --git a/Assets/Obstacles/Mavrik_Trap_Axe.prefab b/Assets/Obstacles/Mavrik_Trap_Axe.prefab index bbfb6bc5..9fe20dab 100644 --- a/Assets/Obstacles/Mavrik_Trap_Axe.prefab +++ b/Assets/Obstacles/Mavrik_Trap_Axe.prefab @@ -3,9 +3,10 @@ --- !u!1 &149168 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 475890} - component: {fileID: 3340184} @@ -21,30 +22,47 @@ GameObject: m_IsActive: 1 --- !u!4 &475890 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 149168} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2780573314573648032} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3340184 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149168} + m_Mesh: {fileID: 4300000, guid: c1de42800dba83442959031eacb99495, type: 3} --- !u!23 &2337088 MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 149168} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 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: 42b64fdb315e3054ea757d8d1c4bcfa7, type: 2} m_StaticBatchInfo: @@ -54,6 +72,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -66,49 +85,102 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &3340184 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 149168} - m_Mesh: {fileID: 4300000, guid: c1de42800dba83442959031eacb99495, type: 3} ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 149168} - m_IsPrefabParent: 1 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &64509403232994950 MeshCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 149168} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 5 m_Convex: 1 - m_CookingOptions: 14 - m_SkinWidth: 0.01 + m_CookingOptions: 30 m_Mesh: {fileID: 43666171727871236, guid: 1f23a948b9701e14f8283dd058acb335, type: 2} --- !u!64 &64822207004734494 MeshCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 149168} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 5 m_Convex: 1 - m_CookingOptions: 14 - m_SkinWidth: 0.01 + m_CookingOptions: 30 + m_Mesh: {fileID: 43318415510654958, guid: 1f23a948b9701e14f8283dd058acb335, type: 2} +--- !u!1 &8747851545961597429 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2780573314573648032} + - component: {fileID: 4817125835886447843} + m_Layer: 0 + m_Name: Colider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2780573314573648032 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8747851545961597429} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.05, y: 1.05, z: 1.05} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 475890} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &4817125835886447843 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8747851545961597429} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 m_Mesh: {fileID: 43318415510654958, guid: 1f23a948b9701e14f8283dd058acb335, type: 2} diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index 48dd6351..5efb56a4 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -1809,6 +1809,60 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} +--- !u!1 &526003204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 526003205} + - component: {fileID: 526003206} + m_Layer: 0 + m_Name: Colider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &526003205 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 526003204} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.05, y: 1.05, z: 1.05} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 755149242} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &526003206 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 526003204} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 43318415510654958, guid: 1f23a948b9701e14f8283dd058acb335, type: 2} --- !u!1001 &536641696 PrefabInstance: m_ObjectHideFlags: 0 @@ -1981,6 +2035,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 735646270} m_PrefabAsset: {fileID: 0} +--- !u!4 &755149242 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1209360984555405499, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + m_PrefabInstance: {fileID: 1000149159} + m_PrefabAsset: {fileID: 0} --- !u!1 &765144257 GameObject: m_ObjectHideFlags: 0 @@ -3163,11 +3223,31 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 405047630416331516, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: delay + value: 0 + objectReference: {fileID: 0} - target: {fileID: 782634506160621956, guid: 7fadbf24dc7c14173a60e008099ea15f, type: 3} propertyPath: m_Name value: Control_Room objectReference: {fileID: 0} + - target: {fileID: 1165778770825774287, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_Convex + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1165778770825774287, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1166089377725675095, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, type: 3} propertyPath: m_LocalPosition.x @@ -3223,6 +3303,16 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1934901309} + - target: {fileID: 6448227419044837256, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: axisOfMovement + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6770967778482584083, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8581408676546642477, guid: 7fadbf24dc7c14173a60e008099ea15f, type: 3} propertyPath: m_Mesh @@ -3230,7 +3320,11 @@ PrefabInstance: objectReference: {fileID: 1934901309} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1209360984555405499, guid: 7fadbf24dc7c14173a60e008099ea15f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 526003205} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7fadbf24dc7c14173a60e008099ea15f, type: 3} --- !u!1 &1028760414 From 52e0c52421709b918ca8dba245b21cc50dd1a5f1 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Wed, 24 Apr 2024 10:38:22 -0400 Subject: [PATCH 6/7] Fixes --- Assets/Scenes/TestControls.unity | 91 +------------------------------- 1 file changed, 1 insertion(+), 90 deletions(-) diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index 5efb56a4..7fe97759 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -1809,60 +1809,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} ---- !u!1 &526003204 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 526003205} - - component: {fileID: 526003206} - m_Layer: 0 - m_Name: Colider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &526003205 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526003204} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.05, y: 1.05, z: 1.05} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 755149242} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &526003206 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526003204} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 43318415510654958, guid: 1f23a948b9701e14f8283dd058acb335, type: 2} --- !u!1001 &536641696 PrefabInstance: m_ObjectHideFlags: 0 @@ -2035,12 +1981,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 735646270} m_PrefabAsset: {fileID: 0} ---- !u!4 &755149242 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1209360984555405499, guid: 7fadbf24dc7c14173a60e008099ea15f, - type: 3} - m_PrefabInstance: {fileID: 1000149159} - m_PrefabAsset: {fileID: 0} --- !u!1 &765144257 GameObject: m_ObjectHideFlags: 0 @@ -3223,31 +3163,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 405047630416331516, guid: 7fadbf24dc7c14173a60e008099ea15f, - type: 3} - propertyPath: delay - value: 0 - objectReference: {fileID: 0} - target: {fileID: 782634506160621956, guid: 7fadbf24dc7c14173a60e008099ea15f, type: 3} propertyPath: m_Name value: Control_Room objectReference: {fileID: 0} - - target: {fileID: 1165778770825774287, guid: 7fadbf24dc7c14173a60e008099ea15f, - type: 3} - propertyPath: m_Convex - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1165778770825774287, guid: 7fadbf24dc7c14173a60e008099ea15f, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1166089377725675095, guid: 7fadbf24dc7c14173a60e008099ea15f, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3277065184914629628, guid: 7fadbf24dc7c14173a60e008099ea15f, type: 3} propertyPath: m_LocalPosition.x @@ -3303,11 +3223,6 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1934901309} - - target: {fileID: 6448227419044837256, guid: 7fadbf24dc7c14173a60e008099ea15f, - type: 3} - propertyPath: axisOfMovement - value: 1 - objectReference: {fileID: 0} - target: {fileID: 6770967778482584083, guid: 7fadbf24dc7c14173a60e008099ea15f, type: 3} propertyPath: m_Enabled @@ -3320,11 +3235,7 @@ PrefabInstance: objectReference: {fileID: 1934901309} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1209360984555405499, guid: 7fadbf24dc7c14173a60e008099ea15f, - type: 3} - insertIndex: -1 - addedObject: {fileID: 526003205} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7fadbf24dc7c14173a60e008099ea15f, type: 3} --- !u!1 &1028760414 From 88c73663797cd9e25c2bcc8aacdd543da8eaec07 Mon Sep 17 00:00:00 2001 From: Abraham Date: Wed, 24 Apr 2024 11:02:50 -0400 Subject: [PATCH 7/7] Added sounds and increased hit power --- Assets/GolfControls/BallHitController.cs | 11 +- Assets/GolfControls/StrokeCounter.cs | 32 +++- Assets/ParStrokeCountReached.asset | 16 ++ Assets/ParStrokeCountReached.asset.meta | 8 + Assets/Prefabs/GamePlay.prefab | 170 ++++++++++++++++++ Assets/Prefabs/GolfController.prefab | 5 +- Assets/Prefabs/Hole/Hole.prefab | 109 +++++++++++ Assets/Prefabs/TestGolfBall.prefab | 100 ++++++++++- Assets/Scripts/OnColliderTrigger.cs | 2 +- Assets/Sounds.meta | 8 + Assets/Sounds/downer_noise.mp3 | 3 + Assets/Sounds/downer_noise.mp3.meta | 23 +++ ...-fantasy-game-success-notification-270.wav | 3 + ...asy-game-success-notification-270.wav.meta | 23 +++ .../Sounds/mixkit-powerful-golf-shot-2126.wav | 3 + .../mixkit-powerful-golf-shot-2126.wav.meta | 23 +++ 16 files changed, 530 insertions(+), 9 deletions(-) create mode 100644 Assets/ParStrokeCountReached.asset create mode 100644 Assets/ParStrokeCountReached.asset.meta create mode 100644 Assets/Sounds.meta create mode 100644 Assets/Sounds/downer_noise.mp3 create mode 100644 Assets/Sounds/downer_noise.mp3.meta create mode 100644 Assets/Sounds/mixkit-fantasy-game-success-notification-270.wav create mode 100644 Assets/Sounds/mixkit-fantasy-game-success-notification-270.wav.meta create mode 100644 Assets/Sounds/mixkit-powerful-golf-shot-2126.wav create mode 100644 Assets/Sounds/mixkit-powerful-golf-shot-2126.wav.meta diff --git a/Assets/GolfControls/BallHitController.cs b/Assets/GolfControls/BallHitController.cs index 1d5421a3..d594008b 100644 --- a/Assets/GolfControls/BallHitController.cs +++ b/Assets/GolfControls/BallHitController.cs @@ -2,7 +2,7 @@ using System.Collections; using UnityAtoms.BaseAtoms; using UnityEngine; -namespace GolfControls +namespace MAVRIC.GEEKCup.GolfControls { public class BallHitController : MonoBehaviour { @@ -18,6 +18,10 @@ namespace GolfControls private Rigidbody body; + public AudioSource hitSoundSource; + + private float minVelocityMagnitude = 0.1f; + private void Start() { body = gameObject.GetComponent(); @@ -36,7 +40,9 @@ namespace GolfControls private void OnHit() { if(isMovingVariable.Value) return; - + if (body.velocity.magnitude >= minVelocityMagnitude) return; + + hitSoundSource.Play(); Vector3 hitVector = AngleVariable.Value.normalized * (PowerVariable.Value * baseForce); body.AddForce(hitVector); StartCoroutine(TrackState()); @@ -45,7 +51,6 @@ namespace GolfControls private IEnumerator TrackState() { - float minVelocityMagnitude = 0.1f; float ballStopTime = 1.0f; isMovingVariable.SetValue(true); diff --git a/Assets/GolfControls/StrokeCounter.cs b/Assets/GolfControls/StrokeCounter.cs index a9d8a2f9..5420c032 100644 --- a/Assets/GolfControls/StrokeCounter.cs +++ b/Assets/GolfControls/StrokeCounter.cs @@ -1,12 +1,29 @@ +using System; using UnityAtoms.BaseAtoms; using UnityEngine; -namespace GolfControls +namespace MAVRIC.GEEKCup.GolfControls { public class StrokeCounter : MonoBehaviour { public IntVariable StrokeVariable; - + + public BoolEvent IsIncrementedEvent; + public int ParStrokeCount = 5; + + public VoidEvent LossEvent; + + private void OnEnable() + { + IsIncrementedEvent.Register(OnStrokeCountIncremented); + } + + private void OnDisable() + { + IsIncrementedEvent.Unregister(OnStrokeCountIncremented); + } + + public void OnHit(bool isHit) { if (!isHit) @@ -16,5 +33,16 @@ namespace GolfControls StrokeVariable.SetValue(StrokeVariable.Value + 1); } + + + private void OnStrokeCountIncremented(bool ballStartedHit) + { + if (ballStartedHit) return; + + if (StrokeVariable.Value >= ParStrokeCount) + { + LossEvent.Raise(); + } + } } } diff --git a/Assets/ParStrokeCountReached.asset b/Assets/ParStrokeCountReached.asset new file mode 100644 index 00000000..b5aa3c23 --- /dev/null +++ b/Assets/ParStrokeCountReached.asset @@ -0,0 +1,16 @@ +%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: 04d35e2eb934747da9d77a3af62bb8ca, type: 3} + m_Name: ParStrokeCountReached + m_EditorClassIdentifier: + _developerDescription: + _replayBufferSize: 1 diff --git a/Assets/ParStrokeCountReached.asset.meta b/Assets/ParStrokeCountReached.asset.meta new file mode 100644 index 00000000..fbd5a9ff --- /dev/null +++ b/Assets/ParStrokeCountReached.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d75584e89af7e6488027b09813f11e6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GamePlay.prefab b/Assets/Prefabs/GamePlay.prefab index c85c055b..6d1ed032 100644 --- a/Assets/Prefabs/GamePlay.prefab +++ b/Assets/Prefabs/GamePlay.prefab @@ -34,6 +34,7 @@ Transform: - {fileID: 7529011191634243865} - {fileID: 2969644529280671742} - {fileID: 3631394724762200096} + - {fileID: 2734812901335878935} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3021524037178137395 @@ -82,6 +83,175 @@ Transform: m_Children: [] m_Father: {fileID: 1575695703629199926} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6950397858787610770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2734812901335878935} + - component: {fileID: 4860048457319323441} + - component: {fileID: 6337772897861031450} + m_Layer: 0 + m_Name: ParEvent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2734812901335878935 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6950397858787610770} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1575695703629199926} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &4860048457319323441 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6950397858787610770} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 454f6ff3e51d5fd44ab84bb27b326036, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.7 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &6337772897861031450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6950397858787610770} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2458933140c54c9db0aec7a69c1b617, type: 3} + m_Name: + m_EditorClassIdentifier: + _developerDescription: + _unityEventResponse: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4860048457319323441} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _actionResponses: [] + _conditions: [] + _operator: 0 + _replayEventBufferOnRegister: 1 + _eventReference: + _usage: 0 + _event: {fileID: 11400000, guid: 6d75584e89af7e6488027b09813f11e6, type: 2} + _eventInstancer: {fileID: 0} + _collection: {fileID: 0} + _list: {fileID: 0} + _collectionInstancer: {fileID: 0} + _listInstancer: {fileID: 0} --- !u!1001 &2420978955236610172 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/GolfController.prefab b/Assets/Prefabs/GolfController.prefab index 9f24a4a3..935b83fa 100644 --- a/Assets/Prefabs/GolfController.prefab +++ b/Assets/Prefabs/GolfController.prefab @@ -63,9 +63,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 594dbcb0ac6fee442ac8e47c96781542, type: 3} m_Name: m_EditorClassIdentifier: - ballMovingVariable: {fileID: 11400000, guid: 838a13f5fd312c94398e49cfc36e34ad, type: 2} StrokeVariable: {fileID: 11400000, guid: b17566f4d19813249a993793ac86d94c, type: 2} - HitEvent: {fileID: 11400000, guid: 90fa28c269919df41acdd37835ee3b9e, type: 2} + IsIncrementedEvent: {fileID: 11400000, guid: ec7d602226c7a4b4a9aeacaba953fc38, type: 2} + ParStrokeCount: 5 + LossEvent: {fileID: 11400000, guid: 6d75584e89af7e6488027b09813f11e6, type: 2} --- !u!114 &1229042045006618261 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Hole/Hole.prefab b/Assets/Prefabs/Hole/Hole.prefab index 5448406d..cdf0e1c2 100644 --- a/Assets/Prefabs/Hole/Hole.prefab +++ b/Assets/Prefabs/Hole/Hole.prefab @@ -82,6 +82,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1969549356574266556} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: Play + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 layerMask: serializedVersion: 2 m_Bits: 1 @@ -165,6 +177,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8649987843805268783} + - component: {fileID: 1969549356574266556} m_Layer: 7 m_Name: Hole m_TagString: Untagged @@ -192,6 +205,102 @@ Transform: - {fileID: 5490686123428067723} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1969549356574266556 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6121683813469744371} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 8db469e270c7311428e074fc0d1000c1, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.8 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &6783148664893773472 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/TestGolfBall.prefab b/Assets/Prefabs/TestGolfBall.prefab index 976154a4..e2d8ff45 100644 --- a/Assets/Prefabs/TestGolfBall.prefab +++ b/Assets/Prefabs/TestGolfBall.prefab @@ -17,6 +17,7 @@ GameObject: - component: {fileID: 2848465825052700219} - component: {fileID: 3220627860812539771} - component: {fileID: 3638049900979181177} + - component: {fileID: 1555587377596854050} m_Layer: 0 m_Name: TestGolfBall m_TagString: Player @@ -171,7 +172,8 @@ MonoBehaviour: PowerVariable: {fileID: 11400000, guid: b5aa4452d8d082d48b46495c7352e39e, type: 2} isMovingVariable: {fileID: 11400000, guid: 838a13f5fd312c94398e49cfc36e34ad, type: 2} inHoleVariable: {fileID: 11400000, guid: 3b0e06d0a76bceb4296c54d02f0d34a4, type: 2} - baseForce: 200 + baseForce: 400 + hitSoundSource: {fileID: 1555587377596854050} --- !u!114 &3220627860812539771 MonoBehaviour: m_ObjectHideFlags: 0 @@ -199,3 +201,99 @@ MonoBehaviour: _tags: - {fileID: 11400000, guid: 1f557d488f8464000b778362139a0045, type: 2} - {fileID: 0} +--- !u!82 &1555587377596854050 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 550417892748896529} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b76a30d1b47d7094aac2c87dbbe93da2, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Scripts/OnColliderTrigger.cs b/Assets/Scripts/OnColliderTrigger.cs index f36f0086..7ec7d3de 100644 --- a/Assets/Scripts/OnColliderTrigger.cs +++ b/Assets/Scripts/OnColliderTrigger.cs @@ -15,7 +15,7 @@ namespace MAVRIC.GEEKCup [SerializeField] private UnityEvent onTrigger; [SerializeField] private LayerMask layerMask = 1 >> 0; - [SerializeField] private List tagsMask = new (); + [SerializeField] private List tagsMask = new List(); private void OnTriggerEnter(Collider other) { diff --git a/Assets/Sounds.meta b/Assets/Sounds.meta new file mode 100644 index 00000000..8091d8a0 --- /dev/null +++ b/Assets/Sounds.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 971eae2805eb624438c84cf77a3ebfab +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/downer_noise.mp3 b/Assets/Sounds/downer_noise.mp3 new file mode 100644 index 00000000..c50606dd --- /dev/null +++ b/Assets/Sounds/downer_noise.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a73350e0daf24a8f886cbefd2080e54d00717c6359413f8fc0cc3613b15f28f +size 59603 diff --git a/Assets/Sounds/downer_noise.mp3.meta b/Assets/Sounds/downer_noise.mp3.meta new file mode 100644 index 00000000..d599a775 --- /dev/null +++ b/Assets/Sounds/downer_noise.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 454f6ff3e51d5fd44ab84bb27b326036 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/mixkit-fantasy-game-success-notification-270.wav b/Assets/Sounds/mixkit-fantasy-game-success-notification-270.wav new file mode 100644 index 00000000..da47ae7c --- /dev/null +++ b/Assets/Sounds/mixkit-fantasy-game-success-notification-270.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1403241fba1db6b31e464e99e8e6fd694950e30f8ba148e8ec8de7d38da2d85c +size 529930 diff --git a/Assets/Sounds/mixkit-fantasy-game-success-notification-270.wav.meta b/Assets/Sounds/mixkit-fantasy-game-success-notification-270.wav.meta new file mode 100644 index 00000000..1d56b0d8 --- /dev/null +++ b/Assets/Sounds/mixkit-fantasy-game-success-notification-270.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8db469e270c7311428e074fc0d1000c1 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/mixkit-powerful-golf-shot-2126.wav b/Assets/Sounds/mixkit-powerful-golf-shot-2126.wav new file mode 100644 index 00000000..25a5d82b --- /dev/null +++ b/Assets/Sounds/mixkit-powerful-golf-shot-2126.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13f9a8e8e0443c6b62c0bcacbc87d1e1d3147ceb1ed7efac1803853934a0536f +size 169946 diff --git a/Assets/Sounds/mixkit-powerful-golf-shot-2126.wav.meta b/Assets/Sounds/mixkit-powerful-golf-shot-2126.wav.meta new file mode 100644 index 00000000..454d1c4b --- /dev/null +++ b/Assets/Sounds/mixkit-powerful-golf-shot-2126.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b76a30d1b47d7094aac2c87dbbe93da2 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: