mindfulminun/FebGameJam
1
0
Fork 0
mirror of https://github.com/frizbee19/FebGameJam.git synced 2026-09-11 08:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into beni

Browse Source
This commit is contained in:
Benji
2022-02-27 02:44:25 -06:00
committed by GitHub
parent 4ac49467b9 094c89cb7e
commit 020041c8c0
2 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Game Scenes/Bird Level.unity
+52 -4
View File
@@ -506,6 +506,42 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 909522769}
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ResumeGame
objectReference: {fileID: 0}
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: GameOver, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 465430853313913524, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
value: ResumeGame()
objectReference: {fileID: 0}
- target: {fileID: 465430853607620548, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 909522769}
- target: {fileID: 465430853607620548, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ReturnToMain
objectReference: {fileID: 0}
- target: {fileID: 465430853607620548, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: GameOver, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 3765277719197793240, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_Name
value: Game Over
@@ -558,6 +594,18 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7909362878412871847, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 909522769}
- target: {fileID: 7909362878412871847, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ReturnToReal
objectReference: {fileID: 0}
- target: {fileID: 7909362878412871847, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: GameOver, Assembly-CSharp
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 229417a88c124ac40a6a32ba8b224303, type: 3}
--- !u!1 &163424210
@@ -7744,7 +7792,7 @@ MonoBehaviour:
value: 0
player: {fileID: 387672841}
respawn: {x: -7.5, y: 6}
canHurt: 0
canHurt: 1
--- !u!50 &1981804707
Rigidbody2D:
serializedVersion: 4
@@ -8133,9 +8181,9 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: 1027733709
m_SortingLayer: 2
m_SortingOrder: 9
m_Sprite: {fileID: -8221170716321238454, guid: d06424b435e03449d8a18a49e7790beb, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
UserSettings/EditorUserSettings.asset
+3
View File
@@ -8,6 +8,9 @@ EditorUserSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663f3af0e47414e7f133e5a92f31352d1b
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0