Fixed mountain rendering issue and clipping through camera/ margo. Ad…

…ded interactivity to the food objects in tent - Removed young adults from each day scene
fielddaylab · Jan 16, 2025 · 019acc4 · 019acc4
1 parent 60600a0
commit 019acc4
Show file tree

Hide file tree

Showing 46 changed files with 3,885 additions and 2,065 deletions.
diff --git a/Assets/Scenes/ExteriorScene.unity b/Assets/Scenes/ExteriorScene.unity
diff --git a/Assets/Scenes/ExteriorScene_Logic.unity b/Assets/Scenes/ExteriorScene_Logic.unity
@@ -893,6 +893,18 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -290
       objectReference: {fileID: 0}
+    - target: {fileID: 2000959550618446934, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
+      propertyPath: m_Drag
+      value: 70
+      objectReference: {fileID: 0}
+    - target: {fileID: 2000959550618446934, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
+      propertyPath: m_Mass
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2000959550618446934, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
+      propertyPath: m_AngularDrag
+      value: 70
+      objectReference: {fileID: 0}
     - target: {fileID: 2104462254075063704, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
       propertyPath: m_IsActive
       value: 1

diff --git a/Assets/Scenes/ExteriorScene_Logic/LightingData.asset b/Assets/Scenes/ExteriorScene_Logic/LightingData.asset
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-0_comp_dir.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-0_comp_dir.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-0_comp_light.exr b/Assets/Scenes/ExteriorScene_Logic/Lightmap-0_comp_light.exr
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-0_comp_shadowmask.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-0_comp_shadowmask.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-1_comp_dir.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-1_comp_dir.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-1_comp_light.exr b/Assets/Scenes/ExteriorScene_Logic/Lightmap-1_comp_light.exr
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-1_comp_shadowmask.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-1_comp_shadowmask.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-2_comp_dir.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-2_comp_dir.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-2_comp_light.exr b/Assets/Scenes/ExteriorScene_Logic/Lightmap-2_comp_light.exr
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-2_comp_shadowmask.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-2_comp_shadowmask.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-3_comp_dir.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-3_comp_dir.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-3_comp_light.exr b/Assets/Scenes/ExteriorScene_Logic/Lightmap-3_comp_light.exr
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-3_comp_shadowmask.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-3_comp_shadowmask.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-4_comp_dir.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-4_comp_dir.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-4_comp_light.exr b/Assets/Scenes/ExteriorScene_Logic/Lightmap-4_comp_light.exr
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-4_comp_shadowmask.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-4_comp_shadowmask.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-5_comp_dir.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-5_comp_dir.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-5_comp_light.exr b/Assets/Scenes/ExteriorScene_Logic/Lightmap-5_comp_light.exr
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-5_comp_shadowmask.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-5_comp_shadowmask.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-6_comp_dir.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-6_comp_dir.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-6_comp_light.exr b/Assets/Scenes/ExteriorScene_Logic/Lightmap-6_comp_light.exr
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-7_comp_dir.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-7_comp_dir.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-7_comp_light.exr b/Assets/Scenes/ExteriorScene_Logic/Lightmap-7_comp_light.exr
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-8_comp_dir.png b/Assets/Scenes/ExteriorScene_Logic/Lightmap-8_comp_dir.png
diff --git a/Assets/Scenes/ExteriorScene_Logic/Lightmap-8_comp_light.exr b/Assets/Scenes/ExteriorScene_Logic/Lightmap-8_comp_light.exr
diff --git a/Assets/Scenes/ExteriorScene_Logic/ReflectionProbe-0.exr b/Assets/Scenes/ExteriorScene_Logic/ReflectionProbe-0.exr
diff --git a/Assets/Scenes/Penguins_Day1.unity b/Assets/Scenes/Penguins_Day1.unity
@@ -439,205 +439,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 6641921480938123477, guid: f0610d234ddcaf2468023786b349feb7, type: 3}
   m_PrefabInstance: {fileID: 163303858}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &220127949
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 238360902}
-    m_Modifications:
-    - target: {fileID: 528553999500421203, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: Group
-      value: 
-      objectReference: {fileID: 1767987462}
-    - target: {fileID: 6298012263750707823, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_Name
-      value: Adelie_YoungAdult
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 14.15
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -2.52
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -28.44
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.21919787
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.9756805
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 154.676
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8350485731795820935, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_Id.m_Source
-      value: PenguinYoungAdult1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8350485731795820935, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_Id.m_HashValue
-      value: 273093602
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
---- !u!4 &220127950 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-  m_PrefabInstance: {fileID: 220127949}
-  m_PrefabAsset: {fileID: 0}
---- !u!1001 &222217600
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 238360902}
-    m_Modifications:
-    - target: {fileID: 528553999500421203, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: Group
-      value: 
-      objectReference: {fileID: 1767987462}
-    - target: {fileID: 6298012263750707823, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_Name
-      value: Adelie_YoungAdult2
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 13.21
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -2.52
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -24.57
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.21919787
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.9756805
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 154.676
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8350485731795820935, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_Id.m_Source
-      value: PenguinYoungAdult2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8350485731795820935, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_Id.m_HashValue
-      value: 256315983
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
---- !u!4 &222217601 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-  m_PrefabInstance: {fileID: 222217600}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &238360901
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 238360902}
-  - component: {fileID: 238360903}
-  m_Layer: 0
-  m_Name: PenguinYoungAdults
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &238360902
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 238360901}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -14.341232, y: 2.5370383, z: 32.83}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 220127950}
-  - {fileID: 222217601}
-  - {fileID: 1045015661}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &238360903
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 238360901}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6ae620349e7bce24688d2ab26f9be5a5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  DestroyInactiveChildren: 0
-  Recursive: 0
-  DestroyGameObject: 1
-  IgnoreAnimators: 1
 --- !u!1001 &274020224
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3155,80 +2956,6 @@ MonoBehaviour:
   Recursive: 0
   DestroyGameObject: 1
   IgnoreAnimators: 1
---- !u!1001 &1045015660
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 238360902}
-    m_Modifications:
-    - target: {fileID: 528553999500421203, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: Group
-      value: 
-      objectReference: {fileID: 1767987462}
-    - target: {fileID: 6298012263750707823, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_Name
-      value: Adelie_YoungAdult3
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 11.929
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -2.52
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -27.916
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.21919787
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.9756805
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 154.676
-      objectReference: {fileID: 0}
-    - target: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8350485731795820935, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_Id.m_Source
-      value: PenguinYoungAdult3
-      objectReference: {fileID: 0}
-    - target: {fileID: 8350485731795820935, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-      propertyPath: m_Id.m_HashValue
-      value: 239538364
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
---- !u!4 &1045015661 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6641921480938123477, guid: 435153ea031ffcc499fccea0c84aad46, type: 3}
-  m_PrefabInstance: {fileID: 1045015660}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1062322915
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -9148,5 +8875,4 @@ SceneRoots:
   - {fileID: 654570715}
   - {fileID: 1042745210}
   - {fileID: 841297659}
-  - {fileID: 238360902}
   - {fileID: 1767987464}