From 5da64a7b3d7af205d5fb241c74aa84267e79f370 Mon Sep 17 00:00:00 2001 From: ThomasCharester Date: Wed, 19 Nov 2025 14:45:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BD=D1=8E,=20=D0=B4=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=8C,=20=D1=86=D0=B2=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Code/App/AppStates/MainMenuState.cs | 24 +- .../Assets/Code/Gameplay/Camera/CameraMode.cs | 1 + .../Gameplay/Camera/CameraStateMachine.cs | 3 +- .../Camera/CameraStates/UltraStaticState.cs | 29 + .../CameraStates/UltraStaticState.cs.meta | 3 + .../CourierOld/Assets/Code/Gameplay/Door.meta | 3 + .../Gameplay/Door/CinematicDoorOpening.cs | 23 + .../Door/CinematicDoorOpening.cs.meta | 3 + .../Assets/Code/Gameplay/Door/DamnDoor.cs | 16 + .../Code/Gameplay/Door/DamnDoor.cs.meta | 3 + .../SceneEnvironments/MainMenuEnvironment.cs | 9 +- .../CourierOld/Assets/Code/UI/Panels/Etc.meta | 3 + .../Assets/Code/UI/Panels/Etc/HoverButton.cs | 16 + .../Code/UI/Panels/Etc/HoverButton.cs.meta | 3 + .../Assets/Code/UI/Panels/MainMenuPanel.cs | 33 +- .../Resources/Prefabs/App/Camera.prefab | 4 +- .../Resources/Prefabs/Doors/MetalDoor.prefab | 85 +- .../Resources/Prefabs/Doors/WoodenDoor.prefab | 96 -- .../Prefabs/Doors/WoodenDoorFR.prefab | 281 +++++ ...r.prefab.meta => WoodenDoorFR.prefab.meta} | 2 +- .../Assets/Resources/Scenes/MainMenu.unity | 1053 ++++++++++++----- .../Scenes/MainMenu/LightingData.asset | Bin 19617 -> 19697 bytes .../Scenes/MainMenu/Lightmap-0_comp_dir.png | 4 +- .../Scenes/MainMenu/Lightmap-0_comp_light.exr | 4 +- .../MainMenu/Lightmap-0_comp_shadowmask.png | 4 +- .../Assets/Resources_moved/UI/MainMenu.prefab | 32 +- Game/CourierOld/Assets/_Recovery.meta | 8 + Game/CourierOld/Assets/_Recovery/0.unity | 272 +++++ Game/CourierOld/Assets/_Recovery/0.unity.meta | 7 + 29 files changed, 1581 insertions(+), 443 deletions(-) create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStates/UltraStaticState.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStates/UltraStaticState.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Door.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Door/CinematicDoorOpening.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Door/CinematicDoorOpening.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Door/DamnDoor.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Door/DamnDoor.cs.meta create mode 100644 Game/CourierOld/Assets/Code/UI/Panels/Etc.meta create mode 100644 Game/CourierOld/Assets/Code/UI/Panels/Etc/HoverButton.cs create mode 100644 Game/CourierOld/Assets/Code/UI/Panels/Etc/HoverButton.cs.meta delete mode 100644 Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoor.prefab create mode 100644 Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoorFR.prefab rename Game/CourierOld/Assets/Resources/Prefabs/Doors/{WoodenDoor.prefab.meta => WoodenDoorFR.prefab.meta} (74%) create mode 100644 Game/CourierOld/Assets/_Recovery.meta create mode 100644 Game/CourierOld/Assets/_Recovery/0.unity create mode 100644 Game/CourierOld/Assets/_Recovery/0.unity.meta diff --git a/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs index efa4400..1489550 100644 --- a/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs +++ b/Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs @@ -2,11 +2,13 @@ using Code.App.StateMachine; using Code.Audio; using Code.Gameplay.Camera; using Code.Gameplay.Camera.CameraStates; +using Code.Gameplay.Door; using Code.Input; using Code.Scenes; using Code.Scenes.SceneEnvironments; using Code.StateMachine; using Code.UI; +using Code.UI.Panels; using Cysharp.Threading.Tasks; using Reflex.Extensions; using UnityEngine; @@ -24,13 +26,14 @@ namespace Code.App.AppStates { Context.UIService.LoadingScreen.Show(); - Context.CameraStateMachine.SwitchState(CameraMode.Static); + Context.CameraStateMachine.SwitchState(CameraMode.UltraStatic); #pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed WaitForSceneToLoad(); #pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed } + private CinematicDoorOpening _damnDoor = new(); private async UniTaskVoid WaitForSceneToLoad() { await UniTask.WhenAll( @@ -42,17 +45,20 @@ namespace Code.App.AppStates Context.AudioService.TransitToSnapshot(AudioSnapshotState.Menu); Context.AudioService.PlayRandomMusicUntilHumanityWillBeDestroyedForTheySins(MusicType.Menu); - ((MainMenuPanel)Context.UIService.CurrentPanel).startButton.onClick.AddListener(StartGame); - ((MainMenuPanel)Context.UIService.CurrentPanel).exitButton.onClick.AddListener(ExitGame); - var hui = ((MainMenuEnvironment)SceneManager.GetActiveScene() .GetSceneContainer().Resolve()); - - ((StaticState)Context.CameraStateMachine.CurrentBaseState).LookTarget = - hui.cameraTarget; - - ((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(hui.cameraPosition); + _damnDoor.DamnDoor = hui.damnDoor; + _damnDoor.DamnDoor.SetPhysics(false); + _damnDoor.DoorLight = hui.doorLight; + var menuPanel = (MainMenuPanel)Context.UIService.CurrentPanel; + + menuPanel.startButton.button.onClick.AddListener(StartGame); + menuPanel.exitButton.button.onClick.AddListener(ExitGame); + menuPanel.CinematicDoorOpening = _damnDoor; + + ((UltraStaticState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(hui.cameraPosition); + Context.UIService.LoadingScreen.Hide(); Context.InputService.EnableMap(ActionMappings.MainMenu); diff --git a/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraMode.cs b/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraMode.cs index 8616df3..52352d1 100644 --- a/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraMode.cs +++ b/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraMode.cs @@ -12,6 +12,7 @@ namespace Code.Gameplay.Camera { Bogdan, Static, + UltraStatic, FirstPerson, ThirdPerson, Cinematic diff --git a/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStateMachine.cs b/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStateMachine.cs index 098fa1b..34308f7 100644 --- a/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStateMachine.cs +++ b/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStateMachine.cs @@ -10,10 +10,11 @@ namespace Code.Gameplay.Camera public override void Initialize() { States.Add(CameraMode.Static, new StaticState(StateMachineContext)); + States.Add(CameraMode.UltraStatic, new UltraStaticState(StateMachineContext)); States.Add(CameraMode.FirstPerson, new FirstPersonState(StateMachineContext)); States.Add(CameraMode.ThirdPerson, new ThirdPersonState(StateMachineContext)); - CurrentBaseState = States[CameraMode.Static]; + CurrentBaseState = States[CameraMode.UltraStatic]; } diff --git a/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStates/UltraStaticState.cs b/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStates/UltraStaticState.cs new file mode 100644 index 0000000..673c98d --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStates/UltraStaticState.cs @@ -0,0 +1,29 @@ +using UnityEngine; + +namespace Code.Gameplay.Camera.CameraStates +{ + public class UltraStaticState : BaseCameraState, ICameraState + { + public UltraStaticState(CameraStateMachineContext context) : base(context) { } + + public override void EnterState() + { + Debug.Log("Ultra static State Enter"); + base.EnterState(); + } + + protected override void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation) + { + Camera.transform.position = FollowTransform.position; + } + + public CameraMode GetCameraMode() => CameraMode.UltraStatic; + + protected override void HandleRotationInput(float deltaTime, Vector3 rotationInput, + out Quaternion targetRotation) + { + if(FollowTransform) Camera.transform.rotation = FollowTransform.rotation; + targetRotation = Camera.transform.rotation; + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStates/UltraStaticState.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStates/UltraStaticState.cs.meta new file mode 100644 index 0000000..0484856 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStates/UltraStaticState.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8e4b2fa3af4b4ba78ab79ca154f05fb4 +timeCreated: 1763547110 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Door.meta b/Game/CourierOld/Assets/Code/Gameplay/Door.meta new file mode 100644 index 0000000..75e6d7f --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Door.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b7ba7b62b1aa47c48dc82ac8d8e8530e +timeCreated: 1763548306 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Door/CinematicDoorOpening.cs b/Game/CourierOld/Assets/Code/Gameplay/Door/CinematicDoorOpening.cs new file mode 100644 index 0000000..bd65bf5 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Door/CinematicDoorOpening.cs @@ -0,0 +1,23 @@ +using DG.Tweening; +using UnityEngine; + +namespace Code.Gameplay.Door +{ + public class CinematicDoorOpening + { + public DamnDoor DamnDoor; + public Light DoorLight; + + public void PreOpen(bool start) + { + DoorLight.DOColor(start ? Color.yellow : Color.red, 0.2f); + + DamnDoor.Petlya.DORotate(new Vector3(0, -40, 0), 1f); + } + + public void Close() + { + DamnDoor.Petlya.DORotate(new Vector3(0, 0, 0), 1f); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Door/CinematicDoorOpening.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Door/CinematicDoorOpening.cs.meta new file mode 100644 index 0000000..d13abc4 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Door/CinematicDoorOpening.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: deda0339570d44609dd62eafd9c6215f +timeCreated: 1763548908 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Door/DamnDoor.cs b/Game/CourierOld/Assets/Code/Gameplay/Door/DamnDoor.cs new file mode 100644 index 0000000..c9b7dd3 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Door/DamnDoor.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +namespace Code.Gameplay.Door +{ + public class DamnDoor : MonoBehaviour + { + [SerializeField] Rigidbody rigidbody; + [SerializeField] private Transform petlya; + public Transform Petlya => petlya; + + public void SetPhysics(bool active) + { + rigidbody.isKinematic = active; + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Door/DamnDoor.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Door/DamnDoor.cs.meta new file mode 100644 index 0000000..6acc0f3 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Door/DamnDoor.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 50a6b5e332704611b19f5a209d4dbffe +timeCreated: 1763548314 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Scenes/SceneEnvironments/MainMenuEnvironment.cs b/Game/CourierOld/Assets/Code/Scenes/SceneEnvironments/MainMenuEnvironment.cs index 724af04..2c7ac66 100644 --- a/Game/CourierOld/Assets/Code/Scenes/SceneEnvironments/MainMenuEnvironment.cs +++ b/Game/CourierOld/Assets/Code/Scenes/SceneEnvironments/MainMenuEnvironment.cs @@ -1,18 +1,21 @@ +using Code.Gameplay.Door; using UnityEngine; -using UnityEngine.Serialization; +using UnityEngine.Experimental.GlobalIllumination; namespace Code.Scenes.SceneEnvironments { [System.Serializable] public class MainMenuEnvironment : CurrentSceneEnvironment { - public Transform cameraTarget; public Transform cameraPosition; + public DamnDoor damnDoor; + public Light doorLight; public void TransitVariables(MainMenuEnvironment env) { - cameraTarget = env.cameraTarget; cameraPosition = env.cameraPosition; + damnDoor = env.damnDoor; + doorLight = env.doorLight; } } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/UI/Panels/Etc.meta b/Game/CourierOld/Assets/Code/UI/Panels/Etc.meta new file mode 100644 index 0000000..5bc1a84 --- /dev/null +++ b/Game/CourierOld/Assets/Code/UI/Panels/Etc.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 14bf9dd380324bf49ea98fbeb8c94186 +timeCreated: 1763550884 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/UI/Panels/Etc/HoverButton.cs b/Game/CourierOld/Assets/Code/UI/Panels/Etc/HoverButton.cs new file mode 100644 index 0000000..38fd211 --- /dev/null +++ b/Game/CourierOld/Assets/Code/UI/Panels/Etc/HoverButton.cs @@ -0,0 +1,16 @@ +using System; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +namespace Code.UI.Panels.Etc +{ + public class HoverButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler + { + public Button button; + public Action OnPointerEnterEvent, OnPointerExitEvent; + + public void OnPointerEnter(PointerEventData eventData) => OnPointerEnterEvent?.Invoke(); + public void OnPointerExit(PointerEventData eventData) => OnPointerExitEvent?.Invoke(); + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/UI/Panels/Etc/HoverButton.cs.meta b/Game/CourierOld/Assets/Code/UI/Panels/Etc/HoverButton.cs.meta new file mode 100644 index 0000000..a8e41fa --- /dev/null +++ b/Game/CourierOld/Assets/Code/UI/Panels/Etc/HoverButton.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f97de34a1f6042128921ad728f153909 +timeCreated: 1763550895 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/UI/Panels/MainMenuPanel.cs b/Game/CourierOld/Assets/Code/UI/Panels/MainMenuPanel.cs index bdd190d..83540b0 100644 --- a/Game/CourierOld/Assets/Code/UI/Panels/MainMenuPanel.cs +++ b/Game/CourierOld/Assets/Code/UI/Panels/MainMenuPanel.cs @@ -1,12 +1,22 @@ -using UnityEngine; -using UnityEngine.UI; +using Code.Gameplay.Door; +using Code.UI.Panels.Etc; -namespace Code.UI +namespace Code.UI.Panels { public class MainMenuPanel : UIElement { - public Button startButton; - public Button exitButton; + public HoverButton startButton; + public HoverButton exitButton; + public CinematicDoorOpening CinematicDoorOpening; + + public void Start() + { + startButton.OnPointerEnterEvent = OpenStart; + exitButton.OnPointerEnterEvent = OpenExit; + startButton.OnPointerExitEvent = CloseDoor; + exitButton.OnPointerExitEvent = CloseDoor; + } + public override void Show() { } @@ -14,5 +24,18 @@ namespace Code.UI public override void Hide() { } + + private void OpenExit() + { + CinematicDoorOpening.PreOpen(false); + } + private void OpenStart() + { + CinematicDoorOpening.PreOpen(true); + } + private void CloseDoor() + { + CinematicDoorOpening.Close(); + } } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab b/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab index 0e613b9..38d55af 100644 --- a/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab +++ b/Game/CourierOld/Assets/Resources/Prefabs/App/Camera.prefab @@ -123,7 +123,7 @@ Camera: m_GameObject: {fileID: 6099115053225634464} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 + m_ClearFlags: 4 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 @@ -196,7 +196,7 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 + m_RenderPostProcessing: 1 m_Antialiasing: 0 m_AntialiasingQuality: 2 m_StopNaN: 0 diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Doors/MetalDoor.prefab b/Game/CourierOld/Assets/Resources/Prefabs/Doors/MetalDoor.prefab index 1f24180..6ebbe9c 100644 --- a/Game/CourierOld/Assets/Resources/Prefabs/Doors/MetalDoor.prefab +++ b/Game/CourierOld/Assets/Resources/Prefabs/Doors/MetalDoor.prefab @@ -11,6 +11,8 @@ GameObject: - component: {fileID: 1669639244792780461} - component: {fileID: 8787607318850039954} - component: {fileID: 5651942974808622539} + - component: {fileID: 448402393908802308} + - component: {fileID: 3758149385181302518} m_Layer: 0 m_Name: door m_TagString: Untagged @@ -89,6 +91,72 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!54 &448402393908802308 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077812855099157442} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!59 &3758149385181302518 +HingeJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1077812855099157442} + serializedVersion: 3 + m_ConnectedBody: {fileID: 0} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0.000197, y: -0.005072, z: 0} + m_Axis: {x: 0, y: 0, z: 1} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: 0, y: 0, z: 0} + m_UseSpring: 0 + m_Spring: + spring: 0 + damper: 0 + targetPosition: 0 + m_UseMotor: 0 + m_Motor: + targetVelocity: 0 + force: 0 + freeSpin: 0 + m_UseLimits: 0 + m_ExtendedLimits: 0 + m_UseAcceleration: 0 + m_Limits: + min: 0 + max: 0 + bounciness: 0 + bounceMinVelocity: 0.2 + contactDistance: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!1 &4563712453394892528 GameObject: m_ObjectHideFlags: 0 @@ -98,6 +166,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3755510501817277514} + - component: {fileID: 87929108586902390} m_Layer: 0 m_Name: MetalDoor m_TagString: Untagged @@ -122,6 +191,20 @@ Transform: - {fileID: 2276948336940227993} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &87929108586902390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4563712453394892528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50a6b5e332704611b19f5a209d4dbffe, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Door.DamnDoor + rigidbody: {fileID: 448402393908802308} + petlya: {fileID: 1890351345896388873} --- !u!1 &8309150750552582164 GameObject: m_ObjectHideFlags: 0 @@ -223,7 +306,7 @@ GameObject: m_Layer: 0 m_Name: Petlya m_TagString: Untagged - m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0} + m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoor.prefab b/Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoor.prefab deleted file mode 100644 index 5b7f324..0000000 --- a/Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoor.prefab +++ /dev/null @@ -1,96 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &7707464981021107780 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 121319395578245762} - m_Layer: 0 - m_Name: WoodenDoor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &121319395578245762 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7707464981021107780} - serializedVersion: 2 - 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: 1334315388222809313} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1517371933021618954 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 121319395578245762} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - propertyPath: m_LocalPosition.x - value: -0.019 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - propertyPath: m_LocalPosition.z - value: -0.508 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - propertyPath: m_LocalRotation.y - value: -0.00000002669254 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - propertyPath: m_LocalRotation.z - value: -0.000000026692542 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - propertyPath: m_Name - value: DoorPolotno 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} ---- !u!4 &1334315388222809313 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9e385488db96058c49ea9a0e6311088b, type: 3} - m_PrefabInstance: {fileID: 1517371933021618954} - m_PrefabAsset: {fileID: 0} diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoorFR.prefab b/Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoorFR.prefab new file mode 100644 index 0000000..7896658 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoorFR.prefab @@ -0,0 +1,281 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &88631212879990752 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4703746691742193245} + - component: {fileID: 6101422546854589552} + - component: {fileID: 1320949701131906529} + m_Layer: 0 + m_Name: Cube.001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4703746691742193245 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88631212879990752} + serializedVersion: 2 + m_LocalRotation: {x: -0.70710677, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0.005006922, y: 0, z: 0} + m_LocalScale: {x: 4.0000005, y: 60.000008, z: 110} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9108015012929300507} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6101422546854589552 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88631212879990752} + m_Mesh: {fileID: 4493585093827132993, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} +--- !u!23 &1320949701131906529 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 88631212879990752} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 4 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: cf0428766d6d0be40a31f17bd0d7572b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &8241852938824990100 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5338891978781127550} + - component: {fileID: 3741044777105425888} + - component: {fileID: 5110690079059171647} + - component: {fileID: 5297175640774933049} + - component: {fileID: 1981810865765606892} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5338891978781127550 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8241852938824990100} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} + m_LocalPosition: {x: 0, y: 0, z: -0.0037376476} + m_LocalScale: {x: 99.99992, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9108015012929300507} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3741044777105425888 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8241852938824990100} + m_Mesh: {fileID: -5495902117074765545, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} +--- !u!23 &5110690079059171647 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8241852938824990100} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 4 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: cf0428766d6d0be40a31f17bd0d7572b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!54 &5297175640774933049 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8241852938824990100} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!59 &1981810865765606892 +HingeJoint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8241852938824990100} + serializedVersion: 3 + m_ConnectedBody: {fileID: 0} + m_ConnectedArticulationBody: {fileID: 0} + m_Anchor: {x: 0.000199, y: -0.00507, z: 0} + m_Axis: {x: 0, y: 0, z: 1} + m_AutoConfigureConnectedAnchor: 1 + m_ConnectedAnchor: {x: 0, y: 0, z: 0} + m_UseSpring: 0 + m_Spring: + spring: 0 + damper: 0 + targetPosition: 0 + m_UseMotor: 0 + m_Motor: + targetVelocity: 0 + force: 0 + freeSpin: 0 + m_UseLimits: 0 + m_ExtendedLimits: 0 + m_UseAcceleration: 0 + m_Limits: + min: 0 + max: 0 + bounciness: 0 + bounceMinVelocity: 0.2 + contactDistance: 0 + m_BreakForce: Infinity + m_BreakTorque: Infinity + m_EnableCollision: 0 + m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 +--- !u!1 &8443681718239703713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9108015012929300507} + m_Layer: 0 + m_Name: WoodenDoorFR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9108015012929300507 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8443681718239703713} + serializedVersion: 2 + 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: 5338891978781127550} + - {fileID: 4703746691742193245} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoor.prefab.meta b/Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoorFR.prefab.meta similarity index 74% rename from Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoor.prefab.meta rename to Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoorFR.prefab.meta index 412d85e..ef2dd4d 100644 --- a/Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoor.prefab.meta +++ b/Game/CourierOld/Assets/Resources/Prefabs/Doors/WoodenDoorFR.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0120a90c88d97f0ceb9e4644b1519bc3 +guid: 151a14ce58a607e4eb3f1c899f766ebd PrefabImporter: externalObjects: {} userData: diff --git a/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity b/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity index ca1d6d8..29e0bd0 100644 --- a/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity +++ b/Game/CourierOld/Assets/Resources/Scenes/MainMenu.unity @@ -119,6 +119,95 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &48198221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 48198222} + - component: {fileID: 48198225} + - component: {fileID: 48198224} + m_Layer: 0 + m_Name: LightCutter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &48198222 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48198221} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: -1.516, y: 1.713, z: -3.298} + m_LocalScale: {x: 0.39, y: 0.39, z: 0.39} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 470488569} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!23 &48198224 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48198221} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 16 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &48198225 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48198221} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!850595691 &56934801 LightingSettings: m_ObjectHideFlags: 0 @@ -180,6 +269,95 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 m_RespectSceneVisibilityWhenBakingGI: 0 +--- !u!1 &201656622 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 201656623} + - component: {fileID: 201656626} + - component: {fileID: 201656625} + m_Layer: 0 + m_Name: LightCutter (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &201656623 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201656622} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: -1.5160002, y: 4.14, z: -0.72} + m_LocalScale: {x: 0.39, y: 0.39, z: 0.39} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 470488569} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!23 &201656625 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201656622} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 16 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &201656626 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 201656622} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &212553749 GameObject: m_ObjectHideFlags: 0 @@ -208,8 +386,8 @@ Transform: m_GameObject: {fileID: 212553749} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.238, y: 0, z: 0.79} - m_LocalScale: {x: 0.15, y: 1.5, z: 0.45000002} + m_LocalPosition: {x: 0.25, y: 0, z: -0.751} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 738285477} @@ -258,7 +436,7 @@ MeshRenderer: m_SmallMeshCulling: 1 m_ForceMeshLod: -1 m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 + m_RenderingLayerMask: 17 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: f8c8c9015cc4df84fbbbe32a4f003660, type: 2} @@ -429,6 +607,118 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: -8.084, y: -133.7, z: 0.64} +--- !u!1 &395885371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 395885372} + - component: {fileID: 395885375} + - component: {fileID: 395885374} + - component: {fileID: 395885373} + m_Layer: 0 + m_Name: Plane (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &395885372 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 395885371} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.75, y: 0, z: -0.751} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 738285477} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &395885373 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 395885371} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &395885374 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 395885371} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 17 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f8c8c9015cc4df84fbbbe32a4f003660, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &395885375 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 395885371} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &470488568 GameObject: m_ObjectHideFlags: 0 @@ -471,73 +761,123 @@ Transform: - {fileID: 4351087219735538423} - {fileID: 1400757719} - {fileID: 766027915} + - {fileID: 48198222} + - {fileID: 2128606241} + - {fileID: 201656623} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &713181453 -PrefabInstance: +--- !u!1 &651370291 +GameObject: m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 651370292} + - component: {fileID: 651370295} + - component: {fileID: 651370294} + - component: {fileID: 651370293} + m_Layer: 0 + m_Name: Plane (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &651370292 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 651370291} serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_LocalPosition.x - value: -2.338 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_LocalPosition.y - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_LocalPosition.z - value: 3.368 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7070208 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_LocalRotation.x - value: -0.70702094 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_LocalRotation.y - value: -0.011022216 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_LocalRotation.z - value: -0.011022216 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -1.786 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: 3a10d619ebaceb24d9cc5cdf8878c286, type: 2} - - target: {fileID: 919132149155446097, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_Name - value: WoodenDoor - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bee7bf847655d2d4b90ed579981755f0, type: 3} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.25, y: 0, z: 0.749} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 738285477} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &651370293 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 651370291} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &651370294 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 651370291} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 17 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f8c8c9015cc4df84fbbbe32a4f003660, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &651370295 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 651370291} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &738285476 GameObject: m_ObjectHideFlags: 0 @@ -567,9 +907,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1220410327} - {fileID: 212553750} - - {fileID: 2050798865} + - {fileID: 651370292} + - {fileID: 395885372} + - {fileID: 1397945525} m_Father: {fileID: 470488569} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1001 &766027914 @@ -582,7 +923,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4136395315015130951, guid: 81b93d171ec44174ba298ef12c5e0cfb, type: 3} propertyPath: m_RenderingLayerMask - value: 12 + value: 28 objectReference: {fileID: 0} - target: {fileID: 6221054334566503625, guid: 81b93d171ec44174ba298ef12c5e0cfb, type: 3} propertyPath: m_Name @@ -711,6 +1052,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 57.318 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: be4d9564f6fd43e40b1b9f213e1adc04, type: 3} + propertyPath: m_RenderingLayerMask + value: 17 + objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: be4d9564f6fd43e40b1b9f213e1adc04, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -932,6 +1277,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 6.88 objectReference: {fileID: 0} + - target: {fileID: -4683669308469848369, guid: 8e70d2c5714950140a8fe66efdcf726d, type: 3} + propertyPath: m_RenderingLayerMask + value: 17 + objectReference: {fileID: 0} - target: {fileID: -4683669308469848369, guid: 8e70d2c5714950140a8fe66efdcf726d, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -1018,7 +1367,7 @@ MeshRenderer: m_SmallMeshCulling: 1 m_ForceMeshLod: -1 m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 + m_RenderingLayerMask: 17 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 826e07efb851b074080835cf3caee1fa, type: 2} @@ -1135,6 +1484,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: -4683669308469848369, guid: 8e70d2c5714950140a8fe66efdcf726d, type: 3} + propertyPath: m_RenderingLayerMask + value: 17 + objectReference: {fileID: 0} - target: {fileID: -4683669308469848369, guid: 8e70d2c5714950140a8fe66efdcf726d, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -1189,6 +1542,7 @@ Transform: m_Children: - {fileID: 1696046252} - {fileID: 953409540} + - {fileID: 1517937708} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1134025862 @@ -1215,125 +1569,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1134025862} serializedVersion: 2 - m_LocalRotation: {x: -0.047118817, y: -0.8393192, z: -0.07371711, w: 0.5365527} - m_LocalPosition: {x: -0.5679126, y: 0.12842691, z: 3.8898175} + m_LocalRotation: {x: -0.032828405, y: -0.91702425, z: -0.062619075, w: 0.3925146} + m_LocalPosition: {x: 0.901, y: 0.37, z: 4.853} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1220410323 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1220410327} - - component: {fileID: 1220410326} - - component: {fileID: 1220410325} - - component: {fileID: 1220410324} - m_Layer: 0 - m_Name: Plane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!64 &1220410324 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1220410323} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1220410325 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1220410323} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: e1471edc218f70c40b50f687b839b9c8, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1220410326 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1220410323} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1220410327 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1220410323} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.26, y: 0, z: 0.79} - m_LocalScale: {x: 0.15, y: 1.5, z: 0.45000002} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 738285477} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -8.084, y: -133.7, z: 0.64} --- !u!1 &1223673783 GameObject: m_ObjectHideFlags: 0 @@ -1423,8 +1665,121 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Code.App.SceneInstallers.MainMenuSceneInstaller _mainMenuEnvironment: - cameraTarget: {fileID: 1223673784} cameraPosition: {fileID: 1134025863} + damnDoor: {fileID: 6047941790562593409} + doorLight: {fileID: 1517937710} +--- !u!1 &1397945524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1397945525} + - component: {fileID: 1397945528} + - component: {fileID: 1397945527} + - component: {fileID: 1397945526} + m_Layer: 0 + m_Name: Plane (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &1397945525 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397945524} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.75, y: 0, z: 0.749} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 738285477} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1397945526 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397945524} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1397945527 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397945524} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 17 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f8c8c9015cc4df84fbbbe32a4f003660, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1397945528 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397945524} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1400757718 PrefabInstance: m_ObjectHideFlags: 0 @@ -1435,7 +1790,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4136395315015130951, guid: 81b93d171ec44174ba298ef12c5e0cfb, type: 3} propertyPath: m_RenderingLayerMask - value: 12 + value: 28 objectReference: {fileID: 0} - target: {fileID: 6221054334566503625, guid: 81b93d171ec44174ba298ef12c5e0cfb, type: 3} propertyPath: m_Name @@ -1698,7 +2053,7 @@ MeshRenderer: m_SmallMeshCulling: 1 m_ForceMeshLod: -1 m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 + m_RenderingLayerMask: 17 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 46c32c803fa6b354e927b3c37077003f, type: 2} @@ -1747,87 +2102,133 @@ Transform: m_Children: [] m_Father: {fileID: 470488569} m_LocalEulerAnglesHint: {x: 0, y: -90, z: 180} ---- !u!1001 &1529530204 -PrefabInstance: +--- !u!1 &1517937707 +GameObject: m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1517937708} + - component: {fileID: 1517937710} + - component: {fileID: 1517937709} + m_Layer: 0 + m_Name: Spot Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1517937708 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1517937707} serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_LocalPosition.x - value: -2.358 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_LocalPosition.y - value: 1.104 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_LocalPosition.z - value: 3.377 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -4683669308469848369, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_RenderingLayerMask - value: 4 - objectReference: {fileID: 0} - - target: {fileID: -4683669308469848369, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: cf0428766d6d0be40a31f17bd0d7572b, type: 2} - - target: {fileID: -1461304994638716399, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_RenderingLayerMask - value: 4 - objectReference: {fileID: 0} - - target: {fileID: -1461304994638716399, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: cf0428766d6d0be40a31f17bd0d7572b, type: 2} - - target: {fileID: -516098083770646512, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_Name - value: WoodenDoor (1) - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 12fd412a5c844a347926bffaf1a13568, type: 3} + m_LocalRotation: {x: 0.050020378, y: 0.8704391, z: -0.09618216, w: 0.48019037} + m_LocalPosition: {x: -3.96, y: 1.27, z: 3.65} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1077443129} + m_LocalEulerAnglesHint: {x: 12.444, y: 122.198, z: -0.311} +--- !u!114 &1517937709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1517937707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 16 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &1517937710 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1517937707} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 0 + m_Color: {r: 1, g: 0.07371566, b: 0, a: 1} + m_Intensity: 10.81 + m_Range: 10.32 + m_SpotAngle: 35.388504 + m_InnerSpotAngle: 25.425146 + m_CookieSize: 10 + m_Shadows: + m_Type: 1 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 16 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 0 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!1 &1642087973 GameObject: m_ObjectHideFlags: 0 @@ -1891,7 +2292,7 @@ MeshRenderer: m_SmallMeshCulling: 1 m_ForceMeshLod: -1 m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 + m_RenderingLayerMask: 17 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 826e07efb851b074080835cf3caee1fa, type: 2} @@ -2059,6 +2460,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 301261c148177bf42beff0fa16689192, type: 3} + propertyPath: m_RenderingLayerMask + value: 17 + objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 301261c148177bf42beff0fa16689192, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -2280,6 +2685,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 3.9 objectReference: {fileID: 0} + - target: {fileID: -4683669308469848369, guid: 8e70d2c5714950140a8fe66efdcf726d, type: 3} + propertyPath: m_RenderingLayerMask + value: 17 + objectReference: {fileID: 0} - target: {fileID: -4683669308469848369, guid: 8e70d2c5714950140a8fe66efdcf726d, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -2303,7 +2712,7 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 8e70d2c5714950140a8fe66efdcf726d, type: 3} m_PrefabInstance: {fileID: 1719422690} m_PrefabAsset: {fileID: 0} ---- !u!1 &2050798864 +--- !u!1 &2128606240 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2311,68 +2720,45 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2050798865} - - component: {fileID: 2050798868} - - component: {fileID: 2050798867} - - component: {fileID: 2050798866} + - component: {fileID: 2128606241} + - component: {fileID: 2128606244} + - component: {fileID: 2128606243} m_Layer: 0 - m_Name: Plane (2) + m_Name: LightCutter (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2050798865 +--- !u!4 &2128606241 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2050798864} + m_GameObject: {fileID: 2128606240} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.738, y: 0, z: 0.79} - m_LocalScale: {x: 0.15, y: 1.5, z: 0.45000002} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: -1.5160002, y: 1.444, z: 1.729} + m_LocalScale: {x: 0.39, y: 0.39, z: 0.39} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 738285477} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &2050798866 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2050798864} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2050798867 + m_Father: {fileID: 470488569} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!23 &2128606243 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2050798864} + m_GameObject: {fileID: 2128606240} m_Enabled: 1 - m_CastShadows: 0 + m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 - m_LightProbeUsage: 0 + m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 @@ -2381,10 +2767,10 @@ MeshRenderer: m_SmallMeshCulling: 1 m_ForceMeshLod: -1 m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 + m_RenderingLayerMask: 16 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: f8c8c9015cc4df84fbbbe32a4f003660, type: 2} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2407,13 +2793,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &2050798868 +--- !u!33 &2128606244 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2050798864} + m_GameObject: {fileID: 2128606240} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &3013710943699948973 PrefabInstance: @@ -2527,6 +2913,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6655199269583677862, guid: 141168b19dd83fa4482a7d8659735154, type: 3} + propertyPath: m_RenderingLayerMask + value: 17 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -2550,7 +2940,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4136395315015130951, guid: 81b93d171ec44174ba298ef12c5e0cfb, type: 3} propertyPath: m_RenderingLayerMask - value: 12 + value: 28 objectReference: {fileID: 0} - target: {fileID: 6221054334566503625, guid: 81b93d171ec44174ba298ef12c5e0cfb, type: 3} propertyPath: m_Name @@ -2637,12 +3027,32 @@ PrefabInstance: m_Modifications: - target: {fileID: 968241807993723804, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} propertyPath: m_RenderingLayerMask - value: 5 + value: 21 objectReference: {fileID: 0} - target: {fileID: 1077812855099157442, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} propertyPath: m_Layer value: 9 objectReference: {fileID: 0} + - target: {fileID: 1890351345896388873, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1890351345896388873, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1890351345896388873, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1890351345896388873, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1890351345896388873, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3755510501817277514, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} propertyPath: m_LocalPosition.x value: -2.359 @@ -2697,7 +3107,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5651942974808622539, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} propertyPath: m_RenderingLayerMask - value: 5 + value: 21 objectReference: {fileID: 0} - target: {fileID: 8309150750552582164, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} propertyPath: m_Layer @@ -2716,6 +3126,17 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} +--- !u!114 &6047941790562593409 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 87929108586902390, guid: 5a328d367b793ebb1a43053026a3f461, type: 3} + m_PrefabInstance: {fileID: 6047941790562593407} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50a6b5e332704611b19f5a209d4dbffe, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Door.DamnDoor --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -2727,6 +3148,4 @@ SceneRoots: - {fileID: 1077443129} - {fileID: 263844630} - {fileID: 6047941790562593407} - - {fileID: 713181453} - {fileID: 1668130215} - - {fileID: 1529530204} diff --git a/Game/CourierOld/Assets/Resources/Scenes/MainMenu/LightingData.asset b/Game/CourierOld/Assets/Resources/Scenes/MainMenu/LightingData.asset index e65e833f749931dd9d94b2f0a6958e7bdd95c8b7..fbeb736f451feb23ffb70b6a685a13e2bcd98188 100644 GIT binary patch delta 439 zcmZ2DlkwwB#tHI_A2%wnI5R$&tm-V!cxSV#b2=lVz~o#HTedR$S|PsOlRvlw@qMsm zU;tqdXtF~VYVfuP2~M8i9>dIYXa8h<_vp!4o;!G>UiYZl8R? zEs9Oae%tXtOk;l7PTt_LVRC{SACscpm?Q!%K^0q02P5i0f?CF>k|S1c5{M; delta 411 zcmex3lX2lp#tHI_3pXmTI5SR|tm-V!IAOD^b2=j<|72e;YYvq=x3_!L#n?~&;1a~= zXUD(*#0_Tl3_vhhz%znlN<-*&?f2AAW zc7rrCG}!^2qX2Z_LT};8F5Uu@OMp1VTY%?$n4|p^XNLVfKV&T@D|pLH-s8o=@_zl5 z@X0s4WMtgs1!v9AO}G4}CG!2KR+0^jf9-B<@Z^@*k23f~^G+lh1l9tFk?~YylSmGC-<8;6D&BLYNGUlNo))MVX2>}3%&UzpK diff --git a/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_dir.png b/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_dir.png index bd23e79..7167304 100644 --- a/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_dir.png +++ b/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:355b1fd166d47fb27a3d1e848061004dced437f37d1d4ad2338fb41d2f1fd007 -size 115448 +oid sha256:7c561792424d65c6e79d2a86f3fb7c1000a9b52fb7e23406d6c54f8d29c94c67 +size 97860 diff --git a/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_light.exr b/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_light.exr index 8e0b7f5..f7a46ad 100644 --- a/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_light.exr +++ b/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7cdcb012cb8922299a62da3e62d7b21b2417ea9ecaf7c4fb9e45cb6a8a53bae -size 1059817 +oid sha256:ddb8182d5e9e935b9b0ef44cf3ff5a9761847ec55446a489efc0198cc5a33141 +size 840918 diff --git a/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_shadowmask.png b/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_shadowmask.png index 38234c0..6855ad8 100644 --- a/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_shadowmask.png +++ b/Game/CourierOld/Assets/Resources/Scenes/MainMenu/Lightmap-0_comp_shadowmask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68af285c61b54a094d9b904b43df7c90451f9288afa3ad62fe7f5bf48a778f48 -size 18405 +oid sha256:526a2c9fcd38129915aa788e96aeac9ce7efb8ac815b5e21be19dcc010ecfe49 +size 18163 diff --git a/Game/CourierOld/Assets/Resources_moved/UI/MainMenu.prefab b/Game/CourierOld/Assets/Resources_moved/UI/MainMenu.prefab index 0d205f3..354da19 100644 --- a/Game/CourierOld/Assets/Resources_moved/UI/MainMenu.prefab +++ b/Game/CourierOld/Assets/Resources_moved/UI/MainMenu.prefab @@ -148,6 +148,7 @@ GameObject: - component: {fileID: 8839516694721583648} - component: {fileID: 2681260057701473527} - component: {fileID: 2253845647481943924} + - component: {fileID: 4165078650992608471} m_Layer: 5 m_Name: Play m_TagString: Untagged @@ -257,6 +258,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &4165078650992608471 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3022555534434180202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f97de34a1f6042128921ad728f153909, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.UI.Panels.Etc.HoverButton + button: {fileID: 2253845647481943924} --- !u!1 &4379545213608960436 GameObject: m_ObjectHideFlags: 0 @@ -269,6 +283,7 @@ GameObject: - component: {fileID: 593175698826165087} - component: {fileID: 3927785698894562585} - component: {fileID: 3846966970265265833} + - component: {fileID: 7608137541737768753} m_Layer: 5 m_Name: Exit m_TagString: Untagged @@ -378,6 +393,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &7608137541737768753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4379545213608960436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f97de34a1f6042128921ad728f153909, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.UI.Panels.Etc.HoverButton + button: {fileID: 3846966970265265833} --- !u!1 &5276650998563178813 GameObject: m_ObjectHideFlags: 0 @@ -708,8 +736,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3257edb60d20461a92f3e5dd2c4afee4, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Code.UI.MainMenuPanel - startButton: {fileID: 2253845647481943924} - exitButton: {fileID: 3846966970265265833} + startButton: {fileID: 4165078650992608471} + exitButton: {fileID: 7608137541737768753} --- !u!1 &7490760785407426207 GameObject: m_ObjectHideFlags: 0 diff --git a/Game/CourierOld/Assets/_Recovery.meta b/Game/CourierOld/Assets/_Recovery.meta new file mode 100644 index 0000000..264821d --- /dev/null +++ b/Game/CourierOld/Assets/_Recovery.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ce80ea58c1a9154dab0a2f539b9b2a4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/_Recovery/0.unity b/Game/CourierOld/Assets/_Recovery/0.unity new file mode 100644 index 0000000..f9a0261 --- /dev/null +++ b/Game/CourierOld/Assets/_Recovery/0.unity @@ -0,0 +1,272 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &1253837927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1253837929} + - component: {fileID: 1253837928} + m_Layer: 0 + m_Name: SceneScope + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1253837928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253837927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fd1482e4a9dee141aecc5bcd0a4f0f3, type: 3} + m_Name: + m_EditorClassIdentifier: Reflex::Reflex.Core.SceneScope +--- !u!4 &1253837929 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253837927} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1883358809 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1289568913299077295, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_SortingOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6466339271797533664, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_Name + value: LoadingCanvas + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1253837929} + - {fileID: 1883358809} diff --git a/Game/CourierOld/Assets/_Recovery/0.unity.meta b/Game/CourierOld/Assets/_Recovery/0.unity.meta new file mode 100644 index 0000000..7170917 --- /dev/null +++ b/Game/CourierOld/Assets/_Recovery/0.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 70b67046c875a6a48b40748e9e49d4d6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: