Tetramino/CourierOld
5
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Dev' into Levels2

Browse Source
This commit is contained in:
ThomasCharester committed 2025-12-05 13:45:06 +03:00
2 parents 1a30853147 6f777ba8a3
commit 349ac8a771
12 files changed
+293 -380
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
+5
View File
@@ -20,6 +20,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 24959d51467fd0d4f957ed6e846f73a5
m_Address: Assets/Resources_moved/Audio/Enemies/ded_attack1.ogg
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2ed2d93a9f39d4edba511cb7396c7bb6
m_Address: Assets/Resources_moved/Prefabs/Enemies/Cockroach.prefab
m_ReadOnly: 0
Game/CourierOld/Assets/Code/Gameplay/Character/Controller/CustomCharacterController.cs
+17 -3
View File
@@ -422,9 +422,23 @@ namespace Code.Gameplay.Character.Controller
public void OnMovementHit(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint,
ref HitStabilityReport hitStabilityReport)
{
if (_wallRunningMechanic.TryStartWallRun(hitNormal, hitPoint))
{
}
if (_wallRunningMechanic.TryStartWallRun(hitNormal, hitPoint)) return;
var horizontalVelocity = Vector3.ProjectOnPlane(motor.Velocity, motor.CharacterUp).normalized;
var velocitySqrMag = horizontalVelocity.sqrMagnitude;
if (!(velocitySqrMag > 0.01f)) return;
var dot = Vector3.Dot(horizontalVelocity, hitNormal);
const float impactThreshold = -0.3f;
if (!(dot < impactThreshold)) return;
if (_dashMechanic.IsDashing)
_dashMechanic.EndDash();
if (_slideMechanic.IsSliding)
_slideMechanic.EndSlide();
}
public void ProcessHitStabilityReport(Collider hitCollider, Vector3 hitNormal, Vector3 hitPoint,
Game/CourierOld/Assets/Code/Gameplay/Orders/Order/OrderGiveTrigger.cs
+4 -1
View File
@@ -6,10 +6,13 @@ namespace Code.Gameplay.Orders.Order
public class OrderGiveTrigger : MonoBehaviour
{
[Inject] private IOrderService _orderService;
[SerializeField] private Door.Door door;
private bool _playerEntered;
private void OnTriggerEnter(Collider other)
{
if (_playerEntered ) return;
if (_playerEntered || _orderService.OrderState == OrderState.Recieved) return;
door.TranslationMode(false);
_playerEntered = true;
_orderService.OrderGive();
Game/CourierOld/Assets/Resources/Configs/Audio/DefaultAudioSettingsConfig.asset
+5 -5
View File
@@ -15,7 +15,7 @@ MonoBehaviour:
menuVolume:
_serializedList:
- Key: 0
Value: 1
Value: 0.5
- Key: 1
Value: 1
- Key: 2
@@ -35,9 +35,9 @@ MonoBehaviour:
actionVolume:
_serializedList:
- Key: 0
Value: 1
Value: 0.5
- Key: 1
Value: 0.001
Value: 1
- Key: 2
Value: 1
- Key: 3
@@ -55,9 +55,9 @@ MonoBehaviour:
peacefulVolume:
_serializedList:
- Key: 0
Value: 1
Value: 0.5
- Key: 1
Value: 0.001
Value: 1
- Key: 2
Value: 1
- Key: 3
Game/CourierOld/Assets/Resources/Configs/Audio/EnemiesSoundListConfig.asset
+1 -1
View File
@@ -13,7 +13,7 @@ MonoBehaviour:
m_Name: EnemiesSoundListConfig
m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.EnemiesSoundListConfig
enemies:
- m_AssetGUID: fb8972b33f4c43749add9d98b439b447
- m_AssetGUID: 24959d51467fd0d4f957ed6e846f73a5
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
Game/CourierOld/Assets/Resources/Materials/Fog/Fog.mat
+1 -1
View File
@@ -110,7 +110,7 @@ Material:
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _Smoothness: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
Game/CourierOld/Assets/Resources/UI/Fonts/VCR_OSD_MONO_1.001 SDF.asset
+44 -367
View File
@@ -181,21 +181,6 @@ MonoBehaviour:
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 16
m_Metrics:
m_Width: 35.15625
m_Height: 8.78125
m_HorizontalBearingX: 8.796875
m_HorizontalBearingY: 39.546875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 402
m_Y: 10
m_Width: 36
m_Height: 10
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 20
m_Metrics:
m_Width: 26.359375
@@ -204,28 +189,13 @@ MonoBehaviour:
m_HorizontalBearingY: 65.921875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 457
m_X: 402
m_Y: 10
m_Width: 27
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 23
m_Metrics:
m_Width: 43.953125
m_Height: 61.53125
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 65.921875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 503
m_Y: 10
m_Width: 45
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 27
m_Metrics:
m_Width: 43.953125
@@ -234,7 +204,7 @@ MonoBehaviour:
m_HorizontalBearingY: 65.921875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 567
m_X: 448
m_Y: 10
m_Width: 45
m_Height: 62
@@ -249,14 +219,14 @@ MonoBehaviour:
m_HorizontalBearingY: 65.921875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 631
m_X: 512
m_Y: 10
m_Width: 45
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 47
- m_Index: 23
m_Metrics:
m_Width: 43.953125
m_Height: 61.53125
@@ -264,190 +234,25 @@ MonoBehaviour:
m_HorizontalBearingY: 65.921875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 695
m_X: 576
m_Y: 10
m_Width: 45
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 82
- m_Index: 16
m_Metrics:
m_Width: 43.953125
m_Height: 48.34375
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 52.734375
m_Width: 35.15625
m_Height: 8.78125
m_HorizontalBearingX: 8.796875
m_HorizontalBearingY: 39.546875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 759
m_X: 640
m_Y: 10
m_Width: 45
m_Height: 49
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 68
m_Metrics:
m_Width: 43.953125
m_Height: 52.734375
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 57.125
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 823
m_Y: 10
m_Width: 45
m_Height: 54
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 71
m_Metrics:
m_Width: 43.953125
m_Height: 61.53125
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 65.921875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 759
m_Y: 78
m_Width: 45
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 76
m_Metrics:
m_Width: 26.359375
m_Height: 57.140625
m_HorizontalBearingX: 13.1875
m_HorizontalBearingY: 61.53125
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 402
m_Y: 39
m_Width: 27
m_Height: 58
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 81
m_Metrics:
m_Width: 43.953125
m_Height: 48.34375
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 52.734375
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 887
m_Y: 10
m_Width: 45
m_Height: 49
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 74
m_Metrics:
m_Width: 43.953125
m_Height: 52.734375
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 57.125
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 951
m_Y: 10
m_Width: 45
m_Height: 54
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 3
m_Metrics:
m_Width: 0
m_Height: 0
m_HorizontalBearingX: 0
m_HorizontalBearingY: 0
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 0
m_Y: 0
m_Width: 0
m_Height: 0
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 90
m_Metrics:
m_Width: 43.953125
m_Height: 48.34375
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 52.734375
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 887
m_Y: 78
m_Width: 45
m_Height: 49
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 69
m_Metrics:
m_Width: 43.953125
m_Height: 61.53125
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 65.921875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 823
m_Y: 83
m_Width: 45
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 72
m_Metrics:
m_Width: 43.953125
m_Height: 48.34375
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 52.734375
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 951
m_Y: 83
m_Width: 45
m_Height: 49
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 83
m_Metrics:
m_Width: 43.953125
m_Height: 52.734375
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 57.125
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 887
m_Y: 146
m_Width: 45
m_Height: 54
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 87
m_Metrics:
m_Width: 26.359375
m_Height: 61.53125
m_HorizontalBearingX: 13.1875
m_HorizontalBearingY: 65.921875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 951
m_Y: 151
m_Width: 27
m_Height: 62
m_Width: 36
m_Height: 10
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
@@ -484,18 +289,10 @@ MonoBehaviour:
m_Unicode: 48
m_GlyphIndex: 19
m_Scale: 1
- m_ElementType: 1
m_Unicode: 45
m_GlyphIndex: 16
m_Scale: 1
- m_ElementType: 1
m_Unicode: 49
m_GlyphIndex: 20
m_Scale: 1
- m_ElementType: 1
m_Unicode: 52
m_GlyphIndex: 23
m_Scale: 1
- m_ElementType: 1
m_Unicode: 56
m_GlyphIndex: 27
@@ -505,56 +302,12 @@ MonoBehaviour:
m_GlyphIndex: 25
m_Scale: 1
- m_ElementType: 1
m_Unicode: 76
m_GlyphIndex: 47
m_Unicode: 52
m_GlyphIndex: 23
m_Scale: 1
- m_ElementType: 1
m_Unicode: 111
m_GlyphIndex: 82
m_Scale: 1
- m_ElementType: 1
m_Unicode: 97
m_GlyphIndex: 68
m_Scale: 1
- m_ElementType: 1
m_Unicode: 100
m_GlyphIndex: 71
m_Scale: 1
- m_ElementType: 1
m_Unicode: 105
m_GlyphIndex: 76
m_Scale: 1
- m_ElementType: 1
m_Unicode: 110
m_GlyphIndex: 81
m_Scale: 1
- m_ElementType: 1
m_Unicode: 103
m_GlyphIndex: 74
m_Scale: 1
- m_ElementType: 1
m_Unicode: 32
m_GlyphIndex: 3
m_Scale: 1
- m_ElementType: 1
m_Unicode: 119
m_GlyphIndex: 90
m_Scale: 1
- m_ElementType: 1
m_Unicode: 98
m_GlyphIndex: 69
m_Scale: 1
- m_ElementType: 1
m_Unicode: 101
m_GlyphIndex: 72
m_Scale: 1
- m_ElementType: 1
m_Unicode: 112
m_GlyphIndex: 83
m_Scale: 1
- m_ElementType: 1
m_Unicode: 116
m_GlyphIndex: 87
m_Unicode: 45
m_GlyphIndex: 16
m_Scale: 1
m_AtlasTextures:
- {fileID: 948717598527772745}
@@ -600,126 +353,50 @@ MonoBehaviour:
m_Width: 64
m_Height: 81
- m_X: 392
m_Y: 0
m_Width: 46
m_Height: 81
- m_X: 438
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 502
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 566
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 630
m_Y: 0
m_Width: 55
m_Height: 29
- m_X: 447
m_Y: 0
m_Width: 46
m_Height: 81
- m_X: 493
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 557
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 621
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 685
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 749
m_Y: 0
m_Width: 64
m_Height: 68
- m_X: 813
m_Y: 0
m_Width: 64
m_Height: 73
- m_X: 749
m_Y: 68
m_Width: 64
m_Height: 81
- m_X: 392
m_Y: 29
m_Width: 46
m_Height: 77
- m_X: 877
m_Y: 0
m_Width: 64
m_Height: 68
- m_X: 941
m_Y: 0
m_Width: 64
m_Height: 73
- m_X: 877
m_Y: 68
m_Width: 64
m_Height: 68
- m_X: 813
m_Y: 73
m_Width: 64
m_Height: 81
- m_X: 941
m_Y: 73
m_Width: 64
m_Height: 68
- m_X: 877
m_Y: 136
m_Width: 64
m_Height: 73
- m_X: 941
m_Y: 141
m_Width: 46
m_Height: 81
m_FreeGlyphRects:
- m_X: 128
m_Y: 81
m_Width: 895
m_Height: 942
- m_X: 128
m_Y: 28
m_Width: 8
m_Height: 995
- m_X: 0
m_Y: 110
m_Width: 749
m_Width: 1023
m_Height: 913
- m_X: 64
m_Y: 109
m_Width: 685
m_Width: 959
m_Height: 914
- m_X: 438
- m_X: 630
m_Y: 29
m_Width: 9
m_Width: 393
m_Height: 994
- m_X: 128
m_Y: 106
m_Width: 621
m_Height: 917
- m_X: 128
m_Y: 81
m_Width: 264
m_Height: 942
- m_X: 438
m_Y: 81
m_Width: 311
m_Height: 942
- m_X: 1005
- m_X: 685
m_Y: 0
m_Width: 18
m_Width: 338
m_Height: 1023
- m_X: 0
m_Y: 149
m_Width: 813
m_Height: 874
- m_X: 0
m_Y: 154
m_Width: 877
m_Height: 869
- m_X: 0
m_Y: 222
m_Width: 1023
m_Height: 801
- m_X: 0
m_Y: 209
m_Width: 941
m_Height: 814
- m_X: 987
m_Y: 141
m_Width: 36
m_Height: 882
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
m_LigatureSubstitutionRecords:
@@ -829,7 +506,7 @@ Texture2D:
m_ColorSpace: 1
m_PlatformBlob:
image data: 1048576
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0807050200000306070e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e090806030000000000000000000000050a0f121313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313100f0d0905000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000001040607090909090909090909090909090909090909090909090909090909090909090909090909070300000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e080707090a0e0e0e0e0e0e0e0e090806030000000000000000000000000005080a0b0e0e0e0e0e0e0e0e08070502000000000000000000000000000000000000000407090a0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e090c1012131b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a0400000000000000010910161b1e20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020201d1c1915100a030000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c0500000000000000000000000000000000000001070d111314161616161616161616161616161616161616161616161616161616161616161616161615130f0a04Line truncated
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0807050200000306070e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e090806030000000000000000000000050a0f121313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313100f0d0905000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000104060709090909090909090909090909090909090909090909090909090909090909090909090907030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e090c1012131b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a0400000000000000010910161b1e20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020201d1c1915100a030000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000Line truncated
m_StreamData:
serializedVersion: 2
offset: 0
Game/CourierOld/Assets/Resources_moved/Audio/Enemies/ded_attack1.ogg
LFS
BIN
View File
Binary file not shown.
Game/CourierOld/Assets/Resources_moved/Audio/Enemies/ded_attack1.ogg.meta
+23
View File
@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 24959d51467fd0d4f957ed6e846f73a5
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Game/CourierOld/Assets/Resources_moved/Prefabs/Enemies/Fog.prefab
+183 -1
View File
@@ -1,5 +1,95 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1850445858040252186
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1643275471609345438}
- component: {fileID: 2950399526002266991}
- component: {fileID: 5386943004539180828}
m_Layer: 0
m_Name: Fog (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1643275471609345438
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1850445858040252186}
serializedVersion: 2
m_LocalRotation: {x: 0.08005885, y: -0.26831666, z: 0.007980086, w: 0.95996517}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.95626885, y: 0.95626885, z: 0.95626885}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2479871120354898442}
m_LocalEulerAnglesHint: {x: 9.09, y: -31.36, z: -1.604}
--- !u!33 &2950399526002266991
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1850445858040252186}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5386943004539180828
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1850445858040252186}
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: cd92f58bae8219bf190b30d7c9e47e50, 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!1 &4446044925301680734
GameObject:
m_ObjectHideFlags: 0
@@ -31,7 +121,9 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 15, y: 15, z: 15}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 2352800914270225904}
- {fileID: 1643275471609345438}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &9176085615991257
@@ -105,3 +197,93 @@ MonoBehaviour:
m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Enemies.Fog
agent: {fileID: 0}
enemyCollider: {fileID: 0}
--- !u!1 &4709012146302832438
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2352800914270225904}
- component: {fileID: 5562223873964708683}
- component: {fileID: 3382861707377452007}
m_Layer: 0
m_Name: Fog
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2352800914270225904
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4709012146302832438}
serializedVersion: 2
m_LocalRotation: {x: -0.024685878, y: -0.084096625, z: 0.028418832, w: 0.9957463}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.97348, y: 0.97348, z: 0.97348}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2479871120354898442}
m_LocalEulerAnglesHint: {x: -2.544, y: -9.732, z: 3.486}
--- !u!33 &5562223873964708683
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4709012146302832438}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &3382861707377452007
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4709012146302832438}
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: cd92f58bae8219bf190b30d7c9e47e50, 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}
Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/MainMenu 1.prefab
+1
View File
@@ -334,6 +334,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d3966e4798d243abba9d85b9ad8aef33, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Orders.Order.OrderGiveTrigger
door: {fileID: 8664037799804130812}
--- !u!54 &7775399744687153908
Rigidbody:
m_ObjectHideFlags: 0
Game/CourierOld/Assets/Resources_moved/Prefabs/Levels/Save1.prefab
+6 -1
View File
@@ -223,7 +223,7 @@ Transform:
m_GameObject: {fileID: 1146319805743931034}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.673, y: 0.729, z: 1.098}
m_LocalPosition: {x: -0.61, y: 0.729, z: 1.098}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -414,6 +414,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d3966e4798d243abba9d85b9ad8aef33, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Orders.Order.OrderGiveTrigger
door: {fileID: 5314621602992352196}
--- !u!1 &5758461351357068112
GameObject:
m_ObjectHideFlags: 0
@@ -1355,6 +1356,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 497202044859351241}
m_Modifications:
- target: {fileID: 448402393908802308, guid: 5a328d367b793ebb1a43053026a3f461, type: 3}
propertyPath: m_IsKinematic
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1077812855099157442, guid: 5a328d367b793ebb1a43053026a3f461, type: 3}
propertyPath: m_Layer
value: 15