Commit ccec27f7 authored by mmaluschnig's avatar mmaluschnig
Browse files

Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster

* 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  Saved the scene kappa.
parents c9cb4610 d38798a4
......@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 4
points: 10
points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212407946038748536
SpriteRenderer:
......
......@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 4
points: 10
points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212811011743869882
SpriteRenderer:
......
......@@ -210,7 +210,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 4
points: 10
points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212894587835513782
SpriteRenderer:
......
......@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 4
points: 10
points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212407946038748536
SpriteRenderer:
......
......@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 4
points: 10
points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212888216861688268
SpriteRenderer:
......
......@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 4
points: 10
points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212506891093594290
SpriteRenderer:
......
......@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 4
points: 10
points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212407946038748536
SpriteRenderer:
......
......@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 4
points: 10
points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212407946038748536
SpriteRenderer:
......
......@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 4
points: 10
points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212407946038748536
SpriteRenderer:
......
......@@ -277,8 +277,84 @@ MonoBehaviour:
m_EditorClassIdentifier:
score: {fileID: 1270994740}
combo: {fileID: 1828139996}
multi: {fileID: 106097054}
exitPanel: {fileID: 1216935864}
exitText: {fileID: 1272109652}
--- !u!1 &106097052
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 106097053}
- component: {fileID: 106097055}
- component: {fileID: 106097054}
m_Layer: 0
m_Name: Multiplier
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &106097053
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 106097052}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9999327, y: 0.9999327, z: 0.9999327}
m_Children: []
m_Father: {fileID: 333498656}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 113.180176, y: -21.85}
m_SizeDelta: {x: -266.39996, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &106097054
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 106097052}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'Multiplier: 100'
--- !u!222 &106097055
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 106097052}
m_CullTransparentMesh: 0
--- !u!1 &165739920
GameObject:
m_ObjectHideFlags: 0
......@@ -731,6 +807,7 @@ RectTransform:
m_Children:
- {fileID: 1270994739}
- {fileID: 1828139995}
- {fileID: 106097053}
m_Father: {fileID: 1542602636}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -4238,8 +4315,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 113.180176, y: -0.0000014305115}
m_SizeDelta: {x: -266.36, y: 80}
m_AnchoredPosition: {x: 113.180176, y: 19.999}
m_SizeDelta: {x: -266.4, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1828139996
MonoBehaviour:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment