Исправлена ошибка чтения записки у телика

Merge pull request 'Изменил название основной сцены' (#14 ) from gleb into main
Reviewed-on: #14
2026-03-05 02:14:49 +05:00 · 2026-03-04 20:24:13 +00:00 · 2026-03-04 20:24:05 +00:00 · 2026-03-04 20:23:55 +00:00 · 2026-03-05 01:22:41 +05:00
5 changed files with 7799 additions and 118 deletions
--- a/Assets/Scenes/Playground.unity
+++ b/Assets/Scenes/Playground.unity
@@ -7479,13 +7479,13 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 151165667}
  serializedVersion: 2
-  m_LocalRotation: {x: -0.23748541, y: -0.76210344, z: 0.41133708, w: -0.4400008}
-  m_LocalPosition: {x: 15.713, y: 0.73, z: -52.02}
+  m_LocalRotation: {x: -0.21544388, y: -0.78150594, z: 0.37316, w: -0.45120293}
+  m_LocalPosition: {x: 15.721, y: 0.701, z: -52.025}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 545159292}
-  m_LocalEulerAnglesHint: {x: 56.715, y: -240, z: 0}
+  m_LocalEulerAnglesHint: {x: 51.048, y: -240, z: 0}
 --- !u!23 &151165669
 MeshRenderer:
  m_ObjectHideFlags: 0
@@ -56242,6 +56242,119 @@ Transform:
  - {fileID: 1582675802}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1040569629
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1040569630}
+  - component: {fileID: 1040569633}
+  - component: {fileID: 1040569632}
+  - component: {fileID: 1040569631}
+  m_Layer: 0
+  m_Name: Table (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 2147483647
+  m_IsActive: 1
+--- !u!4 &1040569630
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1040569629}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 5.071277, y: -0.00040018559, z: -1.25659}
+  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 1645391355}
+  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+--- !u!64 &1040569631
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1040569629}
+  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: -6692290496178104961, guid: 981f3baed40547648b5665750d56ef42, type: 3}
+--- !u!23 &1040569632
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1040569629}
+  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: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: f5de86a846367974d9177325597624e2, 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_MaskInteraction: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1040569633
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1040569629}
+  m_Mesh: {fileID: -6692290496178104961, guid: 981f3baed40547648b5665750d56ef42, type: 3}
 --- !u!1 &1042781204
 GameObject:
  m_ObjectHideFlags: 0
@@ -61383,7 +61496,6 @@ Transform:
  m_Children:
  - {fileID: 1297435911}
  - {fileID: 2111454857}
-  - {fileID: 2056484540}
  - {fileID: 120410995}
  m_Father: {fileID: 1557218170}
  m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0}
@@ -68709,13 +68821,13 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1371465956}
  serializedVersion: 2
-  m_LocalRotation: {x: -0.23748541, y: -0.76210344, z: 0.41133708, w: -0.4400008}
-  m_LocalPosition: {x: 15.035, y: 0.216, z: -51.628}
+  m_LocalRotation: {x: -0.21544388, y: -0.78150594, z: 0.37316, w: -0.45120293}
+  m_LocalPosition: {x: 15.09, y: 0.112, z: -51.66}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 545159292}
-  m_LocalEulerAnglesHint: {x: 56.715, y: -240, z: 0}
+  m_LocalEulerAnglesHint: {x: 51.048, y: -240, z: 0}
 --- !u!23 &1371465958
 MeshRenderer:
  m_ObjectHideFlags: 0
@@ -84418,6 +84530,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
+  - {fileID: 1714789982}
  - {fileID: 1136712663}
  m_Father: {fileID: 1355701910}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -93323,6 +93436,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 8894831744967140998}
+  - {fileID: 1040569630}
  - {fileID: 2196596470652620730}
  m_Father: {fileID: 317735279}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -98981,6 +99095,72 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d67c5b90a004d6d4b80421cfd3d5b895, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1001 &1714789981
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1557218170}
+    m_Modifications:
+    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 20.169004
+      objectReference: {fileID: 0}
+    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.2179999
+      objectReference: {fileID: 0}
+    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.99398994
+      objectReference: {fileID: 0}
+    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.0000025033944
+      objectReference: {fileID: 0}
+    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.0000025033944
+      objectReference: {fileID: 0}
+    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.70710677
+      objectReference: {fileID: 0}
+    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.70710677
+      objectReference: {fileID: 0}
+    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8541960315968224901, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: PaperText.GlocText
+      value: papers.Password.Where
+      objectReference: {fileID: 0}
+    - target: {fileID: 8747774001340122420, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+      propertyPath: m_Name
+      value: Paper_A (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+--- !u!4 &1714789982 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
+  m_PrefabInstance: {fileID: 1714789981}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1717309225
 GameObject:
  m_ObjectHideFlags: 0
@@ -113961,6 +114141,10 @@ PrefabInstance:
      propertyPath: m_WalkableMask
      value: 8
      objectReference: {fileID: 0}
+    - target: {fileID: 4121303385992341431, guid: 38f12bb4d1cddca4e91abceba5607b83, type: 3}
+      propertyPath: AllowHeadhsot
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 4270943517178745286, guid: 38f12bb4d1cddca4e91abceba5607b83, type: 3}
      propertyPath: m_LocalPosition.x
      value: 6.2527777e-13
@@ -117384,72 +117568,6 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2054729322}
  m_Mesh: {fileID: -6692290496178104961, guid: 981f3baed40547648b5665750d56ef42, type: 3}
--- !u!1001 &2056484539
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 1136712663}
-    m_Modifications:
-    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.585
-      objectReference: {fileID: 0}
-    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.106
-      objectReference: {fileID: 0}
-    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0.311
-      objectReference: {fileID: 0}
-    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 180
-      objectReference: {fileID: 0}
-    - target: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8541960315968224901, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: PaperText.GlocText
-      value: papers.Password where
-      objectReference: {fileID: 0}
-    - target: {fileID: 8747774001340122420, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-      propertyPath: m_Name
-      value: Paper_A (1)
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
--- !u!4 &2056484540 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3928807314550115601, guid: 471f94be919bb8c4a9b55fab006af519, type: 3}
-  m_PrefabInstance: {fileID: 2056484539}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2057841807
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/Playground.unity.meta
+++ b/Assets/Scenes/Playground.unity.meta
--- a/Condensed/TMP/RobotoCondensed-Light
+++ b/Condensed/TMP/RobotoCondensed-Light
--- a/Studio/UHFPS/Scriptables/Game/StateMachine/NPC/(States)
+++ b/Studio/UHFPS/Scriptables/Game/StateMachine/NPC/(States)
@@ -42,8 +42,8 @@ MonoBehaviour:
  AttackTrigger: Attack
  AttackState: Attack 01
  DamageRange:
-    min: 20
-    max: 40
+    min: 50
+    max: 60
 --- !u!114 &8407762149507097960
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -20,6 +20,10 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/ThunderWire Studio/UHFPS/_Demo/Scenes/Raining.unity
    guid: 5d02e5420369bbe42bc168890153f297
+  - enabled: 1
+    path: Assets/Scenes/TheGame.unity
+    guid: 54e3d8dcc56089c4f97f38881cee4d72
  m_configObjects:
    com.unity.addressableassets: {fileID: 11400000, guid: ae838b1c970aab641bb8e4643590df24, type: 2}
    com.unity.input.settings: {fileID: 11400000, guid: ce68c4c37abec5347801e4204a280574, type: 2}
+  m_UseUCBPForAssetBundles: 0
Author	SHA1	Message	Date
huric	609c4cc553	Исправлена ошибка чтения записки у телика	2026-03-05 02:14:49 +05:00
Хомячок	95752df395	Merge pull request 'Изменил название основной сцены' (#14 ) from gleb into main Reviewed-on: #14	2026-03-04 20:24:13 +00:00
Хомячок	288d24ffa6	Merge branch 'main' into gleb	2026-03-04 20:24:05 +00:00
Хомячок	8e9e463ab1	Merge pull request 'работа над меню' (#15 ) from hamy into main Reviewed-on: #15	2026-03-04 20:23:55 +00:00
huric	56224dbf40	Изменил название основной сцены	2026-03-05 01:22:41 +05:00