Merge branch 'main' of https://github.com/bertibertig/lost-in-the-woods

bertibertig · Jan 16, 2022 · 96bcfd6 · 96bcfd6
2 parents b0291ed + 429ff6d
commit 96bcfd6
Show file tree

Hide file tree

Showing 10 changed files with 28,942 additions and 108 deletions.
diff --git a/Unity-Project/Lost In The Woods/Assets/Prefabs/Player.prefab b/Unity-Project/Lost In The Woods/Assets/Prefabs/Player.prefab
@@ -939,7 +939,7 @@ MonoBehaviour:
   - {fileID: 8300000, guid: aac0fc3b99414f443bfba6d3d8942b7b, type: 3}
   - {fileID: 8300000, guid: e614552c7c8493742bf76b514efcecc6, type: 3}
   footstepDurationWalk: 0.75
-  footstepDurationRun: 0.3
+  footstepDurationRun: 0.5
 --- !u!136 &3058346755462520740
 CapsuleCollider:
   m_ObjectHideFlags: 0

diff --git a/Unity-Project/Lost In The Woods/Assets/Scenes/Forest 1.unity b/Unity-Project/Lost In The Woods/Assets/Scenes/Forest 1.unity
diff --git a/Unity-Project/Lost In The Woods/Assets/Scenes/Forest 1.unity.meta b/Unity-Project/Lost In The Woods/Assets/Scenes/Forest 1.unity.meta
diff --git a/Unity-Project/Lost In The Woods/Assets/Scenes/Forest/Materials.meta b/Unity-Project/Lost In The Woods/Assets/Scenes/Forest/Materials.meta
diff --git a/Unity-Project/Lost In The Woods/Assets/Scenes/Forest/Materials/ReflectionProbe-0.mat b/Unity-Project/Lost In The Woods/Assets/Scenes/Forest/Materials/ReflectionProbe-0.mat
@@ -0,0 +1,32 @@
+%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: ReflectionProbe-0
+  m_Shader: {fileID: 103, 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:
+    - _Tex:
+        m_Texture: {fileID: 8900000, guid: 730b526d10dd87e4c87e258c5c1233ba, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Exposure: 1
+    - _Rotation: 0
+    m_Colors:
+    - _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
+  m_BuildTextureStacks: []
diff --git a/Unity-Project/Lost In The Woods/Assets/Scenes/Forest/Materials/ReflectionProbe-0.mat.meta b/Unity-Project/Lost In The Woods/Assets/Scenes/Forest/Materials/ReflectionProbe-0.mat.meta
diff --git a/Unity-Project/Lost In The Woods/Assets/Scenes/Office.unity b/Unity-Project/Lost In The Woods/Assets/Scenes/Office.unity
@@ -2904,7 +2904,7 @@ Transform:
   m_Children:
   - {fileID: 670630329}
   m_Father: {fileID: 803875686}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
 --- !u!23 &529011393
 MeshRenderer:
@@ -5168,7 +5168,6 @@ Transform:
   - {fileID: 439350170}
   - {fileID: 943102597}
   - {fileID: 994869145}
-  - {fileID: 2083542528}
   - {fileID: 529011392}
   - {fileID: 1320510108}
   m_Father: {fileID: 0}
@@ -8661,7 +8660,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 803875686}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1320510109
 BoxCollider:
@@ -12535,103 +12534,6 @@ MonoBehaviour:
   ringTelephoneAudio: {fileID: 932553342}
   pickUpTelephoneAudio: {fileID: 283740064}
   hangUpTelephoneAudio: {fileID: 1746220550}
---- !u!1 &2083542527
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2083542528}
-  - component: {fileID: 2083542531}
-  - component: {fileID: 2083542530}
-  - component: {fileID: 2083542529}
-  m_Layer: 0
-  m_Name: Side Table
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2083542528
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2083542527}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 3.993, y: 0.25, z: 0}
-  m_LocalScale: {x: 0.3, y: 0.5, z: 0.3}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 803875686}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &2083542529
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2083542527}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &2083542530
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2083542527}
-  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: 2aeecd873a2d7a340ae3ae9635421bba, 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!33 &2083542531
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2083542527}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &2084999571
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Unity-Project/Lost In The Woods/Assets/Scripts/Movements/PlayerMovementController.cs b/Unity-Project/Lost In The Woods/Assets/Scripts/Movements/PlayerMovementController.cs
@@ -41,7 +41,7 @@ void Update()
             }
             else if (currStamina < maxStamina)
             {
-                if (staminaRegenTime >= 3f)
+                if (staminaRegenTime >= 1.5f)
                 {
                     currStamina = Mathf.Clamp(currStamina + (Time.deltaTime), 0.0f, maxStamina);
                 }

diff --git a/Unity-Project/Lost In The Woods/Assets/Terains/ForestTerrain.asset b/Unity-Project/Lost In The Woods/Assets/Terains/ForestTerrain.asset
diff --git a/Unity-Project/Lost In The Woods/UserSettings/EditorUserSettings.asset b/Unity-Project/Lost In The Woods/UserSettings/EditorUserSettings.asset
@@ -9,29 +9,32 @@ EditorUserSettings:
       value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 0601515050065d59545a5d2413730b4446154b2c297d73697e7b4835e4b2353c
+      value: 5100515153540d0f5a0f5f2611720944404e1e7929717567787d4564b1b16c6f
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5100515153540d0f5a0f5f2611720944404e1e7929717567787d4564b1b16c6f
+      value: 07035504560308095b5c5f7b4427084444154b7e2a2977677b2b1f63b5b9653d
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 07035504560308095b5c5f7b4427084444154b7e2a2977677b2b1f63b5b9653d
+      value: 060551075c005a5f5c5c547113705b44434f1b79747d24677c2f4f64e0e26d3d
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 060551075c005a5f5c5c547113705b44434f1b79747d24677c2f4f64e0e26d3d
+      value: 01010250070c5d0b580d0d701671594417161d732e297e6375281b31bbb86060
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 01010250070c5d0b580d0d701671594417161d732e297e6375281b31bbb86060
+      value: 5303515751575b0c545a5d2644705a44434f197b7f2c73357f2a4f60e7b3663b
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 5303515751575b0c545a5d2644705a44434f197b7f2c73357f2a4f60e7b3663b
+      value: 0601515050065d59545a5d2413730b4446154b2c297d73697e7b4835e4b2353c
       flags: 0
     RecentlyUsedSceneGuid-7:
       value: 550900055406500e5f5c557411260c4444164878747f246879714560b6e36639
       flags: 0
     RecentlyUsedSceneGuid-8:
       value: 5455510451535e080e56547344755a44474e497a7f707f332f7d1b62b4b0353a
       flags: 0
+    RecentlyUsedSceneGuid-9:
+      value: 02000d555d045c0a540c5c20167b094444164c2b7c7971697f7b1e67b2b5676e
+      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0