diff --git a/Assets/AssetCaches.asset b/Assets/AssetCaches.asset index c31873b3b..42a349c4e 100644 --- a/Assets/AssetCaches.asset +++ b/Assets/AssetCaches.asset @@ -21643,6 +21643,21 @@ MonoBehaviour: - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} FilterEnum: 0 Filter: '*' + - Path: Assets/ResRaw/Prefabs/Player/PlayerTorso.mask + Address: Plyaer/PlayerTorso + Type: AvatarMask + Bundle: main/plyaer.bundle + Tags: + Group: + Name: Plyaer + Enable: 1 + BundleMode: 0 + AddressMode: 2 + Tags: + Collectors: + - {fileID: 102900000, guid: aa3f5467c0c153642ac320466aee0ec1, type: 3} + FilterEnum: 0 + Filter: '*' - Path: Assets/ResRaw/Prefabs/Player/Sound/1.ogg Address: Plyaer/1 Type: AudioClip diff --git a/Assets/KINEMATION/MagicBlend/MagicBlend_Human_Male.asset b/Assets/KINEMATION/MagicBlend/MagicBlend_Human_Male.asset index 0055280b4..5ce176e88 100644 --- a/Assets/KINEMATION/MagicBlend/MagicBlend_Human_Male.asset +++ b/Assets/KINEMATION/MagicBlend/MagicBlend_Human_Male.asset @@ -50,31 +50,31 @@ MonoBehaviour: elementChain: - name: pelvis_wt index: 2 - depth: -1 + depth: 0 - name: thigh_l index: 113 - depth: -1 + depth: 0 - name: calf_l index: 114 - depth: -1 + depth: 0 - name: foot_l index: 117 - depth: -1 + depth: 0 - name: ball_l index: 118 - depth: -1 + depth: 0 - name: thigh_r index: 121 - depth: -1 + depth: 0 - name: calf_r index: 122 - depth: -1 + depth: 0 - name: foot_r index: 125 - depth: -1 + depth: 0 - name: ball_r index: 126 - depth: -1 + depth: 0 baseWeight: 0 additiveWeight: 0 localWeight: 0 @@ -287,5 +287,5 @@ MonoBehaviour: depth: -1 baseWeight: 0 additiveWeight: 0 - localWeight: 0 - globalWeight: 0 + localWeight: 1 + globalWeight: 1 diff --git a/Assets/ResRaw/Prefabs/Player/Anim2/PlayerAnimator.controller b/Assets/ResRaw/Prefabs/Player/Anim2/PlayerAnimator.controller index 25de8990d..8e5c8c957 100644 --- a/Assets/ResRaw/Prefabs/Player/Anim2/PlayerAnimator.controller +++ b/Assets/ResRaw/Prefabs/Player/Anim2/PlayerAnimator.controller @@ -1443,7 +1443,7 @@ AnimatorController: - serializedVersion: 5 m_Name: Torso m_StateMachine: {fileID: 5323447550115556795} - m_Mask: {fileID: 0} + m_Mask: {fileID: 31900000, guid: b5b726869f44f3a4290d46b80fa8cd93, type: 2} m_Motions: [] m_Behaviours: [] m_BlendingMode: 0 diff --git a/Assets/ResRaw/Prefabs/Player/PlayerTorso.mask b/Assets/ResRaw/Prefabs/Player/PlayerTorso.mask new file mode 100644 index 000000000..7f1ff6e53 --- /dev/null +++ b/Assets/ResRaw/Prefabs/Player/PlayerTorso.mask @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!319 &31900000 +AvatarMask: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerTorso + m_Mask: 01000000010000000000000000000000000000000100000001000000010000000100000000000000000000000100000001000000 + m_Elements: [] diff --git a/Assets/ResRaw/Prefabs/Player/PlayerTorso.mask.meta b/Assets/ResRaw/Prefabs/Player/PlayerTorso.mask.meta new file mode 100644 index 000000000..0d5414ba2 --- /dev/null +++ b/Assets/ResRaw/Prefabs/Player/PlayerTorso.mask.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5b726869f44f3a4290d46b80fa8cd93 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 31900000 + userData: + assetBundleName: + assetBundleVariant: