diff --git a/Assets/Materials/Camera.mat b/Assets/Materials/Camera.mat index 1655366..b702f61 100644 --- a/Assets/Materials/Camera.mat +++ b/Assets/Materials/Camera.mat @@ -1,82 +1,82 @@ -%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: Camera - m_Shader: {fileID: 4800000, guid: 37e8fe914eb083bf39337914a4c653c7, type: 3} - 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} - - _SpecGlossMap: - 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 - - _Fear: 78.60997 - - _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: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} +%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: Camera + m_Shader: {fileID: 4800000, guid: 37e8fe914eb083bf39337914a4c653c7, type: 3} + 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} + - _SpecGlossMap: + 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 + - _Fear: 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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Prefabs/Bear.prefab b/Assets/Prefabs/Bear.prefab index 9224fbe..2fbc212 100644 --- a/Assets/Prefabs/Bear.prefab +++ b/Assets/Prefabs/Bear.prefab @@ -49,6 +49,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 2223390718947501156, guid: 79a628cb0ecc5f640a7684166b7c5982, type: 3} + tent: {fileID: 0} SPEED: 2 --- !u!95 &3032578390488017068 Animator: @@ -105,7 +106,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 10 m_Sprite: {fileID: 21300018, guid: 7367abc9314f02528a112bb4586f0c53, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Prefabs/Ogre.prefab b/Assets/Prefabs/Ogre.prefab index 97721d2..2f47c13 100644 --- a/Assets/Prefabs/Ogre.prefab +++ b/Assets/Prefabs/Ogre.prefab @@ -137,7 +137,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 10 m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index de08ba6..17e1d8c 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -455,7 +455,7 @@ Transform: - {fileID: 2223390718170923181} - {fileID: 2223390719228040257} - {fileID: 2223390719495031762} - - {fileID: 2223390718739837544} + - {fileID: 2525450066361860578} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -514,7 +514,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 10 m_Sprite: {fileID: 21300018, guid: ca4aa4beab2b270ad9425446e51add7a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -726,7 +726,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9760a960b14e61496abdf232e0dbb92d, type: 3} m_Name: m_EditorClassIdentifier: - torch: {fileID: 2223390718739837557} + torch: {fileID: 2525450066361860576} --- !u!1 &2223390719071578195 GameObject: m_ObjectHideFlags: 0 @@ -6381,13 +6381,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, type: 3} ---- !u!1 &2223390718739837557 stripped +--- !u!1 &2525450066361860576 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4456067053918303187, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, type: 3} m_PrefabInstance: {fileID: 2223390718739837491} m_PrefabAsset: {fileID: 0} ---- !u!4 &2223390718739837544 stripped +--- !u!4 &2525450066361860578 stripped Transform: m_CorrespondingSourceObject: {fileID: 4456067053918303185, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, type: 3} diff --git a/Assets/Prefabs/Tent.prefab b/Assets/Prefabs/Tent.prefab index ee42d1f..b3d50e6 100644 --- a/Assets/Prefabs/Tent.prefab +++ b/Assets/Prefabs/Tent.prefab @@ -70,7 +70,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: 05509fb73569bdd44ad22442187d22e7, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Prefabs/Wall.prefab b/Assets/Prefabs/Wall.prefab index 2dd9779..e3a9a9e 100644 --- a/Assets/Prefabs/Wall.prefab +++ b/Assets/Prefabs/Wall.prefab @@ -69,7 +69,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 10 m_Sprite: {fileID: 21300000, guid: da2954c64a539bb4e82e628d2bc6d2f9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Prefabs/tree.prefab b/Assets/Prefabs/tree.prefab index 661cb2d..dcdceb0 100644 --- a/Assets/Prefabs/tree.prefab +++ b/Assets/Prefabs/tree.prefab @@ -71,7 +71,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 20 m_Sprite: {fileID: 21300000, guid: a20571ec8a430b03cbeed46936051dac, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Scenes/GameOverScene.unity b/Assets/Scenes/GameOverScene.unity index 5009cfc..a930cdc 100644 --- a/Assets/Scenes/GameOverScene.unity +++ b/Assets/Scenes/GameOverScene.unity @@ -399,11 +399,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 39867f1c62643b72b8a0ec97abf75766, type: 3} - m_FontSize: 80 + m_FontSize: 90 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 80 + m_MaxSize: 90 m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/Assets/Scenes/MainMenuScene.unity b/Assets/Scenes/MainMenuScene.unity index cdfd1dc..3d155b8 100644 --- a/Assets/Scenes/MainMenuScene.unity +++ b/Assets/Scenes/MainMenuScene.unity @@ -177094,11 +177094,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 39867f1c62643b72b8a0ec97abf75766, type: 3} - m_FontSize: 80 + m_FontSize: 90 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 80 + m_MaxSize: 90 m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 2fe7c8a..2402514 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -5265,7 +5265,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 0 m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -11615,7 +11615,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 10 m_Sprite: {fileID: 21300018, guid: ca4aa4beab2b270ad9425446e51add7a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -12223,51 +12223,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4456067053799440004, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, - type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4456067053799440004, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, - type: 3} - propertyPath: m_LocalScale.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4456067053799440004, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4456067052523149905, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, - type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4456067052523149905, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, - type: 3} - propertyPath: m_LocalScale.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4456067052523149905, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4456067052643620033, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, - type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4456067052643620033, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, - type: 3} - propertyPath: m_LocalScale.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4456067052643620033, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4456067053869943926, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, type: 3} propertyPath: m_Range @@ -12318,6 +12273,51 @@ PrefabInstance: propertyPath: m_SpotAngle value: 179 objectReference: {fileID: 0} + - target: {fileID: 4456067053799440004, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, + type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4456067053799440004, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, + type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4456067053799440004, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4456067052523149905, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, + type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4456067052523149905, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, + type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4456067052523149905, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4456067052643620033, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, + type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4456067052643620033, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, + type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4456067052643620033, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4456067053918303198, guid: 5e1cf6fcd61c8af3e8d2800c824bdbf0, type: 3} propertyPath: m_Mass