From 2a72534908a3e7ea2f9b0e4066edaa115adf2f08 Mon Sep 17 00:00:00 2001 From: Ayumi Date: Fri, 30 Jun 2023 21:15:27 +0200 Subject: [PATCH] =?UTF-8?q?le=20fish=20au=20chocolate=20(bitte=20=C3=A4nde?= =?UTF-8?q?rt=20den=20Creditsong,=20wenn=20ihr=20es=20nicht=20gut=20findet?= =?UTF-8?q?,=20aber=20ich=20feier=20das=20gerade)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Soundtrack/creditsdupstepbiszumdrop.wav | 3 + .../creditsdupstepbiszumdrop.wav.meta | 22 ++++ .../Script/NextSceneAfterCredits.cs | 2 +- .../Timeline/TextTimelineCredits.playable | 116 +++++++++++++++++- .../ScenesInGame/15.4NachBossVorCredits.unity | 2 +- .../Scenes/ScenesInGame/17CreditScene.unity | 69 ----------- Assets/Scenes/ScenesInGame/4DScene.unity | 22 ++++ 7 files changed, 164 insertions(+), 72 deletions(-) create mode 100644 Assets/AssetsFORELLE/Audio/Soundtrack/creditsdupstepbiszumdrop.wav create mode 100644 Assets/AssetsFORELLE/Audio/Soundtrack/creditsdupstepbiszumdrop.wav.meta diff --git a/Assets/AssetsFORELLE/Audio/Soundtrack/creditsdupstepbiszumdrop.wav b/Assets/AssetsFORELLE/Audio/Soundtrack/creditsdupstepbiszumdrop.wav new file mode 100644 index 0000000..96ecd4f --- /dev/null +++ b/Assets/AssetsFORELLE/Audio/Soundtrack/creditsdupstepbiszumdrop.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a2c1f2481648237d27f67d133ddc560b2dd698df1362242630d16c871903bbf +size 9379970 diff --git a/Assets/AssetsFORELLE/Audio/Soundtrack/creditsdupstepbiszumdrop.wav.meta b/Assets/AssetsFORELLE/Audio/Soundtrack/creditsdupstepbiszumdrop.wav.meta new file mode 100644 index 0000000..b93f376 --- /dev/null +++ b/Assets/AssetsFORELLE/Audio/Soundtrack/creditsdupstepbiszumdrop.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 750929f0eeac86942bb19cdf19200d3a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Script/NextSceneAfterCredits.cs b/Assets/AssetsFORELLE/Script/NextSceneAfterCredits.cs index 4c1eb2d..b6579d7 100644 --- a/Assets/AssetsFORELLE/Script/NextSceneAfterCredits.cs +++ b/Assets/AssetsFORELLE/Script/NextSceneAfterCredits.cs @@ -19,7 +19,7 @@ public class NextSceneAfterCredits : MonoBehaviour IEnumerator NextScene() { - yield return new WaitForSeconds(59.9f); + yield return new WaitForSeconds(53.9f); SceneManager.LoadScene(0); } } diff --git a/Assets/AssetsFORELLE/Timeline/TextTimelineCredits.playable b/Assets/AssetsFORELLE/Timeline/TextTimelineCredits.playable index 518c5d4..69afb9a 100644 --- a/Assets/AssetsFORELLE/Timeline/TextTimelineCredits.playable +++ b/Assets/AssetsFORELLE/Timeline/TextTimelineCredits.playable @@ -25,7 +25,7 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: -2388802360454205754} - m_Duration: 60.0000000000001 + m_Duration: 54.000000000000085 m_TimeScale: 1 m_ParentTrack: {fileID: -3000117140720751800} m_EaseInDuration: 0 @@ -315,6 +315,7 @@ MonoBehaviour: m_Tracks: - {fileID: 834333900234940430} - {fileID: -3000117140720751800} + - {fileID: 5731642961127477975} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -362,3 +363,116 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!114 &1368558593032889398 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f10dd60657c6004587f237a7e90f8e4, type: 3} + m_Name: AudioPlayableAsset + m_EditorClassIdentifier: + m_Clip: {fileID: 8300000, guid: 750929f0eeac86942bb19cdf19200d3a, type: 3} + m_Loop: 0 + m_bufferingTime: 0.1 + m_ClipProperties: + volume: 0.528 +--- !u!114 &5731642961127477975 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b22792c3b570444eb18cb78c2af3a74, type: 3} + m_Name: Audio Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: 1368558593032889398} + m_Duration: 54.000000000000085 + m_TimeScale: 1 + m_ParentTrack: {fileID: 5731642961127477975} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 0 + m_PreExtrapolationMode: 0 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: creditsdupstepbiszumdrop + m_Markers: + m_Objects: [] + m_TrackProperties: + volume: 1 + stereoPan: 0 + spatialBlend: 0 diff --git a/Assets/Scenes/ScenesInGame/15.4NachBossVorCredits.unity b/Assets/Scenes/ScenesInGame/15.4NachBossVorCredits.unity index 45378b7..77c0150 100644 --- a/Assets/Scenes/ScenesInGame/15.4NachBossVorCredits.unity +++ b/Assets/Scenes/ScenesInGame/15.4NachBossVorCredits.unity @@ -4933,7 +4933,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1307105793} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -5.17, y: 0.43, z: -10.020564} + m_LocalPosition: {x: -7.1, y: 0.43, z: -10.020564} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/ScenesInGame/17CreditScene.unity b/Assets/Scenes/ScenesInGame/17CreditScene.unity index 4990f98..2e6bd63 100644 --- a/Assets/Scenes/ScenesInGame/17CreditScene.unity +++ b/Assets/Scenes/ScenesInGame/17CreditScene.unity @@ -123,75 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &9672570 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135652, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135653, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_audioClip - value: - objectReference: {fileID: 8300000, guid: 4e1bcdc9554fc0f4eab0dbfff000e6d1, type: 3} - - target: {fileID: 5008637316406135655, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_Name - value: AudioController - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135658, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5008637316406135659, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: aaa21b2eb457ac74b9e319793b401dc6, type: 3} --- !u!1 &429393349 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ScenesInGame/4DScene.unity b/Assets/Scenes/ScenesInGame/4DScene.unity index 83d0a53..d2b1615 100644 --- a/Assets/Scenes/ScenesInGame/4DScene.unity +++ b/Assets/Scenes/ScenesInGame/4DScene.unity @@ -4117,6 +4117,7 @@ GameObject: m_Component: - component: {fileID: 1663922888} - component: {fileID: 1663922889} + - component: {fileID: 1663922890} m_Layer: 0 m_Name: Meowlin The Purrtastic m_TagString: Untagged @@ -4191,6 +4192,27 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &1663922890 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1663922887} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 270acda819b9cb04187bd29a244e6647, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1681817730 GameObject: m_ObjectHideFlags: 0