Добавление задержки для прыжков + секретный переход на юнити 6.3
This commit is contained in:
1 parent
6732aef384
commit
f6e8131d22
14 files changed
+530
-858
No files matched your search
@@ -8,8 +8,11 @@ namespace Code.Configs
|
|||||||
public float
|
public float
|
||||||
maxStableMoveSpeed = 12f,
|
maxStableMoveSpeed = 12f,
|
||||||
stableMovementSharpness = 15f,
|
stableMovementSharpness = 15f,
|
||||||
orientationSharpness = 10f,
|
orientationSharpness = 10f;
|
||||||
jumpSpeed = 10f;
|
|
||||||
|
public float
|
||||||
|
jumpSpeed = 10f,
|
||||||
|
jumpCooldown = 0.4f;
|
||||||
|
|
||||||
public float
|
public float
|
||||||
dashSpeed = 20f,
|
dashSpeed = 20f,
|
||||||
|
|||||||
+4
-3
@@ -189,6 +189,9 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
{
|
{
|
||||||
if (!IsWallRunning || !_motor) return;
|
if (!IsWallRunning || !_motor) return;
|
||||||
|
|
||||||
|
if (_motor.CharacterController is not CustomCharacterController controller || !controller.CanJump)
|
||||||
|
return;
|
||||||
|
|
||||||
IsWallRunning = false;
|
IsWallRunning = false;
|
||||||
|
|
||||||
var wallAway = _wallNormal;
|
var wallAway = _wallNormal;
|
||||||
@@ -214,10 +217,8 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
|
|
||||||
_motor.SetPosition(_motor.TransientPosition + wallAway * 0.07f);
|
_motor.SetPosition(_motor.TransientPosition + wallAway * 0.07f);
|
||||||
|
|
||||||
if (_motor.CharacterController is CustomCharacterController controller)
|
controller.TriggerJump();
|
||||||
{
|
|
||||||
controller.BlockAbilities(0.12f);
|
controller.BlockAbilities(0.12f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+23
-1
@@ -39,6 +39,11 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
private Vector3 _currentFollowPointLocalPosition;
|
private Vector3 _currentFollowPointLocalPosition;
|
||||||
private bool _wasSlidingLastFrame;
|
private bool _wasSlidingLastFrame;
|
||||||
|
|
||||||
|
private float _jumpCooldownTimer;
|
||||||
|
private float _jumpCooldownDuration => _characterConfig.jumpCooldown;
|
||||||
|
|
||||||
|
public bool CanJump => !isAbilitiesBlocked && _jumpCooldownTimer <= 0f;
|
||||||
|
|
||||||
// Подсистемы
|
// Подсистемы
|
||||||
private CharacterInputHandler _inputHandler;
|
private CharacterInputHandler _inputHandler;
|
||||||
private DashMechanic _dashMechanic;
|
private DashMechanic _dashMechanic;
|
||||||
@@ -158,7 +163,16 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
_inputHandler.ProcessInputs(ref inputs, motor);
|
_inputHandler.ProcessInputs(ref inputs, motor);
|
||||||
|
|
||||||
// Передаём запрос прыжка
|
// Передаём запрос прыжка
|
||||||
_groundMovement.RequestJump(inputs.JumpPressed);
|
var jumpInput = inputs.JumpPressed;
|
||||||
|
|
||||||
|
if (jumpInput && CanJump)
|
||||||
|
{
|
||||||
|
_groundMovement.RequestJump(true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_groundMovement.RequestJump(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateRotation(ref Quaternion currentRotation, float deltaTime)
|
public void UpdateRotation(ref Quaternion currentRotation, float deltaTime)
|
||||||
@@ -364,6 +378,11 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
_currentFollowPointLocalPosition = _cameraFollowPoint ? _cameraFollowPoint.localPosition : _originalFollowPointLocalPosition;
|
_currentFollowPointLocalPosition = _cameraFollowPoint ? _cameraFollowPoint.localPosition : _originalFollowPointLocalPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void TriggerJump()
|
||||||
|
{
|
||||||
|
_jumpCooldownTimer = _jumpCooldownDuration;
|
||||||
|
}
|
||||||
|
|
||||||
public void BeforeCharacterUpdate(float deltaTime)
|
public void BeforeCharacterUpdate(float deltaTime)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -380,6 +399,9 @@ namespace Code.Gameplay.Character.Controller
|
|||||||
{
|
{
|
||||||
UpdateSlideTransition(deltaTime);
|
UpdateSlideTransition(deltaTime);
|
||||||
|
|
||||||
|
_jumpCooldownTimer -= deltaTime;
|
||||||
|
if (_jumpCooldownTimer < 0f) _jumpCooldownTimer = 0f;
|
||||||
|
|
||||||
_wallLeanMechanic.Update(
|
_wallLeanMechanic.Update(
|
||||||
_wallRunningMechanic.IsWallRunning,
|
_wallRunningMechanic.IsWallRunning,
|
||||||
_wallRunningMechanic.GetWallNormal(),
|
_wallRunningMechanic.GetWallNormal(),
|
||||||
|
|||||||
+6
-1
@@ -76,8 +76,13 @@ namespace Code.Gameplay.Character.Controller.Movement
|
|||||||
if (JumpRequested)
|
if (JumpRequested)
|
||||||
{
|
{
|
||||||
currentVelocity += motor.CharacterUp * _jumpSpeed - Vector3.Project(currentVelocity, motor.CharacterUp);
|
currentVelocity += motor.CharacterUp * _jumpSpeed - Vector3.Project(currentVelocity, motor.CharacterUp);
|
||||||
JumpRequested = false; // Сброс сразу после применения
|
JumpRequested = false;
|
||||||
motor.ForceUnground();
|
motor.ForceUnground();
|
||||||
|
|
||||||
|
if (motor.CharacterController is CustomCharacterController controller)
|
||||||
|
{
|
||||||
|
controller.TriggerJump();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ MonoBehaviour:
|
|||||||
stableMovementSharpness: 15
|
stableMovementSharpness: 15
|
||||||
orientationSharpness: 10
|
orientationSharpness: 10
|
||||||
jumpSpeed: 10
|
jumpSpeed: 10
|
||||||
|
jumpCooldown: 0.3
|
||||||
dashSpeed: 20
|
dashSpeed: 20
|
||||||
dashDuration: 0.35
|
dashDuration: 0.35
|
||||||
dashCooldown: 1.2
|
dashCooldown: 1.2
|
||||||
@@ -54,9 +55,19 @@ MonoBehaviour:
|
|||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
slideMinVelocityThreshold: 3
|
slideMinVelocityThreshold: 3
|
||||||
slideCooldown: 1.5
|
slideCooldown: 1.5
|
||||||
|
slideColliderHeightScale: 0.5
|
||||||
|
slideCameraOffsetY: -0.5
|
||||||
|
slideEnterDuration: 0.2
|
||||||
|
slideExitDuration: 0.25
|
||||||
leanAngle: 25
|
leanAngle: 25
|
||||||
leanThreshold: 0.3
|
leanThreshold: 0.3
|
||||||
leanSmoothSpeed: 10
|
leanSmoothSpeed: 10
|
||||||
gravity: {x: 0, y: -30, z: 0}
|
gravity: {x: 0, y: -30, z: 0}
|
||||||
maxAirSpeed: 10
|
maxAirSpeed: 10
|
||||||
airControlSharpness: 8
|
airControlSharpness: 8
|
||||||
|
wallRunMaxTime: 1.75
|
||||||
|
wallRunSpeed: 15
|
||||||
|
wallRunAcceleration: 25
|
||||||
|
wallRunGravityScale: 0.25
|
||||||
|
wallDetachImpulse: 7
|
||||||
|
wallContactAngleThreshold: 45
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -181,51 +181,6 @@ MonoBehaviour:
|
|||||||
m_Scale: 1
|
m_Scale: 1
|
||||||
m_AtlasIndex: 0
|
m_AtlasIndex: 0
|
||||||
m_ClassDefinitionType: 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: 27
|
- m_Index: 27
|
||||||
m_Metrics:
|
m_Metrics:
|
||||||
m_Width: 43.953125
|
m_Width: 43.953125
|
||||||
@@ -234,7 +189,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalBearingY: 65.921875
|
m_HorizontalBearingY: 65.921875
|
||||||
m_HorizontalAdvance: 52.734375
|
m_HorizontalAdvance: 52.734375
|
||||||
m_GlyphRect:
|
m_GlyphRect:
|
||||||
m_X: 567
|
m_X: 402
|
||||||
m_Y: 10
|
m_Y: 10
|
||||||
m_Width: 45
|
m_Width: 45
|
||||||
m_Height: 62
|
m_Height: 62
|
||||||
@@ -249,14 +204,14 @@ MonoBehaviour:
|
|||||||
m_HorizontalBearingY: 65.921875
|
m_HorizontalBearingY: 65.921875
|
||||||
m_HorizontalAdvance: 52.734375
|
m_HorizontalAdvance: 52.734375
|
||||||
m_GlyphRect:
|
m_GlyphRect:
|
||||||
m_X: 631
|
m_X: 466
|
||||||
m_Y: 10
|
m_Y: 10
|
||||||
m_Width: 45
|
m_Width: 45
|
||||||
m_Height: 62
|
m_Height: 62
|
||||||
m_Scale: 1
|
m_Scale: 1
|
||||||
m_AtlasIndex: 0
|
m_AtlasIndex: 0
|
||||||
m_ClassDefinitionType: 0
|
m_ClassDefinitionType: 0
|
||||||
- m_Index: 47
|
- m_Index: 23
|
||||||
m_Metrics:
|
m_Metrics:
|
||||||
m_Width: 43.953125
|
m_Width: 43.953125
|
||||||
m_Height: 61.53125
|
m_Height: 61.53125
|
||||||
@@ -264,193 +219,13 @@ MonoBehaviour:
|
|||||||
m_HorizontalBearingY: 65.921875
|
m_HorizontalBearingY: 65.921875
|
||||||
m_HorizontalAdvance: 52.734375
|
m_HorizontalAdvance: 52.734375
|
||||||
m_GlyphRect:
|
m_GlyphRect:
|
||||||
m_X: 695
|
m_X: 530
|
||||||
m_Y: 10
|
m_Y: 10
|
||||||
m_Width: 45
|
m_Width: 45
|
||||||
m_Height: 62
|
m_Height: 62
|
||||||
m_Scale: 1
|
m_Scale: 1
|
||||||
m_AtlasIndex: 0
|
m_AtlasIndex: 0
|
||||||
m_ClassDefinitionType: 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: 759
|
|
||||||
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_Scale: 1
|
|
||||||
m_AtlasIndex: 0
|
|
||||||
m_ClassDefinitionType: 0
|
|
||||||
m_CharacterTable:
|
m_CharacterTable:
|
||||||
- m_ElementType: 1
|
- m_ElementType: 1
|
||||||
m_Unicode: 8230
|
m_Unicode: 8230
|
||||||
@@ -484,18 +259,6 @@ MonoBehaviour:
|
|||||||
m_Unicode: 48
|
m_Unicode: 48
|
||||||
m_GlyphIndex: 19
|
m_GlyphIndex: 19
|
||||||
m_Scale: 1
|
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_ElementType: 1
|
||||||
m_Unicode: 56
|
m_Unicode: 56
|
||||||
m_GlyphIndex: 27
|
m_GlyphIndex: 27
|
||||||
@@ -505,56 +268,8 @@ MonoBehaviour:
|
|||||||
m_GlyphIndex: 25
|
m_GlyphIndex: 25
|
||||||
m_Scale: 1
|
m_Scale: 1
|
||||||
- m_ElementType: 1
|
- m_ElementType: 1
|
||||||
m_Unicode: 76
|
m_Unicode: 52
|
||||||
m_GlyphIndex: 47
|
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_Scale: 1
|
m_Scale: 1
|
||||||
m_AtlasTextures:
|
m_AtlasTextures:
|
||||||
- {fileID: 948717598527772745}
|
- {fileID: 948717598527772745}
|
||||||
@@ -601,125 +316,37 @@ MonoBehaviour:
|
|||||||
m_Height: 81
|
m_Height: 81
|
||||||
- m_X: 392
|
- m_X: 392
|
||||||
m_Y: 0
|
m_Y: 0
|
||||||
m_Width: 55
|
m_Width: 64
|
||||||
m_Height: 29
|
|
||||||
- m_X: 447
|
|
||||||
m_Y: 0
|
|
||||||
m_Width: 46
|
|
||||||
m_Height: 81
|
m_Height: 81
|
||||||
- m_X: 493
|
- m_X: 456
|
||||||
m_Y: 0
|
m_Y: 0
|
||||||
m_Width: 64
|
m_Width: 64
|
||||||
m_Height: 81
|
m_Height: 81
|
||||||
- m_X: 557
|
- m_X: 520
|
||||||
m_Y: 0
|
m_Y: 0
|
||||||
m_Width: 64
|
m_Width: 64
|
||||||
m_Height: 81
|
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_FreeGlyphRects:
|
||||||
|
- m_X: 128
|
||||||
|
m_Y: 81
|
||||||
|
m_Width: 895
|
||||||
|
m_Height: 942
|
||||||
- m_X: 128
|
- m_X: 128
|
||||||
m_Y: 28
|
m_Y: 28
|
||||||
m_Width: 8
|
m_Width: 8
|
||||||
m_Height: 995
|
m_Height: 995
|
||||||
- m_X: 0
|
- m_X: 0
|
||||||
m_Y: 110
|
m_Y: 110
|
||||||
m_Width: 749
|
m_Width: 1023
|
||||||
m_Height: 913
|
m_Height: 913
|
||||||
- m_X: 64
|
- m_X: 64
|
||||||
m_Y: 109
|
m_Y: 109
|
||||||
m_Width: 685
|
m_Width: 959
|
||||||
m_Height: 914
|
m_Height: 914
|
||||||
- m_X: 438
|
- m_X: 584
|
||||||
m_Y: 29
|
|
||||||
m_Width: 9
|
|
||||||
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_Y: 0
|
m_Y: 0
|
||||||
m_Width: 18
|
m_Width: 439
|
||||||
m_Height: 1023
|
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_FontFeatureTable:
|
||||||
m_MultipleSubstitutionRecords: []
|
m_MultipleSubstitutionRecords: []
|
||||||
m_LigatureSubstitutionRecords:
|
m_LigatureSubstitutionRecords:
|
||||||
@@ -829,7 +456,7 @@ Texture2D:
|
|||||||
m_ColorSpace: 1
|
m_ColorSpace: 1
|
||||||
m_PlatformBlob:
|
m_PlatformBlob:
|
||||||
image data: 1048576
|
image data: 1048576
|
||||||
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0807050200000306070e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e090806030000000000000000000000050a0f121313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313100f0d0905000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000001040607090909090909090909090909090909090909090909090909090909090909090909090909070300000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e080707090a0e0e0e0e0e0e0e0e090806030000000000000000000000000005080a0b0e0e0e0e0e0e0e0e08070502000000000000000000000000000000000000000407090a0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e090c1012131b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a0400000000000000010910161b1e20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020201d1c1915100a030000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c0500000000000000000000000000000000000001070d111314161616161616161616161616161616161616161616161616161616161616161616161615130f0a04Line truncated
|
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0807050200000306070e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e090806030000000000000000000000050a0f121313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313100f0d0905000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000c000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000020507080e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000020507080e0e0e0e0e0e0e0e0b0a080500000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a08050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e090c1012131b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a0400000000000000010910161b1e20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020201d1c1915100a030000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05Line truncated
|
||||||
m_StreamData:
|
m_StreamData:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
offset: 0
|
offset: 0
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
|
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
|
||||||
m_Name: PC_RPAsset
|
m_Name: PC_RPAsset
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
k_AssetVersion: 12
|
k_AssetVersion: 13
|
||||||
k_AssetPreviousVersion: 12
|
k_AssetPreviousVersion: 13
|
||||||
m_RendererType: 1
|
m_RendererType: 1
|
||||||
m_RendererData: {fileID: 0}
|
m_RendererData: {fileID: 0}
|
||||||
m_RendererDataList:
|
m_RendererDataList:
|
||||||
@@ -128,9 +128,11 @@ MonoBehaviour:
|
|||||||
m_PrefilterSoftShadowsQualityHigh: 1
|
m_PrefilterSoftShadowsQualityHigh: 1
|
||||||
m_PrefilterSoftShadows: 0
|
m_PrefilterSoftShadows: 0
|
||||||
m_PrefilterScreenCoord: 1
|
m_PrefilterScreenCoord: 1
|
||||||
|
m_PrefilterScreenSpaceIrradiance: 0
|
||||||
m_PrefilterNativeRenderPass: 1
|
m_PrefilterNativeRenderPass: 1
|
||||||
m_PrefilterUseLegacyLightmaps: 0
|
m_PrefilterUseLegacyLightmaps: 0
|
||||||
m_PrefilterBicubicLightmapSampling: 1
|
m_PrefilterBicubicLightmapSampling: 1
|
||||||
|
m_PrefilterReflectionProbeRotation: 0
|
||||||
m_PrefilterReflectionProbeBlending: 0
|
m_PrefilterReflectionProbeBlending: 0
|
||||||
m_PrefilterReflectionProbeBoxProjection: 0
|
m_PrefilterReflectionProbeBoxProjection: 0
|
||||||
m_PrefilterReflectionProbeAtlas: 0
|
m_PrefilterReflectionProbeAtlas: 0
|
||||||
|
|||||||
+29
-17
@@ -62,23 +62,12 @@ MonoBehaviour:
|
|||||||
- rid: 3354338719444762630
|
- rid: 3354338719444762630
|
||||||
- rid: 3354338719444762631
|
- rid: 3354338719444762631
|
||||||
- rid: 3354338719444762632
|
- rid: 3354338719444762632
|
||||||
|
- rid: 5048755193650348032
|
||||||
|
- rid: 5048755193650348033
|
||||||
|
- rid: 5048755193650348034
|
||||||
m_RuntimeSettings:
|
m_RuntimeSettings:
|
||||||
m_List:
|
m_List: []
|
||||||
- rid: 6852985685364965378
|
m_AssetVersion: 9
|
||||||
- rid: 6852985685364965379
|
|
||||||
- rid: 6852985685364965380
|
|
||||||
- rid: 6852985685364965381
|
|
||||||
- rid: 6852985685364965384
|
|
||||||
- rid: 6852985685364965385
|
|
||||||
- rid: 6852985685364965392
|
|
||||||
- rid: 6852985685364965394
|
|
||||||
- rid: 8712630790384254976
|
|
||||||
- rid: 3354338719444762625
|
|
||||||
- rid: 3354338719444762627
|
|
||||||
- rid: 3354338719444762628
|
|
||||||
- rid: 3354338719444762630
|
|
||||||
- rid: 3354338719444762632
|
|
||||||
m_AssetVersion: 8
|
|
||||||
m_ObsoleteDefaultVolumeProfile: {fileID: 0}
|
m_ObsoleteDefaultVolumeProfile: {fileID: 0}
|
||||||
m_RenderingLayerNames:
|
m_RenderingLayerNames:
|
||||||
- Light Layer default
|
- Light Layer default
|
||||||
@@ -241,6 +230,29 @@ MonoBehaviour:
|
|||||||
- {r: 0.5, g: 0, b: 0.5, a: 1}
|
- {r: 0.5, g: 0, b: 0.5, a: 1}
|
||||||
- {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
- {r: 0.5, g: 0.5, b: 0.5, a: 1}
|
||||||
- {r: 0, g: 0, b: 1, a: 1}
|
- {r: 0, g: 0, b: 1, a: 1}
|
||||||
|
- rid: 5048755193650348032
|
||||||
|
type: {class: RayTracingRenderPipelineResources, ns: UnityEngine.Rendering.UnifiedRayTracing, asm: Unity.UnifiedRayTracing.Runtime}
|
||||||
|
data:
|
||||||
|
m_Version: 1
|
||||||
|
m_GeometryPoolKernels: {fileID: 7200000, guid: 98e3d58cae7210c4786f67f504c9e899, type: 3}
|
||||||
|
m_CopyBuffer: {fileID: 7200000, guid: 1b95b5dcf48d1914c9e1e7405c7660e3, type: 3}
|
||||||
|
m_CopyPositions: {fileID: 7200000, guid: 1ad53a96b58d3c3488dde4f14db1aaeb, type: 3}
|
||||||
|
m_BitHistogram: {fileID: 7200000, guid: 8670f7ce4b60cef43bed36148aa1b0a2, type: 3}
|
||||||
|
m_BlockReducePart: {fileID: 7200000, guid: 4e034cc8ea2635c4e9f063e5ddc7ea7a, type: 3}
|
||||||
|
m_BlockScan: {fileID: 7200000, guid: 4d6d5de35fa45ef4a92119397a045cc9, type: 3}
|
||||||
|
m_BuildHlbvh: {fileID: 7200000, guid: 2d70cd6be91bd7843a39a54b51c15b13, type: 3}
|
||||||
|
m_RestructureBvh: {fileID: 7200000, guid: 56641cb88dcb31a4398a4997ef7a7a8c, type: 3}
|
||||||
|
m_Scatter: {fileID: 7200000, guid: a2eaeefdac4637a44b734e85b7be9186, type: 3}
|
||||||
|
- rid: 5048755193650348033
|
||||||
|
type: {class: URPReflectionProbeSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||||
|
data:
|
||||||
|
version: 1
|
||||||
|
useReflectionProbeRotation: 0
|
||||||
|
- rid: 5048755193650348034
|
||||||
|
type: {class: OnTilePostProcessResource, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||||
|
data:
|
||||||
|
m_Version: 0
|
||||||
|
m_UberPostShader: {fileID: 4800000, guid: fe4f13c1004a07d4ea1e30bfd0326d9e, type: 3}
|
||||||
- rid: 6852985685364965376
|
- rid: 6852985685364965376
|
||||||
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||||
data:
|
data:
|
||||||
@@ -302,11 +314,11 @@ MonoBehaviour:
|
|||||||
m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3}
|
m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3}
|
||||||
m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3}
|
m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3}
|
||||||
m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3}
|
m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3}
|
||||||
m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3}
|
|
||||||
m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
|
m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
|
||||||
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
||||||
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
|
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
|
||||||
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
|
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
|
||||||
|
m_DefaultMesh2DLitMaterial: {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2}
|
||||||
- rid: 6852985685364965383
|
- rid: 6852985685364965383
|
||||||
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
|
||||||
data:
|
data:
|
||||||
|
|||||||
@@ -8,14 +8,15 @@
|
|||||||
"com.unity.ide.rider": "3.0.38",
|
"com.unity.ide.rider": "3.0.38",
|
||||||
"com.unity.ide.visualstudio": "2.0.25",
|
"com.unity.ide.visualstudio": "2.0.25",
|
||||||
"com.unity.inputsystem": "1.16.0",
|
"com.unity.inputsystem": "1.16.0",
|
||||||
"com.unity.multiplayer.center": "1.0.0",
|
"com.unity.multiplayer.center": "1.0.1",
|
||||||
"com.unity.render-pipelines.universal": "17.2.0",
|
"com.unity.render-pipelines.universal": "17.3.0",
|
||||||
"com.unity.test-framework": "1.6.0",
|
"com.unity.test-framework": "1.6.0",
|
||||||
"com.unity.timeline": "1.8.9",
|
"com.unity.timeline": "1.8.9",
|
||||||
"com.unity.toolchain.linux-x86_64": "2.0.11",
|
"com.unity.toolchain.linux-x86_64": "2.0.11",
|
||||||
"com.unity.ugui": "2.0.0",
|
"com.unity.ugui": "2.0.0",
|
||||||
"com.unity.visualscripting": "1.9.9",
|
"com.unity.visualscripting": "1.9.9",
|
||||||
"com.unity.modules.accessibility": "1.0.0",
|
"com.unity.modules.accessibility": "1.0.0",
|
||||||
|
"com.unity.modules.adaptiveperformance": "1.0.0",
|
||||||
"com.unity.modules.ai": "1.0.0",
|
"com.unity.modules.ai": "1.0.0",
|
||||||
"com.unity.modules.androidjni": "1.0.0",
|
"com.unity.modules.androidjni": "1.0.0",
|
||||||
"com.unity.modules.animation": "1.0.0",
|
"com.unity.modules.animation": "1.0.0",
|
||||||
@@ -42,6 +43,7 @@
|
|||||||
"com.unity.modules.unitywebrequestaudio": "1.0.0",
|
"com.unity.modules.unitywebrequestaudio": "1.0.0",
|
||||||
"com.unity.modules.unitywebrequesttexture": "1.0.0",
|
"com.unity.modules.unitywebrequesttexture": "1.0.0",
|
||||||
"com.unity.modules.unitywebrequestwww": "1.0.0",
|
"com.unity.modules.unitywebrequestwww": "1.0.0",
|
||||||
|
"com.unity.modules.vectorgraphics": "1.0.0",
|
||||||
"com.unity.modules.vehicles": "1.0.0",
|
"com.unity.modules.vehicles": "1.0.0",
|
||||||
"com.unity.modules.video": "1.0.0",
|
"com.unity.modules.video": "1.0.0",
|
||||||
"com.unity.modules.vr": "1.0.0",
|
"com.unity.modules.vr": "1.0.0",
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
"hash": "e644f1bb8ea190157aaea9c386f85cee4cd03bd9"
|
"hash": "e644f1bb8ea190157aaea9c386f85cee4cd03bd9"
|
||||||
},
|
},
|
||||||
"com.unity.addressables": {
|
"com.unity.addressables": {
|
||||||
"version": "2.7.6",
|
"version": "2.7.4",
|
||||||
"depth": 2,
|
"depth": 2,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
"com.unity.modules.jsonserialize": "1.0.0",
|
"com.unity.modules.jsonserialize": "1.0.0",
|
||||||
"com.unity.modules.imageconversion": "1.0.0",
|
"com.unity.modules.imageconversion": "1.0.0",
|
||||||
"com.unity.modules.unitywebrequest": "1.0.0",
|
"com.unity.modules.unitywebrequest": "1.0.0",
|
||||||
"com.unity.scriptablebuildpipeline": "2.5.0",
|
"com.unity.scriptablebuildpipeline": "2.4.3",
|
||||||
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"
|
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"
|
||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
@@ -122,14 +122,14 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.mathematics": {
|
"com.unity.mathematics": {
|
||||||
"version": "1.3.2",
|
"version": "1.3.3",
|
||||||
"depth": 2,
|
"depth": 2,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.multiplayer.center": {
|
"com.unity.multiplayer.center": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.1",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -137,28 +137,28 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.nuget.mono-cecil": {
|
"com.unity.nuget.mono-cecil": {
|
||||||
"version": "1.11.5",
|
"version": "1.11.6",
|
||||||
"depth": 3,
|
"depth": 3,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.nuget.newtonsoft-json": {
|
"com.unity.nuget.newtonsoft-json": {
|
||||||
"version": "3.2.1",
|
"version": "3.2.2",
|
||||||
"depth": 2,
|
"depth": 2,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.profiling.core": {
|
"com.unity.profiling.core": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.3",
|
||||||
"depth": 3,
|
"depth": 3,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.render-pipelines.core": {
|
"com.unity.render-pipelines.core": {
|
||||||
"version": "17.2.0",
|
"version": "17.3.0",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -168,17 +168,16 @@
|
|||||||
"com.unity.collections": "2.4.3",
|
"com.unity.collections": "2.4.3",
|
||||||
"com.unity.modules.physics": "1.0.0",
|
"com.unity.modules.physics": "1.0.0",
|
||||||
"com.unity.modules.terrain": "1.0.0",
|
"com.unity.modules.terrain": "1.0.0",
|
||||||
"com.unity.modules.jsonserialize": "1.0.0",
|
"com.unity.modules.jsonserialize": "1.0.0"
|
||||||
"com.unity.rendering.light-transport": "1.0.1"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.render-pipelines.universal": {
|
"com.unity.render-pipelines.universal": {
|
||||||
"version": "17.2.0",
|
"version": "17.3.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.render-pipelines.core": "17.2.0",
|
"com.unity.render-pipelines.core": "17.3.0",
|
||||||
"com.unity.shadergraph": "17.2.0",
|
"com.unity.shadergraph": "17.3.0",
|
||||||
"com.unity.render-pipelines.universal-config": "17.0.3"
|
"com.unity.render-pipelines.universal-config": "17.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -190,18 +189,8 @@
|
|||||||
"com.unity.render-pipelines.core": "17.0.3"
|
"com.unity.render-pipelines.core": "17.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.rendering.light-transport": {
|
|
||||||
"version": "1.0.1",
|
|
||||||
"depth": 2,
|
|
||||||
"source": "builtin",
|
|
||||||
"dependencies": {
|
|
||||||
"com.unity.collections": "2.2.0",
|
|
||||||
"com.unity.mathematics": "1.2.4",
|
|
||||||
"com.unity.modules.terrain": "1.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"com.unity.scriptablebuildpipeline": {
|
"com.unity.scriptablebuildpipeline": {
|
||||||
"version": "2.5.0",
|
"version": "2.4.3",
|
||||||
"depth": 3,
|
"depth": 3,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -211,30 +200,30 @@
|
|||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.searcher": {
|
"com.unity.searcher": {
|
||||||
"version": "4.9.3",
|
"version": "4.9.4",
|
||||||
"depth": 2,
|
"depth": 2,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.shadergraph": {
|
"com.unity.shadergraph": {
|
||||||
"version": "17.2.0",
|
"version": "17.3.0",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.render-pipelines.core": "17.2.0",
|
"com.unity.render-pipelines.core": "17.3.0",
|
||||||
"com.unity.searcher": "4.9.3"
|
"com.unity.searcher": "4.9.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.sysroot": {
|
"com.unity.sysroot": {
|
||||||
"version": "2.0.10",
|
"version": "2.0.11",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {},
|
"dependencies": {},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.sysroot.linux-x86_64": {
|
"com.unity.sysroot.linux-x86_64": {
|
||||||
"version": "2.0.9",
|
"version": "2.0.10",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -309,6 +298,14 @@
|
|||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {}
|
"dependencies": {}
|
||||||
},
|
},
|
||||||
|
"com.unity.modules.adaptiveperformance": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "builtin",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.modules.subsystems": "1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"com.unity.modules.ai": {
|
"com.unity.modules.ai": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
@@ -516,6 +513,16 @@
|
|||||||
"com.unity.modules.imageconversion": "1.0.0"
|
"com.unity.modules.imageconversion": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"com.unity.modules.vectorgraphics": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "builtin",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.modules.uielements": "1.0.0",
|
||||||
|
"com.unity.modules.imageconversion": "1.0.0",
|
||||||
|
"com.unity.modules.imgui": "1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"com.unity.modules.vehicles": {
|
"com.unity.modules.vehicles": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
|
|||||||
@@ -59,6 +59,8 @@ GraphicsSettings:
|
|||||||
m_AlbedoSwatchInfos: []
|
m_AlbedoSwatchInfos: []
|
||||||
m_RenderPipelineGlobalSettingsMap:
|
m_RenderPipelineGlobalSettingsMap:
|
||||||
UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, type: 2}
|
UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, type: 2}
|
||||||
|
m_ShaderBuildSettings:
|
||||||
|
keywordDeclarationOverrides: []
|
||||||
m_LightsUseLinearIntensity: 1
|
m_LightsUseLinearIntensity: 1
|
||||||
m_LightsUseColorTemperature: 1
|
m_LightsUseColorTemperature: 1
|
||||||
m_LogWhenShaderIsCompiled: 0
|
m_LogWhenShaderIsCompiled: 0
|
||||||
|
|||||||
+17
@@ -0,0 +1,17 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &1
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 53
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 15023, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: UnityEditor.MultiplayerModule.dll::UnityEditor.Multiplayer.Internal.MultiplayerRolesSettings
|
||||||
|
m_MultiplayerRoleForClassicProfile:
|
||||||
|
m_Keys: []
|
||||||
|
m_Values:
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
m_EditorVersion: 6000.2.15f1
|
m_EditorVersion: 6000.3.0f1
|
||||||
m_EditorVersionWithRevision: 6000.2.15f1 (0707b6d1e918)
|
m_EditorVersionWithRevision: 6000.3.0f1 (d1870ce95baf)
|
||||||
Reference in new issue
Block a user