Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-09-07 09:55:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

smaller stat changes

Browse Source
This commit is contained in:
Melbyj1125
2021-12-13 14:20:52 -06:00
parent 6c09c3e976
commit bb5ee9d2b2
6 changed files with 122 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Prefabs/Player/DebugPlayerPrefab 1.prefab
View File

@@ -3542,7 +3542,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
maxVel: 40
minVel: 15
minVel: 20
curVel: 0
acc: 0.01
jumpPow: 60
@@ -3682,15 +3682,18 @@ MonoBehaviour:
m_EditorClassIdentifier:
pStats: {fileID: 0}
vel: {x: 0, y: 0, z: 0}
driftVel: {x: 0, y: 0, z: 0}
curJumpNum: 0
lowJumpMultiplier: 0.3
fallMultiplier: 1.5
g: 0
isGrounded: 0
groundCheckDistance: 0.05
cam: {fileID: 2637749574256434612}
minAngle: -30
maxAngle: 45
sensitivity: 200
isSliding: 0
--- !u!114 &6664667533527262096
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3718,6 +3721,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
maxGrappleDistance: 25
isGrappled: 0
ropeLength: 0
forceDirection: {x: 0, y: 0, z: 0}
--- !u!114 &6664667533527262098
MonoBehaviour:
m_ObjectHideFlags: 0

11
Assets/Prefabs/Player/PlayerPrefab 2.prefab
View File

@@ -257,7 +257,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
maxVel: 40
minVel: 15
minVel: 20
curVel: 0
acc: 0.01
jumpPow: 60
@@ -397,15 +397,18 @@ MonoBehaviour:
m_EditorClassIdentifier:
pStats: {fileID: 0}
vel: {x: 0, y: 0, z: 0}
driftVel: {x: 0, y: 0, z: 0}
curJumpNum: 0
lowJumpMultiplier: 0.3
fallMultiplier: 1.5
g: 0
isGrounded: 0
groundCheckDistance: 0.05
cam: {fileID: 8073346823032474851}
minAngle: -30
maxAngle: 45
sensitivity: 200
isSliding: 0
--- !u!114 &643107261017207495
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -419,6 +422,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
maxGrappleDistance: 25
isGrappled: 0
ropeLength: 0
--- !u!114 &643107261017207494
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -448,7 +453,7 @@ MonoBehaviour:
moveDirection: {x: 0, y: 0, z: 0}
dashDistance: 10
dashStoppingSpeed: 0.1
dashItem: {fileID: 0}
dashItem: {fileID: 11400000, guid: 4399d7276b3edf446ac51c5145539a5e, type: 2}
--- !u!1 &695157680752675209
GameObject:
m_ObjectHideFlags: 0
@@ -1181,7 +1186,7 @@ GameObject:
- component: {fileID: 1637671170820963385}
m_Layer: 3
m_Name: Leg
m_TagString: Untagged
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0

2
Assets/Prefabs/Player/PlayerPrefab.prefab
View File

@@ -108,7 +108,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
maxVel: 40
minVel: 15
minVel: 20
curVel: 0
acc: 0.01
jumpPow: 60

104
Assets/Scenes/Demos/MovementScene.unity
View File

@@ -624,6 +624,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1650963653}
- {fileID: 1019290560}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -817,6 +818,101 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 981158386}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1019290559
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1019290560}
- component: {fileID: 1019290563}
- component: {fileID: 1019290562}
- component: {fileID: 1019290561}
m_Layer: 0
m_Name: Cube (1)
m_TagString: WallRun
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1019290560
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1019290559}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8.6, y: 7.44, z: -94.7736}
m_LocalScale: {x: 1, y: 30, z: 85.94701}
m_Children: []
m_Father: {fileID: 724425601}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1019290561
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1019290559}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1019290562
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1019290559}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1019290563
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1019290559}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1125832108
GameObject:
m_ObjectHideFlags: 0
@@ -1202,6 +1298,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8100520363622627413, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: minVel
value: 20
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
--- !u!1 &1257935739
@@ -1573,8 +1673,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1650963652}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8.6, y: 7.44, z: -27.9}
m_LocalScale: {x: 1, y: 30, z: 30}
m_LocalPosition: {x: -11.6, y: 7.44, z: -89.2318}
m_LocalScale: {x: 1, y: 30, z: 76.863}
m_Children: []
m_Father: {fileID: 724425601}
m_RootOrder: 0

4
Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dKickController.cs
View File

@@ -31,7 +31,7 @@ public class dKickController : NetworkBehaviour
//Note: when we merge this into PlayerMovement, we may want to change isgrounded to our
//custom is grounded
//If F is pressed or gamepad right trigger is pulled
if ((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && isKicking == false && pMove.isGrounded == false)
if ((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && isKicking == false && pMove.isGrounded == false && pMove.isSliding==false)
{
Debug.Log("dive");
// if kicking in air, kick until grounded (maybe add some foward momentum if needeD)
@@ -40,7 +40,7 @@ public class dKickController : NetworkBehaviour
leg.SetActive(true);
}
//otherwise do ground kick for .3 seconds
else if ((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && isKicking == false){
else if ((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && isKicking == false && pMove.isSliding==false){
StartCoroutine(Kicking(.3f));
}

4
Assets/Scripts/PlayerScripts/KickController.cs
View File

@@ -31,7 +31,7 @@ public class KickController : NetworkBehaviour
//Note: when we merge this into PlayerMovement, we may want to change isgrounded to our
//custom is grounded
//If F is pressed or gamepad right trigger is pulled
if ((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && isKicking == false && pMove.isGrounded == false)
if ((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && isKicking == false && pMove.isGrounded == false && pMove.isSliding==false)
{
Debug.Log("dive");
// if kicking in air, kick until grounded (maybe add some foward momentum if needeD)
@@ -40,7 +40,7 @@ public class KickController : NetworkBehaviour
leg.SetActive(true);
}
//otherwise do ground kick for .3 seconds
else if ((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && isKicking == false){
else if ((Input.GetKeyDown(KeyCode.F) || Input.GetAxis("Kick") != 0) && isKicking == false && pMove.isSliding==false){
StartCoroutine(Kicking(.3f));
}