Little fix on player, added trigger collider on usp

@juliuse98 needs to fix when looking up the weapon gets to far away an the hands look strange. Tried to fix it a bit. Its no a little better but NOT completely fixed.

USP has now a collider that is a trigger. When the weapon is clipping through the wall (befor that the collider should trigger and the player puts the weapon upright) ITS NOT WORKING but the structure is there... (All collider gets disabled when you pick up a weapon)
This commit is contained in:
Noah4ever
2021-12-15 13:19:10 +01:00
parent bdf043d299
commit 572344254d
9 changed files with 174 additions and 109 deletions

View File

@@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
controlID: 12157
controlID: 39
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
controlID: 12158
controlID: 40
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -170,7 +170,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096}
vertical: 0
controlID: 12159
controlID: 41
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -274,7 +274,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 12102
controlID: 61
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -346,8 +346,8 @@ MonoBehaviour:
y: 0
width: 461
height: 1307
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 21}
m_Panes:
- {fileID: 21}
@@ -476,9 +476,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 4e700000
m_LastClickedID: 28750
m_ExpandedIDs: ccf9ffff
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: baf8ffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -819,9 +819,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -47.67771, y: -22.28258, z: -42.074715}
m_Target: {x: -78.60157, y: -36.421288, z: -33.39213}
speed: 2
m_Value: {x: -47.67771, y: -22.28258, z: -42.074715}
m_Value: {x: -78.60157, y: -36.421288, z: -33.39213}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -868,13 +868,13 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0.072064266, y: -0.88201773, z: 0.14362824, w: 0.44292492}
m_Target: {x: 0.11389863, y: -0.81114566, z: 0.16859324, w: 0.54827297}
speed: 2
m_Value: {x: 0.0720657, y: -0.8820353, z: 0.1436311, w: 0.44293377}
m_Value: {x: 0.11390107, y: -0.81116307, z: 0.16859686, w: 0.5482847}
m_Size:
m_Target: 45.54132
m_Target: 55.953186
speed: 2
m_Value: 45.54132
m_Value: 55.953186
m_Ortho:
m_Target: 0
speed: 2
@@ -955,7 +955,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 04ca9a3b
m_LastClickedID: 1000000004
m_ExpandedIDs: 00000000d2760000d4760000d676000000ca9a3b
m_ExpandedIDs: 000000000c7600000e7600001076000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -983,7 +983,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000d2760000d4760000d676000000ca9a3b
m_ExpandedIDs: 000000000c7600000e76000010760000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: