фикс траблов с мерджем
This commit is contained in:
1 parent
175567e4dd
commit
ee7cf3946f
4 files changed
+1012
-99
No files matched your search
@@ -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
|
||||
|
||||
Reference in new issue
Block a user