Linear Ready

htl-leo-itp-2325-4-5BHITM · Jun 19, 2024 · 6c88e5f · 6c88e5f
1 parent 21e0a72
commit 6c88e5f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 72 deletions.
diff --git a/EcoHome-VR/Assets/Scenes/Linear - Main Scene.unity b/EcoHome-VR/Assets/Scenes/Linear - Main Scene.unity
@@ -133,7 +133,6 @@ GameObject:
   m_Component:
   - component: {fileID: 24915398}
   - component: {fileID: 24915403}
-  - component: {fileID: 24915402}
   - component: {fileID: 24915401}
   - component: {fileID: 24915400}
   - component: {fileID: 24915399}
@@ -258,19 +257,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
---- !u!65 &24915402
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 24915397}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 100, y: 100, z: 49.242092}
-  m_Center: {x: 7.4781164e-14, y: 0, z: -25.378645}
 --- !u!54 &24915403
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -5335,7 +5321,6 @@ GameObject:
   m_Component:
   - component: {fileID: 583649001}
   - component: {fileID: 583649006}
-  - component: {fileID: 583649005}
   - component: {fileID: 583649004}
   - component: {fileID: 583649003}
   - component: {fileID: 583649002}
@@ -5460,19 +5445,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
---- !u!65 &583649005
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 583649000}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!54 &583649006
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -10250,7 +10222,7 @@ GameObject:
   - component: {fileID: 1192527969}
   m_Layer: 7
   m_Name: sWaterSource_01
-  m_TagString: bWaterSource
+  m_TagString: sWaterSource
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -17018,7 +16990,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1453966185}
   - component: {fileID: 1453966190}
-  - component: {fileID: 1453966189}
   - component: {fileID: 1453966188}
   - component: {fileID: 1453966187}
   - component: {fileID: 1453966186}
@@ -17143,19 +17114,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
---- !u!65 &1453966189
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1453966184}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!54 &1453966190
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -18850,7 +18808,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!65 &1582778677
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -18922,8 +18880,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1582778676}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -2.7834218, y: 2.0099998, z: -11.8}
-  m_LocalScale: {x: 9, y: 0.030189998, z: 30}
+  m_LocalPosition: {x: -2.7834218, y: 2.0099998, z: -12.85}
+  m_LocalScale: {x: 9, y: 0.030189998, z: 35}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2077048718}
@@ -20512,7 +20470,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1990122552}
+  - {fileID: 3081717072006521411}
   - {fileID: 782913773}
   - {fileID: 67653917}
   - {fileID: 565422623}
@@ -23453,7 +23411,7 @@ PrefabInstance:
     - target: {fileID: 3081717070571404916, guid: bbb3adbc55e58e74f9204cd2b352c0ee,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -14.39
+      value: -14.477
       objectReference: {fileID: 0}
     - target: {fileID: 3081717070571404916, guid: bbb3adbc55e58e74f9204cd2b352c0ee,
         type: 3}
@@ -23490,14 +23448,13 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9122943640391131046, guid: bbb3adbc55e58e74f9204cd2b352c0ee,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 59d0d42eed8ca7f4ea7c857b88a81d66, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: bbb3adbc55e58e74f9204cd2b352c0ee, type: 3}
---- !u!4 &1990122552 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3081717070571404916, guid: bbb3adbc55e58e74f9204cd2b352c0ee,
-    type: 3}
-  m_PrefabInstance: {fileID: 1990122551}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2008007846
 GameObject:
   m_ObjectHideFlags: 0
@@ -23918,6 +23875,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9122943640391131046, guid: bbb3adbc55e58e74f9204cd2b352c0ee,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 59d0d42eed8ca7f4ea7c857b88a81d66, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: bbb3adbc55e58e74f9204cd2b352c0ee, type: 3}
 --- !u!4 &2056705213 stripped
@@ -24231,7 +24193,6 @@ GameObject:
   m_Component:
   - component: {fileID: 2129855534}
   - component: {fileID: 2129855539}
-  - component: {fileID: 2129855538}
   - component: {fileID: 2129855537}
   - component: {fileID: 2129855536}
   - component: {fileID: 2129855535}
@@ -24356,19 +24317,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
---- !u!65 &2129855538
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2129855533}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!54 &2129855539
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -26719,6 +26667,12 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.02, y: 0.012, z: 0.02}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!4 &3081717072006521411 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3081717070571404916, guid: bbb3adbc55e58e74f9204cd2b352c0ee,
+    type: 3}
+  m_PrefabInstance: {fileID: 1990122551}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &3084777372418494916
 GameObject:
   m_ObjectHideFlags: 0
@@ -27465,6 +27419,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9122943640391131046, guid: bbb3adbc55e58e74f9204cd2b352c0ee,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 59d0d42eed8ca7f4ea7c857b88a81d66, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: bbb3adbc55e58e74f9204cd2b352c0ee, type: 3}
 --- !u!1 &4018336076496926236

diff --git a/EcoHome-VR/Assets/Scripts/Player.cs b/EcoHome-VR/Assets/Scripts/Player.cs
@@ -15,7 +15,7 @@ public class Player : MonoBehaviour
     public static int globalScoreCounter = 0;
 
     public static int displayScoreCounter = 0;
-    public static readonly int[] maxScorePerRoom = {0, 1, 5, 9, 15, 20};
+    public static readonly int[] maxScorePerRoom = {0, 1, 5, 9, 18, 24};
 
     bool rotating = false;
 
@@ -63,21 +63,21 @@ void Update()
                     StartCoroutine(RotateDoor(GameObject.Find("door_02"), new Vector3(-1.193f, -1.099973f, -10.566f), 110));
                 }
                 break;
-            case 7:
+            case 9:
                 if (localScoreCounter > 0) 
                 {
                     localScoreCounter = 0;
                     StartCoroutine(RotateDoor(GameObject.Find("door_03"), new Vector3(-1.193f, -1.099973f, -16.5f), 110));
                 }
                 break;
-            case 15:
+            case 18:
                 if (localScoreCounter > 0) 
                 {
                     localScoreCounter = 0;
                     StartCoroutine(RotateDoor(GameObject.Find("door_04"), new Vector3(-1.193f, -1.099973f, -22.41f), 110));
                 }
                 break;
-            case 20:
+            case 24:
                 if (localScoreCounter > 0) 
                 {
                     localScoreCounter = 0;