diff options
author | chai <215380520@qq.com> | 2024-03-19 21:06:40 +0800 |
---|---|---|
committer | chai <215380520@qq.com> | 2024-03-19 21:06:40 +0800 |
commit | c743485dad2ca83e12d16326afc9c319e3169f9a (patch) | |
tree | bef7635defc8d48ffe64738a7ee598f43843f9c3 | |
parent | 999a454764e91714847f531aee13903bfc31b0a9 (diff) |
*misc
66 files changed, 1647 insertions, 80 deletions
diff --git a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab index 92e4e87..239241b 100644 --- a/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab +++ b/ActiveRagdoll/Assets/TABG/Prefabs/human_rigging.prefab @@ -321,7 +321,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 984858210} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0.0419, z: 0} + m_LocalPosition: {x: 0, y: 0.037, z: 0.029} m_LocalScale: {x: 0.15, y: 0.1826, z: 0.15} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1075,6 +1075,156 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1808858621 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1808858622} + - component: {fileID: 7263518919066683589} + - component: {fileID: 8431171258552371941} + - component: {fileID: 8043710031869270073} + - component: {fileID: 7846447219259762999} + - component: {fileID: 2081091539071076239} + - component: {fileID: 5098019257442474416} + - component: {fileID: 83600686717150900} + - component: {fileID: 732440393331709508} + - component: {fileID: 9141217467644992819} + m_Layer: 6 + m_Name: Rigging_Data + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1808858622 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808858621} + 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: [] + m_Father: {fileID: 1666344766112317020} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7263518919066683589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808858621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0152a635e0b8d6547a566f7d1d7f34f8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8431171258552371941 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808858621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c879c488e6c58d741aab956a53d99deb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8043710031869270073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808858621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55cb274536c1d874db0ddeaab163a7a1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7846447219259762999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808858621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cacc0017abb9f54b81913df2d2f00d5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2081091539071076239 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808858621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93ab2bd59aec043479576f7402aba9f0, type: 3} + m_Name: + m_EditorClassIdentifier: + rootBone: {fileID: 861688529590854405} + allRigs: [] +--- !u!114 &5098019257442474416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808858621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 143d6df5e12320e4d9b77b9c46858e12, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &83600686717150900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808858621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 65e8b62425fa0464cb55fe503c4ecf6f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &732440393331709508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808858621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a073593a74173184787a2ac44c2a46f2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &9141217467644992819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1808858621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 19fba01e0aed0674aa94ea0f474f499d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2047997612 GameObject: m_ObjectHideFlags: 0 @@ -1102,7 +1252,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2047997612} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0.04189998, z: 0} + m_LocalPosition: {x: 0, y: 0.037, z: 0.029} m_LocalScale: {x: 0.15, y: 0.18259999, z: 0.15} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1183,6 +1333,8 @@ GameObject: - component: {fileID: 2610225499071172934} - component: {fileID: 8744092416694728233} - component: {fileID: 5009314273586098502} + - component: {fileID: 6122181118401514977} + - component: {fileID: 6122181118401514978} m_Layer: 6 m_Name: Foot_L m_TagString: Untagged @@ -1318,6 +1470,31 @@ ConfigurableJoint: m_EnablePreprocessing: 1 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &6122181118401514977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 352791520568127773} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &6122181118401514978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 352791520568127773} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81776d0149c84094eb151eb8cd90e148, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &360952041233165414 GameObject: m_ObjectHideFlags: 0 @@ -1405,6 +1582,8 @@ GameObject: - component: {fileID: 6228351505900064062} - component: {fileID: 8359930028503767300} - component: {fileID: 6775429611816846059} + - component: {fileID: 2783424386060882345} + - component: {fileID: 2783424386060882346} m_Layer: 6 m_Name: Foot_R m_TagString: Untagged @@ -1540,6 +1719,31 @@ ConfigurableJoint: m_EnablePreprocessing: 1 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &2783424386060882345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 700432527443861042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &2783424386060882346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 700432527443861042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0f204a40a6fa0844bd4ad08985a3824, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1198478719857577481 GameObject: m_ObjectHideFlags: 0 @@ -1551,6 +1755,8 @@ GameObject: - component: {fileID: 3709747199389055775} - component: {fileID: 7862657914170034493} - component: {fileID: 3494091916137669429} + - component: {fileID: 4878685260469331850} + - component: {fileID: 4878685260469331851} m_Layer: 6 m_Name: Hand_L m_TagString: Untagged @@ -1686,6 +1892,31 @@ ConfigurableJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &4878685260469331850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1198478719857577481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &4878685260469331851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1198478719857577481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af25fb620b16ea04384efa2ca29c08d6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1254990767818926415 GameObject: m_ObjectHideFlags: 0 @@ -1696,7 +1927,6 @@ GameObject: m_Component: - component: {fileID: 861688529590854405} - component: {fileID: 6902122112011267104} - - component: {fileID: 8879528567158505374} m_Layer: 6 m_Name: Rigidbody m_TagString: Untagged @@ -1745,19 +1975,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: size: 0.1 ---- !u!114 &8879528567158505374 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254990767818926415} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 93ab2bd59aec043479576f7402aba9f0, type: 3} - m_Name: - m_EditorClassIdentifier: - allRigs: [] --- !u!1 &1515111015024255430 GameObject: m_ObjectHideFlags: 0 @@ -1815,6 +2032,8 @@ GameObject: - component: {fileID: 1415741251372879280} - component: {fileID: 7724590171357447542} - component: {fileID: 7601374539345087183} + - component: {fileID: 7163679047628771627} + - component: {fileID: 7163679047628771628} m_Layer: 6 m_Name: Torso m_TagString: Untagged @@ -1950,6 +2169,31 @@ ConfigurableJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &7163679047628771627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625621794700460608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &7163679047628771628 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625621794700460608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf0e7bf909bb4ff4ca0f30f91a28653d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2047971321291531494 GameObject: m_ObjectHideFlags: 0 @@ -1959,7 +2203,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1666344766112317020} - - component: {fileID: 7828630652246571135} + - component: {fileID: 8128778564773403802} m_Layer: 6 m_Name: human_rigging m_TagString: Untagged @@ -1982,10 +2226,12 @@ Transform: - {fileID: 7750940074767773378} - {fileID: 4187754687432538758} - {fileID: 861688529590854405} + - {fileID: 1808858622} + - {fileID: 5197509156858705010} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7828630652246571135 +--- !u!114 &8128778564773403802 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1994,13 +2240,24 @@ MonoBehaviour: m_GameObject: {fileID: 2047971321291531494} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5b4ad5d4d6e961844a49b7145c877793, type: 3} + m_Script: {fileID: 11500000, guid: ff9a3b3cfb35c564891de827e45f6bb1, type: 3} m_Name: m_EditorClassIdentifier: - rigsToLift: - - {fileID: 5028902801156152278} - - {fileID: 7724590171357447542} - force: 30 + rootArmature: {fileID: 8146753049674130568} + rootRigidbody: {fileID: 1254990767818926415} + status: + standingData: {fileID: 0} + gravity: {fileID: 0} + movementData: {fileID: 0} + body: {fileID: 0} + step: {fileID: 0} + strength: {fileID: 0} + actions: + standing: {fileID: 0} + movement: {fileID: 0} + balance: {fileID: 0} + knockback: {fileID: 0} + rotate: {fileID: 0} --- !u!1 &2132482246703060397 GameObject: m_ObjectHideFlags: 0 @@ -2112,6 +2369,8 @@ GameObject: m_Component: - component: {fileID: 3412188744700893615} - component: {fileID: 7066289305757245630} + - component: {fileID: 6887620786272290105} + - component: {fileID: 6887620786272290106} m_Layer: 6 m_Name: Hip m_TagString: Untagged @@ -2151,6 +2410,31 @@ Rigidbody: m_Interpolate: 1 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &6887620786272290105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2282374011074668424} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &6887620786272290106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2282374011074668424} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e375330714645c4988cf20aecc99c48, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2411311702239281492 GameObject: m_ObjectHideFlags: 0 @@ -2162,6 +2446,8 @@ GameObject: - component: {fileID: 4083486271296676596} - component: {fileID: 6686346309479827042} - component: {fileID: 3629881010665375168} + - component: {fileID: 5216378010582810223} + - component: {fileID: 5216378010582810224} m_Layer: 6 m_Name: Hand_R m_TagString: Untagged @@ -2297,6 +2583,31 @@ ConfigurableJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &5216378010582810223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2411311702239281492} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &5216378010582810224 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2411311702239281492} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 343ebe5625328c6489d85d551955d402, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2474110595537587005 GameObject: m_ObjectHideFlags: 0 @@ -2308,6 +2619,8 @@ GameObject: - component: {fileID: 702326869898971518} - component: {fileID: 8359583798303084104} - component: {fileID: 7237636587702004398} + - component: {fileID: 8750515621544498665} + - component: {fileID: 8750515621544498666} m_Layer: 6 m_Name: Knee_R m_TagString: Untagged @@ -2443,6 +2756,31 @@ ConfigurableJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &8750515621544498665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2474110595537587005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &8750515621544498666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2474110595537587005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 743bb0295fc2b644c80f0e83a9d1f777, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2581325547809608687 GameObject: m_ObjectHideFlags: 0 @@ -2758,6 +3096,8 @@ GameObject: - component: {fileID: 5420353624032219184} - component: {fileID: 3928521349308094214} - component: {fileID: 1295959916615711177} + - component: {fileID: 4321150989774212267} + - component: {fileID: 4321150989774212268} m_Layer: 6 m_Name: Knee_L m_TagString: Untagged @@ -2893,6 +3233,31 @@ ConfigurableJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &4321150989774212267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4879437031530356264} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &4321150989774212268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4879437031530356264} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b869fc9e68992dd4190cf5ed40e60044, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5459608688684196573 GameObject: m_ObjectHideFlags: 0 @@ -2950,6 +3315,8 @@ GameObject: - component: {fileID: 4629454497198766197} - component: {fileID: 3691458469473146159} - component: {fileID: 1657485011335605418} + - component: {fileID: 3526346404085441776} + - component: {fileID: 3526346404085441777} m_Layer: 6 m_Name: Arm_R m_TagString: Untagged @@ -3085,6 +3452,31 @@ ConfigurableJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &3526346404085441776 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5658401667225277159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &3526346404085441777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5658401667225277159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 508e927201861d245bd51ceb5b18eefc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5992969589425681271 GameObject: m_ObjectHideFlags: 0 @@ -3096,6 +3488,8 @@ GameObject: - component: {fileID: 1242350387530561810} - component: {fileID: 7818715855187803684} - component: {fileID: 1267741373379440053} + - component: {fileID: 7057859769783231885} + - component: {fileID: 7057859769783231886} m_Layer: 6 m_Name: Leg_R m_TagString: Untagged @@ -3231,6 +3625,31 @@ ConfigurableJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &7057859769783231885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5992969589425681271} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &7057859769783231886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5992969589425681271} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e168c0b2976ea8459edfe49fecabfb9, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6309941073781425405 GameObject: m_ObjectHideFlags: 0 @@ -3242,6 +3661,8 @@ GameObject: - component: {fileID: 639877345897943008} - component: {fileID: 8457006604249467094} - component: {fileID: 7089674069800452097} + - component: {fileID: 8659986707249222523} + - component: {fileID: 8659986707249222524} m_Layer: 6 m_Name: Leg_L m_TagString: Untagged @@ -3377,6 +3798,31 @@ ConfigurableJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &8659986707249222523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6309941073781425405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &8659986707249222524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6309941073781425405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5df966c9f2b1ed54fbcf55ea8f03380b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7242023275942804698 GameObject: m_ObjectHideFlags: 0 @@ -3419,6 +3865,8 @@ GameObject: - component: {fileID: 7820529921893711972} - component: {fileID: 1239621544883570514} - component: {fileID: 1323609233965017470} + - component: {fileID: 2037636450122013951} + - component: {fileID: 2037636450122013952} m_Layer: 6 m_Name: Arm_L m_TagString: Untagged @@ -3554,6 +4002,31 @@ ConfigurableJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &2037636450122013951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7307037826757058977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd9e48ab223f3c6438a6da67b72efb5e, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} +--- !u!114 &2037636450122013952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7307037826757058977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c9729c60c0c0324fae0eef3d1f7bbba, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7540932285142806653 GameObject: m_ObjectHideFlags: 0 @@ -3565,6 +4038,7 @@ GameObject: - component: {fileID: 4068544631671626976} - component: {fileID: 5028902801156152278} - component: {fileID: 4598979980058915679} + - component: {fileID: 5240332616388624507} m_Layer: 6 m_Name: Head m_TagString: Untagged @@ -3699,6 +4173,18 @@ ConfigurableJoint: m_EnablePreprocessing: 0 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!114 &5240332616388624507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7540932285142806653} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3a5fbc4ef0e67544a940cd268ecffba, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7628504463291864053 GameObject: m_ObjectHideFlags: 0 @@ -3862,6 +4348,108 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 1415741251372879280} +--- !u!1 &9027679549219952251 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5197509156858705010} + - component: {fileID: 6341463708669378897} + - component: {fileID: 4413022550555116497} + - component: {fileID: 3805300644640191623} + - component: {fileID: 3422831897407596435} + - component: {fileID: 576393797451185326} + m_Layer: 6 + m_Name: Rigging_Action + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5197509156858705010 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9027679549219952251} + 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: [] + m_Father: {fileID: 1666344766112317020} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6341463708669378897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9027679549219952251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3851d441af2bef4448b208a0a2d481bb, type: 3} + m_Name: + m_EditorClassIdentifier: + rigsToLift: [] + force: 0 +--- !u!114 &4413022550555116497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9027679549219952251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fe5e09d4f747544988f3af4f3d00c6d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3805300644640191623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9027679549219952251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa66a59fbdeb88241b1d0a4457980e08, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3422831897407596435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9027679549219952251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55df48472ee427144a26e74073837213, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &576393797451185326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9027679549219952251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b4ad5d4d6e961844a49b7145c877793, type: 3} + m_Name: + m_EditorClassIdentifier: + rigsToLift: + - {fileID: 5028902801156152278} + - {fileID: 7724590171357447542} + force: 0 --- !u!1 &9207913841552632399 GameObject: m_ObjectHideFlags: 0 diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Balance.cs b/ActiveRagdoll/Assets/TABG/Scripts/Action/Balance.cs index 2319599..5456faf 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Action/Balance.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Balance.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace Rigging.Action { - public class Balance : MonoBehaviour + public class Balance : RiggingActionBase { public Rigidbody[] rigsToLift; //Head, Torso diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Knockback.cs b/ActiveRagdoll/Assets/TABG/Scripts/Action/Knockback.cs new file mode 100644 index 0000000..b49e1e5 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Knockback.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Rigging.Action +{ + + public class Knockback : RiggingActionBase + { + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Knockback.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Action/Knockback.cs.meta new file mode 100644 index 0000000..c9a4aa1 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Knockback.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1fe5e09d4f747544988f3af4f3d00c6d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs b/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs new file mode 100644 index 0000000..47de9de --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Rigging.Action +{ + + public class Movement : RiggingActionBase + { + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs.meta new file mode 100644 index 0000000..1bcfda9 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Movement.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fa66a59fbdeb88241b1d0a4457980e08 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/RiggingActionBase.cs b/ActiveRagdoll/Assets/TABG/Scripts/Action/RiggingActionBase.cs new file mode 100644 index 0000000..75adc53 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/RiggingActionBase.cs @@ -0,0 +1,47 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Rigging.Action +{ + + public class RiggingActionBase : MonoBehaviour + { + protected Player player; + + private void Awake() + { + player = GetComponentInParent<Player>(); + OnAwake(); + } + + private void Update() + { + OnUpdate(); + } + + private void FixedUpdate() + { + OnFixedUpdate(); + } + + private void Start() + { + OnStart(); + } + + protected virtual void OnAwake() + { + } + protected virtual void OnUpdate() + { + } + protected virtual void OnFixedUpdate() + { + } + protected virtual void OnStart() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/RiggingActionBase.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Action/RiggingActionBase.cs.meta new file mode 100644 index 0000000..0c2700b --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/RiggingActionBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bde6f3fc199d09e47a38a73cb6ce7ae9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Rotation.cs b/ActiveRagdoll/Assets/TABG/Scripts/Action/Rotation.cs new file mode 100644 index 0000000..9652670 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Rotation.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Rigging.Action +{ + + public class Rotation : RiggingActionBase + { + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Rotation.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Action/Rotation.cs.meta new file mode 100644 index 0000000..1596450 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Rotation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 55df48472ee427144a26e74073837213 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Action/Standing.cs b/ActiveRagdoll/Assets/TABG/Scripts/Action/Standing.cs index 91365a4..dd9a62c 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Action/Standing.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Action/Standing.cs @@ -1,18 +1,19 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Windows; namespace Rigging.Action { - public class Standing : MonoBehaviour + public class Standing : RiggingActionBase { public Rigidbody[] rigsToLift; //Head, Torso public float force; - private void FixedUpdate() + protected override void OnFixedUpdate() { foreach (var rig in rigsToLift) { @@ -20,6 +21,26 @@ namespace Rigging.Action } } + + //private void Stand(AnimationCurve curve) + //{ + // float num = 0f; + // if (input.isCrouching) + // { + // num = 0.35f; + // } + // float max = forceCapCurve.Evaluate(forceCapTime); // Á¦µÄÉÏÏÞ + // RigidbodyMovment[] array = rigsToLift; + // foreach (RigidbodyMovment rigidbodyMovment in array) + // { + // // Ê©¼ÓÒ»¸öÏòÉϵĴ¹Ö±ÏòÉϵÄÁ¦£¬°Ñ½ÇÉ«µõÆðÀ´ + // Vector3 forceDir = Vector3.up; + // float forceMagnitude = standingMulti * muscleMultiplier * rigidbodyMovment.force * Mathf.Clamp(curve.Evaluate(standingData.distanceToGround / base.transform.localScale.x + num + offset + moveData.slopeVelocityStrenght * -0.2f), -100f, max); + // rigidbodyMovment.rig.AddForce( + // forceDir * forceMagnitude, ForceMode.Acceleration); + // } + //} + } } diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body.meta new file mode 100644 index 0000000..0f980b0 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a41e77f7b03f9545aefff5381422a09 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmLeft.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmLeft.cs new file mode 100644 index 0000000..c8c70aa --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmLeft.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class ArmLeft : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmLeft.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmLeft.cs.meta new file mode 100644 index 0000000..ac4f903 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmLeft.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9c9729c60c0c0324fae0eef3d1f7bbba +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmRight.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmRight.cs new file mode 100644 index 0000000..555389c --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmRight.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class ArmRight : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmRight.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmRight.cs.meta new file mode 100644 index 0000000..630b0ab --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/ArmRight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 508e927201861d245bd51ceb5b18eefc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/BodyPartBase.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/BodyPartBase.cs new file mode 100644 index 0000000..dd65650 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/BodyPartBase.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Rigging.BodyPart +{ + public class BodyPartBase : MonoBehaviour + { + + public Rigidbody rigidbody; + + private void Awake() + { + rigidbody = GetComponent<Rigidbody>(); + rigidbody.sleepThreshold = 0; + } + + } + +} diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/BodyPartBase.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/BodyPartBase.cs.meta new file mode 100644 index 0000000..d06c038 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/BodyPartBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ccc89c63c2f0a84479798d19b530fcdb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/FootLeft.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/FootLeft.cs new file mode 100644 index 0000000..0a42c87 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/FootLeft.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class FootLeft : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/FootLeft.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/FootLeft.cs.meta new file mode 100644 index 0000000..ccb9a42 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/FootLeft.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 81776d0149c84094eb151eb8cd90e148 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/FootRight.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/FootRight.cs new file mode 100644 index 0000000..306b551 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/FootRight.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class FootRight : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/FootRight.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/FootRight.cs.meta new file mode 100644 index 0000000..b016566 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/FootRight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b0f204a40a6fa0844bd4ad08985a3824 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/HandLeft.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/HandLeft.cs new file mode 100644 index 0000000..cdb2862 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/HandLeft.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class HandLeft : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/HandLeft.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/HandLeft.cs.meta new file mode 100644 index 0000000..223ebf5 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/HandLeft.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: af25fb620b16ea04384efa2ca29c08d6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/HandRight.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/HandRight.cs new file mode 100644 index 0000000..3a547b2 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/HandRight.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class HandRight : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + +} diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/HandRight.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/HandRight.cs.meta new file mode 100644 index 0000000..09ca1d0 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/HandRight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 343ebe5625328c6489d85d551955d402 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/Head.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/Head.cs new file mode 100644 index 0000000..807c72d --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/Head.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + public class Head : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/Head.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/Head.cs.meta new file mode 100644 index 0000000..76d61d1 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/Head.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b3a5fbc4ef0e67544a940cd268ecffba +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/Hip.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/Hip.cs new file mode 100644 index 0000000..00e9dde --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/Hip.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class Hip : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/Hip.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/Hip.cs.meta new file mode 100644 index 0000000..5a9290b --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/Hip.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9e375330714645c4988cf20aecc99c48 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeLeft.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeLeft.cs new file mode 100644 index 0000000..de292ec --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeLeft.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class KneeLeft : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeLeft.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeLeft.cs.meta new file mode 100644 index 0000000..628c5cb --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeLeft.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b869fc9e68992dd4190cf5ed40e60044 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeRight.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeRight.cs new file mode 100644 index 0000000..d3201b9 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeRight.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class KneeRight : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeRight.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeRight.cs.meta new file mode 100644 index 0000000..c36bca0 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/KneeRight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 743bb0295fc2b644c80f0e83a9d1f777 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/LegLeft.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/LegLeft.cs new file mode 100644 index 0000000..17c0841 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/LegLeft.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class LegLeft : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/LegLeft.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/LegLeft.cs.meta new file mode 100644 index 0000000..afaa546 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/LegLeft.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5df966c9f2b1ed54fbcf55ea8f03380b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/LegRight.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/LegRight.cs new file mode 100644 index 0000000..77281a1 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/LegRight.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class LegRight : MonoBehaviour + { + private void Start() + { + } + + private void Update() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/LegRight.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/LegRight.cs.meta new file mode 100644 index 0000000..ab334af --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/LegRight.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5e168c0b2976ea8459edfe49fecabfb9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/Torso.cs b/ActiveRagdoll/Assets/TABG/Scripts/Body/Torso.cs new file mode 100644 index 0000000..5328f57 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/Torso.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace Rigging.BodyPart +{ + + public class Torso : BodyPartBase + { + private void Start() + { + } + + private void Update() + { + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Body/Torso.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Body/Torso.cs.meta new file mode 100644 index 0000000..770d5e9 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Body/Torso.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cf0e7bf909bb4ff4ca0f30f91a28653d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Camera.meta b/ActiveRagdoll/Assets/TABG/Scripts/Camera.meta new file mode 100644 index 0000000..9255b32 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Camera.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf9fc8e7b0f3af746a46260b1116b13c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs new file mode 100644 index 0000000..c988991 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Rigging.Camera +{ + + public class CameraMovement : MonoBehaviour + { + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + } + +}
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs.meta new file mode 100644 index 0000000..b023ac5 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Camera/CameraMovement.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 334643b75d265f8409ae1340eda60cba +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/CollisionChecker.cs b/ActiveRagdoll/Assets/TABG/Scripts/CollisionChecker.cs new file mode 100644 index 0000000..75741ab --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/CollisionChecker.cs @@ -0,0 +1,72 @@ +using Rigging.Data; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Rigging +{ + + public class CollisionChecker : MonoBehaviour + { + public Player player; + + private Transform head + { + get + { + return player.body.head.transform; + } + } + + private Transform hip + { + get + { + return player.body.hip.transform; + } + } + + private StandingDataHandler data; + + public bool active = true; + + public float sinceGrounded = 0; // ÀëµØ¿ªÊ¼ËãµÄʱ¼ä + + public float allowedSteepnesAngle = 60f; + + private void Start() + { + player = GetComponentInParent<Player>(); + + data = player.status.standingData; + } + + private void Update() + { + sinceGrounded += Time.deltaTime; + } + + private void OnCollisionStay(Collision collision) + { + Collide(collision); + } + + private void OnCollisionEnter(Collision collision) + { + Collide(collision); + } + + private void Collide(Collision collision) + { + if (active && Vector3.Angle(Vector3.up, collision.contacts[0].normal) < allowedSteepnesAngle) + { + if ((bool)data) + { + data.TouchGround(Mathf.Abs(hip.position.y - collision.contacts[0].point.y), collision.contacts[0].normal); + } + sinceGrounded = 0f; + } + } + } + +} diff --git a/ActiveRagdoll/Assets/TABG/Scripts/CollisionChecker.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/CollisionChecker.cs.meta new file mode 100644 index 0000000..f89102f --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/CollisionChecker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dd9e48ab223f3c6438a6da67b72efb5e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/AnimationHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/AnimationHandler.cs index bc20e7c..2d051bf 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/AnimationHandler.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/AnimationHandler.cs @@ -5,12 +5,18 @@ using UnityEngine; namespace Rigging.Data { - public class AnimationHandler : MonoBehaviour + public class AnimationHandler : RiggingDataBase { + protected override void OnStart() + { + base.OnStart(); + } + + } } diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/CharacterGearHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/CharacterGearHandler.cs index 7490043..95ef268 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/CharacterGearHandler.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/CharacterGearHandler.cs @@ -5,19 +5,11 @@ using UnityEngine; namespace Rigging.Data { - public class CharacterGearHandler : MonoBehaviour + public class CharacterGearHandler : RiggingDataBase { - // Start is called before the first frame update - void Start() - { - } - // Update is called once per frame - void Update() - { - } } }
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/Gravity.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/Gravity.cs index f087185..2e24f81 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/Gravity.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/Gravity.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace Rigging.Data { - public class Gravity : MonoBehaviour + public class Gravity : RiggingDataBase { // Start is called before the first frame update void Start() diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/MovementDataHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/MovementDataHandler.cs index ae3eb00..9a87817 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/MovementDataHandler.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/MovementDataHandler.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace Rigging.Data { - public class MovementDataHandler : MonoBehaviour + public class MovementDataHandler : RiggingDataBase { // Start is called before the first frame update void Start() diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/RiggingDataBase.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/RiggingDataBase.cs new file mode 100644 index 0000000..f304d5d --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/RiggingDataBase.cs @@ -0,0 +1,56 @@ +using UnityEngine; + +namespace Rigging.Data +{ + + public class RiggingDataBase : MonoBehaviour + { + + protected Player player; + + private void Awake() + { + player = GetComponentInParent<Player>(); + OnAwake(); + } + + private void Update() + { + OnUpdate(); + } + + private void FixedUpdate() + { + OnFixedUpdate(); + } + + private void Start() + { + OnStart(); + } + + private void LateUpdate() + { + OnLateUpdate(); + } + + protected virtual void OnAwake() + { + } + protected virtual void OnUpdate() + { + } + protected virtual void OnFixedUpdate() + { + } + protected virtual void OnStart() + { + } + + protected virtual void OnLateUpdate() + { + } + + } + +} diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/RiggingDataBase.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Data/RiggingDataBase.cs.meta new file mode 100644 index 0000000..3544c82 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/RiggingDataBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0a8f5353f5205904fb677c7c4c397460 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/RigidbodyHolder.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/RigidbodyHolder.cs index ee3c350..eefa961 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/RigidbodyHolder.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/RigidbodyHolder.cs @@ -5,16 +5,15 @@ namespace Rigging.Data { // ±£´æËùÓÐ14¸ö¹Ç÷À - public class RigidbodyHolder : MonoBehaviour - { - public Rigidbody[] allRigs; + public class RigidbodyHolder : RiggingDataBase + { + public Transform rootBone; - //private WeaponHandler weapons; + public Rigidbody[] allRigs; private void Start() { - allRigs = GetComponentsInChildren<Rigidbody>(); - //weapons = GetComponent<WeaponHandler>(); + allRigs = rootBone.gameObject.GetComponentsInChildren<Rigidbody>(); } private void Update() diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/SetRigidbodySettings.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/SetRigidbodySettings.cs index cb4b4e6..0af06c9 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/SetRigidbodySettings.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/SetRigidbodySettings.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace Rigging.Data { - public class SetRigidbodySettings : MonoBehaviour + public class SetRigidbodySettings : RiggingDataBase { // Start is called before the first frame update void Start() diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/StandingDataHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/StandingDataHandler.cs index 588f089..6a4aeb2 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/StandingDataHandler.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/StandingDataHandler.cs @@ -5,18 +5,64 @@ using UnityEngine; namespace Rigging.Data { - public class StandingDataHandler : MonoBehaviour + public class StandingDataHandler : RiggingDataBase { - // Start is called before the first frame update - void Start() + + public float sinceGrounded; // ÀëµØÊ±¼ä + + public float sinceLanded; + + public bool isGrounded; + + public float distanceToGround = 1f; + + private bool hasRecievedTouchedGround; + + private MovementDataHandler movementData; + + protected override void OnStart() + { + movementData = player.status.movementData; + } + + protected override void OnFixedUpdate() + { + sinceGrounded += Time.fixedDeltaTime; + sinceLanded += Time.fixedDeltaTime; + if ((double)sinceGrounded > 0.1) + { + isGrounded = false; + } + } + + protected override void OnLateUpdate() + { + hasRecievedTouchedGround = false; + } + + public void TouchGround(float distance, Vector3 normal) { - + //if (sinceGrounded > 0.5f && (bool)wobbleShake) + //{ + // wobbleShake.AddShake(-Vector3.up * 5f * Mathf.Pow(sinceGrounded, 1.5f), 0.8f); + //} + if (sinceGrounded > 0.5f) + { + Land(sinceGrounded); + } + sinceGrounded = 0f; + isGrounded = true; + if (distance > distanceToGround || !hasRecievedTouchedGround) + { + distanceToGround = distance; + } + hasRecievedTouchedGround = true; + //moveMentData.SetSlope(normal); } - // Update is called once per frame - void Update() + private void Land(float landForce) { - + sinceLanded = 0f; } } diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs index cf178c5..032cf3f 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/StepHandler.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace Rigging.Data { - public class StepHandler : MonoBehaviour + public class StepHandler : RiggingDataBase { // Start is called before the first frame update void Start() diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Data/Strength.cs b/ActiveRagdoll/Assets/TABG/Scripts/Data/Strength.cs index 6967953..b774c1a 100644 --- a/ActiveRagdoll/Assets/TABG/Scripts/Data/Strength.cs +++ b/ActiveRagdoll/Assets/TABG/Scripts/Data/Strength.cs @@ -5,19 +5,12 @@ using UnityEngine; namespace Rigging.Data { - public class Strength : MonoBehaviour + public class Strength : RiggingDataBase { - // Start is called before the first frame update - void Start() - { - - } - // Update is called once per frame - void Update() - { - - } + + + } }
\ No newline at end of file diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Input.meta b/ActiveRagdoll/Assets/TABG/Scripts/Input.meta new file mode 100644 index 0000000..d2f4aab --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Input.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 793d7d4f4582fe642876e55e09baaa6d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Input/InputHandler.cs b/ActiveRagdoll/Assets/TABG/Scripts/Input/InputHandler.cs new file mode 100644 index 0000000..bae645b --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Input/InputHandler.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class InputHandler : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Input/InputHandler.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Input/InputHandler.cs.meta new file mode 100644 index 0000000..353adf4 --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Input/InputHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3e4f01fcb88b28040a13a524b623a670 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Input/SetAnimationByInput.cs b/ActiveRagdoll/Assets/TABG/Scripts/Input/SetAnimationByInput.cs new file mode 100644 index 0000000..0f0feab --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Input/SetAnimationByInput.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SetAnimationByInput : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Input/SetAnimationByInput.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Input/SetAnimationByInput.cs.meta new file mode 100644 index 0000000..5f4a2de --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Input/SetAnimationByInput.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 01e4ef433b714c844acfa85d61aa6921 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Player.cs b/ActiveRagdoll/Assets/TABG/Scripts/Player.cs new file mode 100644 index 0000000..897d10f --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Player.cs @@ -0,0 +1,106 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Rigging.Data; +using Rigging.Action; +using Rigging.Camera; +using System; +using Rigging.BodyPart; + +namespace Rigging +{ + + [Serializable] + public class Status + { + public StandingDataHandler standingData; + + public Gravity gravity; + + public MovementDataHandler movementData; + + public RigidbodyHolder body; + + public StepHandler step; + + public Strength strength; + } + + [Serializable] + public class Actions + { + public Standing standing; + public Movement movement; + public Balance balance; + public Knockback knockback; + public Rotation rotate; + } + + [Serializable] + public class BodyParts + { + public Rigging.BodyPart.Hip hip; + public Rigging.BodyPart.ArmLeft armLeft; + public Rigging.BodyPart.ArmRight armRight; + public Rigging.BodyPart.FootLeft footLeft; + public Rigging.BodyPart.FootRight footRight; + public Rigging.BodyPart.HandLeft handLeft; + public Rigging.BodyPart.HandRight handRight; + public Rigging.BodyPart.Head head; + public Rigging.BodyPart.KneeLeft kneeLeft; + public Rigging.BodyPart.KneeRight kneeRight; + public Rigging.BodyPart.LegLeft legLeft; + public Rigging.BodyPart.LegRight legRight; + public Rigging.BodyPart.Torso torso; + } + + public class Player : MonoBehaviour + { + + public GameObject rootArmature; + public GameObject rootRigidbody; + + // ½ÇÉ«µÄ״̬Êý¾Ý + public Status status; + + public Actions actions; + + public BodyParts body; + + private void Awake() + { + status = new Status(); + status.standingData = GetComponentInChildren<StandingDataHandler>(); + status.gravity = GetComponentInChildren<Gravity>(); + status.movementData = GetComponentInChildren<MovementDataHandler>(); + status.body = GetComponentInChildren<RigidbodyHolder>(); + status.step = GetComponentInChildren<StepHandler>(); + status.strength = GetComponentInChildren<Strength>(); + + actions = new Actions(); + actions.standing = GetComponentInChildren<Standing>(); + actions.movement = GetComponentInChildren<Movement>(); + actions.balance = GetComponentInChildren<Balance>(); + actions.knockback = GetComponentInChildren<Knockback>(); + actions.rotate = GetComponentInChildren<Rotation>(); + + body = new BodyParts(); + body.hip = GetComponentInChildren<Rigging.BodyPart.Hip>(); + body.armLeft = GetComponentInChildren<Rigging.BodyPart.ArmLeft>(); + body.armRight = GetComponentInChildren<Rigging.BodyPart.ArmRight>(); + body.footLeft = GetComponentInChildren<Rigging.BodyPart.FootLeft>(); + body.footRight = GetComponentInChildren<Rigging.BodyPart.FootRight>(); + body.handLeft = GetComponentInChildren<Rigging.BodyPart.HandLeft>(); + body.handRight = GetComponentInChildren<Rigging.BodyPart.HandRight>(); + body.head = GetComponentInChildren<Rigging.BodyPart.Head>(); + body.kneeLeft = GetComponentInChildren<Rigging.BodyPart.KneeLeft>(); + body.kneeRight = GetComponentInChildren<Rigging.BodyPart.KneeRight>(); + body.legLeft = GetComponentInChildren<Rigging.BodyPart.LegLeft>(); + body.legRight = GetComponentInChildren<Rigging.BodyPart.LegRight>(); + body.torso = GetComponentInChildren<Rigging.BodyPart.Torso>(); + + } + + } + +} diff --git a/ActiveRagdoll/Assets/TABG/Scripts/Player.cs.meta b/ActiveRagdoll/Assets/TABG/Scripts/Player.cs.meta new file mode 100644 index 0000000..eda240a --- /dev/null +++ b/ActiveRagdoll/Assets/TABG/Scripts/Player.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ff9a3b3cfb35c564891de827e45f6bb1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ActiveRagdoll/Assets/TABG/Test.unity b/ActiveRagdoll/Assets/TABG/Test.unity index 36f21b0..7e79202 100644 --- a/ActiveRagdoll/Assets/TABG/Test.unity +++ b/ActiveRagdoll/Assets/TABG/Test.unity @@ -1436,22 +1436,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 984858211, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_LocalPosition.y - value: 0.037 - objectReference: {fileID: 0} - - target: {fileID: 984858211, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_LocalPosition.z - value: 0.029 - objectReference: {fileID: 0} - - target: {fileID: 2047997613, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_LocalPosition.y - value: 0.037 - objectReference: {fileID: 0} - - target: {fileID: 2047997613, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} - propertyPath: m_LocalPosition.z - value: 0.029 - objectReference: {fileID: 0} - target: {fileID: 1666344766112317020, guid: fce18bbf37be1384eb1a089a94aac81d, type: 3} propertyPath: m_RootOrder diff --git a/Docs/~$导入设置.xlsx b/Docs/~$导入设置.xlsx Binary files differnew file mode 100644 index 0000000..1e0c8b3 --- /dev/null +++ b/Docs/~$导入设置.xlsx diff --git a/Docs/~$资料.xlsx b/Docs/~$资料.xlsx Binary files differnew file mode 100644 index 0000000..1e0c8b3 --- /dev/null +++ b/Docs/~$资料.xlsx |