diff --git a/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab b/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab index 578f000..544660f 100644 --- a/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab @@ -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 diff --git a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab index 7115ecf..e09363e 100644 --- a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab @@ -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 diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseKickState.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseKickState.cs index ac15c50..265c735 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseKickState.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugOffenseState/DebugKick&Punch/dOffenseKickState.cs @@ -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 diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs index f487205..d9d5b31 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs @@ -168,7 +168,7 @@ public class OffenseStateManager : NetworkBehaviour foreach(GameObject character in playableCharacters){ if(character.transform.root.GetComponent() != null && character.transform.root.GetComponent().NetworkObjectId == netObjId){ - + //Apply kick to other player Debug.Log("Kicking other user"); character.GetComponent().GetHit(direction, 20); return; diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 15e8bd9..b055cff 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,23 +18,23 @@ EditorUserSettings: value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 - flags: 0 - RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 - RecentlyUsedScenePath-6: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb - flags: 0 - RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0