diff --git a/Assets/scene.unity b/Assets/scene.unity index de3e351..7034bd0 100644 --- a/Assets/scene.unity +++ b/Assets/scene.unity @@ -2418,8 +2418,8 @@ Light: m_Enabled: 1 serializedVersion: 3 m_Type: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: .449999988 + m_Color: {r: .647058845, g: .795537472, b: 1, a: 1} + m_Intensity: .200000003 m_Range: 10 m_SpotAngle: 30 m_CookieSize: 10 @@ -4639,7 +4639,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 400042, guid: aa7fdcf288e7de849af8510fc8a29e41, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 400042, guid: aa7fdcf288e7de849af8510fc8a29e41, type: 3} propertyPath: m_LocalScale.x @@ -9897,12 +9897,12 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 828187914} - m_LocalRotation: {x: .0909895971, y: .782058001, z: -.117577158, w: .605212271} - m_LocalPosition: {x: -4.50971222, y: 1.0678364, z: 1.60999274} + m_LocalRotation: {x: .148054197, y: .774360538, z: -.158505604, w: .59440881} + m_LocalPosition: {x: -4.11000013, y: 1.25999999, z: 2.28999996} m_LocalScale: {x: .105946667, y: .10594666, z: .10594666} m_Children: [] m_Father: {fileID: 948211392} - m_RootOrder: 1 + m_RootOrder: 2 --- !u!20 &828187916 Camera: m_ObjectHideFlags: 0 @@ -10863,6 +10863,7 @@ Transform: m_LocalPosition: {x: -3.98939991, y: 17.0209999, z: 54.8720016} m_LocalScale: {x: 9.43871212, y: 9.43871212, z: 9.43871212} m_Children: + - {fileID: 1431872498} - {fileID: 1993968583} - {fileID: 828187915} m_Father: {fileID: 0} @@ -11736,6 +11737,72 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1037635368} m_Mesh: {fileID: 4300134, guid: 027c250b9f20b1e49903b3b4c633cd9d, type: 3} +--- !u!1 &1040378390 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1040378391} + - 222: {fileID: 1040378393} + - 114: {fileID: 1040378392} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1040378391 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1040378390} + 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: 1928396280} + m_RootOrder: 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: .5, y: .5} +--- !u!114 &1040378392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1040378390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .195999995, g: .195999995, b: .195999995, a: 1} + 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_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Button +--- !u!222 &1040378393 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1040378390} --- !u!1 &1053260632 GameObject: m_ObjectHideFlags: 0 @@ -12598,6 +12665,7 @@ MonoBehaviour: charac_nb: {fileID: 1452464990} myfield: {fileID: 52053180} timer: {fileID: 1765856482} + img_bg: {fileID: 1053260633} --- !u!1 &1115721615 GameObject: m_ObjectHideFlags: 0 @@ -15998,6 +16066,97 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1428530347} m_Mesh: {fileID: 4300464, guid: 027c250b9f20b1e49903b3b4c633cd9d, type: 3} +--- !u!1 &1431872497 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1431872498} + - 223: {fileID: 1431872501} + - 114: {fileID: 1431872500} + - 114: {fileID: 1431872499} + m_Layer: 5 + m_Name: dead_window + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1431872498 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1431872497} + m_LocalRotation: {x: 0, y: .556087792, z: 0, w: .83112365} + m_LocalPosition: {x: 0, y: 0, z: 2.58999991} + m_LocalScale: {x: .00456735212, y: .00726802927, z: .105946667} + m_Children: + - {fileID: 1928396280} + m_Father: {fileID: 948211392} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: .469999999, y: -.860000014} + m_SizeDelta: {x: 1067, y: 669} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1431872499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1431872497} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Priority: 3 + ignoreReversedGraphics: 1 + blockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1431872500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1431872497} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1431872501 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1431872497} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 2 + m_Camera: {fileID: 828187916} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 --- !u!1 &1437703997 GameObject: m_ObjectHideFlags: 0 @@ -22253,13 +22412,13 @@ Light: m_Enabled: 1 serializedVersion: 3 m_Type: 1 - m_Color: {r: 1, g: .974442184, b: .867647052, a: 1} - m_Intensity: .5 + m_Color: {r: 1, g: .95030427, b: .742647052, a: 1} + m_Intensity: .200000003 m_Range: 10 m_SpotAngle: 30 m_CookieSize: 10 m_Shadows: - m_Type: 0 + m_Type: 2 m_Resolution: -1 m_Strength: 1 m_Bias: .0500000007 @@ -22411,6 +22570,110 @@ Transform: - {fileID: 200815965} m_Father: {fileID: 536297868} m_RootOrder: 2 +--- !u!1 &1928396279 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1928396280} + - 222: {fileID: 1928396283} + - 114: {fileID: 1928396282} + - 114: {fileID: 1928396281} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1928396280 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1928396279} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -.899999976} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1040378391} + m_Father: {fileID: 1431872498} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -247, y: 183} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1928396281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1928396279} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + 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: 1928396282} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1928396282 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1928396279} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + 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 +--- !u!222 &1928396283 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1928396279} --- !u!1 &1931121553 GameObject: m_ObjectHideFlags: 0 @@ -23459,7 +23722,7 @@ Transform: - {fileID: 2009940642} - {fileID: 1800163884} m_Father: {fileID: 948211392} - m_RootOrder: 0 + m_RootOrder: 1 --- !u!95 &1993968584 Animator: serializedVersion: 3