diff options
-rw-r--r-- | ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab | 270 | ||||
-rw-r--r-- | ActiveRagdoll/Assets/TABG/Test.unity | 349 | ||||
-rw-r--r-- | ActiveRagdoll/ProjectSettings/DynamicsManager.asset | 4 | ||||
-rw-r--r-- | ActiveRagdoll/ProjectSettings/TagManager.asset | 2 |
4 files changed, 585 insertions, 40 deletions
diff --git a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab index 3922b09..6cd77b1 100644 --- a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab +++ b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 984858214} - component: {fileID: 984858213} - component: {fileID: 984858212} - m_Layer: 0 + m_Layer: 6 m_Name: PlayerCollider m_TagString: Untagged m_Icon: {fileID: 0} @@ -97,6 +97,200 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.4 m_Center: {x: 0, y: 0, z: -0.00000013411045} +--- !u!1 &1234205108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1234205109} + - component: {fileID: 1234205112} + - component: {fileID: 1234205111} + - component: {fileID: 1234205110} + m_Layer: 6 + m_Name: PlayerCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1234205109 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1234205108} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.15, y: 0.2455, z: 0.15} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5420353624032219184} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!23 &1234205112 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1234205108} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9d4f4085b5ce801428050308889507e8, type: 2} + 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 &1234205111 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1234205108} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!135 &1234205110 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1234205108} + m_Material: {fileID: 13400000, guid: d0312db448abda64689a354dae4b601a, type: 2} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1639162264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1639162265} + - component: {fileID: 1639162268} + - component: {fileID: 1639162267} + - component: {fileID: 1639162266} + m_Layer: 6 + m_Name: PlayerCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1639162265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639162264} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.15, y: 0.24550001, z: 0.15} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 702326869898971518} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!23 &1639162268 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639162264} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9d4f4085b5ce801428050308889507e8, type: 2} + 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 &1639162267 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639162264} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!135 &1639162266 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639162264} + m_Material: {fileID: 13400000, guid: d0312db448abda64689a354dae4b601a, type: 2} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2047997612 GameObject: m_ObjectHideFlags: 0 @@ -109,7 +303,7 @@ GameObject: - component: {fileID: 2047997616} - component: {fileID: 2047997615} - component: {fileID: 2047997614} - m_Layer: 0 + m_Layer: 6 m_Name: PlayerCollider m_TagString: Untagged m_Icon: {fileID: 0} @@ -205,7 +399,7 @@ GameObject: - component: {fileID: 2610225499071172934} - component: {fileID: 8744092416694728233} - component: {fileID: 5009314273586098502} - m_Layer: 0 + m_Layer: 6 m_Name: Foot_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -350,7 +544,7 @@ GameObject: m_Component: - component: {fileID: 931560466748804515} - component: {fileID: 931560466748804516} - m_Layer: 0 + m_Layer: 6 m_Name: Arm_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -394,7 +588,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6346649401410834727} - m_Layer: 0 + m_Layer: 6 m_Name: Head m_TagString: Untagged m_Icon: {fileID: 0} @@ -427,7 +621,7 @@ GameObject: - component: {fileID: 6228351505900064062} - component: {fileID: 8359930028503767300} - component: {fileID: 6775429611816846059} - m_Layer: 0 + m_Layer: 6 m_Name: Foot_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -573,7 +767,7 @@ GameObject: - component: {fileID: 3709747199389055775} - component: {fileID: 7862657914170034493} - component: {fileID: 3494091916137669429} - m_Layer: 0 + m_Layer: 6 m_Name: Hand_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -718,7 +912,7 @@ GameObject: - component: {fileID: 861688529590854405} - component: {fileID: 6902122112011267104} - component: {fileID: 8879528567158505374} - m_Layer: 0 + m_Layer: 6 m_Name: Rigidbody m_TagString: Untagged m_Icon: {fileID: 0} @@ -789,7 +983,7 @@ GameObject: m_Component: - component: {fileID: 2304275117575405557} - component: {fileID: 2304275117575405558} - m_Layer: 0 + m_Layer: 6 m_Name: Elbow_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -836,7 +1030,7 @@ GameObject: - component: {fileID: 1415741251372879280} - component: {fileID: 7724590171357447542} - component: {fileID: 7601374539345087183} - m_Layer: 0 + m_Layer: 6 m_Name: Torso m_TagString: Untagged m_Icon: {fileID: 0} @@ -980,7 +1174,7 @@ GameObject: m_Component: - component: {fileID: 1666344766112317020} - component: {fileID: 7828630652246571135} - m_Layer: 0 + m_Layer: 6 m_Name: human_rigging m_TagString: Untagged m_Icon: {fileID: 0} @@ -1031,7 +1225,7 @@ GameObject: m_Component: - component: {fileID: 4187754687432538758} - component: {fileID: 8841356996969248167} - m_Layer: 0 + m_Layer: 6 m_Name: Model m_TagString: Untagged m_Icon: {fileID: 0} @@ -1132,7 +1326,7 @@ GameObject: m_Component: - component: {fileID: 3412188744700893615} - component: {fileID: 7066289305757245630} - m_Layer: 0 + m_Layer: 6 m_Name: Hip m_TagString: Untagged m_Icon: {fileID: 0} @@ -1181,7 +1375,7 @@ GameObject: - component: {fileID: 4083486271296676596} - component: {fileID: 6686346309479827042} - component: {fileID: 3629881010665375168} - m_Layer: 0 + m_Layer: 6 m_Name: Hand_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1326,7 +1520,7 @@ GameObject: - component: {fileID: 702326869898971518} - component: {fileID: 8359583798303084104} - component: {fileID: 7237636587702004398} - m_Layer: 0 + m_Layer: 6 m_Name: Knee_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1344,7 +1538,8 @@ Transform: m_LocalPosition: {x: 0.080004, y: -0.785, z: -0.02335178} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1639162265} m_Father: {fileID: 861688529590854405} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} @@ -1470,7 +1665,7 @@ GameObject: m_Component: - component: {fileID: 3124791358957870583} - component: {fileID: 3124791358957870568} - m_Layer: 0 + m_Layer: 6 m_Name: Knee_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1516,7 +1711,7 @@ GameObject: m_Component: - component: {fileID: 3145960147479980722} - component: {fileID: 3145960147479980723} - m_Layer: 0 + m_Layer: 6 m_Name: Elbow_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1562,7 +1757,7 @@ GameObject: m_Component: - component: {fileID: 2331364452878267826} - component: {fileID: 3378585507165708065} - m_Layer: 0 + m_Layer: 6 m_Name: Arm_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1607,7 +1802,7 @@ GameObject: m_Component: - component: {fileID: 8167344788853896405} - component: {fileID: 3697109903974497969} - m_Layer: 0 + m_Layer: 6 m_Name: Leg_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1652,7 +1847,7 @@ GameObject: m_Component: - component: {fileID: 7531363031390143015} - component: {fileID: 4032096270225393979} - m_Layer: 0 + m_Layer: 6 m_Name: Leg_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1696,7 +1891,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6399332395531071283} - m_Layer: 0 + m_Layer: 6 m_Name: Hand_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1728,7 +1923,7 @@ GameObject: m_Component: - component: {fileID: 7627586323907314873} - component: {fileID: 4769388636470347515} - m_Layer: 0 + m_Layer: 6 m_Name: Knee_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -1775,7 +1970,7 @@ GameObject: - component: {fileID: 5420353624032219184} - component: {fileID: 3928521349308094214} - component: {fileID: 1295959916615711177} - m_Layer: 0 + m_Layer: 6 m_Name: Knee_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -1793,7 +1988,8 @@ Transform: m_LocalPosition: {x: -0.080004, y: -0.7850001, z: -0.02335178} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1234205109} m_Father: {fileID: 861688529590854405} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} @@ -1919,7 +2115,7 @@ GameObject: m_Component: - component: {fileID: 5134807851176621822} - component: {fileID: 5459608688684196574} - m_Layer: 0 + m_Layer: 6 m_Name: Neck m_TagString: Untagged m_Icon: {fileID: 0} @@ -1966,7 +2162,7 @@ GameObject: - component: {fileID: 4629454497198766197} - component: {fileID: 3691458469473146159} - component: {fileID: 1657485011335605418} - m_Layer: 0 + m_Layer: 6 m_Name: Arm_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2111,7 +2307,7 @@ GameObject: - component: {fileID: 1242350387530561810} - component: {fileID: 7818715855187803684} - component: {fileID: 1267741373379440053} - m_Layer: 0 + m_Layer: 6 m_Name: Leg_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2256,7 +2452,7 @@ GameObject: - component: {fileID: 639877345897943008} - component: {fileID: 8457006604249467094} - component: {fileID: 7089674069800452097} - m_Layer: 0 + m_Layer: 6 m_Name: Leg_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2399,7 +2595,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4926068877682023553} - m_Layer: 0 + m_Layer: 6 m_Name: Foot_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2432,7 +2628,7 @@ GameObject: - component: {fileID: 7820529921893711972} - component: {fileID: 1239621544883570514} - component: {fileID: 1323609233965017470} - m_Layer: 0 + m_Layer: 6 m_Name: Arm_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2577,7 +2773,7 @@ GameObject: - component: {fileID: 4068544631671626976} - component: {fileID: 5028902801156152278} - component: {fileID: 4598979980058915679} - m_Layer: 0 + m_Layer: 6 m_Name: Head m_TagString: Untagged m_Icon: {fileID: 0} @@ -2720,7 +2916,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3893933050461192441} - m_Layer: 0 + m_Layer: 6 m_Name: Foot_R m_TagString: Untagged m_Icon: {fileID: 0} @@ -2751,7 +2947,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5989260444345333464} - m_Layer: 0 + m_Layer: 6 m_Name: Hand_L m_TagString: Untagged m_Icon: {fileID: 0} @@ -2783,7 +2979,7 @@ GameObject: m_Component: - component: {fileID: 7750940074767773378} - component: {fileID: 4588262802587197927} - m_Layer: 0 + m_Layer: 6 m_Name: Armature m_TagString: Untagged m_Icon: {fileID: 0} @@ -2839,7 +3035,7 @@ GameObject: m_Component: - component: {fileID: 8340722459144044663} - component: {fileID: 8568896127197564856} - m_Layer: 0 + m_Layer: 6 m_Name: Torso m_TagString: Untagged m_Icon: {fileID: 0} @@ -2884,7 +3080,7 @@ GameObject: m_Component: - component: {fileID: 5710296449538741352} - component: {fileID: 5710296449538741353} - m_Layer: 0 + m_Layer: 6 m_Name: Hip m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/ActiveRagdoll/Assets/TABG/Test.unity b/ActiveRagdoll/Assets/TABG/Test.unity index fcee687..0dcc4ff 100644 --- a/ActiveRagdoll/Assets/TABG/Test.unity +++ b/ActiveRagdoll/Assets/TABG/Test.unity @@ -287,6 +287,104 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &312893416 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 312893417} + - component: {fileID: 312893420} + - component: {fileID: 312893419} + - component: {fileID: 312893418} + m_Layer: 6 + m_Name: PlayerCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &312893417 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312893416} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.020000003, z: 0} + m_LocalScale: {x: 0.15, y: 0.2507, z: 0.15} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7057859769783231882} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!136 &312893418 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312893416} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.50000024 + m_Height: 2.000001 + m_Direction: 1 + m_Center: {x: 0, y: 0.00000023841858, z: 0.000000044703484} +--- !u!33 &312893419 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312893416} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &312893420 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312893416} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9d4f4085b5ce801428050308889507e8, type: 2} + 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!850595691 &403353010 LightingSettings: m_ObjectHideFlags: 0 @@ -687,6 +785,103 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &705426289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 705426293} + - component: {fileID: 705426292} + - component: {fileID: 705426291} + - component: {fileID: 705426290} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &705426290 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705426289} + 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 &705426291 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705426289} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + 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 &705426292 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705426289} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &705426293 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705426289} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.168, y: -0.08, z: 0.14327973} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &705806567 GameObject: m_ObjectHideFlags: 0 @@ -785,6 +980,104 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &781237314 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 781237315} + - component: {fileID: 781237318} + - component: {fileID: 781237317} + - component: {fileID: 781237319} + m_Layer: 6 + m_Name: PlayerCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &781237315 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 781237314} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.02, z: 0} + m_LocalScale: {x: 0.15, y: 0.2507, z: 0.15} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8659986707249222520} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &781237317 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 781237314} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &781237318 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 781237314} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9d4f4085b5ce801428050308889507e8, type: 2} + 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!136 &781237319 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 781237314} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.50000024 + m_Height: 2.000001 + m_Direction: 1 + m_Center: {x: 0, y: 0.00000023841858, z: 0.000000044703484} --- !u!1 &981251352 GameObject: m_ObjectHideFlags: 0 @@ -900,6 +1193,46 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} +--- !u!1 &1234205108 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1234205108, guid: fce18bbf37be1384eb1a089a94aac81d, + type: 3} + m_PrefabInstance: {fileID: 8128778564773403800} + m_PrefabAsset: {fileID: 0} +--- !u!136 &1234205113 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1234205108} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2.000001 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1639162264 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1639162264, guid: fce18bbf37be1384eb1a089a94aac81d, + type: 3} + m_PrefabInstance: {fileID: 8128778564773403800} + m_PrefabAsset: {fileID: 0} +--- !u!136 &1639162269 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639162264} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2.000001 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1848931106 GameObject: m_ObjectHideFlags: 0 @@ -1339,6 +1672,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1234205109, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} + propertyPath: m_LocalPosition.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1234205109, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} + propertyPath: m_LocalPosition.z + value: -0.055 + objectReference: {fileID: 0} + - target: {fileID: 1639162265, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} + propertyPath: m_LocalPosition.z + value: -0.055 + objectReference: {fileID: 0} - target: {fileID: 1666344766112317020, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} propertyPath: m_RootOrder @@ -1399,7 +1744,9 @@ PrefabInstance: propertyPath: m_Name value: human_rigging objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1234205110, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} + - {fileID: 1639162266, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} m_SourcePrefab: {fileID: 100100000, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} --- !u!1001 &8277099497161960097 PrefabInstance: diff --git a/ActiveRagdoll/ProjectSettings/DynamicsManager.asset b/ActiveRagdoll/ProjectSettings/DynamicsManager.asset index 1596c42..7a0690a 100644 --- a/ActiveRagdoll/ProjectSettings/DynamicsManager.asset +++ b/ActiveRagdoll/ProjectSettings/DynamicsManager.asset @@ -7,6 +7,7 @@ PhysicsManager: m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 + m_DefaultMaxDepenetrationVelocity: 10 m_SleepThreshold: 0.005 m_DefaultContactOffset: 0.01 m_DefaultSolverIterations: 6 @@ -17,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffbfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 0 @@ -32,5 +33,6 @@ PhysicsManager: m_FrictionType: 0 m_EnableEnhancedDeterminism: 0 m_EnableUnifiedHeightmaps: 1 + m_ImprovedPatchFriction: 0 m_SolverType: 0 m_DefaultMaxAngularSpeed: 50 diff --git a/ActiveRagdoll/ProjectSettings/TagManager.asset b/ActiveRagdoll/ProjectSettings/TagManager.asset index 1c92a78..b1b4120 100644 --- a/ActiveRagdoll/ProjectSettings/TagManager.asset +++ b/ActiveRagdoll/ProjectSettings/TagManager.asset @@ -11,7 +11,7 @@ TagManager: - - Water - UI - - + - LocalPlayer - - - |