From d1750a6147afd285690746d361253ae942852016 Mon Sep 17 00:00:00 2001 From: Valdimir Date: Mon, 10 Apr 2023 23:12:25 +0300 Subject: [PATCH] small fixes --- Assets/Characters/Animations/SittingIdle.anim | 220 +++++++++++++++--- Assets/Scenes/House.unity | 98 +++++++- 2 files changed, 280 insertions(+), 38 deletions(-) diff --git a/Assets/Characters/Animations/SittingIdle.anim b/Assets/Characters/Animations/SittingIdle.anim index aeab055c..330b327e 100644 --- a/Assets/Characters/Animations/SittingIdle.anim +++ b/Assets/Characters/Animations/SittingIdle.anim @@ -2637,6 +2637,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: -0.37 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1.8000001 value: -0.45960194 @@ -4137,6 +4146,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: 0.48 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1.5666667 value: -0.092286296 @@ -6237,6 +6255,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0.39 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -6434,7 +6461,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.5000001 - value: -0.0022258728 + value: -0.11 inSlope: -0.07561229 outSlope: -0.07561229 tangentMode: 0 @@ -6999,6 +7026,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: 0.34 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666667 value: 0.3199994 @@ -7155,6 +7191,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: -0.03 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1.4000001 value: 0.0078737745 @@ -7626,6 +7671,33 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: -0.14 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.8333334 + value: -0.24 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.6333334 + value: -0.3 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -7647,6 +7719,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.8333333 + value: 0.04 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -9766,6 +9847,15 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 81 + script: {fileID: 0} + typeID: 95 + customType: 8 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 attribute: 82 @@ -9820,6 +9910,24 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 91 + script: {fileID: 0} + typeID: 95 + customType: 8 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 92 + script: {fileID: 0} + typeID: 95 + customType: 8 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 attribute: 93 @@ -9883,15 +9991,6 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 81 - script: {fileID: 0} - typeID: 95 - customType: 8 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 attribute: 83 @@ -9919,24 +10018,6 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 91 - script: {fileID: 0} - typeID: 95 - customType: 8 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 92 - script: {fileID: 0} - typeID: 95 - customType: 8 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 attribute: 8 @@ -13092,6 +13173,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: -0.37 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1.8000001 value: -0.45960194 @@ -14592,6 +14682,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: 0.48 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1.5666667 value: -0.092286296 @@ -16692,6 +16791,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0.39 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -16889,7 +16997,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.5000001 - value: -0.0022258728 + value: -0.11 inSlope: -0.07561229 outSlope: -0.07561229 tangentMode: 0 @@ -17454,6 +17562,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: 0.34 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666667 value: 0.3199994 @@ -17610,6 +17727,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: -0.03 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1.4000001 value: 0.0078737745 @@ -18081,6 +18207,33 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6 + value: -0.14 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.8333334 + value: -0.24 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.6333334 + value: -0.3 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -18102,6 +18255,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.8333333 + value: 0.04 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Scenes/House.unity b/Assets/Scenes/House.unity index f67a287e..4f06862d 100644 --- a/Assets/Scenes/House.unity +++ b/Assets/Scenes/House.unity @@ -2637,6 +2637,46 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.102281965 objectReference: {fileID: 0} + - target: {fileID: -4287255307985425556, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.09277579 + objectReference: {fileID: 0} + - target: {fileID: -4287255307985425556, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000014156103 + objectReference: {fileID: 0} + - target: {fileID: -4287255307985425556, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000014086254 + objectReference: {fileID: 0} + - target: {fileID: -4287255307985425556, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9982921 + objectReference: {fileID: 0} + - target: {fileID: -4287255307985425556, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000016880218 + objectReference: {fileID: 0} + - target: {fileID: -4287255307985425556, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.000000016414557 + objectReference: {fileID: 0} + - target: {fileID: -4287255307985425556, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.058420774 + objectReference: {fileID: 0} + - target: {fileID: -4287255307985425556, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -6.698 + objectReference: {fileID: 0} - target: {fileID: -3934200352946294746, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_LocalPosition.x @@ -3350,37 +3390,52 @@ PrefabInstance: - target: {fileID: 1896526759529954774, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_LocalPosition.x - value: -0.028935079 + value: -0.028936444 objectReference: {fileID: 0} - target: {fileID: 1896526759529954774, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_LocalPosition.y - value: -0.0120040625 + value: -0.01200429 objectReference: {fileID: 0} - target: {fileID: 1896526759529954774, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_LocalPosition.z - value: -0.00025631487 + value: -0.00025729247 objectReference: {fileID: 0} - target: {fileID: 1896526759529954774, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_LocalRotation.w - value: -0.4968148 + value: -0.5772578 objectReference: {fileID: 0} - target: {fileID: 1896526759529954774, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_LocalRotation.x - value: 0.0012340097 + value: 0.0013680885 objectReference: {fileID: 0} - target: {fileID: 1896526759529954774, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_LocalRotation.y - value: -0.001466746 + value: -0.0013425219 objectReference: {fileID: 0} - target: {fileID: 1896526759529954774, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} propertyPath: m_LocalRotation.z - value: -0.86785454 + value: -0.8165597 + objectReference: {fileID: 0} + - target: {fileID: 1896526759529954774, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.216 + objectReference: {fileID: 0} + - target: {fileID: 1896526759529954774, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.039 + objectReference: {fileID: 0} + - target: {fileID: 1896526759529954774, guid: 97466f1da416f094e9e81beaab7c4853, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 109.484 objectReference: {fileID: 0} - target: {fileID: 2202585637301304456, guid: 97466f1da416f094e9e81beaab7c4853, type: 3} @@ -5165,7 +5220,7 @@ PrefabInstance: - target: {fileID: 1595984948554774838, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, type: 3} propertyPath: m_LocalPosition.z - value: -1.273 + value: -0.889 objectReference: {fileID: 0} - target: {fileID: 2369538501029799684, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, type: 3} @@ -5200,7 +5255,7 @@ PrefabInstance: - target: {fileID: 5577632863133830020, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, type: 3} propertyPath: m_Name - value: BaseSelectable + value: OfficeWorkerTable objectReference: {fileID: 0} - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, type: 3} @@ -5281,6 +5336,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 1468538265} + - targetCorrespondingSourceObject: {fileID: 8562307062121537200, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1855761223} m_SourcePrefab: {fileID: 100100000, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, type: 3} --- !u!4 &1468538261 stripped Transform: @@ -6359,6 +6418,27 @@ MonoBehaviour: m_EditorClassIdentifier: m_Weight: 1 m_Effectors: [] +--- !u!1 &1855761222 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8562307062121537200, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + m_PrefabInstance: {fileID: 1468538260} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1855761223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855761222} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70ee3205d7b15b4449cdacc7a726e220, type: 3} + m_Name: + m_EditorClassIdentifier: + _selectedObject: {fileID: 1468538265} + visualGameObjectArray: + - {fileID: 1005207436} --- !u!1 &1856998489 GameObject: m_ObjectHideFlags: 0