diff --git a/Assets/Scenes/highscores.unity b/Assets/Scenes/highscores.unity
index 3f0c05b7d9d94948a34b1e2e066f6510d52b8115..5f0b2cce5da78a5d8841060a3e8236a938f371ff 100644
--- a/Assets/Scenes/highscores.unity
+++ b/Assets/Scenes/highscores.unity
@@ -112,83 +112,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &281912172
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 281912173}
- - component: {fileID: 281912175}
- - component: {fileID: 281912174}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &281912173
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 281912172}
- 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: 984987799}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &281912174
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 281912172}
- 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: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 14
- 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: Main Menu
---- !u!222 &281912175
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 281912172}
- m_CullTransparentMesh: 0
--- !u!1 &307728907
GameObject:
m_ObjectHideFlags: 0
@@ -281,9 +204,9 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1133565008}
- - {fileID: 984987799}
- {fileID: 1463724577}
- {fileID: 985162891}
+ - {fileID: 1780011722}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -370,146 +293,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &984987798
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 984987799}
- - component: {fileID: 984987803}
- - component: {fileID: 984987802}
- - component: {fileID: 984987801}
- - component: {fileID: 984987800}
- m_Layer: 5
- m_Name: Button
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &984987799
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 984987798}
- 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:
- - {fileID: 281912173}
- m_Father: {fileID: 307728911}
- m_RootOrder: 1
- 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: -107}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &984987800
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 984987798}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 1c354309142d62d46aba15d1c0f0e235, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- usernameField: {fileID: 0}
- alertField: {fileID: 0}
---- !u!114 &984987801
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 984987798}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 984987802}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 984987800}
- m_MethodName: GotoMainMenuScene
- 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: 1
---- !u!114 &984987802
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 984987798}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!222 &984987803
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 984987798}
- m_CullTransparentMesh: 0
--- !u!1 &985162890
GameObject:
m_ObjectHideFlags: 0
@@ -541,7 +324,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 307728911}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -708,7 +491,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 307728911}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -767,6 +550,223 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1463724576}
m_CullTransparentMesh: 0
+--- !u!1 &1780011721
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1780011722}
+ - component: {fileID: 1780011726}
+ - component: {fileID: 1780011725}
+ - component: {fileID: 1780011724}
+ - component: {fileID: 1780011723}
+ m_Layer: 5
+ m_Name: Button
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1780011722
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1780011721}
+ 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:
+ - {fileID: 1883350783}
+ m_Father: {fileID: 307728911}
+ m_RootOrder: 3
+ 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.5001526, y: -107.500145}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1780011723
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1780011721}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1c354309142d62d46aba15d1c0f0e235, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ usernameField: {fileID: 0}
+ alertField: {fileID: 0}
+--- !u!114 &1780011724
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1780011721}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1780011725}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1780011723}
+ m_MethodName: GotoMainMenuScene
+ 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: 1
+--- !u!114 &1780011725
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1780011721}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!222 &1780011726
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1780011721}
+ m_CullTransparentMesh: 0
+--- !u!1 &1883350782
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1883350783}
+ - component: {fileID: 1883350785}
+ - component: {fileID: 1883350784}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1883350783
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1883350782}
+ 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: 1780011722}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1883350784
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1883350782}
+ 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: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ 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: Main Menu
+--- !u!222 &1883350785
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1883350782}
+ m_CullTransparentMesh: 0
--- !u!1 &2008126066
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity
index 06b9bae03c3085dbb98f33eb8ed6ddc04fea4282..e38b9b2a0f88ac3423bab5e0ec407d0434b8fb66 100644
--- a/Assets/Scenes/main.unity
+++ b/Assets/Scenes/main.unity
@@ -1280,9 +1280,9 @@ RectTransform:
m_Father: {fileID: 359101974}
m_RootOrder: 1
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: -140, y: 120.000046}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 110, y: -15.999954}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1431054861
@@ -2054,9 +2054,9 @@ RectTransform:
m_Father: {fileID: 359101974}
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: 235, y: 120}
+ m_AnchorMin: {x: 1, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -15, y: -16}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1686676678
diff --git a/Assets/Scenes/mainmenu.unity b/Assets/Scenes/mainmenu.unity
index fc459c948d03fceb7cac73af610bfd3141781bc2..d2fbbef72794680082e8418babf71b85776d0449 100644
--- a/Assets/Scenes/mainmenu.unity
+++ b/Assets/Scenes/mainmenu.unity
@@ -282,18 +282,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 373841322}
- 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:
- {fileID: 297518642}
- m_Father: {fileID: 1210387519}
- m_RootOrder: 0
+ m_Father: {fileID: 1423875204}
+ m_RootOrder: 1
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: -106.9}
- m_SizeDelta: {x: 160, y: 30}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &373841324
MonoBehaviour:
@@ -428,7 +428,7 @@ RectTransform:
m_Children:
- {fileID: 851889988}
m_Father: {fileID: 1210387519}
- m_RootOrder: 2
+ 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}
@@ -561,18 +561,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 587421683}
- 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:
- {fileID: 1337733414}
- m_Father: {fileID: 1210387519}
- m_RootOrder: 1
+ m_Father: {fileID: 1423875204}
+ 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: -75}
- m_SizeDelta: {x: 160, y: 30}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &587421685
MonoBehaviour:
@@ -841,9 +841,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- - {fileID: 373841323}
- - {fileID: 587421684}
- {fileID: 539772041}
+ - {fileID: 1423875204}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1022,6 +1021,104 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
AudioText: {fileID: 851889989}
+--- !u!1 &1423875203
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1423875204}
+ - component: {fileID: 1423875207}
+ - component: {fileID: 1423875206}
+ - component: {fileID: 1423875205}
+ m_Layer: 5
+ m_Name: Panel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1423875204
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1423875203}
+ 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:
+ - {fileID: 587421684}
+ - {fileID: 373841323}
+ m_Father: {fileID: 1210387519}
+ m_RootOrder: 1
+ 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: 2, y: -62.75}
+ m_SizeDelta: {x: 146.09998, y: 86.3}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1423875205
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1423875203}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 0
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 1
+ m_ChildForceExpandHeight: 1
+ m_ChildControlWidth: 1
+ m_ChildControlHeight: 1
+--- !u!114 &1423875206
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1423875203}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!222 &1423875207
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1423875203}
+ m_CullTransparentMesh: 0
--- !u!1 &1843760131
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/scripts/SceneSwitcher.cs b/Assets/scripts/SceneSwitcher.cs
index ff264610a7936c7cd75dc982f2b91303215f8863..fc72ac79bc14c66de4fff7858b486a898d831441 100644
--- a/Assets/scripts/SceneSwitcher.cs
+++ b/Assets/scripts/SceneSwitcher.cs
@@ -16,6 +16,7 @@ public class SceneSwitcher : MonoBehaviour
public void GotoMainMenuScene()
{
+ Debug.Log("Main menu");
SceneManager.LoadScene("mainmenu");
}
diff --git a/Assets/scripts/movement.cs b/Assets/scripts/movement.cs
index 9eee51efc96746237fb8325463f62528495143de..11a92ab7e08f423f86159987a622e7d4175cb31a 100644
--- a/Assets/scripts/movement.cs
+++ b/Assets/scripts/movement.cs
@@ -51,7 +51,6 @@ public class movement : MonoBehaviour {
normalGravity = rb2d.gravityScale;
m_Animator = GetComponent<Animator>();
- // m_Animator.SetBool("Jump", true);
}
//FixedUpdate is called at a fixed interval and is independent of frame rate. Put physics code here.
@@ -59,10 +58,8 @@ public class movement : MonoBehaviour {
{
if (!PlayerHealth.freeze)
{
- //BARU
if (isGrounded)
{
- // Debug.Log("Masuk sini");
if (faceDirectionX != 0)
{
if (currentSpeedX == 0)
@@ -104,7 +101,6 @@ public class movement : MonoBehaviour {
{
SetMidairParams();
- // Holding Dash while in midair has no effect
if (faceDirectionX != 0)
{
if (currentSpeedX == 0)
@@ -191,9 +187,6 @@ public class movement : MonoBehaviour {
if (!inputFreezed)
{
faceDirectionX = Input.GetAxisRaw("Horizontal"); // > 0 for right, < 0 for left
- //isDashing = Input.GetButton("Dash");
- //isCrouching = Input.GetButton("Crouch");
- //isShooting = Input.GetButtonDown("Dash");
jumpButtonHeld = Input.GetButton("Jump");
if (Input.GetButtonUp("Jump"))
{
@@ -201,10 +194,8 @@ public class movement : MonoBehaviour {
jumpButtonReleased = true;
}
}
- // Debug.Log(faceDirectionX);
isFalling = rb2d.velocity.y < 0 && !isGrounded;
- // TODO M_GROUNDCHECK1 and GROUNDLAYER
isGrounded = Physics2D.OverlapPoint(m_GroundCheck1.position, GroundLayers) || Physics2D.OverlapPoint(m_GroundCheck2.position, GroundLayers);
isChangingDirection = currentSpeedX > 0 && faceDirectionX * moveDirectionX < 0;
@@ -256,7 +247,6 @@ public class movement : MonoBehaviour {
}
}
- /****************** Movement control */
void SetJumpParams()
{
if (currentSpeedX < 3.75f)
diff --git a/Library/CurrentLayout.dwlt b/Library/CurrentLayout.dwlt
index 47ed025af34b6e17ccdb5f17dbc90da35395b43c..a096c3f3fc3b665ebd88687d2af24611aec5dae0 100644
--- a/Library/CurrentLayout.dwlt
+++ b/Library/CurrentLayout.dwlt
@@ -21,7 +21,7 @@ MonoBehaviour:
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 2}
- m_MinSize: {x: 950, y: 300}
+ m_MinSize: {x: 950, y: 498}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
--- !u!114 &2
@@ -93,10 +93,10 @@ MonoBehaviour:
y: 30
width: 1366
height: 635
- m_MinSize: {x: 917, y: 448}
- m_MaxSize: {x: 22012, y: 10024}
+ m_MinSize: {x: 911, y: 448}
+ m_MaxSize: {x: 22006, y: 10024}
vertical: 0
- controlID: 95
+ controlID: 92
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -142,7 +142,7 @@ MonoBehaviour:
m_MinSize: {x: 202, y: 448}
m_MaxSize: {x: 4002, y: 8048}
vertical: 1
- controlID: 77
+ controlID: 93
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -214,8 +214,8 @@ MonoBehaviour:
y: 0
width: 277
height: 635
- m_MinSize: {x: 277, y: 74}
- m_MaxSize: {x: 4002, y: 4024}
+ m_MinSize: {x: 275, y: 50}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 16}
@@ -268,8 +268,8 @@ MonoBehaviour:
y: 326
width: 501
height: 309
- m_MinSize: {x: 202, y: 224}
- m_MaxSize: {x: 4002, y: 4024}
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 18}
@@ -389,12 +389,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 399
- width: 623
+ width: 499
height: 289
m_PersistentViewDataDictionary: {fileID: 0}
m_LockTracker:
m_IsLocked: 0
- m_LastSelectedObjectID: 4204
+ m_LastSelectedObjectID: 12694
--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -426,7 +426,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 66fbffffdefbffff
+ m_ExpandedIDs: 68e6ffff80e6fffface7ffffb2e7ffffb6e7ffffc4e7ffffb0e9ffffece9ffff14ecffff2cecffff2eecffff32ecffff36ecffff3aecffff0cedffff24edffff50eeffff56eeffff62eeffff66eeffffeeeffffffaefffff52f4ffff0cf6ffffe0f9fffff8f9ffff26fbffff2cfbffff38fbffff42fbffffdefbffff4230000056300000623100001c3800003c38000056380000523b00000c3e0000263e0000464000005c40000066400000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -523,20 +523,20 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SearchArea: 1
m_Folders:
- - Assets/prefabs
+ - Assets/scripts
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- - Assets/prefabs
+ - Assets/scripts
m_LastFoldersGridSize: -1
m_LastProjectPath: D:\final\Tubes
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: fe090000
- m_LastClickedID: 2558
- m_ExpandedIDs: 00000000a60900007e0a0000c20a0000480b0000900b0000f00b0000d62d0000d82d000000ca9a3b
+ m_SelectedIDs: 620c0000
+ m_LastClickedID: 3170
+ m_ExpandedIDs: 00000000a60900007e0a0000c20a0000480b0000900b0000f00b0000c02d0000c22d000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -564,7 +564,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000a60900007e0a0000c20a0000480b0000900b0000f00b0000d62d0000d82d0000
+ m_ExpandedIDs: 00000000a60900007e0a0000c20a0000480b0000900b0000f00b0000c02d0000c22d0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -592,7 +592,7 @@ MonoBehaviour:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
- m_ExpandedInstanceIDs: 680e0000660e0000
+ m_ExpandedInstanceIDs: 680e0000660e0000c6050000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -616,7 +616,7 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_NewAssetIndexInList: -1
- m_ScrollPosition: {x: 0, y: 373}
+ m_ScrollPosition: {x: 0, y: 419}
m_GridSize: 64
m_DirectoriesAreaWidth: 110
--- !u!114 &18
@@ -730,9 +730,9 @@ MonoBehaviour:
m_isRotationLocked: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: 249.5, y: 136, z: 0}
+ m_Target: {x: 484.00006, y: 256, z: 0}
speed: 2
- m_Value: {x: 249.5, y: 136, z: 0}
+ m_Value: {x: 484.00006, y: 256, z: 0}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -764,9 +764,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
- m_Target: 937.72424
+ m_Target: 268.60056
speed: 2
- m_Value: 937.72424
+ m_Value: 268.60056
m_Ortho:
m_Target: 1
speed: 2
diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport
index 767d1c5a988087aa6ba84164ee031a895a7076d8..e175c7f15275912ab481a084310832d120e92088 100644
Binary files a/Library/LastBuild.buildreport and b/Library/LastBuild.buildreport differ
diff --git a/Library/LastSceneManagerSetup.txt b/Library/LastSceneManagerSetup.txt
index 7adf48ca6f8e8921484b6320b96d98eb312a8f24..5c9432eb2179e5482ca51f207c0decefb18313ba 100644
--- a/Library/LastSceneManagerSetup.txt
+++ b/Library/LastSceneManagerSetup.txt
@@ -1,4 +1,4 @@
sceneSetups:
-- path: Assets/Scenes/mainmenu.unity
+- path: Assets/Scenes/main.unity
isLoaded: 1
isActive: 1
diff --git a/Library/PlayerDataCache/Win64/Data/Managed/Assembly-CSharp.dll b/Library/PlayerDataCache/Win64/Data/Managed/Assembly-CSharp.dll
index 1f77731b1361171613d278233c97c628848bc63b..f71e4182b99a4fe5035506a5a3a4e03e08b17c82 100644
Binary files a/Library/PlayerDataCache/Win64/Data/Managed/Assembly-CSharp.dll and b/Library/PlayerDataCache/Win64/Data/Managed/Assembly-CSharp.dll differ
diff --git a/Library/PlayerDataCache/Win64/Data/Managed/Unity.Analytics.DataPrivacy.dll b/Library/PlayerDataCache/Win64/Data/Managed/Unity.Analytics.DataPrivacy.dll
index 783b1721fc10377c1fc86996641063f2135554c8..5a0f6dda88efad560c0b862cf1b60aa91dff7486 100644
Binary files a/Library/PlayerDataCache/Win64/Data/Managed/Unity.Analytics.DataPrivacy.dll and b/Library/PlayerDataCache/Win64/Data/Managed/Unity.Analytics.DataPrivacy.dll differ
diff --git a/Library/PlayerDataCache/Win64/Data/Managed/Unity.TextMeshPro.dll b/Library/PlayerDataCache/Win64/Data/Managed/Unity.TextMeshPro.dll
index cef74227edfb23b0387d966c6b0cbda6cdb07a6f..1d0bcf8d98003ed0876855e990373ab37236dba9 100644
Binary files a/Library/PlayerDataCache/Win64/Data/Managed/Unity.TextMeshPro.dll and b/Library/PlayerDataCache/Win64/Data/Managed/Unity.TextMeshPro.dll differ
diff --git a/Library/PlayerDataCache/Win64/Data/globalgamemanagers b/Library/PlayerDataCache/Win64/Data/globalgamemanagers
index 01bbe84adf7a6d4174ec7071b6bb5c0e8a50e3ba..fb8c48e96e4c5cee71ce9a48dad94ace93f07bf4 100644
Binary files a/Library/PlayerDataCache/Win64/Data/globalgamemanagers and b/Library/PlayerDataCache/Win64/Data/globalgamemanagers differ
diff --git a/Library/PlayerDataCache/Win64/Data/level0 b/Library/PlayerDataCache/Win64/Data/level0
index b041a670d77f05c41043e131160a2f79156421f2..80ad9f116ceaa0ae1fd47208a243ecac8f86119a 100644
Binary files a/Library/PlayerDataCache/Win64/Data/level0 and b/Library/PlayerDataCache/Win64/Data/level0 differ
diff --git a/Library/PlayerDataCache/Win64/Data/level1 b/Library/PlayerDataCache/Win64/Data/level1
index 9f9b8d3066e27e3dc1cf91a3c22bded6d7a3b543..d536ae2e47b7c98da3f1c1c0e79c901bfc6961df 100644
Binary files a/Library/PlayerDataCache/Win64/Data/level1 and b/Library/PlayerDataCache/Win64/Data/level1 differ
diff --git a/Library/PlayerDataCache/Win64/Data/level2 b/Library/PlayerDataCache/Win64/Data/level2
index 3cece9bcb96a63dd5d7edbbb182a1bae462c31bf..13c65aa634d49c686c9d3374b00964cda6bf7546 100644
Binary files a/Library/PlayerDataCache/Win64/Data/level2 and b/Library/PlayerDataCache/Win64/Data/level2 differ
diff --git a/Library/PlayerDataCache/Win64/Data/level3 b/Library/PlayerDataCache/Win64/Data/level3
index 7118dc3964a78d5b5f5d0d7455044ed40184d631..cdeb1cb2a26ea1a553dc7952bd6905d00bd71a76 100644
Binary files a/Library/PlayerDataCache/Win64/Data/level3 and b/Library/PlayerDataCache/Win64/Data/level3 differ
diff --git a/Library/PlayerDataCache/Win64/Data/sharedassets0.assets b/Library/PlayerDataCache/Win64/Data/sharedassets0.assets
index 562b281c077a10748d75b4354645569d7452506a..f0db97a872396e170b13c5c5bb51a2dd07331902 100644
Binary files a/Library/PlayerDataCache/Win64/Data/sharedassets0.assets and b/Library/PlayerDataCache/Win64/Data/sharedassets0.assets differ
diff --git a/Library/PlayerDataCache/Win64/Data/sharedassets0.assets.resS b/Library/PlayerDataCache/Win64/Data/sharedassets0.assets.resS
index 4fac4ea42e18fe78d57c59cf4866d1d7287f4fb4..2123a15783037222bae419ea0ffd13eec4b4f4dd 100644
Binary files a/Library/PlayerDataCache/Win64/Data/sharedassets0.assets.resS and b/Library/PlayerDataCache/Win64/Data/sharedassets0.assets.resS differ
diff --git a/Library/PlayerDataCache/Win64/Data/sharedassets1.assets b/Library/PlayerDataCache/Win64/Data/sharedassets1.assets
index 577de5c643157d98ed0e8fbdd4a39d4b17d6f76c..832f59e8b1ca8cce1d0297fae594a8764d925aea 100644
Binary files a/Library/PlayerDataCache/Win64/Data/sharedassets1.assets and b/Library/PlayerDataCache/Win64/Data/sharedassets1.assets differ
diff --git a/Library/PlayerDataCache/Win64/Data/sharedassets2.assets b/Library/PlayerDataCache/Win64/Data/sharedassets2.assets
index 20bcacf9026ea41e985cae83b0c568e7146f1d23..5636eb247949ee2cdd44758e5e2c556f439797f0 100644
Binary files a/Library/PlayerDataCache/Win64/Data/sharedassets2.assets and b/Library/PlayerDataCache/Win64/Data/sharedassets2.assets differ
diff --git a/Library/PlayerDataCache/Win64/Data/sharedassets3.assets b/Library/PlayerDataCache/Win64/Data/sharedassets3.assets
index bd7e79b090904e71227c68003083815509ad9128..4b89f3cb45d516a19dda8ede2bf1091566d8ed3b 100644
Binary files a/Library/PlayerDataCache/Win64/Data/sharedassets3.assets and b/Library/PlayerDataCache/Win64/Data/sharedassets3.assets differ
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
index 33ec7e6fcdb1d58aa727501d44d0feb33d72c048..7ee728dc89fe6502376bfd56f15703d8e6760a00 100644
Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb
index 6ce9cf23bfaa9c480c6a93761df5e1e7ae3b1859..f532f58b10b5b9538cec3be036c796f9fbad23c1 100644
Binary files a/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Library/ScriptAssemblies/Assembly-CSharp.pdb differ
diff --git a/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll b/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll
index 1fe43c6b901dc21c39b60aa2f02947dca50f8fa9..3be2adc02ca489a4e63debfe07c0ffb44fe4b1ed 100644
Binary files a/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll and b/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll differ
diff --git a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll
index 759518d74fd4b35afdac915c1d3d82f561bb12fb..5a0203d23fec3b3f166d618be61df14e86641446 100644
Binary files a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll and b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll differ
diff --git a/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll b/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll
index 7b2332f30a399bf8ee2e5bdb6fd3b93eeb4ede94..c4c1c693c4b1fbc084b1996091fa130f734efc37 100644
Binary files a/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll and b/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll differ
diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll
index 38d67822809937595cf1e7af2fe916169701ad3c..af9dbaa0590dc7372314e154575c0443ff9ebf77 100644
Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll and b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll differ
diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.dll
index addee24c17d5ac94f95ab31ebef95f7fa8073cf7..22f2f00f935124cd2065cde5f70b4cfab43d1fe1 100644
Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.dll and b/Library/ScriptAssemblies/Unity.TextMeshPro.dll differ
diff --git a/Library/StateCache/SceneView/47c57d-mainStage.json b/Library/StateCache/SceneView/47c57d-mainStage.json
index b3e38d9078369856524c7aab57934bad1d959d7e..5ce10286e46d7b4bfc9b91cb6519131894cce6cc 100644
--- a/Library/StateCache/SceneView/47c57d-mainStage.json
+++ b/Library/StateCache/SceneView/47c57d-mainStage.json
@@ -1 +1 @@
-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":249.5,"y":136.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":937.7242431640625,"orthographic":true}
\ No newline at end of file
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":484.00006103515627,"y":256.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":268.6005554199219,"orthographic":true}
\ No newline at end of file
diff --git a/Library/assetDatabase3 b/Library/assetDatabase3
index dd8876b111e61888aa7811f93643aa77f271dbfa..0f2d6151e87981df4618be9fa1ccae04ff763e9a 100644
Binary files a/Library/assetDatabase3 and b/Library/assetDatabase3 differ
diff --git a/Library/metadata/1c/1c354309142d62d46aba15d1c0f0e235 b/Library/metadata/1c/1c354309142d62d46aba15d1c0f0e235
index 0e3a8aab7563d7043eb7f3e1c7a87687889e4004..8cd4d37079a4e06431b545ca00dcbb6a7b8217f8 100644
Binary files a/Library/metadata/1c/1c354309142d62d46aba15d1c0f0e235 and b/Library/metadata/1c/1c354309142d62d46aba15d1c0f0e235 differ
diff --git a/Library/metadata/2c/2c9d37d9a75909543a6377d1eb440c55 b/Library/metadata/2c/2c9d37d9a75909543a6377d1eb440c55
index 9f3cdf6a313b379b51e50ee3f3bb5192376119e7..0bb8a23b3798eeb5674c5f0a3380341c265fc3fd 100644
Binary files a/Library/metadata/2c/2c9d37d9a75909543a6377d1eb440c55 and b/Library/metadata/2c/2c9d37d9a75909543a6377d1eb440c55 differ
diff --git a/Library/metadata/2c/2c9d37d9a75909543a6377d1eb440c55.info b/Library/metadata/2c/2c9d37d9a75909543a6377d1eb440c55.info
index 263f11a09be51f2902cf668e922877731c6d3e64..d325c389c4fd002c0a23552c9d1f0c0650434a36 100644
Binary files a/Library/metadata/2c/2c9d37d9a75909543a6377d1eb440c55.info and b/Library/metadata/2c/2c9d37d9a75909543a6377d1eb440c55.info differ
diff --git a/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Library/shadercompiler-UnityShaderCompiler.exe0.log
index 136010bf967b1216b3de089449521be1aa53daa2..8248bedfdbb4a84ba9788c8a6222bd4d0b5bfa66 100644
--- a/Library/shadercompiler-UnityShaderCompiler.exe0.log
+++ b/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -2,3 +2,9 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.4.18f1/Editor/Data
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
diff --git a/Library/shadercompiler-UnityShaderCompiler.exe1.log b/Library/shadercompiler-UnityShaderCompiler.exe1.log
index e63c34641f8b4967fbef76fc50cb10530f52290f..8248bedfdbb4a84ba9788c8a6222bd4d0b5bfa66 100644
--- a/Library/shadercompiler-UnityShaderCompiler.exe1.log
+++ b/Library/shadercompiler-UnityShaderCompiler.exe1.log
@@ -5,3 +5,6 @@ Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
diff --git a/Library/shadercompiler-UnityShaderCompiler.exe2.log b/Library/shadercompiler-UnityShaderCompiler.exe2.log
index e63c34641f8b4967fbef76fc50cb10530f52290f..8248bedfdbb4a84ba9788c8a6222bd4d0b5bfa66 100644
--- a/Library/shadercompiler-UnityShaderCompiler.exe2.log
+++ b/Library/shadercompiler-UnityShaderCompiler.exe2.log
@@ -5,3 +5,6 @@ Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
diff --git a/Library/shadercompiler-UnityShaderCompiler.exe3.log b/Library/shadercompiler-UnityShaderCompiler.exe3.log
index e63c34641f8b4967fbef76fc50cb10530f52290f..8248bedfdbb4a84ba9788c8a6222bd4d0b5bfa66 100644
--- a/Library/shadercompiler-UnityShaderCompiler.exe3.log
+++ b/Library/shadercompiler-UnityShaderCompiler.exe3.log
@@ -5,3 +5,6 @@ Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler
+Cmd: initializeCompiler