diff --git a/Assets/Prefabs/UI.prefab b/Assets/Prefabs/UI.prefab index 1333b20..cd49582 100644 --- a/Assets/Prefabs/UI.prefab +++ b/Assets/Prefabs/UI.prefab @@ -158,9 +158,8 @@ GameObject: m_Component: - component: {fileID: 224035875368067210} - component: {fileID: 222221304479498010} - - component: {fileID: 114711005776932040} - - component: {fileID: 114013939794050082} - component: {fileID: 114373005502633030} + - component: {fileID: 114474847320342008} m_Layer: 5 m_Name: MessagePanel m_TagString: Untagged @@ -230,7 +229,6 @@ GameObject: - component: {fileID: 222407216902702286} - component: {fileID: 114395085421692120} - component: {fileID: 114700265308343224} - - component: {fileID: 114996926366695680} m_Layer: 5 m_Name: MessageText m_TagString: Untagged @@ -308,28 +306,6 @@ Transform: m_Father: {fileID: 224011665836974194} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &114013939794050082 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1738841749900334} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 10 - m_Right: 10 - m_Top: 5 - m_Bottom: 5 - m_ChildAlignment: 5 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 --- !u!114 &114029318060691450 MonoBehaviour: m_ObjectHideFlags: 1 @@ -519,7 +495,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: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -528,16 +504,16 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 + m_FontSize: 40 + m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: Back to Menu --- !u!114 &114333100955944072 @@ -603,7 +579,7 @@ MonoBehaviour: m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 2 + m_HorizontalFit: 0 m_VerticalFit: 0 --- !u!114 &114395085421692120 MonoBehaviour: @@ -617,7 +593,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: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -626,12 +602,12 @@ MonoBehaviour: 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: 0 - m_MaxSize: 40 - m_Alignment: 5 + m_FontSize: 200 + m_FontStyle: 1 + m_BestFit: 1 + m_MinSize: 11 + m_MaxSize: 200 + m_Alignment: 4 m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 @@ -719,6 +695,33 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &114474847320342008 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1738841749900334} + 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: aef4053338277214c9f32a70117fa370, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &114617351635937986 MonoBehaviour: m_ObjectHideFlags: 1 @@ -800,33 +803,6 @@ MonoBehaviour: m_InputActionsPerSecond: 10 m_RepeatDelay: 0.5 m_ForceModuleActive: 0 ---- !u!114 &114711005776932040 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1738841749900334} - 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - 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 --- !u!114 &114745107968250074 MonoBehaviour: m_ObjectHideFlags: 1 @@ -941,7 +917,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: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -950,16 +926,16 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 + m_FontSize: 40 + m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: Restart --- !u!114 &114959533071530678 @@ -974,7 +950,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: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -995,19 +971,6 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: Game Over ---- !u!114 &114996926366695680 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1783803660317794} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!222 &222022790769267342 CanvasRenderer: m_ObjectHideFlags: 1 @@ -1149,10 +1112,10 @@ RectTransform: m_Father: {fileID: 224011665836974194} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -30} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 161.7, y: -3.84} + m_SizeDelta: {x: 323.4, y: 162.53} m_Pivot: {x: 1, y: 0.5} --- !u!224 &224071502787034986 RectTransform: @@ -1162,7 +1125,7 @@ RectTransform: m_GameObject: {fileID: 1160732466323946} 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_LocalScale: {x: 0.4, y: 0.4, z: 1} m_Children: [] m_Father: {fileID: 224827547678119310} m_RootOrder: 0 @@ -1198,7 +1161,7 @@ RectTransform: m_GameObject: {fileID: 1776649970698928} 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_LocalScale: {x: 0.3, y: 0.3, z: 1} m_Children: [] m_Father: {fileID: 224218339018349506} m_RootOrder: 0 @@ -1216,16 +1179,16 @@ RectTransform: m_GameObject: {fileID: 1783803660317794} 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_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] m_Father: {fileID: 224035875368067210} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 64.16286, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 1, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1.3500061, y: 2.56} + m_SizeDelta: {x: 2031.38, y: 714.52} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224218339018349506 RectTransform: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index ce0e3d0..faeb59f 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -930,8 +930,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5d9a051e822e2cf4ea3ca01c5a4df37c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: followSpeed: 0.05 minZoom: 5 zoomFactor: 4 @@ -947,8 +947,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e40ea81463f7264a8ce9334d6bf62ac, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: mixer: {fileID: 24100000, guid: efb934a745665924d8c7dd46c0a117ae, type: 2} maintheme: {fileID: 1600556435} menutheme: {fileID: 30160411} @@ -1011,12 +1011,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: dd625f75dbf83194392a299951cf04fb, type: 2} m_IsPrefabParent: 0 ---- !u!114 &974873814 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 114745107968250074, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - m_PrefabInternal: {fileID: 1379476068} - m_Script: {fileID: 11500000, guid: d819f21fefea9da4199b468cca99e711, type: 3} --- !u!1 &1015503428 GameObject: m_ObjectHideFlags: 0 @@ -1364,85 +1358,61 @@ Prefab: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, + type: 2} + propertyPath: m_FontData.m_FontSize + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, + type: 2} + propertyPath: m_FontData.m_MaxSize + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, + type: 2} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, + type: 2} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchoredPosition.x - value: 66.298874 - objectReference: {fileID: 0} - - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 + value: 1.3500061 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_SizeDelta.x - value: 0 + value: 2031.38 + objectReference: {fileID: 0} + - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 2.56 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 714.52 objectReference: {fileID: 0} - - target: {fileID: 224035875368067210, guid: 460d856ea4eb14cedb5fecde1fe6d743, + - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} - propertyPath: m_SizeDelta.x - value: 0 + propertyPath: m_FontData.m_BestFit + value: 1 objectReference: {fileID: 0} - - target: {fileID: 1604998495297016, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224351136746992674, guid: 460d856ea4eb14cedb5fecde1fe6d743, + - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} - propertyPath: m_LocalRotation.z - value: 0.7771459 + propertyPath: m_FontData.m_MinSize + value: 11 objectReference: {fileID: 0} - - target: {fileID: 224351136746992674, guid: 460d856ea4eb14cedb5fecde1fe6d743, + - target: {fileID: 114395085421692120, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} - propertyPath: m_LocalRotation.w - value: 0.62932044 + propertyPath: m_FontData.m_FontStyle + value: 1 objectReference: {fileID: 0} - - target: {fileID: 224351136746992674, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_LocalEulerAnglesHint.z - value: 102 - objectReference: {fileID: 0} - - target: {fileID: 224351136746992674, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchoredPosition.x - value: -1.7573471 - objectReference: {fileID: 0} - - target: {fileID: 224351136746992674, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_AnchoredPosition.y - value: -4.5857997 - objectReference: {fileID: 0} - - target: {fileID: 224351136746992674, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Pivot.x - value: 0.06394628 - objectReference: {fileID: 0} - - target: {fileID: 224351136746992674, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: m_Pivot.y - value: 0.06415958 - objectReference: {fileID: 0} - - target: {fileID: 114917026543374048, guid: 460d856ea4eb14cedb5fecde1fe6d743, - type: 2} - propertyPath: brakeBarController - value: - objectReference: {fileID: 974873814} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} m_IsPrefabParent: 0 @@ -2280,8 +2250,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 87d25c2cd3eb97749b79f2cb5f7c5cea, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: scorpion: {fileID: 1303102899095328, guid: 4c5ecfd27b4038941a6e493a8117ea0a, type: 2} bug: {fileID: 1887677565572348, guid: dd625f75dbf83194392a299951cf04fb, type: 2} coin: {fileID: 1974526777167790, guid: 35e8b8e102a45a1489ef949961dca4a6, type: 2} diff --git a/Assets/graphics/textures/UI/messageBox.png.meta b/Assets/graphics/textures/UI/messageBox.png.meta index 50ca7e5..3f679fd 100644 --- a/Assets/graphics/textures/UI/messageBox.png.meta +++ b/Assets/graphics/textures/UI/messageBox.png.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: aef4053338277214c9f32a70117fa370 TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: messageBox_0 externalObjects: {} serializedVersion: 5 mipmaps: @@ -38,13 +39,13 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 380, y: 296, z: 503, w: 271} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -67,9 +68,62 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: messageBox_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1900 + height: 1000 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 376, y: 290, z: 501, w: 265} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: aea7f48a86e105743bb2c608b7db8b7b + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: []