Skip to content
Snippets Groups Projects
Commit d9fcffb5 authored by Jenny's avatar Jenny
Browse files

resized archive, tagged talismans & new materials

new materials for archive, talismans and feather, and tagged feather
parent 7c7f49dc
No related branches found
No related tags found
No related merge requests found
Showing
with 565 additions and 217 deletions
%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}
fileFormatVersion: 2
guid: adc3188ac93b57c45b5df2fcd632fddb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
%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}
fileFormatVersion: 2
guid: 119d4180f5b92514eba58c988a33405a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
%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}
fileFormatVersion: 2
guid: 9b9e16ebf53ad764784f052174db8877
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
%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}
fileFormatVersion: 2
guid: 51d6124a5e0ca6846ad9ddf6ec657e56
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
%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}
fileFormatVersion: 2
guid: cf6e702817bc23045b388c73f1bbbc29
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
...@@ -9,8 +9,8 @@ Material: ...@@ -9,8 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Tree m_Name: Tree
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: m_ShaderKeywords: _EMISSION
m_LightmapFlags: 4 m_LightmapFlags: 2
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
...@@ -61,7 +61,7 @@ Material: ...@@ -61,7 +61,7 @@ Material:
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _DstBlend: 0 - _DstBlend: 0
- _GlossMapScale: 1 - _GlossMapScale: 1
- _Glossiness: 0.5 - _Glossiness: 0.55
- _GlossyReflections: 1 - _GlossyReflections: 1
- _Metallic: 0 - _Metallic: 0
- _Mode: 0 - _Mode: 0
...@@ -73,5 +73,5 @@ Material: ...@@ -73,5 +73,5 @@ Material:
- _UVSec: 0 - _UVSec: 0
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _Color: {r: 0.6037736, g: 0.39917216, b: 0.17657529, a: 1} - _Color: {r: 0.3584906, g: 0.23103002, b: 0.091313645, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0.0747688, g: 0.012696587, b: 0.012696587, a: 1}
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1001 &845902791430020692 --- !u!1001 &591521826293971567
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: 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, - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
...@@ -25,17 +40,17 @@ PrefabInstance: ...@@ -25,17 +40,17 @@ PrefabInstance:
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -4.41 value: 22.55
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -1.5 value: -1.6
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -2.169983 value: 17.8
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e, - target: {fileID: 5328154696141807002, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3} type: 3}
...@@ -75,7 +90,7 @@ PrefabInstance: ...@@ -75,7 +90,7 @@ PrefabInstance:
- target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Lure value: Feather
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3} type: 3}
...@@ -85,7 +100,7 @@ PrefabInstance: ...@@ -85,7 +100,7 @@ PrefabInstance:
- target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3} type: 3}
propertyPath: m_TagString propertyPath: m_TagString
value: Lure value: Feather
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e, - target: {fileID: 7124069227720082730, guid: 3ab706ba2b13d7d4094e770592e5c61e,
type: 3} type: 3}
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 8c3c6c3cc730f134490afc7ceb6d5eed guid: 191e7f512cc777648a8866ec5318a7d8
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:
......
...@@ -205,7 +205,7 @@ MonoBehaviour: ...@@ -205,7 +205,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2aab6ec0e81e97648b729f9f864e18cf, type: 3} m_Script: {fileID: 11500000, guid: 2aab6ec0e81e97648b729f9f864e18cf, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Lure: {fileID: 4777237749162705870, guid: 8c3c6c3cc730f134490afc7ceb6d5eed, type: 3} Lure: {fileID: 4739169447874979829, guid: 191e7f512cc777648a8866ec5318a7d8, type: 3}
canFollow: 0 canFollow: 0
--- !u!195 &5625237100295792483 --- !u!195 &5625237100295792483
NavMeshAgent: NavMeshAgent:
......
This diff is collapsed.
...@@ -13,7 +13,7 @@ public class GuardianScript : MonoBehaviour ...@@ -13,7 +13,7 @@ public class GuardianScript : MonoBehaviour
{ {
if (canFollow) if (canFollow)
{ {
Lure = GameObject.FindGameObjectWithTag("Lure").transform; Lure = GameObject.FindGameObjectWithTag("Feather").transform;
agent = GetComponent<NavMeshAgent>(); agent = GetComponent<NavMeshAgent>();
agent.SetDestination(Lure.position); agent.SetDestination(Lure.position);
...@@ -40,7 +40,7 @@ public class GuardianScript : MonoBehaviour ...@@ -40,7 +40,7 @@ public class GuardianScript : MonoBehaviour
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
if (other.gameObject.tag == "Lure") if (other.gameObject.tag == "Feather")
{ {
canFollow = true; canFollow = true;
} }
......
...@@ -13,6 +13,10 @@ TagManager: ...@@ -13,6 +13,10 @@ TagManager:
- Lure - Lure
- Cave - Cave
- Candle - Candle
- Scale
- Flame
- Crystal
- Feather
layers: layers:
- Default - Default
- TransparentFX - TransparentFX
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment