фикс траблов с мерджем

This commit is contained in:
MrTorex committed 2025-11-27 09:24:56 +03:00
1 parent 175567e4dd
commit ee7cf3946f
4 files changed
+1012 -99

No files matched your search

@@ -1,7 +1,4 @@
using System.Collections.Generic;
using System.Globalization;
using System.Reflection.Emit;
using System.Threading.Tasks;
using Code.App.Loading;
using Code.App.StateMachine;
using Code.Audio;
@@ -10,7 +7,6 @@ using Code.Gameplay.Camera.CameraStates;
using Code.Gameplay.Character.Core;
using Code.Gameplay.Enemies;
using Code.Gameplay.Orders.Order;
using Code.Gameplay.Orders.Order;
using Code.Gameplay.Player;
using Code.Input;
using Code.Scenes;
@@ -21,7 +17,6 @@ using Code.UI.Panels;
using Cysharp.Threading.Tasks;
using Reflex.Core;
using Reflex.Extensions;
using Reflex.Injectors;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.SceneManagement;
@@ -46,8 +41,6 @@ namespace Code.App.AppStates
public override void EnterState()
{
Context.UIService.LoadingScreen.Show();
_playerMoney = Context.PlayerFactory.CreatePlayerMoney();
Context.LoadingManager
.RegisterLoading(LoadingWork.LoadScene)
@@ -88,10 +81,6 @@ namespace Code.App.AppStates
Context.AudioFactory.WarmSFX(),
Context.AudioFactory.WarmDispatcher()
);
_playerHealth = Context.PlayerProvider.Health;
_playerHealth.OnDamage += PlayerDamageTaken;
_playerHealth.OnDeath += EndGame;
Context.LoadingManager
.UnregisterLoading(LoadingWork.LoadUI)
@@ -115,6 +104,10 @@ namespace Code.App.AppStates
WaitForPlayerCharacterLoad()
);
_playerHealth = Context.PlayerProvider.Health;
_playerHealth.OnDamage += PlayerDamageTaken;
_playerHealth.OnDeath += EndGame;
Context.LoadingManager
.UnregisterLoading(LoadingWork.LoadModelResource);
}
@@ -12,9 +12,9 @@ Texture2D:
Hash: 00000000000000000000000000000000
m_IsAlphaChannelOptional: 0
serializedVersion: 4
m_Width: 1
m_Height: 1
m_CompleteImageSize: 1
m_Width: 1024
m_Height: 1024
m_CompleteImageSize: 1048576
m_MipsStripped: 0
m_TextureFormat: 1
m_MipCount: 1
@@ -39,8 +39,8 @@ Texture2D:
m_LightmapFormat: 0
m_ColorSpace: 1
m_PlatformBlob:
image data: 1
_typelessdata: 00
image data: 1048576
_typelessdata: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010406070a0d0e0e0d0c0906050300000000000000000000000000000000010406070a0d0e0e0d0c0906050300000000000000000000000000000000010406070a0d0e0e0d0c090806030000000000000000000000000000000000020507080a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a08070502000000000000000000000000000000000000000000000000000000000000000000010406070809090a0a09090807060401000000000000000000000000000000000000000000000000000000000000000105090b0c13131313131313131313131312110e0904000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001050707090a0a09080706040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105090b0c13131313131313131313131312110e09040000000000000000000000000205070813131313131313131313131310100d0a0500000000000000000000000000000000000000000000000000000000000005090d0f1013131313131313131313130f0e0c08040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000306070809090a0a090908060503000000000000000000000000000000000000000000000000000000000000000000000004090c0e0f11111111111111111111110c0c0a060200000000000000000000000000000000000000000000000003080b0d0e11111111111111111111110d0d0b07020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001070d10131417191a1b1a191613120f0b0600000000000000000000000001070d11131417191a1b1a191613120f0b0600000000000000000000000001080d11131417191a1b1a191615130f0a040000000000000000000000000002090e1214151616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161514120e0902000000000000000000000000000000000000000000000000000002050708070d11131415151616171616151413110d070906050300000000000000000000000000000000000000000000000000060c111518182020202020202020202020201f1d1a150f08000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004060709080d11131416161616151413100c07060300000000000000000000000000000000000000000000000000000000000000000000000000000000000000060c111518182020202020202020202020201f1d1a150f0800000000000000000002090e1114142020202020202020202020201d1c1a16110a030000000000000000000000000000Line truncated
m_StreamData:
serializedVersion: 2
offset: 0
@@ -106,8 +106,445 @@ MonoBehaviour:
m_SourceFontFilePath:
m_AtlasPopulationMode: 1
InternalDynamicOS: 0
m_GlyphTable: []
m_CharacterTable: []
m_GlyphTable:
- m_Index: 659
m_Metrics:
m_Width: 74.265625
m_Height: 14.015625
m_HorizontalBearingX: 8.265625
m_HorizontalBearingY: 13.40625
m_HorizontalAdvance: 90.875
m_GlyphRect:
m_X: 10
m_Y: 10
m_Width: 75
m_Height: 15
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 64
m_Metrics:
m_Width: 45.875
m_Height: 4.484375
m_HorizontalBearingX: -0.4375
m_HorizontalBearingY: -6.765625
m_HorizontalAdvance: 45
m_GlyphRect:
m_X: 104
m_Y: 10
m_Width: 47
m_Height: 6
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 472
m_Metrics:
m_Width: 48.125
m_Height: 63.375
m_HorizontalBearingX: 1.453125
m_HorizontalBearingY: 62.09375
m_HorizontalAdvance: 53.484375
m_GlyphRect:
m_X: 170
m_Y: 10
m_Width: 49
m_Height: 65
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 465
m_Metrics:
m_Width: 56.421875
m_Height: 60.828125
m_HorizontalBearingX: 1.1875
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 58.75
m_GlyphRect:
m_X: 10
m_Y: 44
m_Width: 57
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 468
m_Metrics:
m_Width: 39.421875
m_Height: 60.828125
m_HorizontalBearingX: 5.578125
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 46.796875
m_GlyphRect:
m_X: 104
m_Y: 35
m_Width: 40
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 481
m_Metrics:
m_Width: 44.421875
m_Height: 60.828125
m_HorizontalBearingX: 6.59375
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 54.453125
m_GlyphRect:
m_X: 238
m_Y: 10
m_Width: 46
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 484
m_Metrics:
m_Width: 53.1875
m_Height: 62.109375
m_HorizontalBearingX: 1.53125
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 55.453125
m_GlyphRect:
m_X: 303
m_Y: 10
m_Width: 54
m_Height: 63
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 475
m_Metrics:
m_Width: 46.3125
m_Height: 60.828125
m_HorizontalBearingX: 6.59375
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 56.515625
m_GlyphRect:
m_X: 376
m_Y: 10
m_Width: 47
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 483
m_Metrics:
m_Width: 49.84375
m_Height: 60.828125
m_HorizontalBearingX: 1.53125
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 52.90625
m_GlyphRect:
m_X: 442
m_Y: 10
m_Width: 51
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 479
m_Metrics:
m_Width: 52.375
m_Height: 63.375
m_HorizontalBearingX: 3.78125
m_HorizontalBearingY: 62.09375
m_HorizontalAdvance: 59.9375
m_GlyphRect:
m_X: 512
m_Y: 10
m_Width: 54
m_Height: 65
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 490
m_Metrics:
m_Width: 76.03125
m_Height: 71.640625
m_HorizontalBearingX: 6.59375
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 83.796875
m_GlyphRect:
m_X: 376
m_Y: 90
m_Width: 77
m_Height: 72
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 470
m_Metrics:
m_Width: 39.5
m_Height: 60.828125
m_HorizontalBearingX: 6.59375
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 50.5
m_GlyphRect:
m_X: 238
m_Y: 90
m_Width: 41
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 478
m_Metrics:
m_Width: 48.78125
m_Height: 60.828125
m_HorizontalBearingX: 6.59375
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 61.921875
m_GlyphRect:
m_X: 163
m_Y: 94
m_Width: 50
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 1
m_Metrics:
m_Width: 0
m_Height: 0
m_HorizontalBearingX: 0
m_HorizontalBearingY: 0
m_HorizontalAdvance: 21.625
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: 15
m_Metrics:
m_Width: 14.328125
m_Height: 14.015625
m_HorizontalBearingX: 5.671875
m_HorizontalBearingY: 13.40625
m_HorizontalAdvance: 25.671875
m_GlyphRect:
m_X: 472
m_Y: 90
m_Width: 15
m_Height: 15
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 482
m_Metrics:
m_Width: 51.859375
m_Height: 63.375
m_HorizontalBearingX: 4.21875
m_HorizontalBearingY: 62.09375
m_HorizontalAdvance: 58.578125
m_GlyphRect:
m_X: 86
m_Y: 115
m_Width: 53
m_Height: 65
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 474
m_Metrics:
m_Width: 48.5625
m_Height: 79.109375
m_HorizontalBearingX: 6.59375
m_HorizontalBearingY: 79.109375
m_HorizontalAdvance: 61.75
m_GlyphRect:
m_X: 10
m_Y: 124
m_Width: 50
m_Height: 80
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 473
m_Metrics:
m_Width: 48.5625
m_Height: 60.828125
m_HorizontalBearingX: 6.59375
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 61.75
m_GlyphRect:
m_X: 298
m_Y: 92
m_Width: 50
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 467
m_Metrics:
m_Width: 46.578125
m_Height: 60.828125
m_HorizontalBearingX: 6.59375
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 57.046875
m_GlyphRect:
m_X: 232
m_Y: 172
m_Width: 48
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 492
m_Metrics:
m_Width: 66.484375
m_Height: 60.828125
m_HorizontalBearingX: 6.59375
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 79.625
m_GlyphRect:
m_X: 79
m_Y: 199
m_Width: 68
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 486
m_Metrics:
m_Width: 53.953125
m_Height: 60.828125
m_HorizontalBearingX: 1.28125
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 56.515625
m_GlyphRect:
m_X: 299
m_Y: 172
m_Width: 55
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 469
m_Metrics:
m_Width: 57.484375
m_Height: 71.640625
m_HorizontalBearingX: 1.1875
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 59.859375
m_GlyphRect:
m_X: 585
m_Y: 10
m_Width: 58
m_Height: 72
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 493
m_Metrics:
m_Width: 45.4375
m_Height: 60.828125
m_HorizontalBearingX: 6.59375
m_HorizontalBearingY: 60.828125
m_HorizontalAdvance: 55.453125
m_GlyphRect:
m_X: 166
m_Y: 174
m_Width: 47
m_Height: 61
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
m_CharacterTable:
- m_ElementType: 1
m_Unicode: 8230
m_GlyphIndex: 659
m_Scale: 1
- m_ElementType: 1
m_Unicode: 95
m_GlyphIndex: 64
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1047
m_GlyphIndex: 472
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1040
m_GlyphIndex: 465
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1043
m_GlyphIndex: 468
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1056
m_GlyphIndex: 481
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1059
m_GlyphIndex: 484
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1050
m_GlyphIndex: 475
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1058
m_GlyphIndex: 483
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1054
m_GlyphIndex: 479
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1065
m_GlyphIndex: 490
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1045
m_GlyphIndex: 470
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1053
m_GlyphIndex: 478
m_Scale: 1
- m_ElementType: 1
m_Unicode: 32
m_GlyphIndex: 1
m_Scale: 1
- m_ElementType: 1
m_Unicode: 46
m_GlyphIndex: 15
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1057
m_GlyphIndex: 482
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1049
m_GlyphIndex: 474
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1048
m_GlyphIndex: 473
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1042
m_GlyphIndex: 467
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1067
m_GlyphIndex: 492
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1061
m_GlyphIndex: 486
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1044
m_GlyphIndex: 469
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1068
m_GlyphIndex: 493
m_Scale: 1
m_AtlasTextures:
- {fileID: -680064802141868518}
m_AtlasTextureIndex: 0
@@ -118,12 +555,176 @@ MonoBehaviour:
m_AtlasHeight: 1024
m_AtlasPadding: 9
m_AtlasRenderMode: 4165
m_UsedGlyphRects: []
m_FreeGlyphRects:
m_UsedGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 94
m_Height: 34
- m_X: 94
m_Y: 0
m_Width: 66
m_Height: 25
- m_X: 160
m_Y: 0
m_Width: 68
m_Height: 84
- m_X: 0
m_Y: 34
m_Width: 76
m_Height: 80
- m_X: 94
m_Y: 25
m_Width: 59
m_Height: 80
- m_X: 228
m_Y: 0
m_Width: 65
m_Height: 80
- m_X: 293
m_Y: 0
m_Width: 73
m_Height: 82
- m_X: 366
m_Y: 0
m_Width: 66
m_Height: 80
- m_X: 432
m_Y: 0
m_Width: 70
m_Height: 80
- m_X: 502
m_Y: 0
m_Width: 73
m_Height: 84
- m_X: 366
m_Y: 80
m_Width: 96
m_Height: 91
- m_X: 228
m_Y: 80
m_Width: 60
m_Height: 80
- m_X: 153
m_Y: 84
m_Width: 69
m_Height: 80
- m_X: 462
m_Y: 80
m_Width: 34
m_Height: 34
- m_X: 76
m_Y: 105
m_Width: 72
m_Height: 84
- m_X: 0
m_Y: 114
m_Width: 69
m_Height: 99
- m_X: 288
m_Y: 82
m_Width: 69
m_Height: 80
- m_X: 222
m_Y: 162
m_Width: 67
m_Height: 80
- m_X: 69
m_Y: 189
m_Width: 87
m_Height: 80
- m_X: 289
m_Y: 162
m_Width: 74
m_Height: 80
- m_X: 575
m_Y: 0
m_Width: 77
m_Height: 91
- m_X: 156
m_Y: 164
m_Width: 66
m_Height: 80
m_FreeGlyphRects:
- m_X: 153
m_Y: 25
m_Width: 7
m_Height: 59
- m_X: 462
m_Y: 114
m_Width: 561
m_Height: 909
- m_X: 496
m_Y: 80
m_Width: 6
m_Height: 943
- m_X: 76
m_Y: 34
m_Width: 18
m_Height: 71
- m_X: 288
m_Y: 80
m_Width: 5
m_Height: 2
- m_X: 222
m_Y: 84
m_Width: 6
m_Height: 78
- m_X: 222
m_Y: 160
m_Width: 66
m_Height: 2
- m_X: 148
m_Y: 105
m_Width: 5
m_Height: 84
- m_X: 69
m_Y: 114
m_Width: 7
m_Height: 75
- m_X: 0
m_Y: 269
m_Width: 1023
m_Height: 754
- m_X: 0
m_Y: 213
m_Width: 69
m_Height: 810
- m_X: 357
m_Y: 82
m_Width: 9
m_Height: 80
- m_X: 363
m_Y: 82
m_Width: 3
m_Height: 941
- m_X: 363
m_Y: 171
m_Width: 660
m_Height: 852
- m_X: 652
m_Y: 0
m_Width: 371
m_Height: 1023
- m_X: 496
m_Y: 91
m_Width: 527
m_Height: 932
- m_X: 496
m_Y: 84
m_Width: 79
m_Height: 939
- m_X: 148
m_Y: 164
m_Width: 8
m_Height: 25
- m_X: 156
m_Y: 244
m_Width: 867
m_Height: 779
- m_X: 222
m_Y: 242
m_Width: 801
m_Height: 781
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
m_LigatureSubstitutionRecords: []
@@ -60,8 +60,255 @@ MonoBehaviour:
m_SourceFontFilePath:
m_AtlasPopulationMode: 1
InternalDynamicOS: 0
m_GlyphTable: []
m_CharacterTable: []
m_GlyphTable:
- m_Index: 185
m_Metrics:
m_Width: 43.953125
m_Height: 8.796875
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 13.1875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 10
m_Y: 10
m_Width: 45
m_Height: 10
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 66
m_Metrics:
m_Width: 52.734375
m_Height: 8.796875
m_HorizontalBearingX: 0
m_HorizontalBearingY: 8.796875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 74
m_Y: 10
m_Width: 53
m_Height: 9
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 22
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: 146
m_Y: 10
m_Width: 45
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 26
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: 74
m_Y: 38
m_Width: 45
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 24
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: 10
m_Y: 39
m_Width: 45
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 21
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: 210
m_Y: 10
m_Width: 45
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 28
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: 274
m_Y: 10
m_Width: 45
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 19
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: 338
m_Y: 10
m_Width: 45
m_Height: 62
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
m_Height: 61.53125
m_HorizontalBearingX: 13.1875
m_HorizontalBearingY: 65.921875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 457
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: 25
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: 567
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
m_Height: 61.53125
m_HorizontalBearingX: 4.390625
m_HorizontalBearingY: 65.921875
m_HorizontalAdvance: 52.734375
m_GlyphRect:
m_X: 631
m_Y: 10
m_Width: 45
m_Height: 62
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
m_CharacterTable:
- m_ElementType: 1
m_Unicode: 8230
m_GlyphIndex: 185
m_Scale: 1
- m_ElementType: 1
m_Unicode: 95
m_GlyphIndex: 66
m_Scale: 1
- m_ElementType: 1
m_Unicode: 51
m_GlyphIndex: 22
m_Scale: 1
- m_ElementType: 1
m_Unicode: 55
m_GlyphIndex: 26
m_Scale: 1
- m_ElementType: 1
m_Unicode: 53
m_GlyphIndex: 24
m_Scale: 1
- m_ElementType: 1
m_Unicode: 50
m_GlyphIndex: 21
m_Scale: 1
- m_ElementType: 1
m_Unicode: 57
m_GlyphIndex: 28
m_Scale: 1
- m_ElementType: 1
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: 54
m_GlyphIndex: 25
m_Scale: 1
- m_ElementType: 1
m_Unicode: 56
m_GlyphIndex: 27
m_Scale: 1
m_AtlasTextures:
- {fileID: 948717598527772745}
m_AtlasTextureIndex: 0
@@ -72,11 +319,83 @@ MonoBehaviour:
m_AtlasHeight: 1024
m_AtlasPadding: 9
m_AtlasRenderMode: 4165
m_UsedGlyphRects: []
m_FreeGlyphRects:
m_UsedGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 64
m_Height: 29
- m_X: 64
m_Y: 0
m_Width: 72
m_Height: 28
- m_X: 136
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 64
m_Y: 28
m_Width: 64
m_Height: 81
- m_X: 0
m_Y: 29
m_Width: 64
m_Height: 81
- m_X: 200
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 264
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 328
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 392
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_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: 1023
m_Height: 913
- m_X: 64
m_Y: 109
m_Width: 959
m_Height: 914
- m_X: 392
m_Y: 29
m_Width: 55
m_Height: 994
- m_X: 685
m_Y: 0
m_Width: 338
m_Height: 1023
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
@@ -159,9 +478,9 @@ Texture2D:
Hash: 00000000000000000000000000000000
m_IsAlphaChannelOptional: 0
serializedVersion: 4
m_Width: 1
m_Height: 1
m_CompleteImageSize: 1
m_Width: 1024
m_Height: 1024
m_CompleteImageSize: 1048576
m_MipsStripped: 0
m_TextureFormat: 1
m_MipCount: 1
@@ -186,8 +505,8 @@ Texture2D:
m_LightmapFormat: 0
m_ColorSpace: 1
m_PlatformBlob:
image data: 1
_typelessdata: 00
image data: 1048576
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0807050200000306070e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e090806030000000000000000000000050a0f121313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313100f0d0905000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000001040607090909090909090909090909090909090909090909090909090909090909090909090909070300000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e090c1012131b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a0400000000000000010910161b1e20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020201d1c1915100a030000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c0500000000000000000000000000000000000001070d111314161616161616161616161616161616161616161616161616161616161616161616161615130f0a04Line truncated
m_StreamData:
serializedVersion: 2
offset: 0
@@ -130,11 +130,11 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2527703521557431680}
- component: {fileID: 3661801025373459518}
- component: {fileID: 2338437892164946760}
- component: {fileID: 3099094249566452406}
- component: {fileID: 3283650228831796584}
- component: {fileID: 6003242550544221350}
- component: {fileID: 8541228187116599584}
- component: {fileID: 8476708390679839925}
m_Layer: 7
m_Name: CharacterController
m_TagString: Player
@@ -160,71 +160,6 @@ Transform:
- {fileID: 1463034091404591669}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!136 &3661801025373459518
CapsuleCollider:
m_ObjectHideFlags: 8
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5180666550922024311}
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: 2
m_Radius: 0.5
m_Height: 2
m_Direction: 1
m_Center: {x: 0, y: 1, z: 0}
--- !u!114 &2338437892164946760
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5180666550922024311}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d1bc5515e3ab954e80599c538834774, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::KinematicCharacterController.KinematicCharacterMotor
Capsule: {fileID: 3661801025373459518}
CapsuleRadius: 0.5
CapsuleHeight: 2
CapsuleYOffset: 1
CapsulePhysicsMaterial: {fileID: 0}
GroundDetectionExtraDistance: 0
MaxStableSlopeAngle: 60
StableGroundLayers:
serializedVersion: 2
m_Bits: 256
DiscreteCollisionEvents: 0
StepHandling: 1
MaxStepHeight: 0.5
AllowSteppingWithoutStableGrounding: 0
MinRequiredStepDepth: 0.1
LedgeAndDenivelationHandling: 1
MaxStableDistanceFromLedge: 0.5
MaxVelocityForLedgeSnap: 0
MaxStableDenivelationAngle: 180
InteractiveRigidbodyHandling: 1
RigidbodyInteractionType: 0
SimulatedCharacterMass: 1
PreserveAttachedRigidbodyMomentum: 1
HasPlanarConstraint: 0
PlanarConstraintAxis: {x: 0, y: 0, z: 1}
MaxMovementIterations: 5
MaxDecollisionIterations: 1
CheckMovementInitialOverlaps: 1
KillVelocityWhenExceedMaxMovementIterations: 1
KillRemainingMovementWhenExceedMaxMovementIterations: 1
--- !u!114 &3099094249566452406
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -237,7 +172,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a6f74123648343c498c883d02909b499, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Player.CharacterController
motor: {fileID: 2338437892164946760}
motor: {fileID: 8476708390679839925}
characterTransform: {fileID: 4122797476271397740}
--- !u!114 &3283650228831796584
MonoBehaviour:
@@ -266,7 +201,72 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2f94efbea729423596ee5c6ee2366c98, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Player.PlayerAnimator
kinematicCharacterMotor: {fileID: 2338437892164946760}
kinematicCharacterMotor: {fileID: 8476708390679839925}
--- !u!136 &8541228187116599584
CapsuleCollider:
m_ObjectHideFlags: 8
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5180666550922024311}
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: 2
m_Radius: 0.5
m_Height: 2
m_Direction: 1
m_Center: {x: 0, y: 1, z: 0}
--- !u!114 &8476708390679839925
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5180666550922024311}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d1bc5515e3ab954e80599c538834774, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::KinematicCharacterController.KinematicCharacterMotor
Capsule: {fileID: 8541228187116599584}
CapsuleRadius: 0.5
CapsuleHeight: 2
CapsuleYOffset: 1
CapsulePhysicsMaterial: {fileID: 0}
GroundDetectionExtraDistance: 0
MaxStableSlopeAngle: 60
StableGroundLayers:
serializedVersion: 2
m_Bits: 4294967295
DiscreteCollisionEvents: 0
StepHandling: 1
MaxStepHeight: 0.5
AllowSteppingWithoutStableGrounding: 0
MinRequiredStepDepth: 0.1
LedgeAndDenivelationHandling: 1
MaxStableDistanceFromLedge: 0.5
MaxVelocityForLedgeSnap: 0
MaxStableDenivelationAngle: 180
InteractiveRigidbodyHandling: 1
RigidbodyInteractionType: 0
SimulatedCharacterMass: 1
PreserveAttachedRigidbodyMomentum: 1
HasPlanarConstraint: 0
PlanarConstraintAxis: {x: 0, y: 0, z: 1}
MaxMovementIterations: 5
MaxDecollisionIterations: 1
CheckMovementInitialOverlaps: 1
KillVelocityWhenExceedMaxMovementIterations: 1
KillRemainingMovementWhenExceedMaxMovementIterations: 1
--- !u!1 &5873422912663271407
GameObject:
m_ObjectHideFlags: 0
@@ -403,7 +403,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &4122797476271397740
Transform:
m_ObjectHideFlags: 0