Skip to content

Commit

Permalink
Bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Prown0 committed Dec 21, 2024
1 parent 7746734 commit 9e5c016
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 62 deletions.
72 changes: 14 additions & 58 deletions 302/Assets/Scenes/DefaultGameScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -2403,7 +2403,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &131868639
PrefabInstance:
Expand Down Expand Up @@ -7986,7 +7986,7 @@ Transform:
- {fileID: 686324238}
- {fileID: 1675446299}
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &346510890
PrefabInstance:
Expand Down Expand Up @@ -8416,7 +8416,7 @@ RectTransform:
- {fileID: 351231063}
- {fileID: 109632270}
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -9011,7 +9011,7 @@ Transform:
- {fileID: 1140758988}
- {fileID: 564947111}
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &409596541
PrefabInstance:
Expand Down Expand Up @@ -10280,7 +10280,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1157955353405416223, guid: 7c34e61c4c1b39040bc8b4a56d34f904, type: 3}
propertyPath: m_RootOrder
value: 19
value: 18
objectReference: {fileID: 0}
- target: {fileID: 1157955353405416223, guid: 7c34e61c4c1b39040bc8b4a56d34f904, type: 3}
propertyPath: m_LocalScale.x
Expand Down Expand Up @@ -10522,7 +10522,7 @@ Transform:
- {fileID: 1996899819}
- {fileID: 728370163}
m_Father: {fileID: 0}
m_RootOrder: 18
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &470489866 stripped
GameObject:
Expand Down Expand Up @@ -22708,7 +22708,7 @@ RectTransform:
- {fileID: 924724806}
- {fileID: 210424746}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -24123,50 +24123,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e8452d6febdb74d3baa023ccec6ad5d2, type: 3}
m_PrefabInstance: {fileID: 1081794280}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1084129217
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1084129219}
- component: {fileID: 1084129218}
m_Layer: 0
m_Name: ScreenFader
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1084129218
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1084129217}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2267cbb47d31243949c189cf5380789d, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1084129219
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1084129217}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.2420564, y: 1.364642, z: 7.3993287}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1087920892
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -26633,7 +26589,7 @@ Transform:
m_Children:
- {fileID: 592683971}
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!114 &1169446214
MonoBehaviour:
Expand Down Expand Up @@ -33580,7 +33536,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8773584364483337333, guid: 4dbfb06eecc5e57499f6ea0d7a944a7d, type: 3}
propertyPath: m_RootOrder
value: 14
value: 13
objectReference: {fileID: 0}
- target: {fileID: 8773584364483337333, guid: 4dbfb06eecc5e57499f6ea0d7a944a7d, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -35431,7 +35387,7 @@ Transform:
- {fileID: 776868654}
- {fileID: 746649503}
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1632629191
PrefabInstance:
Expand Down Expand Up @@ -35755,7 +35711,7 @@ Transform:
- {fileID: 951219931}
- {fileID: 1983020638}
m_Father: {fileID: 0}
m_RootOrder: 16
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1646071858
GameObject:
Expand Down Expand Up @@ -41405,7 +41361,7 @@ Transform:
- {fileID: 1312744305}
- {fileID: 248584500}
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1874864534
PrefabInstance:
Expand Down Expand Up @@ -48187,7 +48143,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6835821722049786628, guid: e98bfaaf0938845d098edce033f7e7a2, type: 3}
propertyPath: m_RootOrder
value: 17
value: 16
objectReference: {fileID: 0}
- target: {fileID: 6835821722049786628, guid: e98bfaaf0938845d098edce033f7e7a2, type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -48504,7 +48460,7 @@ Transform:
m_Children:
- {fileID: 5060942477613140018}
m_Father: {fileID: 0}
m_RootOrder: 20
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: -89.98, y: 180, z: 0}
--- !u!4 &4951250094039373438
Transform:
Expand Down
11 changes: 7 additions & 4 deletions 302/Assets/Scripts/PlayerManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,15 @@ protected override bool Awake_()
// 필드를 초기화하는 메서드
protected override bool InitFields()
{
GameObject obj = GameObject.Find("ScreenFader");
bool res = base.InitFields();

screenFader = FindObjectOfType<ScreenFader>();
if (screenFader == null) {
GameObject obj = new GameObject("ScreenFader");

if (obj != null) {
Log("Find `ScreenFader` success => Get `ScreenFader`");
screenFader = obj.GetComponent<ScreenFader>();
} else {
Log("Find `ScreenFader` failed => New `ScreenFader`");
obj = new GameObject("ScreenFader");
screenFader = obj.AddComponent<ScreenFader>();
}

Expand Down

0 comments on commit 9e5c016

Please sign in to comment.