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)
2025-10-31 05:27:07 +01:00 · 2021-12-15 13:19:10 +01:00
parent bdf043d299
commit 572344254d
9 changed files with 174 additions and 109 deletions
--- a/Assets/Objects/Weapons/USP/USP
+++ b/Assets/Objects/Weapons/USP/USP
@@ -23,13 +23,14 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1029209707363336683}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0}
-  m_LocalPosition: {x: -0.039, y: -0.0474, z: -0.2881}
+  m_LocalRotation: {x: 0.04839414, y: 0.7054488, z: 0.7054488, w: -0.04839414}
+  m_LocalPosition: {x: -0.048699856, y: -0.058, z: -0.1693}
  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 8797726366404580855}
  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: -90, y: 180, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: 180, z: 7.848999}
 --- !u!1 &1880099159927430553
 GameObject:
  m_ObjectHideFlags: 0
@@ -42,6 +43,8 @@ GameObject:
  - component: {fileID: 1078062810013672401}
  - component: {fileID: 1672832146417829139}
  - component: {fileID: 6050550425513890989}
+  - component: {fileID: 1514911119484970353}
+  - component: {fileID: 2772737694660170496}
  m_Layer: 7
  m_Name: USP 1
  m_TagString: Weapon
@@ -59,6 +62,7 @@ Transform:
  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:
  - {fileID: 6108047450985722759}
  - {fileID: 5139256649524637864}
@@ -92,17 +96,20 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  weaponKind: 1
-  active: 0
+  dropForce: 10
+  hitForce: 100
  damage: 35
  firerate: 352
-  roundsPerShot: 1
  recoilStrength: 22
  currentAmmunition: 12
  magazinSize: 12
  totalAmmunition: 24
  bulletExit: {fileID: 7014992348987952529}
+  toCloseToWall: 0
  allowAction: 1
  weaponAnimator: {fileID: 0}
+  gunRightREF: {fileID: 0}
+  gunLeftREF: {fileID: 0}
 --- !u!65 &6050550425513890989
 BoxCollider:
  m_ObjectHideFlags: 0
@@ -114,8 +121,34 @@ BoxCollider:
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 0.059358627, y: 0.19563963, z: 0.2655142}
-  m_Center: {x: -0.00082542, y: -0.00907933, z: -0.10297042}
+  m_Size: {x: 0.059358627, y: 0.19563963, z: 0.1087072}
+  m_Center: {x: -0.00082542, y: -0.00907933, z: -0.044957932}
+--- !u!65 &1514911119484970353
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1880099159927430553}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.058347225, y: 0.08560109, z: 0.15380552}
+  m_Center: {x: -0.00016379356, y: 0.046416283, z: 0.087245554}
+--- !u!65 &2772737694660170496
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1880099159927430553}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.32707262, y: 0.28505918, z: 0.3238248}
+  m_Center: {x: -0.00073075294, y: 0.0064445883, z: 0.056424513}
 --- !u!1 &4999713445390711574
 GameObject:
  m_ObjectHideFlags: 0
@@ -140,31 +173,13 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4999713445390711574}
  m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0}
-  m_LocalPosition: {x: 0.034, y: -0.0177, z: -0.2867}
+  m_LocalPosition: {x: 0.0425, y: -0.0467, z: -0.1904}
  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 8797726366404580855}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: -90, y: 180, z: 0}
--- !u!95 &4797094208700084232
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6885991082275612989}
-  m_Enabled: 1
-  m_Avatar: {fileID: 9000000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
-  m_Controller: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 1
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &7014992348987952529
 GameObject:
  m_ObjectHideFlags: 0
@@ -189,8 +204,9 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7014992348987952529}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.008, y: 0.055, z: 0.167}
+  m_LocalPosition: {x: -0.008, y: 0.055, z: 0.091}
  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 8797726366404580855}
  m_RootOrder: 1
@@ -232,7 +248,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 0.137
+      value: 0.060999997
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
      propertyPath: m_LocalRotation.w
@@ -334,3 +350,23 @@ Transform:
  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: db8a9548ba56c1949bb28f7c6129bbeb, type: 3}
  m_PrefabInstance: {fileID: 6002908758433764460}
  m_PrefabAsset: {fileID: 0}
+--- !u!95 &4797094208700084232
+Animator:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6885991082275612989}
+  m_Enabled: 1
+  m_Avatar: {fileID: 9000000, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3}
+  m_Controller: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 1
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0