Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-08-23 02:44:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'KickSolution'

Browse Source
This commit is contained in:
Melbyj1125
2022-03-30 12:44:25 -05:00
parent 1a8d190a83 432cb0c028
commit f63ae476a0
15 changed files with 71 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab
View File

@@ -736,7 +736,6 @@ GameObject:
- component: {fileID: 3389602815704512536}
- component: {fileID: 4452213775082161952}
- component: {fileID: 4294750041305290919}
- component: {fileID: 3196960407361654525}
m_Layer: 3
m_Name: Leg
m_TagString: Untagged
@@ -808,19 +807,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!135 &3196960407361654525
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1615006149904301342}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &1655147020398655403
GameObject:
m_ObjectHideFlags: 0
@@ -2942,6 +2928,7 @@ GameObject:
- component: {fileID: 7575299769256707918}
- component: {fileID: 8566149901599326232}
- component: {fileID: 9176281754177461293}
- component: {fileID: 1038175323437337372}
m_Layer: 3
m_Name: LegHitbox
m_TagString: Untagged
@@ -3025,6 +3012,24 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!143 &1038175323437337372
CharacterController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4657826167432197394}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Height: 1.0000001
m_Radius: 0.5
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &4681379502263150042
GameObject:
m_ObjectHideFlags: 0

33
Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab
View File

@@ -2487,6 +2487,7 @@ GameObject:
- component: {fileID: 1451039203560339613}
- component: {fileID: 856506937936150475}
- component: {fileID: 169813891660997630}
- component: {fileID: 2306961581443597869}
m_Layer: 3
m_Name: LegHitbox
m_TagString: Untagged
@@ -2570,6 +2571,24 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!143 &2306961581443597869
CharacterController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4440570458476415681}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Height: 1.0000001
m_Radius: 0.5
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &4464306020322417161
GameObject:
m_ObjectHideFlags: 0
@@ -5184,7 +5203,6 @@ GameObject:
- component: {fileID: 5911456903690389451}
- component: {fileID: 4668701882978121971}
- component: {fileID: 5087373364349937524}
- component: {fileID: 5863156733035393326}
m_Layer: 3
m_Name: Leg
m_TagString: Untagged
@@ -5256,19 +5274,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!135 &5863156733035393326
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7740096766088430285}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &7781019508846381176
GameObject:
m_ObjectHideFlags: 0

2
Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseKickState.cs
View File

@@ -51,7 +51,7 @@ public class dOffenseKickState : dOffenseBaseState
}
//jitter player upwards because of a weird issue with collider
oSM.moveController.Move(new Vector3(0,.002f,0));
//oSM.moveController.Move(new Vector3(0,.002f,0));
}
//kicking timer

3
Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/Aerial/AerialFallingState.cs
View File

@@ -16,11 +16,14 @@ public class AerialFallingState : AerialBaseState
//if Grav Vel > 0 then jumping
if(aSM.pStats.GravVel > 0 && (aSM.mSM.currentState != aSM.mSM.SlideState && aSM.mSM.currentState != aSM.mSM.CrouchState && aSM.mSM.currentState != aSM.mSM.RagdollState && aSM.mSM.currentState != aSM.mSM.RecoveringState)){
Debug.Log("Going to Jump From Fall");
aSM.SwitchState(aSM.JumpingState);
}
//if jump has been pressed and has glider and is in a state that allows it glide
else if(Input.GetButton("Jump") && aSM.pStats.HasGlider && (aSM.mSM.currentState != aSM.mSM.SlideState && aSM.mSM.currentState != aSM.mSM.CrouchState && aSM.mSM.currentState != aSM.mSM.RagdollState && aSM.mSM.currentState != aSM.mSM.RecoveringState) && !aSM.pStats.IsPaused){
Debug.Log("Going to Glide From Fall");
aSM.SwitchState(aSM.GlidingState);
}

5
Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs
View File

@@ -210,7 +210,8 @@ public class AerialStateManager : NetworkBehaviour
}
public void SwitchState(AerialBaseState state){
if (!IsLocalPlayer) { return; }
currentState.ExitState(this, state);
//Sets the previous State
@@ -304,7 +305,7 @@ public class AerialStateManager : NetworkBehaviour
curJumpNum = 0;
}
else{
pStats.GravVel = pStats.JumpPow;
pStats.GravVel = pStats.JumpPow;
}

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/DashStateManager.cs
View File

@@ -78,7 +78,7 @@ public class DashStateManager : NetworkBehaviour
}
public void SwitchState(DashBaseState state){
if (!IsLocalPlayer) { return; }
currentState.ExitState(this, state);
//Sets the previous State

4
Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs
View File

@@ -172,7 +172,7 @@ public class MoveStateManager : NetworkBehaviour
}
public void SwitchState(MoveBaseState state){
if (!IsLocalPlayer) { return; }
currentState.ExitState(this, state);
//Sets the previous State
@@ -314,7 +314,7 @@ public class MoveStateManager : NetworkBehaviour
//Get hit into a ragdoll
public void GetHit(Vector3 dir, float force){
//if (!IsLocalPlayer) { return; }
if (!IsLocalPlayer) { return; }
dir.Normalize();
dirHit = dir * force;
SwitchState(RagdollState);

4
Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/WASD/MoveIdleState.cs
View File

@@ -6,12 +6,12 @@ public class MoveIdleState : MoveBaseState
{
public override void EnterState(MoveStateManager mSM, MoveBaseState previousState){
mSM.GetComponent<Animator>().SetBool("isIdle", true);
Debug.Log("Entered Idle");
//Debug.Log("Entered Idle");
}
public override void ExitState(MoveStateManager mSM, MoveBaseState nextState){
mSM.GetComponent<Animator>().SetBool("isIdle", false);
Debug.Log("Exited Idle");
//Debug.Log("Exited Idle");
}
public override void UpdateState(MoveStateManager mSM){

4
Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/WASD/MoveJogState.cs
View File

@@ -6,12 +6,12 @@ public class MoveJogState : MoveBaseState
{
public override void EnterState(MoveStateManager mSM, MoveBaseState previousState){
mSM.GetComponent<Animator>().SetBool("isJogging", true);
Debug.Log("Entered Jog");
//Debug.Log("Entered Jog");
}
public override void ExitState(MoveStateManager mSM, MoveBaseState nextState){
mSM.GetComponent<Animator>().SetBool("isJogging", false);
Debug.Log("Exited Jog");
//Debug.Log("Exited Jog");
}
public override void UpdateState(MoveStateManager mSM){

4
Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/WASD/MoveRunState.cs
View File

@@ -6,12 +6,12 @@ public class MoveRunState : MoveBaseState
{
public override void EnterState(MoveStateManager mSM, MoveBaseState previousState){
mSM.GetComponent<Animator>().SetBool("isRunning", true);
Debug.Log("Entered Run");
//Debug.Log("Entered Run");
}
public override void ExitState(MoveStateManager mSM, MoveBaseState nextState){
mSM.GetComponent<Animator>().SetBool("isRunning", false);
Debug.Log("Exit Run");
//Debug.Log("Exit Run");
}
public override void UpdateState(MoveStateManager mSM){

4
Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/WASD/MoveWalkState.cs
View File

@@ -6,12 +6,12 @@ public class MoveWalkState : MoveBaseState
{
public override void EnterState(MoveStateManager mSM, MoveBaseState previousState){
mSM.GetComponent<Animator>().SetBool("isWalking", true);
Debug.Log("Entered Walk");
//Debug.Log("Entered Walk");
}
public override void ExitState(MoveStateManager mSM, MoveBaseState nextState){
mSM.GetComponent<Animator>().SetBool("isWalking", false);
Debug.Log("Exited Walk");
//Debug.Log("Exited Walk");
}
public override void UpdateState(MoveStateManager mSM){

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs
View File

@@ -92,7 +92,7 @@ public class NitroStateManager : NetworkBehaviour
}
public void SwitchState(NitroBaseState state){
if (!IsLocalPlayer) { return; }
currentState.ExitState(this, state);
//Sets the previous State

3
Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/Kick&Punch/OffenseKickState.cs
View File

@@ -48,9 +48,6 @@ public class OffenseKickState : OffenseBaseState
else{
legRotation = -90;
}
//jitter player upwards because of a weird issue with collider
oSM.moveController.Move(new Vector3(0,.002f,0));
}
//kicking timer

34
Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs
View File

@@ -101,7 +101,7 @@ public class OffenseStateManager : NetworkBehaviour
}
public void SwitchState(OffenseBaseState state){
if (!IsLocalPlayer) { return; }
currentState.ExitState(this, state);
//Sets the previous State
@@ -146,7 +146,9 @@ public class OffenseStateManager : NetworkBehaviour
[ServerRpc(RequireOwnership = false)]
private void ApplyKickServerRPC(Vector3 direction, ulong netObjId) {
GameObject[] kickables = GameObject.FindGameObjectsWithTag("kickable");
GameObject[] players = GameObject.FindGameObjectsWithTag("ArcherTarget");
// Get all players in the scene
GameObject[] playableCharacters = GameObject.FindGameObjectsWithTag("ArcherTarget");
foreach (GameObject kickedItem in kickables) {
// First check to make sure this is the item we kicked
@@ -164,32 +166,14 @@ public class OffenseStateManager : NetworkBehaviour
}
}
foreach(GameObject kickedPlayer in players){
//First check if the player is kicked
Debug.Log(kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId);
if(kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId == netObjId){
Debug.Log("Kicked Players NetObjId is equal to the NetObjId");
}
else{
Debug.Log("Kicked Player NetObjId not equal to the NetObjId");
}
if(kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId != this.transform.root.GetComponent<NetworkObject>().NetworkObjectId){
Debug.Log("Kicked Player Not The Same as Me");
}
else{
Debug.Log("My RPC ID: " + this.transform.root.GetComponent<NetworkObject>().NetworkObjectId);
Debug.Log("Their RPC ID: " + kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId);
}
if(kickedPlayer.transform.root.GetComponent<NetworkObject>() != null && kickedPlayer.transform.root.GetComponent<NetworkObject>().NetworkObjectId == netObjId){
foreach(GameObject character in playableCharacters){
if(character.transform.root.GetComponent<NetworkObject>() != null && character.transform.root.GetComponent<NetworkObject>().NetworkObjectId == netObjId){
//Apply kick to other player
Debug.Log("Kicking other user");
kickedPlayer.GetComponent<MoveStateManager>().GetHit(direction, 20);
character.GetComponent<MoveStateManager>().GetHit(direction, 20);
return;
}
return;
}
}
}

10
UserSettings/EditorUserSettings.asset
View File

@@ -15,25 +15,25 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
value: 22424703114646680e0b0227036c731f1415016439262f2434
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c731f1415016439262f2434
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c731f1415016439262f2434
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650