Блять

2025-11-28 15:13:03 +03:00
1 parent 26804e08f7
commit 34d7fa3791
@@ -10,7 +10,7 @@ namespace Code.Gameplay.Orders.Order
        private bool _playerEntered;
        private void OnTriggerEnter(Collider other)
        {
-            if (_playerEntered) return;
+            if (_playerEntered || !other.CompareTag("Player")) return;
            
             _playerEntered = true;
            _orderService.OrderDelivered();
@@ -9,7 +9,7 @@ namespace Code.Gameplay.Orders.Order
        private bool _playerEntered;
        private void OnTriggerEnter(Collider other)
        {
-            if (_playerEntered && !other.CompareTag("Player")) return;
+            if (_playerEntered || !other.CompareTag("Player")) return;
            
            _playerEntered = true;
            _orderService.OrderGive();
@@ -20,8 +20,7 @@ namespace Code.Generator
        // }
        private void OnTriggerEnter(Collider other)
        {
-            if (_playerEntered) return;
-            if (!other.CompareTag("Player")) return;
+            if (_playerEntered || !other.CompareTag("Player")) return;

            _playerEntered = true;

@@ -43,11 +43,6 @@ MonoBehaviour:
    m_SubObjectType: 
    m_SubObjectGUID: 
    m_EditorAssetChanged: 0
-  - m_AssetGUID: ab5926b5200bedc49aec36c0afe6b028
-    m_SubObjectName: 
-    m_SubObjectType: 
-    m_SubObjectGUID: 
-    m_EditorAssetChanged: 0
  - m_AssetGUID: dc328d8aadb0e8545978741d451e0544
    m_SubObjectName: 
    m_SubObjectType: 
@@ -7,7 +7,7 @@ TextureImporter:
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
@@ -54,7 +54,7 @@ TextureImporter:
  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
@@ -233,7 +233,6 @@ GameObject:
  - component: {fileID: 7658469590460197305}
  - component: {fileID: 4000132046665382781}
  - component: {fileID: 3477723652303856792}
-  - component: {fileID: 5983638633854855048}
  - component: {fileID: 5086952839173509543}
  m_Layer: 15
  m_Name: Level1Box
@@ -360,19 +359,6 @@ MonoBehaviour:
  enterMarker: {fileID: 5129792664829691973}
  exitMarker: {fileID: 7151845401872401167}
  door: {fileID: 8287786444850190383}
--- !u!114 &5983638633854855048
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8162956792271030380}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 20620ae30fdd0164c9bb5bdc717d3ada, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Reflex::Reflex.Components.GameObjectSelfInjector
-  _injectionStrategy: 2
 --- !u!114 &5086952839173509543
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -258,7 +258,6 @@ GameObject:
  - component: {fileID: 7658469590460197305}
  - component: {fileID: 4000132046665382781}
  - component: {fileID: 3477723652303856792}
-  - component: {fileID: 5983638633854855048}
  - component: {fileID: -3696999240725143744}
  m_Layer: 15
  m_Name: Level1Save
@@ -384,19 +383,6 @@ MonoBehaviour:
  enterMarker: {fileID: 5129792664829691973}
  exitMarker: {fileID: 7151845401872401167}
  door: {fileID: 8287786444850190383}
--- !u!114 &5983638633854855048
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8162956792271030380}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 20620ae30fdd0164c9bb5bdc717d3ada, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Reflex::Reflex.Components.GameObjectSelfInjector
-  _injectionStrategy: 2
 --- !u!114 &-3696999240725143744
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -107,6 +107,7 @@ GameObject:
  - component: {fileID: 5646220261930218471}
  - component: {fileID: 1903270114139615917}
  - component: {fileID: 3514568996749414155}
+  - component: {fileID: 6270132394485304178}
  m_Layer: 0
  m_Name: Level3_Big
  m_TagString: Untagged
@@ -263,6 +264,19 @@ MonoBehaviour:
  enterMarker: {fileID: 6178253775547123378}
  exitMarker: {fileID: 8273978963053227506}
  door: {fileID: 0}
+--- !u!114 &6270132394485304178
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6150680252031504946}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 20620ae30fdd0164c9bb5bdc717d3ada, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Reflex::Reflex.Components.GameObjectSelfInjector
+  _injectionStrategy: 2
 --- !u!1 &7156104076513938594
 GameObject:
  m_ObjectHideFlags: 0
@@ -137,6 +137,8 @@ GameObject:
  - component: {fileID: 1321487708616757334}
  - component: {fileID: 3869200488557012124}
  - component: {fileID: 8931740490583137883}
+  - component: {fileID: 145167298974947048}
+  - component: {fileID: 8225376439119395010}
  m_Layer: 0
  m_Name: Level4_Parkur
  m_TagString: Untagged
@@ -259,6 +261,41 @@ MonoBehaviour:
  enterMarker: {fileID: 228080209773947928}
  exitMarker: {fileID: 1216027210121557438}
  door: {fileID: 7696826591571260106}
+--- !u!64 &145167298974947048
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3364986239837717833}
+  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: -6462661440221476476, guid: 0b5f5a5bafb21244387206e908d6509f, type: 3}
+--- !u!114 &8225376439119395010
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3364986239837717833}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 20620ae30fdd0164c9bb5bdc717d3ada, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Reflex::Reflex.Components.GameObjectSelfInjector
+  _injectionStrategy: 2
 --- !u!1 &7731075017058277066
 GameObject:
  m_ObjectHideFlags: 0
@@ -43,6 +43,8 @@ GameObject:
  - component: {fileID: 1284801017599972287}
  - component: {fileID: 3904745113406646133}
  - component: {fileID: 6478694878633485400}
+  - component: {fileID: 8785645763124069098}
+  - component: {fileID: -5721631172788629572}
  m_Layer: 0
  m_Name: Level5
  m_TagString: Untagged
@@ -182,6 +184,41 @@ MonoBehaviour:
  enterMarker: {fileID: 8996401671676858062}
  exitMarker: {fileID: 6264135071762588400}
  door: {fileID: 9218948349599485641}
+--- !u!64 &8785645763124069098
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3256257073069164192}
+  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: -6462661440221476476, guid: 34e82d6ea1c709f4b8ff5ab5e8a047d1, type: 3}
+--- !u!114 &-5721631172788629572
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3256257073069164192}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 20620ae30fdd0164c9bb5bdc717d3ada, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Reflex::Reflex.Components.GameObjectSelfInjector
+  _injectionStrategy: 2
 --- !u!1 &7124456341882465757
 GameObject:
  m_ObjectHideFlags: 0
@@ -333,7 +333,7 @@ Transform:
  m_GameObject: {fileID: 8947044706009838770}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: -0.878, y: 0, z: -0.54}
+  m_LocalPosition: {x: -0.878, y: -0.316, z: -0.54}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@@ -44,6 +44,7 @@ GameObject:
  - component: {fileID: 1634039740568140710}
  - component: {fileID: 6845601055732463106}
  - component: {fileID: 8351462140297953793}
+  - component: {fileID: 6388575241704530229}
  m_Layer: 0
  m_Name: Save1
  m_TagString: Untagged
@@ -174,6 +175,19 @@ MonoBehaviour:
  enterMarker: {fileID: 3335730486935238478}
  exitMarker: {fileID: 1591990838045886174}
  door: {fileID: 5314621602992352196}
+--- !u!114 &6388575241704530229
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 985648457316358771}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 20620ae30fdd0164c9bb5bdc717d3ada, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Reflex::Reflex.Components.GameObjectSelfInjector
+  _injectionStrategy: 2
 --- !u!1 &3172166553278198835
 GameObject:
  m_ObjectHideFlags: 0