diff --git a/Assets/Characters/Animations/SittingIdle.anim b/Assets/Characters/Animations/SittingIdle.anim index 40c54aab..7c34f69d 100644 --- a/Assets/Characters/Animations/SittingIdle.anim +++ b/Assets/Characters/Animations/SittingIdle.anim @@ -11451,8 +11451,8 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 + m_LoopTime: 1 + m_LoopBlend: 1 m_LoopBlendOrientation: 1 m_LoopBlendPositionY: 1 m_LoopBlendPositionXZ: 1 diff --git a/Assets/Scenes/House.unity b/Assets/Scenes/House.unity index 77357eb0..87d98583 100644 --- a/Assets/Scenes/House.unity +++ b/Assets/Scenes/House.unity @@ -254,7 +254,7 @@ Transform: - {fileID: 1771395766} - {fileID: 1216490882} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &296647571 stripped GameObject: @@ -422,7 +422,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &563116883 PrefabInstance: @@ -1056,7 +1056,7 @@ PrefabInstance: - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} @@ -2210,12 +2210,12 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1468538261} m_Modifications: - target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_RootOrder - value: 1 + value: -1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} @@ -2230,7 +2230,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_LocalPosition.z - value: 6.665 + value: 0.7490001 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} @@ -2240,7 +2240,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} @@ -2250,7 +2250,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} @@ -2279,8 +2279,16 @@ PrefabInstance: objectReference: {fileID: 9100000, guid: 99b5264d51909cd4890098c89c137a38, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1836445628} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + insertIndex: -1 + addedObject: {fileID: 927526094} m_SourcePrefab: {fileID: 100100000, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} --- !u!1 &714981011 GameObject: @@ -2780,6 +2788,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1468538260} m_PrefabAsset: {fileID: 0} +--- !u!1 &927526091 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + m_PrefabInstance: {fileID: 572560109} + m_PrefabAsset: {fileID: 0} +--- !u!4 &927526093 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + m_PrefabInstance: {fileID: 572560109} + m_PrefabAsset: {fileID: 0} +--- !u!114 &927526094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927526091} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fff0960ef4ea6e04eac66b4a7fd2189d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RigLayers: + - m_Rig: {fileID: 1836445629} + m_Active: 1 + m_Effectors: [] --- !u!1 &1005207436 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4327680794412319598, guid: 7699f5af06713974ba61777a8a830f6e, @@ -3076,7 +3112,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1322044268 stripped Transform: @@ -3402,6 +3438,10 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, type: 3} insertIndex: 1 + addedObject: {fileID: 927526093} + - targetCorrespondingSourceObject: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + insertIndex: 2 addedObject: {fileID: 1421482531} - targetCorrespondingSourceObject: {fileID: 5263837543333092293, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, type: 3} @@ -4385,7 +4425,7 @@ PrefabInstance: - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 7908616180235619651, guid: 88fcb1c95eeeabc479f95a580dea8152, type: 3} @@ -4448,6 +4488,52 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1494404566} m_SourcePrefab: {fileID: 100100000, guid: 88fcb1c95eeeabc479f95a580dea8152, type: 3} +--- !u!1 &1836445627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1836445628} + - component: {fileID: 1836445629} + m_Layer: 0 + m_Name: Rig 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1836445628 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836445627} + m_LocalRotation: {x: -0, y: -1, z: -0, w: 0} + m_LocalPosition: {x: 0.002, y: -0.07, z: 6.749} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 927526093} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1836445629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1836445627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70b342d8ce5c2fd48b8fa3147d48d1d1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Weight: 1 + m_Effectors: [] --- !u!1 &1856998489 GameObject: m_ObjectHideFlags: 0 @@ -4833,7 +4919,7 @@ Transform: - {fileID: 738861884} - {fileID: 830407897} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2123015989 GameObject: @@ -4989,7 +5075,7 @@ PrefabInstance: - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, type: 3}