Готовый вариант проекта под сдачу

2026-03-06 01:09:34 +05:00
parent 609c4cc553
commit 88e1f8d87d
27 changed files with 91329 additions and 456 deletions
--- a/Studio/UHFPS/Content/Fonts/NotoSerif/TMP/Normal/Normal/NotoSerif-Regular
+++ b/Studio/UHFPS/Content/Fonts/NotoSerif/TMP/Normal/Normal/NotoSerif-Regular
--- a/Condensed/TMP/RobotoCondensed-Bold
+++ b/Condensed/TMP/RobotoCondensed-Bold
--- a/Condensed/TMP/RobotoCondensed-Light
+++ b/Condensed/TMP/RobotoCondensed-Light
--- a/Condensed/TMP/RobotoCondensed-Regular
+++ b/Condensed/TMP/RobotoCondensed-Regular
--- a/Studio/UHFPS/Content/Scenes/LevelManager.unity
+++ b/Studio/UHFPS/Content/Scenes/LevelManager.unity
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 10
  m_Fog: 0
  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
  m_FogMode: 3
@@ -38,13 +38,12 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 12
-  m_GIWorkflowMode: 1
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
  m_GISettings:
    serializedVersion: 2
    m_BounceScale: 1
@@ -67,9 +66,6 @@ LightmapSettings:
    m_LightmapParameters: {fileID: 0}
    m_LightmapsBakeMode: 1
    m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
    m_ReflectionCompression: 2
    m_MixedBakeMode: 2
    m_BakeBackend: 1
@@ -131,6 +127,26 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 739956880366519295, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
+      propertyPath: LevelInfos.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 739956880366519295, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
+      propertyPath: LevelInfos.Array.data[3].SceneName
+      value: TheGame
+      objectReference: {fileID: 0}
+    - target: {fileID: 739956880366519295, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
+      propertyPath: LevelInfos.Array.data[3].Background
+      value: 
+      objectReference: {fileID: 21300000, guid: 8a90b4371d5d5b6458c58d448a0e4d7e, type: 3}
+    - target: {fileID: 739956880366519295, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
+      propertyPath: LevelInfos.Array.data[3].Title.GlocText
+      value: loading.scenename.thegame
+      objectReference: {fileID: 0}
+    - target: {fileID: 739956880366519295, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
+      propertyPath: LevelInfos.Array.data[3].Description.GlocText
+      value: loading.description.thegame
+      objectReference: {fileID: 0}
    - target: {fileID: 1397992443369760298, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@@ -155,6 +171,14 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 1926522897735945627, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
+      propertyPath: TipTime
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 1926522897735945627, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
+      propertyPath: TipChangeSpeed
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 2674515566535311797, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
      propertyPath: m_Name
      value: LEVELMANAGER
@@ -199,6 +223,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3373390543984086613, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
+      propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
+      value: 1801810542
+      objectReference: {fileID: 0}
    - target: {fileID: 4162225303223942720, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@@ -235,6 +263,10 @@ PrefabInstance:
      propertyPath: m_AnchorMax.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9223006730287496768, guid: a6d90327880ef514da0c37e51d684ce0, type: 3}
+      propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
+      value: 1801810542
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Studio/UHFPS/Content/Scenes/MainMenu.unity
+++ b/Studio/UHFPS/Content/Scenes/MainMenu.unity
@@ -119,6 +119,50 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
+--- !u!1 &1601073489
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1601073491}
+  - component: {fileID: 1601073490}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1601073490
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1601073489}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1f01f3c24f6a1ac468e5c8f0413df37a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::UnlockCursor
+--- !u!4 &1601073491
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1601073489}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 128.22202, y: -0.00001, z: 8840.663}
+  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 &959197369019108646
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -277,3 +321,4 @@ SceneRoots:
  m_ObjectHideFlags: 0
  m_Roots:
  - {fileID: 959197369019108646}
+  - {fileID: 1601073491}
--- a/Studio/UHFPS/Content/Scripts/PressAnyKey.cs
+++ b/Studio/UHFPS/Content/Scripts/PressAnyKey.cs
@@ -0,0 +1,22 @@
+using UnityEngine;
+using UnityEngine.Events;
+
+public class PressAnyKey : MonoBehaviour
+{
+    // Сюда в инспекторе перетащи метод LoadSceneFromList из прошлого скрипта
+    // Или любое другое действие
+    public UnityEvent OnAnyKeyPressed;
+
+    void Update()
+    {
+        // Проверяем, нажата ли любая клавиша или кнопка мыши
+        if (Input.anyKeyDown)
+        {
+            OnAnyKeyPressed.Invoke();
+
+            // Опционально: отключаем скрипт после срабатывания, 
+            // чтобы не спамить переходами
+            this.enabled = false;
+        }
+    }
+}
--- a/Studio/UHFPS/Content/Scripts/PressAnyKey.cs.meta
+++ b/Studio/UHFPS/Content/Scripts/PressAnyKey.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 45f130d2b84c9574cbc6595aa20424c2
--- a/Studio/UHFPS/Content/Scripts/Runtime/Trigger/FinishZone.cs
+++ b/Studio/UHFPS/Content/Scripts/Runtime/Trigger/FinishZone.cs
@@ -0,0 +1,27 @@
+using UHFPS.Runtime;
+using UnityEngine;
+
+public class FinishZone : MonoBehaviour
+{
+    [Header("Настройки")]
+    public GameObject victoryPanel; // Панель победы
+    public GameObject Gameui;
+    public CanvasGroup WinPanel;
+    public GameObject player; // Скрипт управления игроком
+
+    private void OnTriggerEnter(Collider other)
+    {
+        // Проверка тега игрока [1]
+        if (other.CompareTag("Player"))
+        {
+            // Активация UI [2]
+            victoryPanel.SetActive(true);
+
+            // Отключение управления [3]
+            player.SetActive(false);
+            Gameui.SetActive(false);
+            WinPanel.alpha = 1.0f;
+            WinPanel.interactable = true;
+        }
+    }
+}
--- a/Studio/UHFPS/Content/Scripts/Runtime/Trigger/FinishZone.cs.meta
+++ b/Studio/UHFPS/Content/Scripts/Runtime/Trigger/FinishZone.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: fd28aa21a98fbef42a1701817a2d2533
--- a/Studio/UHFPS/Content/Scripts/SceneSwitcher.cs
+++ b/Studio/UHFPS/Content/Scripts/SceneSwitcher.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class SceneSwitcher : MonoBehaviour
+{
+    // Список названий сцен, который ты заполнишь в инспекторе
+    public List<string> sceneList;
+
+    // Метод, который мы будем вызывать
+    public void LoadSceneFromList(int index)
+    {
+        // Проверка, что индекс не выходит за границы списка
+        if (index >= 0 && index < sceneList.Count)
+        {
+            SceneManager.LoadScene(sceneList[index]);
+        }
+        else
+        {
+            Debug.LogError("Индекс сцены вне диапазона списка!");
+        }
+    }
+}
--- a/Studio/UHFPS/Content/Scripts/SceneSwitcher.cs.meta
+++ b/Studio/UHFPS/Content/Scripts/SceneSwitcher.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 63cb8efe90d46e941b1866522a55cc6d
--- a/Studio/UHFPS/Content/Scripts/UnlockCursor.cs
+++ b/Studio/UHFPS/Content/Scripts/UnlockCursor.cs
@@ -0,0 +1,22 @@
+using UnityEngine;
+
+public class UnlockCursor : MonoBehaviour
+{
+    void Awake()
+    {
+        // Разблокируем курсор
+        Cursor.lockState = CursorLockMode.None;
+        // Делаем его видимым
+        Cursor.visible = true;
+    }
+
+    // На случай, если какой-то другой скрипт попытается залочить его в Update
+    void LateUpdate()
+    {
+        if (Cursor.lockState != CursorLockMode.None)
+        {
+            Cursor.lockState = CursorLockMode.None;
+            Cursor.visible = true;
+        }
+    }
+}
--- a/Studio/UHFPS/Content/Scripts/UnlockCursor.cs.meta
+++ b/Studio/UHFPS/Content/Scripts/UnlockCursor.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1f01f3c24f6a1ac468e5c8f0413df37a
--- a/Studio/UHFPS/Content/Shaders/BloodOverlay/Material/BloodDisortion.mat
+++ b/Studio/UHFPS/Content/Shaders/BloodOverlay/Material/BloodDisortion.mat
@@ -88,7 +88,7 @@ Material:
    - _AlphaClip: 0
    - _AlphaToMask: 0
    - _Blend: 0
-    - _BlendAmount: 0.004201125
+    - _BlendAmount: 0.003814532
    - _BlendModePreserveSpecular: 1
    - _BumpScale: 1
    - _ClearCoatMask: 0
@@ -126,6 +126,7 @@ Material:
    - _OverlayColor: {r: 1, g: 0.7490196, b: 0.7490196, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &1903955094634650722
 MonoBehaviour:
  m_ObjectHideFlags: 11
--- a/Studio/UHFPS/Content/Shaders/EyeBlink/Materials/EyeBlinkBlit.mat
+++ b/Studio/UHFPS/Content/Shaders/EyeBlink/Materials/EyeBlinkBlit.mat
@@ -126,6 +126,7 @@ Material:
    - _VignetteCenter: {r: 0.5, g: 0.5, b: 0, a: 0}
    - _VignetteColor: {r: 0, g: 0, b: 0, a: 1}
  m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &4884345247192764323
 MonoBehaviour:
  m_ObjectHideFlags: 11
--- a/Studio/UHFPS/Scriptables/Game/(GLoc)
+++ b/Studio/UHFPS/Scriptables/Game/(GLoc)
@@ -127,6 +127,13 @@ MonoBehaviour:
    - Key: description.demoscene3
      Text: It's raining outside, you can test how the raindrop effect works when
        you're sheltered under a roof or not.
+    - Key: scenename.thegame
+      Text: "\u0423\u0447\u0435\u0431\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442
+        \u043F\u043E \u041C\u0414\u041A 01.06"
+    - Key: description.thegame
+      Text: "\u041D\u0430\u0439\u0442\u0438 \u0432\u044B\u0445\u043E\u0434 \u0438\u0437
+        \u0437\u0430\u0445\u0432\u0430\u0447\u0435\u043D\u043E\u0439 \u043C\u0435\u0440\u0442\u0432\u0435\u0446\u0430\u043C\u0438
+        \u0437\u043E\u043D\u044B \u0438 \u0432\u044B\u0436\u0438\u0442\u044C"
  - Section: titles
    Localizations:
    - Key: putaway
@@ -485,11 +492,15 @@ MonoBehaviour:
  - Section: tips
    Localizations:
    - Key: tip1
-      Text: This is the first example of a tip.
+      Text: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439 \u0444\u043E\u043D\u0430\u0440\u0438\u043A"
    - Key: tip2
-      Text: This is the second example of a tip.
+      Text: "\u0417\u043E\u043C\u0431\u0438 \u043E\u0447\u0435\u043D\u044C \u0431\u044B\u0441\u0442\u0440\u044B\u0435
+        - \u0431\u0443\u0434\u044C \u043D\u0430\u0447\u0435\u043A\u0443"
    - Key: tip3
-      Text: This is the third example of a tip.
+      Text: "\u041D\u0435 \u0432\u0441\u0435\u043C \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0430\u043C
+        \u043C\u043E\u0436\u043D\u043E \u0432\u0435\u0440\u0438\u0442\u044C"
+    - Key: tip4
+      Text: "\u041F\u0430\u0441\u0445\u0430\u043B\u043A\u043E"
  - Section: options
    Localizations:
    - Key: brightness
--- a/Studio/UHFPS/URP/UniversalRenderPipelineGlobalSettings.asset
+++ b/Studio/UHFPS/URP/UniversalRenderPipelineGlobalSettings.asset
@@ -225,6 +225,7 @@ MonoBehaviour:
        m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3}
        m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3}
        m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3}
+        m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3}
        m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
        m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
        m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}