Skip to content

Commit

Permalink
Merge pull request #193 from 2024FALL-SWPP/ref/chaehwan/design-pattern
Browse files Browse the repository at this point in the history
Change scripts' names; Modify GameManager, TimeManager, etc.
  • Loading branch information
Prown0 authored Dec 13, 2024
2 parents 0c2c775 + 4e9eea3 commit c7dee45
Show file tree
Hide file tree
Showing 151 changed files with 839 additions and 701 deletions.
6 changes: 3 additions & 3 deletions 302/Assets/Prefabs/Anomaly01/sittingGirl.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ GameObject:
- component: {fileID: 4543532148542983630}
- component: {fileID: 4073337738985234537}
- component: {fileID: 1078734396322403036}
- component: {fileID: 8530691117493187380}
- component: {fileID: 2357615498098561285}
m_Layer: 3
m_Name: sittingGirl
m_TagString: Untagged
Expand Down Expand Up @@ -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 &8530691117493187380
--- !u!114 &2357615498098561285
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -878,7 +878,7 @@ MonoBehaviour:
m_GameObject: {fileID: 3766714381938235252}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 13b29b2cac673a5419b45e5853d126ec, type: 3}
m_Script: {fileID: 11500000, guid: 61696140f24c05e4a8a11b47c471b12b, type: 3}
m_Name:
m_EditorClassIdentifier:
prompt:
Expand Down
6 changes: 3 additions & 3 deletions 302/Assets/Prefabs/Anomaly06/Cake.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ GameObject:
m_Component:
- component: {fileID: 304119721586272743}
- component: {fileID: 1269198580064314291}
- component: {fileID: 9115472224493573052}
- component: {fileID: -8651826616036947606}
m_Layer: 3
m_Name: Cake
m_TagString: Untagged
Expand Down Expand Up @@ -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 &9115472224493573052
--- !u!114 &-8651826616036947606
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -351,7 +351,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1113413758793249629}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ea3e75052d956814095a954bc86ac6c8, type: 3}
m_Script: {fileID: 11500000, guid: 63c2b768a7e3960459603cf9e88eecc0, type: 3}
m_Name:
m_EditorClassIdentifier:
prompt:
Expand Down
6 changes: 3 additions & 3 deletions 302/Assets/Prefabs/Anomaly18/Anomaly18Chairs.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 804342736015318115}
- component: {fileID: 6451951202203810141}
- component: {fileID: -6116211564230804281}
m_Layer: 0
m_Name: Anomaly18Chairs
m_TagString: Untagged
Expand Down Expand Up @@ -56,7 +56,7 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6451951202203810141
--- !u!114 &-6116211564230804281
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -65,7 +65,7 @@ MonoBehaviour:
m_GameObject: {fileID: 2824771154171234484}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: abf04317342a08b43b99639716e15455, type: 3}
m_Script: {fileID: 11500000, guid: e2e44fc5e1725d647908a6343ed98090, type: 3}
m_Name:
m_EditorClassIdentifier:
duration: 2
Expand Down
6 changes: 3 additions & 3 deletions 302/Assets/Prefabs/Anomaly18/Anomaly18Desks.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3346580053050280452}
- component: {fileID: 6127939753784815240}
- component: {fileID: 5360591617155509057}
m_Layer: 0
m_Name: Anomaly18Desks
m_TagString: Untagged
Expand Down Expand Up @@ -38,7 +38,7 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6127939753784815240
--- !u!114 &5360591617155509057
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -47,7 +47,7 @@ MonoBehaviour:
m_GameObject: {fileID: 3135954807459457769}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: abf04317342a08b43b99639716e15455, type: 3}
m_Script: {fileID: 11500000, guid: e2e44fc5e1725d647908a6343ed98090, type: 3}
m_Name:
m_EditorClassIdentifier:
duration: 2
Expand Down
7 changes: 3 additions & 4 deletions 302/Assets/Prefabs/Anomaly18/Anomaly18Interactable1.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ GameObject:
m_Component:
- component: {fileID: 6670105427928595574}
- component: {fileID: 8219951293162197828}
- component: {fileID: 2017085401444559450}
- component: {fileID: 1167900592675330579}
m_Layer: 3
m_Name: Anomaly18Interactable1
m_TagString: Untagged
Expand Down Expand Up @@ -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 &2017085401444559450
--- !u!114 &1167900592675330579
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -732,10 +732,9 @@ MonoBehaviour:
m_GameObject: {fileID: 6330698921243240140}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c1fef15414d38cd49ac6dc744856e8b9, type: 3}
m_Script: {fileID: 11500000, guid: 33a51968eb2cf9549ba0e069a5074acc, type: 3}
m_Name:
m_EditorClassIdentifier:
nameCameraMain: Main Camera
prompt:
distanceInteractionMax: 3
duration: 2
Expand Down
7 changes: 3 additions & 4 deletions 302/Assets/Prefabs/Anomaly18/Anomaly18Interactable2.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ GameObject:
m_Component:
- component: {fileID: 8613521071373069016}
- component: {fileID: 6416086224060810730}
- component: {fileID: 6898711655119319520}
- component: {fileID: 2260679722752361086}
m_Layer: 3
m_Name: Anomaly18Interactable2
m_TagString: Untagged
Expand Down Expand Up @@ -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 &6898711655119319520
--- !u!114 &2260679722752361086
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -1147,10 +1147,9 @@ MonoBehaviour:
m_GameObject: {fileID: 8989905498966388834}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c1fef15414d38cd49ac6dc744856e8b9, type: 3}
m_Script: {fileID: 11500000, guid: 33a51968eb2cf9549ba0e069a5074acc, type: 3}
m_Name:
m_EditorClassIdentifier:
nameCameraMain: Main Camera
prompt:
distanceInteractionMax: 3
duration: 2
7 changes: 3 additions & 4 deletions 302/Assets/Prefabs/Anomaly18/Anomaly18Interactable3.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ GameObject:
m_Component:
- component: {fileID: 4647422507514480652}
- component: {fileID: 7997598608241911614}
- component: {fileID: 1859839871753564884}
- component: {fileID: 6827081098204092515}
m_Layer: 3
m_Name: Anomaly18Interactable3
m_TagString: Untagged
Expand Down Expand Up @@ -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 &1859839871753564884
--- !u!114 &6827081098204092515
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -815,10 +815,9 @@ MonoBehaviour:
m_GameObject: {fileID: 5419280097993429686}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c1fef15414d38cd49ac6dc744856e8b9, type: 3}
m_Script: {fileID: 11500000, guid: 33a51968eb2cf9549ba0e069a5074acc, type: 3}
m_Name:
m_EditorClassIdentifier:
nameCameraMain: Main Camera
prompt:
distanceInteractionMax: 3
duration: 2
Expand Down
7 changes: 3 additions & 4 deletions 302/Assets/Prefabs/Anomaly18/Anomaly18Interactable4.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ GameObject:
m_Component:
- component: {fileID: 172549105730445443}
- component: {fileID: 3235519489252216753}
- component: {fileID: 24838291918306546}
- component: {fileID: 4300784729179825900}
m_Layer: 3
m_Name: Anomaly18Interactable4
m_TagString: Untagged
Expand Down Expand Up @@ -308,7 +308,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 &24838291918306546
--- !u!114 &4300784729179825900
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -317,10 +317,9 @@ MonoBehaviour:
m_GameObject: {fileID: 661700201260497465}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c1fef15414d38cd49ac6dc744856e8b9, type: 3}
m_Script: {fileID: 11500000, guid: 33a51968eb2cf9549ba0e069a5074acc, type: 3}
m_Name:
m_EditorClassIdentifier:
nameCameraMain: Main Camera
prompt:
distanceInteractionMax: 3
duration: 2
Expand Down
7 changes: 3 additions & 4 deletions 302/Assets/Prefabs/Anomaly18/Anomaly18Interactable5.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ GameObject:
m_Component:
- component: {fileID: 6503443985375851902}
- component: {fileID: 8413573422723816012}
- component: {fileID: 7615847411419680703}
- component: {fileID: -8668577580007678075}
m_Layer: 3
m_Name: Anomaly18Interactable5
m_TagString: Untagged
Expand Down Expand Up @@ -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 &7615847411419680703
--- !u!114 &-8668577580007678075
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -732,10 +732,9 @@ MonoBehaviour:
m_GameObject: {fileID: 5839778339388796868}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c1fef15414d38cd49ac6dc744856e8b9, type: 3}
m_Script: {fileID: 11500000, guid: 33a51968eb2cf9549ba0e069a5074acc, type: 3}
m_Name:
m_EditorClassIdentifier:
nameCameraMain: Main Camera
prompt:
distanceInteractionMax: 3
duration: 2
Expand Down
7 changes: 3 additions & 4 deletions 302/Assets/Prefabs/Anomaly18/Anomaly18Interactable6.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ GameObject:
m_Component:
- component: {fileID: 1385833862649261190}
- component: {fileID: 4447484008536605620}
- component: {fileID: 3248939476315829577}
- component: {fileID: -8609727679995584818}
m_Layer: 3
m_Name: Anomaly18Interactable6
m_TagString: Untagged
Expand Down Expand Up @@ -474,7 +474,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 &3248939476315829577
--- !u!114 &-8609727679995584818
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -483,10 +483,9 @@ MonoBehaviour:
m_GameObject: {fileID: 1761092321075197500}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c1fef15414d38cd49ac6dc744856e8b9, type: 3}
m_Script: {fileID: 11500000, guid: 33a51968eb2cf9549ba0e069a5074acc, type: 3}
m_Name:
m_EditorClassIdentifier:
nameCameraMain: Main Camera
prompt:
distanceInteractionMax: 3
duration: 2
Expand Down
6 changes: 3 additions & 3 deletions 302/Assets/Prefabs/Anomaly20/Anomaly20InteractableBack.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 3033663053936672906}
- component: {fileID: 2026440862349033724}
- component: {fileID: 3007005032385091976}
- component: {fileID: -5418363686235835766}
m_Layer: 3
m_Name: Anomaly20InteractableBack
m_TagString: Untagged
Expand Down Expand Up @@ -46,7 +46,7 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 0.6, y: 2.4, z: 0.1}
m_Center: {x: 0, y: 2, z: 0}
--- !u!114 &3007005032385091976
--- !u!114 &-5418363686235835766
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -55,7 +55,7 @@ MonoBehaviour:
m_GameObject: {fileID: 8359328002521216368}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e3abf5127f1fd514eafeb2411741d79a, type: 3}
m_Script: {fileID: 11500000, guid: 8fb76969add5cf04c807554bc63c2b16, type: 3}
m_Name:
m_EditorClassIdentifier:
prompt:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 956152231290083482}
- component: {fileID: 4269990928468924652}
- component: {fileID: 9026940281139440207}
- component: {fileID: -8853786589799450245}
m_Layer: 3
m_Name: Anomaly20InteractableFront
m_TagString: Untagged
Expand Down Expand Up @@ -46,7 +46,7 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 0.6, y: 2.4, z: 0.1}
m_Center: {x: 0, y: 2, z: 0}
--- !u!114 &9026940281139440207
--- !u!114 &-8853786589799450245
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -55,7 +55,7 @@ MonoBehaviour:
m_GameObject: {fileID: 6007555188655779168}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa6dee73251e9a04e8d20560af1f1997, type: 3}
m_Script: {fileID: 11500000, guid: 8c92679bac1ed184e89802565dea5023, type: 3}
m_Name:
m_EditorClassIdentifier:
prompt:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 446314887832338340}
- component: {fileID: 3474316305581948882}
- component: {fileID: 8697349718316497385}
- component: {fileID: -8365079299294410971}
m_Layer: 3
m_Name: Anomaly20InteractableRight
m_TagString: Untagged
Expand Down Expand Up @@ -46,7 +46,7 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 0.6, y: 2.4, z: 0.1}
m_Center: {x: 0, y: 2, z: 0}
--- !u!114 &8697349718316497385
--- !u!114 &-8365079299294410971
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -55,7 +55,7 @@ MonoBehaviour:
m_GameObject: {fileID: 6352980353013582430}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5c14879ba6f660e4196accbcc95dfe7a, type: 3}
m_Script: {fileID: 11500000, guid: e59a0281bd9bdfb43ac0588c3fb8e938, type: 3}
m_Name:
m_EditorClassIdentifier:
prompt:
Expand Down
6 changes: 3 additions & 3 deletions 302/Assets/Prefabs/Anomaly20/PlayerAnomaly.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2110923677284472899}
- component: {fileID: 3150737880391576839}
- component: {fileID: 2242511788721463015}
m_Layer: 7
m_Name: PlayerAnomaly
m_TagString: Untagged
Expand All @@ -119,7 +119,7 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3150737880391576839
--- !u!114 &2242511788721463015
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -128,7 +128,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1585356450965799673}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0599189f40e873443b3c17a2bf43fc1b, type: 3}
m_Script: {fileID: 11500000, guid: 152526297e2dff144836b43225cb3abe, type: 3}
m_Name:
m_EditorClassIdentifier:
namePlayer: Player
Expand Down
Loading

0 comments on commit c7dee45

Please sign in to comment.