Допил наклонов полноценный
This commit is contained in:
1 parent
177464cc09
commit
874280741c
4 files changed
+28
-212
No files matched your search
+28
-27
@@ -42,37 +42,40 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
_leanDirection = -_lastWallNormal;
|
_leanDirection = -_lastWallNormal;
|
||||||
_leanDirection = Vector3.ProjectOnPlane(_leanDirection, motor.CharacterUp).normalized;
|
_leanDirection = Vector3.ProjectOnPlane(_leanDirection, motor.CharacterUp).normalized;
|
||||||
|
|
||||||
//TODO: БЛЯТЬ ПОЛНАЯ ХУЙНЯ НАДО ПЕРЕПИСАТЬ С ИФ ЭЛС НУ Я ПОСЛЕ ПУЛА ПРИДУ И ДОДЕЛАЮ
|
|
||||||
_leanSign = 1;
|
_leanSign = 1;
|
||||||
|
|
||||||
|
// what the fuck
|
||||||
if (_leanDirection.x != 0)
|
if (_leanDirection.x != 0)
|
||||||
{
|
{
|
||||||
if ((int)_leanDirection.x == -1 && motor.CharacterRight.x > 0.1f)
|
switch (_leanDirection.x)
|
||||||
_leanSign = -1;
|
{
|
||||||
else if ((int)_leanDirection.x == -1 && Mathf.Abs(motor.CharacterRight.x) < 0.1f)
|
case -1 when motor.CharacterRight.x > 0.1f:
|
||||||
_leanDirection = new Vector3(0, 0, -1);
|
case 1 when motor.CharacterRight.x > 0.1f:
|
||||||
else if ((int)_leanDirection.x == 1 && motor.CharacterRight.x > 0.1f)
|
_leanSign = -1;
|
||||||
_leanSign = -1;
|
break;
|
||||||
else if ((int)_leanDirection.x == 1 && Mathf.Abs(motor.CharacterRight.x) < 0.1f)
|
case -1 when Mathf.Abs(motor.CharacterRight.x) < 0.1f:
|
||||||
_leanDirection = new Vector3(0, 0, -1);
|
case 1 when Mathf.Abs(motor.CharacterRight.x) < 0.1f:
|
||||||
|
_leanDirection = new Vector3(0, 0, -1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (_leanDirection.z != 0)
|
else
|
||||||
{
|
{
|
||||||
if ((int)_leanDirection.z == 1 && Mathf.Abs(motor.CharacterRight.z) < 0.1f)
|
switch (_leanDirection.z)
|
||||||
_leanSign = -1;
|
{
|
||||||
else if ((int)_leanDirection.z == -1 && motor.CharacterRight.z < -0.1f)
|
case 1 when Mathf.Abs(motor.CharacterRight.z) < 0.1f:
|
||||||
_leanDirection = new Vector3(-1, 0, 0);
|
_leanSign = -1;
|
||||||
else if ((int)_leanDirection.z == -1 && motor.CharacterRight.z > 0.1f)
|
break;
|
||||||
_leanDirection = new Vector3(1, 0, 0);
|
case -1 when motor.CharacterRight.z < -0.1f:
|
||||||
else if ((int)_leanDirection.z == 1 && motor.CharacterRight.z < -0.1f)
|
case 1 when motor.CharacterRight.z > 0.1f:
|
||||||
_leanDirection = new Vector3(1, 0, 0);
|
_leanDirection = new Vector3(-1, 0, 0);
|
||||||
else if ((int)_leanDirection.z == 1 && motor.CharacterRight.z > 0.1f)
|
break;
|
||||||
_leanDirection = new Vector3(-1, 0, 0);
|
case -1 when motor.CharacterRight.z > 0.1f:
|
||||||
|
case 1 when motor.CharacterRight.z < -0.1f:
|
||||||
|
_leanDirection = new Vector3(1, 0, 0);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Log("LeanDirection: " + _leanDirection);
|
|
||||||
Debug.Log("CharacterRight: " + motor.CharacterRight);
|
|
||||||
Debug.Log(_leanSign);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Обновление каждый кадр
|
// Обновление каждый кадр
|
||||||
@@ -104,8 +107,6 @@ namespace Code.Gameplay.Character.Controller.Abilities
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (_leanDirection.sqrMagnitude < 0.01f) return;
|
if (_leanDirection.sqrMagnitude < 0.01f) return;
|
||||||
|
|
||||||
var leanAngle = _leanSign * _leanFactor * _maxLeanAngle;
|
var leanAngle = _leanSign * _leanFactor * _maxLeanAngle;
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 75793e520683ea032ace153b3040cf4e
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,170 +0,0 @@
|
|||||||
%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}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 4ee6c9ddf0020bc978ffcb0af4b2464a
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Reference in new issue
Block a user