Skip to content

Commit

Permalink
fix error
Browse files Browse the repository at this point in the history
  • Loading branch information
Dongho committed Nov 21, 2024
1 parent 255d11c commit 80bce58
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 22 deletions.
40 changes: 20 additions & 20 deletions 302/Assets/Scenes/GameEndingScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -22611,8 +22611,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1118218538}
- component: {fileID: 1118218537}
- component: {fileID: 1118218536}
- component: {fileID: 1118218539}
m_Layer: 0
m_Name: EndingManager
m_TagString: Untagged
Expand Down Expand Up @@ -22716,7 +22716,22 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &1118218537
--- !u!4 &1118218538
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1118218535}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -18.001822, y: 7.0339108, z: 0.16438524}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1118218539
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -22725,7 +22740,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1118218535}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c984b3f304c1f4cf39dc349346f66bb2, type: 3}
m_Script: {fileID: 11500000, guid: 9a4af468d20e7ac468e837c0fb357359, type: 3}
m_Name:
m_EditorClassIdentifier:
clockCamera: {fileID: 429070650}
Expand All @@ -22735,21 +22750,6 @@ MonoBehaviour:
player: {fileID: 1169446209}
fadeImage: {fileID: 1496156668}
fadeSpeed: 1
--- !u!4 &1118218538
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1118218535}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -18.001822, y: 7.0339108, z: 0.16438524}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1119523402
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -36158,10 +36158,10 @@ MonoBehaviour:
creditUI: {fileID: 1477365615}
endingAudioSource: {fileID: 1825529824}
endingMusic: {fileID: 8300000, guid: 9aebf01d2434545beaed16f416873b82, type: 3}
musicDuration: 30
musicFadeSpeed: 1
doorSoundSource: {fileID: 1825529824}
doorOpenSound: {fileID: 8300000, guid: be32529d7bbab4893b4a94fe8899b8a1, type: 3}
musicDuration: 30
musicFadeSpeed: 1
--- !u!65 &1825529826
BoxCollider:
m_ObjectHideFlags: 0
Expand Down
4 changes: 2 additions & 2 deletions 302/Assets/Scripts/EndingManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ public class EndingManager : MonoBehaviour
[SerializeField] private GameObject clockCamera;
[SerializeField] private AudioSource endingAudioSource;
[SerializeField] private AudioClip endingMusic;
[SerializeField] private float moveSpeed = 1f;
[SerializeField] private float moveSpeed = 0.001f;
[SerializeField] private GameObject player;
[SerializeField] private Image fadeImage;
[SerializeField] private float fadeSpeed = 2f;
[SerializeField] private float fadeSpeed = 1f;

private Vector3 targetPosition = new Vector3(-15.3f, 7.25f, 0f);
private bool isMoving = false;
Expand Down
11 changes: 11 additions & 0 deletions 302/Assets/Scripts/EndingManager.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 80bce58

Please sign in to comment.