From d9fcffb5910b4cbfaa92f69aa7da643307a201e5 Mon Sep 17 00:00:00 2001 From: Jenny <jen333jjou@icloud.com> Date: Tue, 16 Mar 2021 00:52:10 +0000 Subject: [PATCH] resized archive, tagged talismans & new materials new materials for archive, talismans and feather, and tagged feather --- Assets/Materials/Candle.mat | 77 +++++ Assets/Materials/Candle.mat.meta | 8 + Assets/Materials/Crystal.mat | 77 +++++ Assets/Materials/Crystal.mat.meta | 8 + Assets/Materials/Feather.mat | 77 +++++ Assets/Materials/Feather.mat.meta | 8 + Assets/Materials/Flame.mat | 77 +++++ Assets/Materials/Flame.mat.meta | 8 + Assets/Materials/Scale.mat | 77 +++++ Assets/Materials/Scale.mat.meta | 8 + Assets/Materials/Tree.mat | 10 +- .../{Lure Variant.prefab => Feather.prefab} | 27 +- ...ariant.prefab.meta => Feather.prefab.meta} | 2 +- Assets/Prefabs/Guardian.prefab | 2 +- Assets/Scenes/Game/SampleScene.unity | 308 ++++++------------ Assets/Scripts/GuardianScript.cs | 4 +- ProjectSettings/TagManager.asset | 4 + 17 files changed, 565 insertions(+), 217 deletions(-) create mode 100644 Assets/Materials/Candle.mat create mode 100644 Assets/Materials/Candle.mat.meta create mode 100644 Assets/Materials/Crystal.mat create mode 100644 Assets/Materials/Crystal.mat.meta create mode 100644 Assets/Materials/Feather.mat create mode 100644 Assets/Materials/Feather.mat.meta create mode 100644 Assets/Materials/Flame.mat create mode 100644 Assets/Materials/Flame.mat.meta create mode 100644 Assets/Materials/Scale.mat create mode 100644 Assets/Materials/Scale.mat.meta rename Assets/Prefabs/{Lure Variant.prefab => Feather.prefab} (85%) rename Assets/Prefabs/{Lure Variant.prefab.meta => Feather.prefab.meta} (74%) diff --git a/Assets/Materials/Candle.mat b/Assets/Materials/Candle.mat new file mode 100644 index 0000000..9b58bc0 --- /dev/null +++ b/Assets/Materials/Candle.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Candle + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.76 + - _GlossyReflections: 1 + - _Metallic: 0.84 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 0.4898166, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Candle.mat.meta b/Assets/Materials/Candle.mat.meta new file mode 100644 index 0000000..241cd5e --- /dev/null +++ b/Assets/Materials/Candle.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: adc3188ac93b57c45b5df2fcd632fddb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Crystal.mat b/Assets/Materials/Crystal.mat new file mode 100644 index 0000000..8ff20d9 --- /dev/null +++ b/Assets/Materials/Crystal.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Crystal + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.76 + - _GlossyReflections: 1 + - _Metallic: 0.87 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.03773582, g: 0.9906208, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Crystal.mat.meta b/Assets/Materials/Crystal.mat.meta new file mode 100644 index 0000000..fbf727c --- /dev/null +++ b/Assets/Materials/Crystal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 119d4180f5b92514eba58c988a33405a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Feather.mat b/Assets/Materials/Feather.mat new file mode 100644 index 0000000..f029907 --- /dev/null +++ b/Assets/Materials/Feather.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Feather + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.15739918, g: 0, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0.09719514, b: 0.13397168, a: 1} diff --git a/Assets/Materials/Feather.mat.meta b/Assets/Materials/Feather.mat.meta new file mode 100644 index 0000000..12beb1b --- /dev/null +++ b/Assets/Materials/Feather.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b9e16ebf53ad764784f052174db8877 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Flame.mat b/Assets/Materials/Flame.mat new file mode 100644 index 0000000..cf58714 --- /dev/null +++ b/Assets/Materials/Flame.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Flame + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.86 + - _GlossyReflections: 1 + - _Metallic: 0.83 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Flame.mat.meta b/Assets/Materials/Flame.mat.meta new file mode 100644 index 0000000..dc509af --- /dev/null +++ b/Assets/Materials/Flame.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51d6124a5e0ca6846ad9ddf6ec657e56 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Scale.mat b/Assets/Materials/Scale.mat new file mode 100644 index 0000000..8a54bc7 --- /dev/null +++ b/Assets/Materials/Scale.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Scale + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _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} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.77 + - _GlossyReflections: 1 + - _Metallic: 0.81 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 0.5188679, b: 0.9930492, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Scale.mat.meta b/Assets/Materials/Scale.mat.meta new file mode 100644 index 0000000..c8bdb63 --- /dev/null +++ b/Assets/Materials/Scale.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf6e702817bc23045b388c73f1bbbc29 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Tree.mat b/Assets/Materials/Tree.mat index a07c60c..9861a8a 100644 --- a/Assets/Materials/Tree.mat +++ b/Assets/Materials/Tree.mat @@ -9,8 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Tree m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -61,7 +61,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.55 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -73,5 +73,5 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.6037736, g: 0.39917216, b: 0.17657529, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0.3584906, g: 0.23103002, b: 0.091313645, a: 1} + - _EmissionColor: {r: 0.0747688, g: 0.012696587, b: 0.012696587, a: 1} diff --git a/Assets/Prefabs/Lure Variant.prefab b/Assets/Prefabs/Feather.prefab similarity index 85% rename from Assets/Prefabs/Lure Variant.prefab rename to Assets/Prefabs/Feather.prefab index e5ce42d..5994333 100644 --- a/Assets/Prefabs/Lure Variant.prefab +++ b/Assets/Prefabs/Feather.prefab @@ -1,12 +1,27 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &845902791430020692 +--- !u!1001 &591521826293971567 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, + type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, + type: 3} + propertyPath: m_Size.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, + type: 3} + propertyPath: m_Size.z + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_RootOrder @@ -25,17 +40,17 @@ PrefabInstance: - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_LocalPosition.x - value: -4.41 + value: 22.55 objectReference: {fileID: 0} - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_LocalPosition.y - value: -1.5 + value: -1.6 objectReference: {fileID: 0} - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_LocalPosition.z - value: -2.169983 + value: 17.8 objectReference: {fileID: 0} - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} @@ -75,7 +90,7 @@ PrefabInstance: - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_Name - value: Lure + value: Feather objectReference: {fileID: 0} - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} @@ -85,7 +100,7 @@ PrefabInstance: - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_TagString - value: Lure + value: Feather objectReference: {fileID: 0} - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} diff --git a/Assets/Prefabs/Lure Variant.prefab.meta b/Assets/Prefabs/Feather.prefab.meta similarity index 74% rename from Assets/Prefabs/Lure Variant.prefab.meta rename to Assets/Prefabs/Feather.prefab.meta index 92a6ca5..d7c3e0a 100644 --- a/Assets/Prefabs/Lure Variant.prefab.meta +++ b/Assets/Prefabs/Feather.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8c3c6c3cc730f134490afc7ceb6d5eed +guid: 191e7f512cc777648a8866ec5318a7d8 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Guardian.prefab b/Assets/Prefabs/Guardian.prefab index 53d98e6..d059c35 100644 --- a/Assets/Prefabs/Guardian.prefab +++ b/Assets/Prefabs/Guardian.prefab @@ -205,7 +205,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2aab6ec0e81e97648b729f9f864e18cf, type: 3} m_Name: m_EditorClassIdentifier: - Lure: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, type: 3} + Lure: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} canFollow: 0 --- !u!195 &5625237100295792483 NavMeshAgent: diff --git a/Assets/Scenes/Game/SampleScene.unity b/Assets/Scenes/Game/SampleScene.unity index 115b5fa..4a6a723 100644 --- a/Assets/Scenes/Game/SampleScene.unity +++ b/Assets/Scenes/Game/SampleScene.unity @@ -498,7 +498,7 @@ PrefabInstance: - target: {fileID: 8635680084915852503, guid: 65f9f9ac109de58409903f4f955226de, type: 3} propertyPath: m_LocalPosition.x - value: 6.781006 + value: 18 objectReference: {fileID: 0} - target: {fileID: 8635680084915852503, guid: 65f9f9ac109de58409903f4f955226de, type: 3} @@ -663,12 +663,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 163319218} m_PrefabAsset: {fileID: 0} ---- !u!4 &180049451 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e, - type: 3} - m_PrefabInstance: {fileID: 2031757468} - m_PrefabAsset: {fileID: 0} --- !u!1 &180372360 GameObject: m_ObjectHideFlags: 0 @@ -700,7 +694,6 @@ Transform: - {fileID: 1719282225} - {fileID: 2100558566} - {fileID: 561595812} - - {fileID: 1122512875} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -840,17 +833,17 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: f9345dcbfea81854893a2aaccb47b1d0, type: 3} propertyPath: m_LocalScale.x - value: 5 + value: 2.7 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: f9345dcbfea81854893a2aaccb47b1d0, type: 3} propertyPath: m_LocalScale.y - value: 5 + value: 2.5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: f9345dcbfea81854893a2aaccb47b1d0, type: 3} propertyPath: m_LocalScale.z - value: 5 + value: 2.7 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: f9345dcbfea81854893a2aaccb47b1d0, type: 3} @@ -1229,12 +1222,6 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 83fa75ce84c722b489e0035c33c9e5f4, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9345dcbfea81854893a2aaccb47b1d0, type: 3} ---- !u!4 &223974232 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e, - type: 3} - m_PrefabInstance: {fileID: 585714761} - m_PrefabAsset: {fileID: 0} --- !u!1 &230960266 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6014503084441653313, guid: f9345dcbfea81854893a2aaccb47b1d0, @@ -1960,7 +1947,7 @@ PrefabInstance: - target: {fileID: 8635680084915852503, guid: 65f9f9ac109de58409903f4f955226de, type: 3} propertyPath: m_LocalPosition.x - value: -29.441528 + value: -43.5 objectReference: {fileID: 0} - target: {fileID: 8635680084915852503, guid: 65f9f9ac109de58409903f4f955226de, type: 3} @@ -2199,9 +2186,9 @@ Transform: m_PrefabAsset: {fileID: 0} --- !u!4 &561595812 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + m_CorrespondingSourceObject: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} - m_PrefabInstance: {fileID: 845902790878026743} + m_PrefabInstance: {fileID: 591521826817785804} m_PrefabAsset: {fileID: 0} --- !u!1 &585518296 stripped GameObject: @@ -2230,20 +2217,30 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1208018446} m_Modifications: + - target: {fileID: 162277290822840587, guid: d0440375075bf174fa364c0506ec807e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 51d6124a5e0ca6846ad9ddf6ec657e56, type: 2} - target: {fileID: 1487808829240919087, guid: d0440375075bf174fa364c0506ec807e, type: 3} propertyPath: m_Name - value: Lure Variant Variant (3) + value: Zealous Flame objectReference: {fileID: 0} - target: {fileID: 1487808829240919087, guid: d0440375075bf174fa364c0506ec807e, type: 3} propertyPath: m_TagString - value: Talisman + value: Flame + objectReference: {fileID: 0} + - target: {fileID: 3205671549770231390, guid: d0440375075bf174fa364c0506ec807e, + type: 3} + propertyPath: m_RootOrder + value: 2 objectReference: {fileID: 0} - target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e, type: 3} @@ -3047,6 +3044,12 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 2212009239438826721, guid: f9345dcbfea81854893a2aaccb47b1d0, type: 3} +--- !u!4 &847599689 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3205671549770231390, guid: d0440375075bf174fa364c0506ec807e, + type: 3} + m_PrefabInstance: {fileID: 2031757468} + m_PrefabAsset: {fileID: 0} --- !u!1 &849935925 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7356103720107474860, guid: 2342577add2bab844a55e25cc4fea601, @@ -3966,137 +3969,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1081587678} m_PrefabAsset: {fileID: 0} ---- !u!4 &1114040586 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e, - type: 3} - m_PrefabInstance: {fileID: 1581564273} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1122512874 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 180372361} - m_Modifications: - - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_Size.x - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_Size.y - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4332970355487493207, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_Size.z - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalScale.z - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalPosition.x - value: 7.27 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalPosition.y - value: -1.36 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalPosition.z - value: 26.93 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_Name - value: Candle (1) - objectReference: {fileID: 0} - - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_TagString - value: Candle - objectReference: {fileID: 0} - - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_NavMeshLayer - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_StaticEditorFlags - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 8374587950931898382, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: ae0bfd19e9a2b6043844b23723990014, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} ---- !u!4 &1122512875 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - type: 3} - m_PrefabInstance: {fileID: 1122512874} - m_PrefabAsset: {fileID: 0} --- !u!1 &1143309577 GameObject: m_ObjectHideFlags: 0 @@ -4178,9 +4050,9 @@ Transform: m_LocalPosition: {x: 1.7300415, y: 4.3106995, z: 5.9902344} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1114040586} - - {fileID: 223974232} - - {fileID: 180049451} + - {fileID: 847599689} + - {fileID: 1932044628} + - {fileID: 1816684102} m_Father: {fileID: 1152204772} m_RootOrder: 47 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4827,12 +4699,12 @@ PrefabInstance: - target: {fileID: 8635680084915852503, guid: 65f9f9ac109de58409903f4f955226de, type: 3} propertyPath: m_LocalPosition.y - value: 6 + value: 9 objectReference: {fileID: 0} - target: {fileID: 8635680084915852503, guid: 65f9f9ac109de58409903f4f955226de, type: 3} propertyPath: m_LocalPosition.z - value: -2.7908325 + value: -12.9 objectReference: {fileID: 0} - target: {fileID: 8635680084915852503, guid: 65f9f9ac109de58409903f4f955226de, type: 3} @@ -5170,20 +5042,30 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1208018446} m_Modifications: + - target: {fileID: 162277290822840587, guid: d0440375075bf174fa364c0506ec807e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: cf6e702817bc23045b388c73f1bbbc29, type: 2} - target: {fileID: 1487808829240919087, guid: d0440375075bf174fa364c0506ec807e, type: 3} propertyPath: m_Name - value: Lure Variant Variant (1) + value: Gem Scale objectReference: {fileID: 0} - target: {fileID: 1487808829240919087, guid: d0440375075bf174fa364c0506ec807e, type: 3} propertyPath: m_TagString - value: Talisman + value: Scale + objectReference: {fileID: 0} + - target: {fileID: 3205671549770231390, guid: d0440375075bf174fa364c0506ec807e, + type: 3} + propertyPath: m_RootOrder + value: 1 objectReference: {fileID: 0} - target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e, type: 3} @@ -5697,7 +5579,7 @@ PrefabInstance: - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_Name - value: Object (1) + value: Throwable Object objectReference: {fileID: 0} - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} @@ -5906,7 +5788,7 @@ PrefabInstance: - target: {fileID: 8635680084915852503, guid: 65f9f9ac109de58409903f4f955226de, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 14.49 objectReference: {fileID: 0} - target: {fileID: 8635680084915852503, guid: 65f9f9ac109de58409903f4f955226de, type: 3} @@ -6105,6 +5987,12 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -5495902117074765545, guid: f9345dcbfea81854893a2aaccb47b1d0, type: 3} +--- !u!4 &1816684102 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3205671549770231390, guid: d0440375075bf174fa364c0506ec807e, + type: 3} + m_PrefabInstance: {fileID: 585714761} + m_PrefabAsset: {fileID: 0} --- !u!1 &1869055325 GameObject: m_ObjectHideFlags: 0 @@ -6161,6 +6049,12 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -153830957423991239, guid: f9345dcbfea81854893a2aaccb47b1d0, type: 3} +--- !u!4 &1932044628 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3205671549770231390, guid: d0440375075bf174fa364c0506ec807e, + type: 3} + m_PrefabInstance: {fileID: 1581564273} + m_PrefabAsset: {fileID: 0} --- !u!1 &1975519961 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2800250516343163423, guid: f9345dcbfea81854893a2aaccb47b1d0, @@ -6227,20 +6121,25 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1208018446} m_Modifications: + - target: {fileID: 162277290822840587, guid: d0440375075bf174fa364c0506ec807e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 119d4180f5b92514eba58c988a33405a, type: 2} - target: {fileID: 1487808829240919087, guid: d0440375075bf174fa364c0506ec807e, type: 3} propertyPath: m_Name - value: Lure Variant Variant + value: Soul Crystal objectReference: {fileID: 0} - target: {fileID: 1487808829240919087, guid: d0440375075bf174fa364c0506ec807e, type: 3} propertyPath: m_TagString - value: Talisman + value: Crystal objectReference: {fileID: 0} - target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4578310890621295775, guid: d0440375075bf174fa364c0506ec807e, type: 3} @@ -6672,17 +6571,17 @@ PrefabInstance: - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_LocalPosition.x - value: 10.32 + value: 4.16 objectReference: {fileID: 0} - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_LocalPosition.y - value: 11.37 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_LocalPosition.z - value: 105.11 + value: 98.23 objectReference: {fileID: 0} - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} @@ -6722,7 +6621,7 @@ PrefabInstance: - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} propertyPath: m_Name - value: Candle + value: Eternal Candle objectReference: {fileID: 0} - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} @@ -6748,7 +6647,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: ae0bfd19e9a2b6043844b23723990014, type: 2} + objectReference: {fileID: 2100000, guid: adc3188ac93b57c45b5df2fcd632fddb, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3ab706ba2b13d7d4094e770592e5c61e, type: 3} --- !u!4 &2100558566 stripped @@ -6940,90 +6839,85 @@ Mesh: offset: 0 size: 0 path: ---- !u!1001 &845902790878026743 +--- !u!1001 &591521826817785804 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 180372361} m_Modifications: - - target: {fileID: 4007233416600998403, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, - type: 3} - propertyPath: m_Size.x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4007233416600998403, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, - type: 3} - propertyPath: m_Size.y - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4007233416600998403, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, - type: 3} - propertyPath: m_Size.z - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_LocalPosition.x value: 22.55 objectReference: {fileID: 0} - - target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_LocalPosition.y value: -1.6 objectReference: {fileID: 0} - - target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_LocalPosition.z value: 17.8 objectReference: {fileID: 0} - - target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7593217598490057598, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, + - target: {fileID: 7703484953948356421, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} propertyPath: m_Name - value: Lure + value: Feather objectReference: {fileID: 0} + - target: {fileID: 7703484953948356421, guid: 191e7f512cc777648a8866ec5318a7d8, + type: 3} + propertyPath: m_TagString + value: Feather + objectReference: {fileID: 0} + - target: {fileID: 8938803762398202465, guid: 191e7f512cc777648a8866ec5318a7d8, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9b9e16ebf53ad764784f052174db8877, type: 2} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3} --- !u!1001 &1331997589048256817 PrefabInstance: m_ObjectHideFlags: 0 @@ -7056,11 +6950,21 @@ PrefabInstance: propertyPath: locator value: objectReference: {fileID: 0} + - target: {fileID: 1331997591070191852, guid: 2342577add2bab844a55e25cc4fea601, + type: 3} + propertyPath: glideDown + value: 0.05 + objectReference: {fileID: 0} - target: {fileID: 1331997591070191852, guid: 2342577add2bab844a55e25cc4fea601, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 1331997591070191852, guid: 2342577add2bab844a55e25cc4fea601, + type: 3} + propertyPath: glideForward + value: 100 + objectReference: {fileID: 0} - target: {fileID: 1331997591070191853, guid: 2342577add2bab844a55e25cc4fea601, type: 3} propertyPath: m_Name diff --git a/Assets/Scripts/GuardianScript.cs b/Assets/Scripts/GuardianScript.cs index 031bc86..79bdd88 100644 --- a/Assets/Scripts/GuardianScript.cs +++ b/Assets/Scripts/GuardianScript.cs @@ -13,7 +13,7 @@ public class GuardianScript : MonoBehaviour { if (canFollow) { - Lure = GameObject.FindGameObjectWithTag("Lure").transform; + Lure = GameObject.FindGameObjectWithTag("Feather").transform; agent = GetComponent<NavMeshAgent>(); agent.SetDestination(Lure.position); @@ -40,7 +40,7 @@ public class GuardianScript : MonoBehaviour private void OnTriggerEnter(Collider other) { - if (other.gameObject.tag == "Lure") + if (other.gameObject.tag == "Feather") { canFollow = true; } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index c9d5e12..5d96550 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,6 +13,10 @@ TagManager: - Lure - Cave - Candle + - Scale + - Flame + - Crystal + - Feather layers: - Default - TransparentFX -- GitLab