Merge branch 'develop' of github.com:fielddaylab/pennycookvr into dev…

…elop
fielddaylab · Nov 22, 2024 · 9712439 · 9712439
2 parents 57c82f4 + 33ba47b
commit 9712439
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 36 deletions.
diff --git a/Assets/Scenes/ExteriorScene.unity b/Assets/Scenes/ExteriorScene.unity
@@ -12351,10 +12351,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.x
       value: -115
       objectReference: {fileID: 0}
-    - target: {fileID: 6862235390430512804, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
-      propertyPath: Current
-      value: 
-      objectReference: {fileID: 1816318722}
     - target: {fileID: 7987689946290396969, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
       propertyPath: m_Id.m_Source
       value: AdelieLegTracker2
@@ -27416,17 +27412,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 590508d7bbab8174eb57528d6457a44b, type: 3}
   m_PrefabInstance: {fileID: 1808681322}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1816318722 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 4111639823015317013, guid: 937659e33d4f86b49a20287bdad2ba7a, type: 3}
-  m_PrefabInstance: {fileID: 584279721}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5dafab9db04b59c4bb36e52c1514ad6b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1830079503 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 806390538421233952, guid: ecccbe51fb34f4f4db03e17ad053761b, type: 3}

diff --git a/Assets/_Assets/Data/Scripts/Day2/Day2.leaf b/Assets/_Assets/Data/Scripts/Day2/Day2.leaf
@@ -246,6 +246,14 @@ $call Wait(2)
 
 $call CreateGoal("Day2_trackers", Retrieve 3 trackers from Penguins)
 
+$call FuzzLegTracker->Activate()
+$call AlfredoLegTracker->Activate()
+$call WinstonLegTracker->Activate()
+$call MillieLegTracker->Activate()
+$call PoloLegTracker->Activate()
+$call AdelieLegTracker1->Activate()
+$call AdelieLegTracker2->Activate()
+
 //show the trackers visible on several penguins...
 $call SocketObjectTo(FuzzLegTracker, FuzzLegSocket)
 $call SocketObjectTo(AlfredoLegTracker, AlfredoLegSocket)
@@ -255,13 +263,6 @@ $call SocketObjectTo(PoloLegTracker, PoloLegSocket)
 $call SocketObjectTo(AdelieLegTracker1, AdelieLegSocket1)
 $call SocketObjectTo(AdelieLegTracker2, AdelieLegSocket2)
 
-$call FuzzLegTracker->SetMeshEnabled(true)
-$call AlfredoLegTracker->SetMeshEnabled(true)
-$call WinstonLegTracker->SetMeshEnabled(true)
-$call MillieLegTracker->SetMeshEnabled(true)
-$call PoloLegTracker->SetMeshEnabled(true)
-$call AdelieLegTracker1->SetMeshEnabled(true)
-$call AdelieLegTracker2->SetMeshEnabled(true)
 
 {@Margo}    Okay, kid. This is the tricky part. You’ll need to remove each penguin’s GPS tracker. $[Day2/Rookery/2rm15]
 {@Margo}    Place one hand on a penguin to hold it still.    $[Day2/Rookery/2rm16]

diff --git a/Assets/_Assets/Prefabs/Penguins/Adelie.prefab b/Assets/_Assets/Prefabs/Penguins/Adelie.prefab
@@ -631,7 +631,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Locked: 0
-  Current: {fileID: 4111639823015317013}
+  Current: {fileID: 0}
   Mode: 0
   JointConfig:
     BreakForce: Infinity
@@ -2324,7 +2324,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 2727433517442618833, guid: ed088ff268e6c47deb00046936bc3f86, type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3860401310179700414, guid: ed088ff268e6c47deb00046936bc3f86, type: 3}
       propertyPath: m_LocalPosition.x
@@ -2372,7 +2372,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4528710434265953284, guid: ed088ff268e6c47deb00046936bc3f86, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8577636952787516431, guid: ed088ff268e6c47deb00046936bc3f86, type: 3}
       propertyPath: TrackedPenguin
@@ -2383,17 +2383,6 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ed088ff268e6c47deb00046936bc3f86, type: 3}
---- !u!114 &4111639823015317013 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8124216371476101191, guid: ed088ff268e6c47deb00046936bc3f86, type: 3}
-  m_PrefabInstance: {fileID: 5309877124034950738}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5dafab9db04b59c4bb36e52c1514ad6b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!4 &8944887273496107244 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 3860401310179700414, guid: ed088ff268e6c47deb00046936bc3f86, type: 3}