Merge pull request #195 from 2024FALL-SWPP/revert-194-ref/psy/Anomaly3

Revert "Ref/psy/anomaly3"
2024FALL-SWPP · Dec 14, 2024 · e6ff3e7 · e6ff3e7
2 parents ddee1e5 + 9c9fafc
commit e6ff3e7
Show file tree

Hide file tree

Showing 228 changed files with 1,309 additions and 2,133 deletions.
diff --git a/302/Assets/Course Library/Anomalies/Anomaly10/floorTile_abnormal.prefab b/302/Assets/Course Library/Anomalies/Anomaly10/floorTile_abnormal.prefab
@@ -271,8 +271,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 20681d21fd96f1d4997f4ec4d7641215, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  prompt: 
-  distanceInteractionMax: 5
+  promptMessage: "\uD074\uB9AD\uD558\uC5EC \uC0C1\uD638\uC791\uC6A9"
+  interactionRange: 2
 --- !u!82 &-3146942907749045525
 AudioSource:
   m_ObjectHideFlags: 0

diff --git a/302/Assets/Course Library/Anomalies/Anomaly11/door_opened.prefab b/302/Assets/Course Library/Anomalies/Anomaly11/door_opened.prefab
@@ -160,8 +160,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0308f3d0e5f4a2b468bacc485aebf6d2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  prompt: 
-  distanceInteractionMax: 2
+  promptMessage: "\uD074\uB9AD\uD558\uC5EC \uC0C1\uD638\uC791\uC6A9"
+  interactionRange: 2
   fadeImage: {fileID: 6108600949248145028, guid: af86313d08cec4241a8b1edd8d8a29da, type: 3}
   fadeSpeed: 2
   closeSpeed: 1

diff --git a/302/Assets/Course Library/Anomalies/Anomaly12/ligh_tilted.prefab b/302/Assets/Course Library/Anomalies/Anomaly12/ligh_tilted.prefab
@@ -192,7 +192,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7578491145889696626}
   m_LocalRotation: {x: 0, y: 0.06975647, z: 0, w: 0.9975641}
-  m_LocalPosition: {x: 1.7000008, y: 8, z: 1}
+  m_LocalPosition: {x: -13.900001, y: 0, z: 0.5}
   m_LocalScale: {x: 1, y: 1, z: 2.7}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -226,6 +226,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8f01f1db524329643a33a6f26ae020eb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  prompt: 
-  distanceInteractionMax: 4
+  promptMessage: "\uD074\uB9AD\uD558\uC5EC \uC0C1\uD638\uC791\uC6A9"
+  interactionRange: 2
   rotationSpeed: 1
diff --git a/302/Assets/Course Library/Anomalies/Anomaly13/eyes.prefab b/302/Assets/Course Library/Anomalies/Anomaly13/eyes.prefab
@@ -60,8 +60,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 93b91f91247fb0b45aeedc1f250a1e63, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  prompt: 
-  distanceInteractionMax: 5
+  player: {fileID: 0}
+  leftEye: {fileID: 0}
+  rightEye: {fileID: 0}
+  rotationOffsetX: -90
 --- !u!1001 &4036253353244585447
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/302/Assets/Course Library/Anomalies/Anomaly26/fire/Fire.unitypackage.meta b/302/Assets/Course Library/Anomalies/Anomaly26/fire/Fire.unitypackage.meta
diff --git a/302/Assets/Course Library/Anomalies/Anomaly26/fireEx/fireEx.unitypackage.meta b/302/Assets/Course Library/Anomalies/Anomaly26/fireEx/fireEx.unitypackage.meta
diff --git a/302/Assets/Course Library/Anomalies/Anomaly3/noHeadSitGirl.prefab b/302/Assets/Course Library/Anomalies/Anomaly3/noHeadSitGirl.prefab
@@ -1829,8 +1829,8 @@ GameObject:
   - component: {fileID: 5702866697557762460}
   - component: {fileID: -5115927794089966355}
   - component: {fileID: 1762372057293109387}
+  - component: {fileID: 102974955409158419}
   - component: {fileID: 2823924222544873001}
-  - component: {fileID: 5847809326673953691}
   m_Layer: 3
   m_Name: noHeadSitGirl
   m_TagString: Untagged
@@ -1845,8 +1845,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4931291677343464230}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: -1.72, y: -0.92, z: -6.15}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1924,6 +1924,21 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.78868043, y: 1.2432933, z: 0.8379879}
   m_Center: {x: -0.007043898, y: 1.0091901, z: 0.081006035}
+--- !u!114 &102974955409158419
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4931291677343464230}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d9b3f08a1c74cca4da83f16b57568fbf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  promptMessage: "\uD074\uB9AD\uD558\uC5EC \uC0C1\uD638\uC791\uC6A9"
+  interactionRange: 2
+  interactionSoundPrefab: {fileID: 0}
 --- !u!82 &2823924222544873001
 AudioSource:
   m_ObjectHideFlags: 0
@@ -2020,20 +2035,6 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
---- !u!114 &5847809326673953691
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4931291677343464230}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d9b3f08a1c74cca4da83f16b57568fbf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  prompt: 
-  distanceInteractionMax: 2
 --- !u!1 &5032775393752142314
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/302/Assets/Course Library/Anomalies/Anomaly8/professor_Anomaly8.prefab b/302/Assets/Course Library/Anomalies/Anomaly8/professor_Anomaly8.prefab
@@ -3082,8 +3082,8 @@ GameObject:
   - component: {fileID: 8773584364483337333}
   - component: {fileID: -7422413402872412774}
   - component: {fileID: -1963283817825714181}
+  - component: {fileID: 8480570695569470048}
   - component: {fileID: 3429054842545089841}
-  - component: {fileID: 5851915364222104651}
   m_Layer: 3
   m_Name: professor_Anomaly8
   m_TagString: Untagged
@@ -3098,8 +3098,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8253366189145917135}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: -0.7071068}
-  m_LocalPosition: {x: 14, y: 0, z: 0.8}
+  m_LocalRotation: {x: 0, y: 0.7071068, z: -0, w: -0.7071068}
+  m_LocalPosition: {x: -0.9374157, y: 1.4354091, z: 2.6702428}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -3178,6 +3178,21 @@ CapsuleCollider:
   m_Height: 2.0122426
   m_Direction: 1
   m_Center: {x: -0.0046090484, y: 0.9393765, z: 0.12905467}
+--- !u!114 &8480570695569470048
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8253366189145917135}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 13668f2615e0a94489f12ccbeb6d1c48, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  promptMessage: "\uD074\uB9AD\uD558\uC5EC \uC0C1\uD638\uC791\uC6A9"
+  interactionRange: 2
+  maxVolumeDistance: 5
 --- !u!82 &3429054842545089841
 AudioSource:
   m_ObjectHideFlags: 0
@@ -3274,24 +3289,6 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
---- !u!114 &5851915364222104651
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8253366189145917135}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 13668f2615e0a94489f12ccbeb6d1c48, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  prompt: 
-  distanceInteractionMax: 2
-  maxVolumeDistance: 5
-  startDistance: 30
-  fadeOutDuration: 2
-  audioStartDelay: 5
 --- !u!1 &8279582076143391115
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/302/Assets/Prefabs/Anomaly01/sittingGirl.prefab b/302/Assets/Prefabs/Anomaly01/sittingGirl.prefab
@@ -807,7 +807,7 @@ GameObject:
   - component: {fileID: 4543532148542983630}
   - component: {fileID: 4073337738985234537}
   - component: {fileID: 1078734396322403036}
-  - component: {fileID: 2357615498098561285}
+  - component: {fileID: 8530691117493187380}
   m_Layer: 3
   m_Name: sittingGirl
   m_TagString: Untagged
@@ -869,7 +869,7 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.004, y: 0.016, z: 0.003}
   m_Center: {x: 0, y: 0.0085, z: 0}
---- !u!114 &2357615498098561285
+--- !u!114 &8530691117493187380
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -878,7 +878,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3766714381938235252}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 61696140f24c05e4a8a11b47c471b12b, type: 3}
+  m_Script: {fileID: 11500000, guid: 13b29b2cac673a5419b45e5853d126ec, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   prompt: 

diff --git a/302/Assets/Prefabs/Anomaly06/Cake.prefab b/302/Assets/Prefabs/Anomaly06/Cake.prefab
@@ -259,7 +259,7 @@ GameObject:
   m_Component:
   - component: {fileID: 304119721586272743}
   - component: {fileID: 1269198580064314291}
-  - component: {fileID: -8651826616036947606}
+  - component: {fileID: 9115472224493573052}
   m_Layer: 3
   m_Name: Cake
   m_TagString: Untagged
@@ -342,7 +342,7 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.35, y: 0.25, z: 0.35}
   m_Center: {x: 0.22, y: 0.31, z: 0.2}
---- !u!114 &-8651826616036947606
+--- !u!114 &9115472224493573052
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -351,7 +351,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1113413758793249629}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 63c2b768a7e3960459603cf9e88eecc0, type: 3}
+  m_Script: {fileID: 11500000, guid: ea3e75052d956814095a954bc86ac6c8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   prompt: 

diff --git a/302/Assets/Prefabs/Anomaly18/Anomaly18Chairs.prefab b/302/Assets/Prefabs/Anomaly18/Anomaly18Chairs.prefab
@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 804342736015318115}
-  - component: {fileID: -6116211564230804281}
+  - component: {fileID: 6451951202203810141}
   m_Layer: 0
   m_Name: Anomaly18Chairs
   m_TagString: Untagged
@@ -56,7 +56,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &-6116211564230804281
+--- !u!114 &6451951202203810141
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -65,7 +65,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 2824771154171234484}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e2e44fc5e1725d647908a6343ed98090, type: 3}
+  m_Script: {fileID: 11500000, guid: abf04317342a08b43b99639716e15455, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   duration: 2

diff --git a/302/Assets/Prefabs/Anomaly18/Anomaly18Desks.prefab b/302/Assets/Prefabs/Anomaly18/Anomaly18Desks.prefab
@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3346580053050280452}
-  - component: {fileID: 5360591617155509057}
+  - component: {fileID: 6127939753784815240}
   m_Layer: 0
   m_Name: Anomaly18Desks
   m_TagString: Untagged
@@ -38,7 +38,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5360591617155509057
+--- !u!114 &6127939753784815240
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -47,7 +47,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3135954807459457769}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e2e44fc5e1725d647908a6343ed98090, type: 3}
+  m_Script: {fileID: 11500000, guid: abf04317342a08b43b99639716e15455, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   duration: 2

diff --git a/302/Assets/Prefabs/Anomaly18/Anomaly18Interactable1.prefab b/302/Assets/Prefabs/Anomaly18/Anomaly18Interactable1.prefab
@@ -674,7 +674,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6670105427928595574}
   - component: {fileID: 8219951293162197828}
-  - component: {fileID: 1167900592675330579}
+  - component: {fileID: 2017085401444559450}
   m_Layer: 3
   m_Name: Anomaly18Interactable1
   m_TagString: Untagged
@@ -723,7 +723,7 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.017582536, y: 0.014485538, z: 0.042276703}
   m_Center: {x: -0.34068245, y: 0.20315066, z: -0.12153947}
---- !u!114 &1167900592675330579
+--- !u!114 &2017085401444559450
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -732,9 +732,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 6330698921243240140}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 33a51968eb2cf9549ba0e069a5074acc, type: 3}
+  m_Script: {fileID: 11500000, guid: c1fef15414d38cd49ac6dc744856e8b9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  nameCameraMain: Main Camera
   prompt: 
   distanceInteractionMax: 3
   duration: 2

diff --git a/302/Assets/Prefabs/Anomaly18/Anomaly18Interactable2.prefab b/302/Assets/Prefabs/Anomaly18/Anomaly18Interactable2.prefab
@@ -1089,7 +1089,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8613521071373069016}
   - component: {fileID: 6416086224060810730}
-  - component: {fileID: 2260679722752361086}
+  - component: {fileID: 6898711655119319520}
   m_Layer: 3
   m_Name: Anomaly18Interactable2
   m_TagString: Untagged
@@ -1138,7 +1138,7 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.017582536, y: 0.014485538, z: 0.042276703}
   m_Center: {x: -0.34068245, y: 0.20315066, z: -0.12153947}
---- !u!114 &2260679722752361086
+--- !u!114 &6898711655119319520
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1147,9 +1147,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 8989905498966388834}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 33a51968eb2cf9549ba0e069a5074acc, type: 3}
+  m_Script: {fileID: 11500000, guid: c1fef15414d38cd49ac6dc744856e8b9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  nameCameraMain: Main Camera
   prompt: 
   distanceInteractionMax: 3
   duration: 2
diff --git a/302/Assets/Prefabs/Anomaly18/Anomaly18Interactable3.prefab b/302/Assets/Prefabs/Anomaly18/Anomaly18Interactable3.prefab
@@ -757,7 +757,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4647422507514480652}
   - component: {fileID: 7997598608241911614}
-  - component: {fileID: 6827081098204092515}
+  - component: {fileID: 1859839871753564884}
   m_Layer: 3
   m_Name: Anomaly18Interactable3
   m_TagString: Untagged
@@ -806,7 +806,7 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.017582536, y: 0.014485538, z: 0.042276703}
   m_Center: {x: -0.34068245, y: 0.20315066, z: -0.12153947}
---- !u!114 &6827081098204092515
+--- !u!114 &1859839871753564884
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -815,9 +815,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 5419280097993429686}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 33a51968eb2cf9549ba0e069a5074acc, type: 3}
+  m_Script: {fileID: 11500000, guid: c1fef15414d38cd49ac6dc744856e8b9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  nameCameraMain: Main Camera
   prompt: 
   distanceInteractionMax: 3
   duration: 2