Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring 3, 8, 10, 11, 12, 13, 21, 24, 27 completed #196

Merged
merged 1 commit into from
Dec 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 20681d21fd96f1d4997f4ec4d7641215, type: 3}
m_Name:
m_EditorClassIdentifier:
promptMessage: "\uD074\uB9AD\uD558\uC5EC \uC0C1\uD638\uC791\uC6A9"
interactionRange: 2
prompt:
distanceInteractionMax: 5
--- !u!82 &-3146942907749045525
AudioSource:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0308f3d0e5f4a2b468bacc485aebf6d2, type: 3}
m_Name:
m_EditorClassIdentifier:
promptMessage: "\uD074\uB9AD\uD558\uC5EC \uC0C1\uD638\uC791\uC6A9"
interactionRange: 2
prompt:
distanceInteractionMax: 2
fadeImage: {fileID: 6108600949248145028, guid: af86313d08cec4241a8b1edd8d8a29da, type: 3}
fadeSpeed: 2
closeSpeed: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: -13.900001, y: 0, z: 0.5}
m_LocalPosition: {x: 1.7000008, y: 8, z: 1}
m_LocalScale: {x: 1, y: 1, z: 2.7}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -226,6 +226,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8f01f1db524329643a33a6f26ae020eb, type: 3}
m_Name:
m_EditorClassIdentifier:
promptMessage: "\uD074\uB9AD\uD558\uC5EC \uC0C1\uD638\uC791\uC6A9"
interactionRange: 2
prompt:
distanceInteractionMax: 4
rotationSpeed: 1
6 changes: 2 additions & 4 deletions 302/Assets/Course Library/Anomalies/Anomaly13/eyes.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 93b91f91247fb0b45aeedc1f250a1e63, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 0}
leftEye: {fileID: 0}
rightEye: {fileID: 0}
rotationOffsetX: -90
prompt:
distanceInteractionMax: 5
--- !u!1001 &4036253353244585447
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down

This file was deleted.

This file was deleted.

35 changes: 17 additions & 18 deletions 302/Assets/Course Library/Anomalies/Anomaly3/noHeadSitGirl.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -1845,8 +1845,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4931291677343464230}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -1.72, y: -0.92, z: -6.15}
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -1924,21 +1924,6 @@ 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
Expand Down Expand Up @@ -2035,6 +2020,20 @@ 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: -0.9374157, y: 1.4354091, z: 2.6702428}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: -0.7071068}
m_LocalPosition: {x: 14, y: 0, z: 0.8}
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -3178,21 +3178,6 @@ 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
Expand Down Expand Up @@ -3289,6 +3274,24 @@ 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 242199192578515326}
- component: {fileID: 242199192578515327}
- component: {fileID: -4456860463678520930}
m_Layer: 0
m_Name: AnomalyManager (10)
m_TagString: Untagged
Expand All @@ -32,7 +32,7 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &242199192578515327
--- !u!114 &-4456860463678520930
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -44,4 +44,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8ee0d51b9421e4225a3063944179fe0d, type: 3}
m_Name:
m_EditorClassIdentifier:
abnormalTilePrefab: {fileID: 9055656618054629428, guid: bb9039250362fbd4fa80976616652088, type: 3}
names: []
prefabs:
- {fileID: 9055656618054629428, guid: bb9039250362fbd4fa80976616652088, type: 3}
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 60b202be270b34142adf24b6c800fda5, type: 3}
m_Name:
m_EditorClassIdentifier:
targetDoorName: door
doorOpenedPrefab: {fileID: 8121868656660789279, guid: c893de987f87ca142b73f034e6b12896, type: 3}
names:
- Classroom/WallRight/door
prefabs:
- {fileID: 8121868656660789279, guid: c893de987f87ca142b73f034e6b12896, type: 3}
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4ea9c09112d4b4ec080ddd838dbd3f86, type: 3}
m_Name:
m_EditorClassIdentifier:
targetLightName: light (4)
tiltedLightPrefab: {fileID: 7578491145889696626, guid: a25ddb5ae5b6b1849b3b874a6401e9ea, type: 3}
names:
- Classroom/ceiling/Lights/light (4)
prefabs:
- {fileID: 7578491145889696626, guid: a25ddb5ae5b6b1849b3b874a6401e9ea, type: 3}
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b863f6020c9be4d36af5976ae7def815, type: 3}
m_Name:
m_EditorClassIdentifier:
targetObjectName: sitGirl
lookingGirlPrefab: {fileID: 865672691596713360, guid: 3ea9e4e205f1eb2418fc327cd3c3f601, type: 3}
eyesPrefab: {fileID: 3430613836902118324, guid: 11e3551dd4b590742b42d0da43be8523, type: 3}
names:
- SitGirls/sitGirl/_eye_left
- SitGirls/sitGirl/eye_right
prefabs:
- {fileID: 3430613836902118324, guid: 11e3551dd4b590742b42d0da43be8523, type: 3}
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7089c0d6190134ca985c8ad224f6c04e, type: 3}
m_Name:
m_EditorClassIdentifier:
targetObjectName: professor_normal
professorPrefab: {fileID: 7831368780425544879, guid: a655570cc35bfc949a9c58b5eb8b4a90, type: 3}
names:
- professor_normal
prefabs:
- {fileID: 7831368780425544879, guid: a655570cc35bfc949a9c58b5eb8b4a90, type: 3}
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bf3259c18316d40cc8480a306dee7396, type: 3}
m_Name:
m_EditorClassIdentifier:
targetObjectName: clock
clockPrefab: {fileID: 791923717464669601, guid: 64c3e9afb26debe44847a16a22c4dae8, type: 3}
names: []
prefabs:
- {fileID: 791923717464669601, guid: 64c3e9afb26debe44847a16a22c4dae8, type: 3}
10 changes: 5 additions & 5 deletions 302/Assets/Prefabs/AnomalyControllers/AnomalyManager (3).prefab
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8155634044022115139}
- component: {fileID: 8155634044022115138}
- component: {fileID: 6771753627572306098}
m_Layer: 0
m_Name: AnomalyManager (3)
m_TagString: Untagged
Expand All @@ -32,7 +32,7 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!114 &8155634044022115138
--- !u!114 &6771753627572306098
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -44,6 +44,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcbd18baab98f449ca317b70a293321b, type: 3}
m_Name:
m_EditorClassIdentifier:
headlessSchoolgirlPrefab: {fileID: 4931291677343464230, guid: 30233d2ccbd511e4fab58553448c1bd4, type: 3}
spawnLocation: {fileID: 0}
chairPrefab: {fileID: 0}
names: []
prefabs:
- {fileID: 4931291677343464230, guid: 30233d2ccbd511e4fab58553448c1bd4, type: 3}
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7327451d79d164181b37686d02ca311a, type: 3}
m_Name:
m_EditorClassIdentifier:
normalProfessorPrefab: {fileID: 8253366189145917135, guid: 4dbfb06eecc5e57499f6ea0d7a944a7d, type: 3}
names:
- professor_normal
prefabs:
- {fileID: 8253366189145917135, guid: 75a39b1d903b8ea44b089727e4979d46, type: 3}
micSoundProfessorPrefab: {fileID: 8253366189145917135, guid: 75a39b1d903b8ea44b089727e4979d46, type: 3}
Loading
Loading