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

4cdf3473 · nedboy3 · b01d7003 · a7e4a8eb · 4cdf3473 · 4cdf3473
Commit 4cdf3473 authored Feb 11, 2019 by nedboy3
--- a/RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
+++ b/RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
 <Properties StartupConfiguration="{67A4F128-F6AC-CD88-DA35-F29416A0792A}|">
  <MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/TrapezeScripts/FollowPlayerx.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/MimeScripts/TriggerManager.cs">
    <Files>
-      <File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs" Line="1" Column="1" />
-      <File FileName="Assets/Scripts/TrapezeScripts/TrapezeCameraFollow.cs" Line="37" Column="3" />
-      <File FileName="Assets/Scripts/TrapezeScripts/TrapezePerson.cs" Line="108" Column="55" />
-      <File FileName="Assets/Scripts/TrapezeScripts/FollowPlayerx.cs" Line="24" Column="16" />
+      <File FileName="Assets/Scripts/MimeScripts/SpawnKeys.cs" Line="1" Column="1" />
+      <File FileName="Assets/Scripts/MimeScripts/TriggerManager.cs" Line="143" Column="32" />
    </Files>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />

--- a/RingMaster/RingMaster/.vs/RingMaster/xs/sqlite3/storage.ide
+++ b/RingMaster/RingMaster/.vs/RingMaster/xs/sqlite3/storage.ide
--- a/RingMaster/RingMaster/Assets/Prefabs/BadHit.prefab
+++ b/RingMaster/RingMaster/Assets/Prefabs/BadHit.prefab
@@ -43,7 +43,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1783430355985828
 GameObject:
  m_ObjectHideFlags: 0
@@ -60,7 +60,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1933345221963994
 GameObject:
  m_ObjectHideFlags: 0
@@ -14117,9 +14117,9 @@ ParticleSystemRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1966733235
+  m_SortingLayer: 2
+  m_SortingOrder: -1
  m_RenderMode: 0
  m_SortMode: 0
  m_MinParticleSize: 0

--- a/RingMaster/RingMaster/Assets/Prefabs/E(Down).prefab
+++ b/RingMaster/RingMaster/Assets/Prefabs/E(Down).prefab
@@ -113,9 +113,9 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1966733235
+  m_SortingLayer: 2
+  m_SortingOrder: 1
  m_Sprite: {fileID: 21300000, guid: ed80dbbbc56aab34aa7a7aa8536df87b, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0

--- a/RingMaster/RingMaster/Assets/Prefabs/GoodHit.prefab
+++ b/RingMaster/RingMaster/Assets/Prefabs/GoodHit.prefab
@@ -27,7 +27,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1298412414263232
 GameObject:
  m_ObjectHideFlags: 0
@@ -4894,8 +4894,8 @@ ParticleSystem:
    startSpeed:
      serializedVersion: 2
      minMaxState: 3
-      scalar: 4
-      minScalar: 1
+      scalar: 2
+      minScalar: 0.5
      maxCurve:
        serializedVersion: 2
        m_Curve:

--- a/RingMaster/RingMaster/Assets/Prefabs/PauseMenuController.prefab
+++ b/RingMaster/RingMaster/Assets/Prefabs/PauseMenuController.prefab
@@ -191,7 +191,7 @@ Transform:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1602431506710890}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 1.0530677, y: 1.222854, z: -5.073231}
+  m_LocalPosition: {x: 1.0530677, y: 1.222854, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 224962148856270744}
@@ -717,7 +717,7 @@ Canvas:
  m_SortingBucketNormalizedSize: 0
  m_AdditionalShaderChannelsFlag: 0
  m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 4
  m_TargetDisplay: 0
 --- !u!224 &224082423174859926
 RectTransform:

--- a/RingMaster/RingMaster/Assets/Prefabs/PerfectHit.prefab
+++ b/RingMaster/RingMaster/Assets/Prefabs/PerfectHit.prefab
@@ -9600,7 +9600,7 @@ ParticleSystem:
    startSize:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 0.3
+      scalar: 0.6
      minScalar: 1
      maxCurve:
        serializedVersion: 2
@@ -14003,9 +14003,9 @@ ParticleSystemRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1966733235
+  m_SortingLayer: 2
+  m_SortingOrder: -1
  m_RenderMode: 0
  m_SortMode: 0
  m_MinParticleSize: 0

--- a/RingMaster/RingMaster/Assets/Prefabs/PieThrowing Prefabs/pie.prefab
+++ b/RingMaster/RingMaster/Assets/Prefabs/PieThrowing Prefabs/pie.prefab
@@ -54,7 +54,7 @@ Rigidbody2D:
  m_Simulated: 1
  m_UseFullKinematicContacts: 0
  m_UseAutoMass: 0
-  m_Mass: 40
+  m_Mass: 20
  m_LinearDrag: 0
  m_AngularDrag: 0.05
  m_GravityScale: 1

--- a/RingMaster/RingMaster/Assets/Prefabs/Q(Left).prefab
+++ b/RingMaster/RingMaster/Assets/Prefabs/Q(Left).prefab
@@ -113,9 +113,9 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1966733235
+  m_SortingLayer: 2
+  m_SortingOrder: 1
  m_Sprite: {fileID: 21300000, guid: aebf40153d2449b4f8a62e3640801e4f, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0

--- a/RingMaster/RingMaster/Assets/Prefabs/R(Right).prefab
+++ b/RingMaster/RingMaster/Assets/Prefabs/R(Right).prefab
@@ -113,9 +113,9 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1966733235
+  m_SortingLayer: 2
+  m_SortingOrder: 1
  m_Sprite: {fileID: 21300000, guid: 32def2f4935440d4fbd9e356c62e25f2, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0

--- a/RingMaster/RingMaster/Assets/Prefabs/TextParticles.prefab
+++ b/RingMaster/RingMaster/Assets/Prefabs/TextParticles.prefab
@@ -133,7 +133,7 @@ ParticleSystem:
    startLifetime:
      serializedVersion: 2
      minMaxState: 0
-      scalar: 5
+      scalar: 2
      minScalar: 5
      maxCurve:
        serializedVersion: 2
@@ -4678,8 +4678,8 @@ ParticleSystemRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: -1966733235
+  m_SortingLayer: 2
  m_SortingOrder: 0
  m_RenderMode: 0
  m_SortMode: 0

--- a/RingMaster/RingMaster/Assets/Prefabs/VerticalSegment.prefab
+++ b/RingMaster/RingMaster/Assets/Prefabs/VerticalSegment.prefab
--- a/RingMaster/RingMaster/Assets/Prefabs/VerticalSegment.prefab.meta
+++ b/RingMaster/RingMaster/Assets/Prefabs/VerticalSegment.prefab.meta
+fileFormatVersion: 2
+guid: a13b0bed2e5711a4fbda550f1ba732b7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/RingMaster/RingMaster/Assets/Prefabs/W(Up).prefab
+++ b/RingMaster/RingMaster/Assets/Prefabs/W(Up).prefab
@@ -113,9 +113,9 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -1966733235
+  m_SortingLayer: 2
+  m_SortingOrder: 1
  m_Sprite: {fileID: 21300000, guid: 908db036c1e262c4aa865a0526d715b1, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0

--- a/RingMaster/RingMaster/Assets/Resources/Meatball.txt
+++ b/RingMaster/RingMaster/Assets/Resources/Meatball.txt
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
+\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
+
+\f0\fs24 \cf0 Meatball 8.0\
+up 0\
+left 0.2\
+up 0.4\
+right 0.6\
+up 0.8\
+down 1.5\
+up 1.7\
+left 1.9\
+up 2.1\
+right 2.3\
+up 2.5\
+down 3.1\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
+\cf0 up 3.3\
+left 3.5\
+up 3.7\
+right 3.9\
+up 4.1\
+up 4.3\
+left 4.6\
+right 5.0\
+down 6.2\
+up 0\
+left 0.2\
+up 0.4\
+right 0.6\
+up 0.8\
+\
+\
+}
\ No newline at end of file
--- a/RingMaster/RingMaster/Assets/Resources/Meatball.txt.meta
+++ b/RingMaster/RingMaster/Assets/Resources/Meatball.txt.meta
+fileFormatVersion: 2
+guid: abcc865c19a97934f901eab0f203caa5
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/RingMaster/RingMaster/Assets/Scenes/Daytime.unity
+++ b/RingMaster/RingMaster/Assets/Scenes/Daytime.unity
@@ -485,6 +485,139 @@ Transform:
  m_Father: {fileID: 2052297032}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &119530977
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 119530979}
+  - component: {fileID: 119530978}
+  m_Layer: 0
+  m_Name: Audio Source
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!82 &119530978
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 119530977}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: e58f839d41204438eb75f0c7a3c0d00c, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 7.1443634
+  MaxDistance: 80.38216
+  Pan2D: 0
+  rolloffMode: 2
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0.03888073
+      value: 0.008037567
+      inSlope: 11.144143
+      outSlope: 11.144143
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0.06782932
+    - serializedVersion: 3
+      time: 0.20437163
+      value: 0.9991112
+      inSlope: -0.007916211
+      outSlope: -0.007916211
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.5151981
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 0.9875463
+      inSlope: -0.088915415
+      outSlope: -0.088915415
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!4 &119530979
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 119530977}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &124138635
 GameObject:
  m_ObjectHideFlags: 0
@@ -1506,6 +1639,7 @@ Transform:
  m_LocalScale: {x: 4, y: 3.7, z: 1}
  m_Children:
  - {fileID: 1210641576}
+  - {fileID: 489920132}
  m_Father: {fileID: 119128647}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1544,7 +1678,82 @@ SpriteRenderer:
  m_SortingLayerID: -1106870113
  m_SortingLayer: 1
  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 08e6188b6abad7f48ab781ce762e2b20, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 89a6bdf81982d3a4487f94518b7ccd2c, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 10, y: 5}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &489920131
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 489920132}
+  - component: {fileID: 489920133}
+  m_Layer: 0
+  m_Name: Backgorund Ground
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &489920132
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 489920131}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 473481958}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &489920133
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 489920131}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -1106870113
+  m_SortingLayer: 1
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: faabef3ba4af8bd49b4c81dd48c0642c, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
  m_FlipY: 0
@@ -2109,6 +2318,81 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
+--- !u!1 &730948160
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 730948161}
+  - component: {fileID: 730948162}
+  m_Layer: 0
+  m_Name: Backgorund Ground
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &730948161
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 730948160}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1338108759}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &730948162
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 730948160}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -1106870113
+  m_SortingLayer: 1
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: faabef3ba4af8bd49b4c81dd48c0642c, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 10, y: 5}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &757305216
 GameObject:
  m_ObjectHideFlags: 0
@@ -17989,6 +18273,7 @@ Transform:
  m_LocalScale: {x: 4, y: 3.7, z: 1}
  m_Children:
  - {fileID: 997962364}
+  - {fileID: 730948161}
  m_Father: {fileID: 119128647}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -18027,7 +18312,7 @@ SpriteRenderer:
  m_SortingLayerID: -1106870113
  m_SortingLayer: 1
  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 08e6188b6abad7f48ab781ce762e2b20, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 89a6bdf81982d3a4487f94518b7ccd2c, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
  m_FlipY: 0

--- a/RingMaster/RingMaster/Assets/Scenes/MainMenu.unity
+++ b/RingMaster/RingMaster/Assets/Scenes/MainMenu.unity
@@ -136,16 +136,16 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 187337959}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
-  m_Father: {fileID: 896807685}
+  m_Father: {fileID: 2144649529}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 150}
+  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 500, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &187337961
@@ -160,7 +160,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 0.8906649, b: 0.21226418, a: 1}
  m_RaycastTarget: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
@@ -355,7 +355,7 @@ RectTransform: