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 with riz worked!

Browse Source
This commit is contained in:
Zoe J
2022-02-21 19:40:12 -06:00
parent 44e4c7368f
commit 1bd8897d05
8 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Main Menu.unity
Generated
+17 -13
View File
@@ -156,7 +156,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -613,8 +613,8 @@ RectTransform:
m_Father: {fileID: 684044597}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -1019,8 +1019,8 @@ RectTransform:
m_Father: {fileID: 1299549684}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -1437,7 +1437,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -1996,7 +1996,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -2197,7 +2197,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 80
m_text: 100
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 1a720ceb9285174499a73898e09bd868, type: 2}
m_sharedMaterial: {fileID: 69611261040843789, guid: 1a720ceb9285174499a73898e09bd868, type: 2}
@@ -3362,7 +3362,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 80
m_text: 100
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 1a720ceb9285174499a73898e09bd868, type: 2}
m_sharedMaterial: {fileID: 69611261040843789, guid: 1a720ceb9285174499a73898e09bd868, type: 2}
@@ -3895,7 +3895,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &997522403
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5438,6 +5438,10 @@ PrefabInstance:
propertyPath: m_Name
value: Options Button
objectReference: {fileID: 0}
- target: {fileID: 8900608489955080584, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 158e2c5bf8709994a87286eb92997cd6, type: 3}
--- !u!224 &1579296636 stripped
@@ -5477,8 +5481,8 @@ RectTransform:
m_Father: {fileID: 981775343}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -5883,7 +5887,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 80
m_text: 100
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 1a720ceb9285174499a73898e09bd868, type: 2}
m_sharedMaterial: {fileID: 69611261040843789, guid: 1a720ceb9285174499a73898e09bd868, type: 2}