Revert "Merge remote-tracking branch 'origin/movement-dev' into dev"

This reverts commit 5220a65c7f, reversing
changes made to 0f8a629e4b.
This commit is contained in:
ThomasCharester committed 2025-11-12 19:32:02 +03:00
1 parent 5220a65c7f
commit 1234ffd828
9 files changed
+1014 -78

No files matched your search

@@ -17,8 +17,6 @@ namespace Code.Gameplay.Character.Controller.Abilities
private Vector3 _lastWallNormal;
private float _lastWallContactHeight;
private float _leanFactor;
private float _leanSign;
private Vector3 _leanDirection;
public WallLeanMechanic(float maxLeanAngle, float leanSharpness, float heightScale)
{
@@ -34,49 +32,10 @@ namespace Code.Gameplay.Character.Controller.Abilities
}
// Вызывается из OnMovementHit
public void OnWallContact(KinematicCharacterMotor motor, Vector3 wallNormal, float contactHeight)
public void OnWallContact(Vector3 wallNormal, float contactHeight)
{
_lastWallNormal = wallNormal;
_lastWallContactHeight = contactHeight;
_leanDirection = -_lastWallNormal;
_leanDirection = Vector3.ProjectOnPlane(_leanDirection, motor.CharacterUp).normalized;
_leanSign = 1;
// what the fuck
if (_leanDirection.x != 0)
{
switch (_leanDirection.x)
{
case -1 when motor.CharacterRight.x > 0.1f:
case 1 when motor.CharacterRight.x > 0.1f:
_leanSign = -1;
break;
case -1 when Mathf.Abs(motor.CharacterRight.x) < 0.1f:
case 1 when Mathf.Abs(motor.CharacterRight.x) < 0.1f:
_leanDirection = new Vector3(0, 0, -1);
break;
}
}
else
{
switch (_leanDirection.z)
{
case 1 when Mathf.Abs(motor.CharacterRight.z) < 0.1f:
_leanSign = -1;
break;
case -1 when motor.CharacterRight.z < -0.1f:
case 1 when motor.CharacterRight.z > 0.1f:
_leanDirection = new Vector3(-1, 0, 0);
break;
case -1 when motor.CharacterRight.z > 0.1f:
case 1 when motor.CharacterRight.z < -0.1f:
_leanDirection = new Vector3(1, 0, 0);
break;
}
}
}
_lastWallContactHeight = contactHeight; }
// Обновление каждый кадр
public void UpdateLean(KinematicCharacterMotor motor, float deltaTime)
@@ -107,10 +66,13 @@ namespace Code.Gameplay.Character.Controller.Abilities
return;
}
if (_leanDirection.sqrMagnitude < 0.01f) return;
var leanAngle = _leanSign * _leanFactor * _maxLeanAngle;
var leanRotation = Quaternion.AngleAxis(leanAngle, Vector3.Cross(motor.CharacterUp, _leanDirection));
var leanDirection = -_lastWallNormal;
leanDirection = Vector3.ProjectOnPlane(leanDirection, motor.CharacterUp).normalized;
if (leanDirection.sqrMagnitude < 0.01f) return;
var leanAngle = _leanFactor * _maxLeanAngle;
var leanRotation = Quaternion.AngleAxis(leanAngle, Vector3.Cross(motor.CharacterUp, leanDirection));
_characterTransform.localRotation = leanRotation;
}
}
@@ -225,7 +225,7 @@ namespace Code.Gameplay.Character.Controller
var dotWithUp = Vector3.Dot(hitNormal, motor.CharacterUp);
if (Mathf.Abs(dotWithUp) <= _wallClimbMechanic.WallNormalThreshold)
{
_wallLeanMechanic.OnWallContact(motor, hitNormal, motor.TransientPosition.y);
_wallLeanMechanic.OnWallContact(hitNormal, motor.TransientPosition.y);
}
}
@@ -233,7 +233,7 @@ Transform:
m_GameObject: {fileID: 453575297}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.395, z: 0}
m_LocalPosition: {x: 0, y: 1.395, z: 0.59}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -522,7 +522,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -10, y: 3, z: 0}
m_LocalScale: {x: 10, y: 6, z: 10}
m_LocalScale: {x: 2, y: 6, z: 10}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
@@ -60,8 +60,122 @@ MonoBehaviour:
m_SourceFontFilePath:
m_AtlasPopulationMode: 1
InternalDynamicOS: 0
m_GlyphTable: []
m_CharacterTable: []
m_GlyphTable:
- m_Index: 30
m_Metrics:
m_Width: 51.296875
m_Height: 63
m_HorizontalBearingX: 2.703125
m_HorizontalBearingY: 63
m_HorizontalAdvance: 56.703125
m_GlyphRect:
m_X: 10
m_Y: 10
m_Width: 52
m_Height: 63
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 60
m_Metrics:
m_Width: 49.234375
m_Height: 63
m_HorizontalBearingX: 2.703125
m_HorizontalBearingY: 63
m_HorizontalAdvance: 54.625
m_GlyphRect:
m_X: 10
m_Y: 92
m_Width: 50
m_Height: 63
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 67
m_Metrics:
m_Width: 49.234375
m_Height: 63
m_HorizontalBearingX: 2.703125
m_HorizontalBearingY: 63
m_HorizontalAdvance: 54.625
m_GlyphRect:
m_X: 10
m_Y: 174
m_Width: 50
m_Height: 63
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 64
m_Metrics:
m_Width: 31.40625
m_Height: 63
m_HorizontalBearingX: 2.703125
m_HorizontalBearingY: 63
m_HorizontalAdvance: 36.8125
m_GlyphRect:
m_X: 10
m_Y: 256
m_Width: 33
m_Height: 63
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 77
m_Metrics:
m_Width: 53.09375
m_Height: 63
m_HorizontalBearingX: 2.703125
m_HorizontalBearingY: 63
m_HorizontalAdvance: 58.5
m_GlyphRect:
m_X: 10
m_Y: 338
m_Width: 54
m_Height: 63
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 73
m_Metrics:
m_Width: 52.203125
m_Height: 63
m_HorizontalBearingX: 2.703125
m_HorizontalBearingY: 63
m_HorizontalAdvance: 55.984375
m_GlyphRect:
m_X: 62
m_Y: 256
m_Width: 53
m_Height: 63
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
m_CharacterTable:
- m_ElementType: 1
m_Unicode: 68
m_GlyphIndex: 30
m_Scale: 1
- m_ElementType: 1
m_Unicode: 101
m_GlyphIndex: 60
m_Scale: 1
- m_ElementType: 1
m_Unicode: 108
m_GlyphIndex: 67
m_Scale: 1
- m_ElementType: 1
m_Unicode: 105
m_GlyphIndex: 64
m_Scale: 1
- m_ElementType: 1
m_Unicode: 118
m_GlyphIndex: 77
m_Scale: 1
- m_ElementType: 1
m_Unicode: 114
m_GlyphIndex: 73
m_Scale: 1
m_AtlasTextures:
- {fileID: 688428377202190775}
m_AtlasTextureIndex: 0
@@ -72,12 +186,52 @@ MonoBehaviour:
m_AtlasHeight: 1024
m_AtlasPadding: 9
m_AtlasRenderMode: 4165
m_UsedGlyphRects: []
m_FreeGlyphRects:
m_UsedGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 71
m_Height: 82
- m_X: 0
m_Y: 82
m_Width: 69
m_Height: 82
- m_X: 0
m_Y: 164
m_Width: 69
m_Height: 82
- m_X: 0
m_Y: 246
m_Width: 52
m_Height: 82
- m_X: 0
m_Y: 328
m_Width: 73
m_Height: 82
- m_X: 52
m_Y: 246
m_Width: 72
m_Height: 82
m_FreeGlyphRects:
- m_X: 0
m_Y: 410
m_Width: 1023
m_Height: 613
- m_X: 71
m_Y: 0
m_Width: 952
m_Height: 246
- m_X: 73
m_Y: 328
m_Width: 950
m_Height: 695
- m_X: 124
m_Y: 0
m_Width: 899
m_Height: 1023
- m_X: 69
m_Y: 82
m_Width: 954
m_Height: 164
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
m_LigatureSubstitutionRecords: []
@@ -153,9 +307,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
@@ -180,8 +334,8 @@ Texture2D:
m_LightmapFormat: 0
m_ColorSpace: 1
m_PlatformBlob:
image data: 1
_typelessdata: 00
image data: 1048576
_typelessdata: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000407090a131313131313131313131313131212121212121212121212121212121212121212110f0d0a070604010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050b101416172020202020202020202020201f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1e1e1c1a171413110d08010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000Line truncated
m_StreamData:
serializedVersion: 2
offset: 0
@@ -60,8 +60,293 @@ 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: 47
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: 82
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: 74
m_Y: 38
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: 10
m_Y: 39
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: 210
m_Y: 10
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: 274
m_Y: 10
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: 320
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: 384
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: 320
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: 138
m_Y: 91
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: 74
m_Y: 106
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: 10
m_Y: 112
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: 274
m_Y: 87
m_Width: 27
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: 76
m_GlyphIndex: 47
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_Scale: 1
m_AtlasTextures:
- {fileID: 948717598527772745}
m_AtlasTextureIndex: 0
@@ -72,12 +357,100 @@ MonoBehaviour:
m_AtlasHeight: 1024
m_AtlasPadding: 9
m_AtlasRenderMode: 4165
m_UsedGlyphRects: []
m_FreeGlyphRects:
m_UsedGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 1023
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: 68
- m_X: 0
m_Y: 29
m_Width: 64
m_Height: 73
- m_X: 200
m_Y: 0
m_Width: 64
m_Height: 81
- m_X: 264
m_Y: 0
m_Width: 46
m_Height: 77
- m_X: 310
m_Y: 0
m_Width: 64
m_Height: 68
- m_X: 374
m_Y: 0
m_Width: 64
m_Height: 73
- m_X: 310
m_Y: 68
m_Width: 64
m_Height: 68
- m_X: 128
m_Y: 81
m_Width: 64
m_Height: 81
- m_X: 64
m_Y: 96
m_Width: 64
m_Height: 68
- m_X: 0
m_Y: 102
m_Width: 64
m_Height: 73
- m_X: 264
m_Y: 77
m_Width: 46
m_Height: 81
m_FreeGlyphRects:
- m_X: 438
m_Y: 0
m_Width: 585
m_Height: 1023
- m_X: 374
m_Y: 73
m_Width: 649
m_Height: 950
- m_X: 128
m_Y: 28
m_Width: 8
m_Height: 53
- m_X: 128
m_Y: 162
m_Width: 895
m_Height: 861
- m_X: 0
m_Y: 175
m_Width: 1023
m_Height: 848
- m_X: 64
m_Y: 164
m_Width: 959
m_Height: 859
- m_X: 192
m_Y: 81
m_Width: 72
m_Height: 942
- m_X: 192
m_Y: 158
m_Width: 831
m_Height: 865
- m_X: 310
m_Y: 136
m_Width: 713
m_Height: 887
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
m_LigatureSubstitutionRecords:
@@ -159,9 +532,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 +559,8 @@ Texture2D:
m_LightmapFormat: 0
m_ColorSpace: 1
m_PlatformBlob:
image data: 1
_typelessdata: 00
image data: 1048576
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0807050200000306070e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e090806030000000000000000000000050a0f121313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313100f0d090500000000000000000000000005080a0b0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000000000000000407090a0e0e0e0e0e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e09080603000000000000000000000000000000000000000000000000000000000000020507080e0e0e0e0e0e0e0e0b0a08050000000000000000000000000005080a0b0e0e0e0e0e0e0e0e08070502000000000000000000000000000000000000000407090a0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e090c1012131b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a0400000000000000010910161b1e20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020201d1c1915100a030000000000000000060c111517181b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1615130f0a0400000000000000000000000000000000000000000000050b101316161b1b1b1b1b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000000000000000000003090e1214151b1b1b1b1b1b1b1b171714110c05000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e0903000000000000000000000000000000050b101416171b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000Line truncated
m_StreamData:
serializedVersion: 2
offset: 0
@@ -215,8 +215,198 @@ MonoBehaviour:
m_SourceFontFilePath:
m_AtlasPopulationMode: 1
InternalDynamicOS: 0
m_GlyphTable: []
m_CharacterTable: []
m_GlyphTable:
- m_Index: 969
m_Metrics:
m_Width: 48
m_Height: 59
m_HorizontalBearingX: 7
m_HorizontalBearingY: 59
m_HorizontalAdvance: 62
m_GlyphRect:
m_X: 10
m_Y: 10
m_Width: 48
m_Height: 59
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 996
m_Metrics:
m_Width: 24
m_Height: 45
m_HorizontalBearingX: 5
m_HorizontalBearingY: 45
m_HorizontalAdvance: 31
m_GlyphRect:
m_X: 10
m_Y: 88
m_Width: 24
m_Height: 45
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 1009
m_Metrics:
m_Width: 40
m_Height: 64
m_HorizontalBearingX: 5
m_HorizontalBearingY: 46
m_HorizontalAdvance: 48
m_GlyphRect:
m_X: 10
m_Y: 152
m_Width: 40
m_Height: 64
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 993
m_Metrics:
m_Width: 45
m_Height: 47
m_HorizontalBearingX: 3
m_HorizontalBearingY: 46
m_HorizontalAdvance: 48
m_GlyphRect:
m_X: 10
m_Y: 235
m_Width: 45
m_Height: 47
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 1011
m_Metrics:
m_Width: 37
m_Height: 45
m_HorizontalBearingX: 1
m_HorizontalBearingY: 45
m_HorizontalAdvance: 39
m_GlyphRect:
m_X: 53
m_Y: 88
m_Width: 37
m_Height: 45
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 1021
m_Metrics:
m_Width: 37
m_Height: 45
m_HorizontalBearingX: 5
m_HorizontalBearingY: 45
m_HorizontalAdvance: 45
m_GlyphRect:
m_X: 77
m_Y: 10
m_Width: 37
m_Height: 45
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 963
m_Metrics:
m_Width: 46
m_Height: 59
m_HorizontalBearingX: 7
m_HorizontalBearingY: 59
m_HorizontalAdvance: 57
m_GlyphRect:
m_X: 69
m_Y: 152
m_Width: 46
m_Height: 59
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 1020
m_Metrics:
m_Width: 51
m_Height: 45
m_HorizontalBearingX: 5
m_HorizontalBearingY: 45
m_HorizontalAdvance: 62
m_GlyphRect:
m_X: 109
m_Y: 74
m_Width: 51
m_Height: 45
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 1002
m_Metrics:
m_Width: 38
m_Height: 63
m_HorizontalBearingX: 5
m_HorizontalBearingY: 63
m_HorizontalAdvance: 48
m_GlyphRect:
m_X: 10
m_Y: 301
m_Width: 38
m_Height: 63
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 1001
m_Metrics:
m_Width: 38
m_Height: 45
m_HorizontalBearingX: 5
m_HorizontalBearingY: 45
m_HorizontalAdvance: 48
m_GlyphRect:
m_X: 133
m_Y: 10
m_Width: 38
m_Height: 45
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
m_CharacterTable:
- m_ElementType: 1
m_Unicode: 1048
m_GlyphIndex: 969
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1075
m_GlyphIndex: 996
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1088
m_GlyphIndex: 1009
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1072
m_GlyphIndex: 993
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1090
m_GlyphIndex: 1011
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1100
m_GlyphIndex: 1021
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1042
m_GlyphIndex: 963
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1099
m_GlyphIndex: 1020
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1081
m_GlyphIndex: 1002
m_Scale: 1
- m_ElementType: 1
m_Unicode: 1080
m_GlyphIndex: 1001
m_Scale: 1
m_AtlasTextures:
- {fileID: 28268798066460806}
m_AtlasTextureIndex: 0
@@ -227,11 +417,83 @@ MonoBehaviour:
m_AtlasHeight: 512
m_AtlasPadding: 9
m_AtlasRenderMode: 4169
m_UsedGlyphRects: []
m_FreeGlyphRects:
m_UsedGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 67
m_Height: 78
- m_X: 0
m_Y: 78
m_Width: 43
m_Height: 64
- m_X: 0
m_Y: 142
m_Width: 59
m_Height: 83
- m_X: 0
m_Y: 225
m_Width: 64
m_Height: 66
- m_X: 43
m_Y: 78
m_Width: 56
m_Height: 64
- m_X: 67
m_Y: 0
m_Width: 56
m_Height: 64
- m_X: 59
m_Y: 142
m_Width: 65
m_Height: 78
- m_X: 99
m_Y: 64
m_Width: 70
m_Height: 64
- m_X: 0
m_Y: 291
m_Width: 57
m_Height: 82
- m_X: 123
m_Y: 0
m_Width: 57
m_Height: 64
m_FreeGlyphRects:
- m_X: 59
m_Y: 220
m_Width: 452
m_Height: 5
- m_X: 64
m_Y: 220
m_Width: 447
m_Height: 291
- m_X: 67
m_Y: 64
m_Width: 32
m_Height: 14
- m_X: 99
m_Y: 128
m_Width: 412
m_Height: 14
- m_X: 124
m_Y: 128
m_Width: 387
m_Height: 383
- m_X: 0
m_Y: 373
m_Width: 511
m_Height: 138
- m_X: 57
m_Y: 291
m_Width: 454
m_Height: 220
- m_X: 169
m_Y: 64
m_Width: 342
m_Height: 447
- m_X: 180
m_Y: 0
m_Width: 331
m_Height: 511
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
@@ -1153,9 +1415,9 @@ Texture2D:
Hash: 00000000000000000000000000000000
m_IsAlphaChannelOptional: 0
serializedVersion: 4
m_Width: 1
m_Height: 1
m_CompleteImageSize: 1
m_Width: 512
m_Height: 512
m_CompleteImageSize: 262144
m_MipsStripped: 0
m_TextureFormat: 1
m_MipCount: 1
@@ -1180,8 +1442,8 @@ Texture2D:
m_LightmapFormat: 0
m_ColorSpace: 0
m_PlatformBlob:
image data: 1
_typelessdata: 00
image data: 262144
_typelessdata: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002080c10121213131313131313131208070502000000000000000000000000000000000000000000000005080a0b131313131313100f0d0a0500000000000000000000000000040613131313131313131313131313131313131313131211110f0c0a0707050100000000000000000000000000000000000000000000000004061313131313131313130b0a080400000000000000000000000000020507081313131313131307070501000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060d13181c1e1f20202020202020201f1414110e080200000000000000000000000000000000000000060c111517182020202020201d1c1a16110a03000000000000000001070c101320202020202020202020202020202020202020201f1e1d1c19171413110d08040000000000000000000000000000000000000001070c1013202020202020202020171614100b0500000000000000000003090e121415202020202020201413110d08020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000710181f24282b2c2d2d2d2d2d2d2d2d2c21201e19140d0500000000000000000000000000000000000911171d2124252d2d2d2d2d2d2a2926221c150d04000000000000030b12181c1f2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2c2c2b2a28262421201d1913100c0701000000000000000000000000000000030b12181c1f2d2d2d2d2d2d2d2d2d2423211c17100800000000000000060e141a1e21222d2d2d2d2d2d2d21201d19130c05000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000610192229303538393939393939393939392e2d2a251e170e0500000000000000000000000000000009121b22292d30313939393939393635322d271f160d0300000000030d151d23292c39393939393939393939393939393939393939393838373533302e2d29251f1d18120b0300000000000000000000000000030d151d23292c39393939393939393931302d28221a12080000000000060f181f262b2d2e393939393939392e2d2a251e160e0500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000Line truncated
m_StreamData:
serializedVersion: 2
offset: 0
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 75793e520683ea032ace153b3040cf4e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+170
View File
@@ -0,0 +1,170 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 10
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 13
m_BakeOnSceneLoad: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &1253837927
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1253837929}
- component: {fileID: 1253837928}
m_Layer: 0
m_Name: SceneScope
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1253837928
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1253837927}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3fd1482e4a9dee141aecc5bcd0a4f0f3, type: 3}
m_Name:
m_EditorClassIdentifier: Reflex::Reflex.Core.SceneScope
--- !u!4 &1253837929
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1253837927}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
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!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1253837929}
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4ee6c9ddf0020bc978ffcb0af4b2464a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: