diff --git a/.idea/.idea.FlyingFred/.idea/indexLayout.xml b/.idea/.idea.FlyingFred/.idea/indexLayout.xml
new file mode 100644
index 00000000..7b08163c
--- /dev/null
+++ b/.idea/.idea.FlyingFred/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="UserContentModel">
+ <attachedFolders />
+ <explicitIncludes />
+ <explicitExcludes />
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.FlyingFred/.idea/vcs.xml b/.idea/.idea.FlyingFred/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/.idea.FlyingFred/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/Assets/Prefabs/Gameplay.prefab b/Assets/Prefabs/Gameplay.prefab
index a4a7fd46..14a90d87 100644
--- a/Assets/Prefabs/Gameplay.prefab
+++ b/Assets/Prefabs/Gameplay.prefab
@@ -718,8 +718,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 3373260627105364898}
- {fileID: 8367612435897413798}
- - {fileID: 3187720748108813139}
m_Father: {fileID: 8595566100368854393}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -2156,19 +2156,19 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1704155954224294269}
- 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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5011018397641126043}
- {fileID: 6375842483749008933}
- m_Father: {fileID: 8367612435897413798}
+ m_Father: {fileID: 7964252620613099516}
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: 12.1649, y: -254.52}
- m_SizeDelta: {x: 574.2752, y: 179.6301}
+ m_AnchoredPosition: {x: -436, y: 860}
+ m_SizeDelta: {x: 210, y: 138}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2407600440277449353
CanvasRenderer:
@@ -2185,7 +2185,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1704155954224294269}
- m_Enabled: 0
+ m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@@ -2198,8 +2198,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: ec020954b9973da47942beb747d92837, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -2301,8 +2301,8 @@ RectTransform:
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: -15.8699, y: 156.33224}
- m_SizeDelta: {x: 518.2056, y: 179.6301}
+ m_AnchoredPosition: {x: 0, y: -63.4}
+ m_SizeDelta: {x: 462, y: 121}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1547356617943097473
CanvasRenderer:
@@ -2319,7 +2319,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1708851241164271117}
- m_Enabled: 0
+ m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@@ -2332,8 +2332,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: 290e5f16b4131f94d852f0c84b2dad23, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -3019,7 +3019,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &4370151158760356567
RectTransform:
m_ObjectHideFlags: 0
@@ -5384,140 +5384,6 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
---- !u!1 &3550475434857522957
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4894029170770774176}
- - component: {fileID: 8899068525840695617}
- - component: {fileID: 5855948722396787926}
- m_Layer: 5
- m_Name: PauseText
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4894029170770774176
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3550475434857522957}
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 791653017345535858}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 48.743164, y: 22.671204}
- m_SizeDelta: {x: -317.4861, y: -90.6851}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8899068525840695617
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3550475434857522957}
- m_CullTransparentMesh: 1
---- !u!114 &5855948722396787926
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3550475434857522957}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_text: Pause
- m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 5da2ee26a9d0b024dafba9acbda5519e, type: 2}
- m_sharedMaterial: {fileID: 2100000, guid: 1246bf1715be85246a64e0c6de518fab, type: 2}
- m_fontSharedMaterials: []
- m_fontMaterial: {fileID: 0}
- m_fontMaterials: []
- m_fontColor32:
- serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
- m_fontColorGradient:
- topLeft: {r: 1, g: 1, b: 1, a: 1}
- topRight: {r: 1, g: 1, b: 1, a: 1}
- bottomLeft: {r: 1, g: 1, b: 1, a: 1}
- bottomRight: {r: 1, g: 1, b: 1, a: 1}
- m_fontColorGradientPreset: {fileID: 0}
- m_spriteAsset: {fileID: 0}
- m_tintAllSprites: 0
- m_StyleSheet: {fileID: 0}
- m_TextStyleHashCode: -1183493901
- m_overrideHtmlColors: 0
- m_faceColor:
- serializedVersion: 2
- rgba: 4294967295
- m_fontSize: 98.57
- m_fontSizeBase: 36
- m_fontWeight: 400
- m_enableAutoSizing: 1
- m_fontSizeMin: 18
- m_fontSizeMax: 98.57
- m_fontStyle: 32
- m_HorizontalAlignment: 2
- m_VerticalAlignment: 512
- m_textAlignment: 65535
- m_characterSpacing: 0
- m_wordSpacing: 0
- m_lineSpacing: 0
- m_lineSpacingMax: 0
- m_paragraphSpacing: 0
- m_charWidthMaxAdj: 0
- m_enableWordWrapping: 1
- m_wordWrappingRatios: 0.4
- m_overflowMode: 0
- m_linkedTextComponent: {fileID: 0}
- parentLinkedComponent: {fileID: 0}
- m_enableKerning: 1
- m_enableExtraPadding: 0
- checkPaddingRequired: 0
- m_isRichText: 1
- m_parseCtrlCharacters: 1
- m_isOrthographic: 1
- m_isCullingEnabled: 0
- m_horizontalMapping: 0
- m_verticalMapping: 0
- m_uvLineOffset: 0
- m_geometrySortingOrder: 0
- m_IsTextObjectScaleStatic: 0
- m_VertexBufferAutoSizeReduction: 0
- m_useMaxVisibleDescender: 1
- m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_isUsingLegacyAnimationComponent: 0
- m_isVolumetricText: 0
- m_hasFontAssetChanged: 0
- m_baseMaterial: {fileID: 0}
- m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3627177618520031948
GameObject:
m_ObjectHideFlags: 0
@@ -6269,7 +6135,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3880209530060406563}
m_Enabled: 1
- m_Alpha: 0
+ m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 0
m_IgnoreParentGroups: 0
@@ -6485,7 +6351,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &6375842483749008933
RectTransform:
m_ObjectHideFlags: 0
@@ -6757,17 +6623,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4042972866134870573}
- 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_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 791653017345535858}
+ m_Father: {fileID: 8367612435897413798}
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: -159.86644, y: 22.999908}
- m_SizeDelta: {x: 83.7871, y: 93.7278}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 0, y: -78}
+ m_SizeDelta: {x: 505, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8776463577813154921
CanvasRenderer:
@@ -6797,7 +6663,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: -608099445, guid: 0f62be13d4d8d9c48ad73fb487971e3f, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 06f442e10b003f54f82fb4d05c9fe978, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -7438,7 +7304,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &181492963150599423
RectTransform:
m_ObjectHideFlags: 0
@@ -9252,7 +9118,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &483296017566524237
RectTransform:
m_ObjectHideFlags: 0
@@ -10260,16 +10126,16 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 791653017345535858}
+ - {fileID: 5161257222231088767}
- {fileID: 8477957369569519359}
- {fileID: 1308131808644539750}
- - {fileID: 3373260627105364898}
+ - {fileID: 3187720748108813139}
m_Father: {fileID: 7964252620613099516}
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: -51.0103}
- m_SizeDelta: {x: 1001.8819, y: 984.9247}
+ m_AnchoredPosition: {x: 0, y: -6}
+ m_SizeDelta: {x: 980, y: 915}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7882421776274092226
CanvasRenderer:
@@ -10299,7 +10165,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 1976314647, guid: 0f62be13d4d8d9c48ad73fb487971e3f, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 6c5e0b43edae82d4088a95321d31700a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -11333,8 +11199,8 @@ RectTransform:
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: 12.1649, y: -54.6}
- m_SizeDelta: {x: 574.2752, y: 179.6301}
+ m_AnchoredPosition: {x: 0, y: -253}
+ m_SizeDelta: {x: 462, y: 121}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5300307049055125738
CanvasRenderer:
@@ -11351,7 +11217,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7402304405144679140}
- m_Enabled: 0
+ m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@@ -11364,8 +11230,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: 58efedabf5382c043bcccf1bd0950c40, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -11921,17 +11787,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7528714701532259311}
- 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_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 7964252620613099516}
+ m_Father: {fileID: 8367612435897413798}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 21.6461, y: 97.93115}
- m_SizeDelta: {x: 230.8281, y: 230.8281}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 78}
+ m_SizeDelta: {x: 462, y: 121}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &2311434443584752279
CanvasRenderer:
@@ -11961,7 +11827,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 873333361, guid: 0f62be13d4d8d9c48ad73fb487971e3f, type: 3}
+ m_Sprite: {fileID: 21300000, guid: ffe6870b9f42d864a9cacc08d2415d8d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -12379,7 +12245,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &4403679310133121460
RectTransform:
m_ObjectHideFlags: 0
@@ -13615,7 +13481,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &5011018397641126043
RectTransform:
m_ObjectHideFlags: 0
@@ -13899,83 +13765,6 @@ MonoBehaviour:
m_YawDamping: 0
m_RollDamping: 0
m_AngularDamping: 0
---- !u!1 &8887079070567942172
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 791653017345535858}
- - component: {fileID: 5062623492736970690}
- - component: {fileID: 725627319719827644}
- m_Layer: 5
- m_Name: Banner
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &791653017345535858
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8887079070567942172}
- 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_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 4894029170770774176}
- - {fileID: 5161257222231088767}
- m_Father: {fileID: 8367612435897413798}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 1}
- m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 0, y: 146.87683}
- m_SizeDelta: {x: 740.3335, y: 228.8768}
- m_Pivot: {x: 0.5, y: 1}
---- !u!222 &5062623492736970690
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8887079070567942172}
- m_CullTransparentMesh: 1
---- !u!114 &725627319719827644
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8887079070567942172}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: -774971219, guid: 0f62be13d4d8d9c48ad73fb487971e3f, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
--- !u!1 &8979672485623760070
GameObject:
m_ObjectHideFlags: 0
@@ -14003,7 +13792,7 @@ Transform:
m_GameObject: {fileID: 8979672485623760070}
serializedVersion: 2
m_LocalRotation: {x: 0.000000028193124, y: 0.32342434, z: -0.000000009636251, w: 0.9462541}
- m_LocalPosition: {x: -1.603, y: -2.3711, z: -2.071}
+ m_LocalPosition: {x: -1.603, y: -2.3711002, z: -2.071}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
diff --git a/Assets/UI/NewUI/Slicing/Level complete/Level-complete-screen.png.meta b/Assets/UI/NewUI/Slicing/Level complete/Level-complete-screen.png.meta
index 64bbb37c..cc4e1686 100644
--- a/Assets/UI/NewUI/Slicing/Level complete/Level-complete-screen.png.meta
+++ b/Assets/UI/NewUI/Slicing/Level complete/Level-complete-screen.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/UI/NewUI/Slicing/Level complete/Shining-star.png.meta b/Assets/UI/NewUI/Slicing/Level complete/Shining-star.png.meta
index 53d425d7..e342e0d7 100644
--- a/Assets/UI/NewUI/Slicing/Level complete/Shining-star.png.meta
+++ b/Assets/UI/NewUI/Slicing/Level complete/Shining-star.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/UI/NewUI/Slicing/Level complete/embeded-star.png.meta b/Assets/UI/NewUI/Slicing/Level complete/embeded-star.png.meta
index f2dc7744..d0eb553f 100644
--- a/Assets/UI/NewUI/Slicing/Level complete/embeded-star.png.meta
+++ b/Assets/UI/NewUI/Slicing/Level complete/embeded-star.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/UI/NewUI/Slicing/Level complete/level-complete-panel.png.meta b/Assets/UI/NewUI/Slicing/Level complete/level-complete-panel.png.meta
index 6a96032a..cb480697 100644
--- a/Assets/UI/NewUI/Slicing/Level complete/level-complete-panel.png.meta
+++ b/Assets/UI/NewUI/Slicing/Level complete/level-complete-panel.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/UI/NewUI/Slicing/Level complete/level-complete-text-n-icon.png.meta b/Assets/UI/NewUI/Slicing/Level complete/level-complete-text-n-icon.png.meta
index 94b6ebd7..5d01d689 100644
--- a/Assets/UI/NewUI/Slicing/Level complete/level-complete-text-n-icon.png.meta
+++ b/Assets/UI/NewUI/Slicing/Level complete/level-complete-text-n-icon.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/UI/NewUI/Slicing/Pause screen/Cross-btn.png.meta b/Assets/UI/NewUI/Slicing/Pause screen/Cross-btn.png.meta
index 69fcbf79..af74502e 100644
--- a/Assets/UI/NewUI/Slicing/Pause screen/Cross-btn.png.meta
+++ b/Assets/UI/NewUI/Slicing/Pause screen/Cross-btn.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/UI/NewUI/Slicing/Pause screen/Pause-screen.png.meta b/Assets/UI/NewUI/Slicing/Pause screen/Pause-screen.png.meta
index 822e5790..68063188 100644
--- a/Assets/UI/NewUI/Slicing/Pause screen/Pause-screen.png.meta
+++ b/Assets/UI/NewUI/Slicing/Pause screen/Pause-screen.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/UI/NewUI/Slicing/Pause screen/home-btn.png.meta b/Assets/UI/NewUI/Slicing/Pause screen/home-btn.png.meta
index d1a5e331..d2f318d6 100644
--- a/Assets/UI/NewUI/Slicing/Pause screen/home-btn.png.meta
+++ b/Assets/UI/NewUI/Slicing/Pause screen/home-btn.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/UI/NewUI/Slicing/Pause screen/pause-level-panel.png.meta b/Assets/UI/NewUI/Slicing/Pause screen/pause-level-panel.png.meta
index cd5d7c6c..f5319b01 100644
--- a/Assets/UI/NewUI/Slicing/Pause screen/pause-level-panel.png.meta
+++ b/Assets/UI/NewUI/Slicing/Pause screen/pause-level-panel.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/UI/NewUI/Slicing/Pause screen/pause-text-n-icon.png.meta b/Assets/UI/NewUI/Slicing/Pause screen/pause-text-n-icon.png.meta
index 60cb3829..58901d81 100644
--- a/Assets/UI/NewUI/Slicing/Pause screen/pause-text-n-icon.png.meta
+++ b/Assets/UI/NewUI/Slicing/Pause screen/pause-text-n-icon.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/UI/NewUI/Slicing/Pause screen/restart-btn.png.meta b/Assets/UI/NewUI/Slicing/Pause screen/restart-btn.png.meta
index 06306ab1..e5e53751 100644
--- a/Assets/UI/NewUI/Slicing/Pause screen/restart-btn.png.meta
+++ b/Assets/UI/NewUI/Slicing/Pause screen/restart-btn.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/UI/NewUI/Slicing/Pause screen/resume-btn.png.meta b/Assets/UI/NewUI/Slicing/Pause screen/resume-btn.png.meta
index 7b6cd29d..daa5fd40 100644
--- a/Assets/UI/NewUI/Slicing/Pause screen/resume-btn.png.meta
+++ b/Assets/UI/NewUI/Slicing/Pause screen/resume-btn.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 13
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,7 +125,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 681917fa..c53574c4 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -11,10 +11,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/MainMenu.unity
guid: 9b814f32eb849e34f8290b210687919e
- - enabled: 0
- path: Assets/Scenes/GameplayOld.unity
- guid: 9fc0d4010bbf28b4594072e72b8655ab
- enabled: 1
- path: Assets/Scenes/Gameplay.unity
- guid: 319fb6e8662bafd4a8fed4106ad7bbf2
+ path: Assets/Scenes/New Scene.unity
+ guid: b2d2def585012cb4f888bfcb51d460f8
m_configObjects: {}