Jonathan/Jeremy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Katharina Ziolkowski
2025-01-05 19:55:00 +01:00
parent 437a332337 4d7fe1fa1c
commit fcac8ce4eb
16 changed files with 584 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/SecondTry.unity
+162 -2
View File
@@ -129,6 +129,7 @@ GameObject:
m_Component:
- component: {fileID: 37478705}
- component: {fileID: 37478706}
- component: {fileID: 37478707}
m_Layer: 0
m_Name: 6-DoggyWithFirstArm
m_TagString: Untagged
@@ -176,8 +177,25 @@ PlayableDirector:
value: {fileID: 1655854536}
- key: {fileID: 2845738039573819732, guid: 05c95ba7c04696c43a66646eda0c1872, type: 2}
value: {fileID: 614152673}
- key: {fileID: -7451755293292363163, guid: 05c95ba7c04696c43a66646eda0c1872, type: 2}
value: {fileID: 37478707}
m_ExposedReferences:
m_References: []
--- !u!114 &37478707
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 37478704}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Events:
m_Signals: []
m_Events: []
--- !u!1 &37857173
GameObject:
m_ObjectHideFlags: 0
@@ -526,6 +544,7 @@ MonoBehaviour:
m_Events:
m_Signals:
- {fileID: 11400000, guid: 7ff41bb94f156fe458259794407f867f, type: 2}
- {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls:
@@ -541,6 +560,20 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1712245177}
m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp
m_MethodName: PlayMusicFinaleBuildUp
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &92100610
GameObject:
m_ObjectHideFlags: 0
@@ -3078,7 +3111,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text:
m_text: Jeremy? Bist du das? Erkennst du mich?
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -3691,6 +3724,7 @@ GameObject:
m_Component:
- component: {fileID: 666077052}
- component: {fileID: 666077053}
- component: {fileID: 666077054}
m_Layer: 0
m_Name: 1-MainMenu
m_TagString: Untagged
@@ -3732,8 +3766,40 @@ PlayableDirector:
value: {fileID: 2005490199}
- key: {fileID: 7424517097278253482, guid: 7a2b8a832524b58409674b14bab5f69a, type: 2}
value: {fileID: 491528497}
- key: {fileID: 2093478255871917301, guid: 7a2b8a832524b58409674b14bab5f69a, type: 2}
value: {fileID: 666077054}
m_ExposedReferences:
m_References: []
--- !u!114 &666077054
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 666077051}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Events:
m_Signals:
- {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1712245177}
m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp
m_MethodName: PlayMusicCozy
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &668583055
GameObject:
m_ObjectHideFlags: 0
@@ -4733,6 +4799,8 @@ PlayableDirector:
value: {fileID: 881863053}
- key: {fileID: 4484598294104975580, guid: 7e63ca2f70cff174984580bc91332e21, type: 2}
value: {fileID: 614152673}
- key: {fileID: -6749673999287359741, guid: 7e63ca2f70cff174984580bc91332e21, type: 2}
value: {fileID: 0}
m_ExposedReferences:
m_References:
- 1bc3b4f78c985f64d802b91dd1927376: {fileID: 43342454}
@@ -5814,7 +5882,7 @@ MonoBehaviour:
m_BoolArgument: 0
m_CallState: 2
_outlineFx: {fileID: 1012237403}
isActive: 1
isActive: 0
--- !u!114 &1012237403
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -9283,6 +9351,7 @@ GameObject:
m_Component:
- component: {fileID: 1672360742}
- component: {fileID: 1672360743}
- component: {fileID: 1672360744}
m_Layer: 0
m_Name: 20-DoggyTurn
m_TagString: Untagged
@@ -9340,8 +9409,40 @@ PlayableDirector:
value: {fileID: 1712245181}
- key: {fileID: 4271253055062602636, guid: f23c08ddf12082242b7dfc9154555ee7, type: 2}
value: {fileID: 614152673}
- key: {fileID: -2856112576394045403, guid: f23c08ddf12082242b7dfc9154555ee7, type: 2}
value: {fileID: 1672360744}
m_ExposedReferences:
m_References: []
--- !u!114 &1672360744
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1672360741}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Events:
m_Signals:
- {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1712245177}
m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp
m_MethodName: PlayMusicTurnAround
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &1676006750
GameObject:
m_ObjectHideFlags: 0
@@ -9524,6 +9625,17 @@ MonoBehaviour:
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!114 &1712245177 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4726213464259086350, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3}
m_PrefabInstance: {fileID: 1712245174}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d105854c4ef8253498191cabbacf6202, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!95 &1712245181
Animator:
serializedVersion: 7
@@ -9882,6 +9994,7 @@ MonoBehaviour:
m_Events:
m_Signals:
- {fileID: 11400000, guid: 7ff41bb94f156fe458259794407f867f, type: 2}
- {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls:
@@ -9897,6 +10010,20 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1712245177}
m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp
m_MethodName: PlayMusicCozyPlusTrash
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1792707390
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -10517,6 +10644,7 @@ GameObject:
m_Component:
- component: {fileID: 2025623354}
- component: {fileID: 2025623355}
- component: {fileID: 2025623356}
m_Layer: 0
m_Name: 22-DoggyOPDetail
m_TagString: Untagged
@@ -10562,8 +10690,40 @@ PlayableDirector:
value: {fileID: 1012237401}
- key: {fileID: 6245622514681690319, guid: c7a2a808b906f4847ab929c8df47c049, type: 2}
value: {fileID: 614152673}
- key: {fileID: 1619188942213112811, guid: c7a2a808b906f4847ab929c8df47c049, type: 2}
value: {fileID: 2025623356}
m_ExposedReferences:
m_References: []
--- !u!114 &2025623356
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2025623353}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Events:
m_Signals:
- {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1712245177}
m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp
m_MethodName: PlayMusicTurnAroundPlusJeremyLives
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &2028584897
GameObject:
m_ObjectHideFlags: 0