diff --git a/Assets/Act-3.unity b/Assets/Act-3.unity index 737497f..c7c29d7 100644 --- a/Assets/Act-3.unity +++ b/Assets/Act-3.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 5704.598, g: 5476.5903, b: 5559.2075, a: 1} + m_IndirectSpecularColor: {r: 5704.0503, g: 5476.488, b: 5554.2925, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1296,8 +1296,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ExecuteInEditor: 1 - m_Bindings: - - {fileID: 322746116} + m_Bindings: [] m_VisualEffect: {fileID: 322746119} --- !u!73398921 &322746118 VFXRenderer: @@ -1307,7 +1306,7 @@ VFXRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 322746115} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -1883,7 +1882,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ExecuteInEditor: 1 - m_Bindings: [] + m_Bindings: + - {fileID: 402486030} + - {fileID: 402486036} + - {fileID: 402486035} + - {fileID: 402486034} + - {fileID: 402486040} m_VisualEffect: {fileID: 402486033} --- !u!73398921 &402486032 VFXRenderer: @@ -1893,7 +1897,7 @@ VFXRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 402486028} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -1982,7 +1986,7 @@ VisualEffect: - m_Value: 0.05 m_Name: Turbulence Intensity m_Overridden: 1 - - m_Value: 3.94 + - m_Value: 8.19 m_Name: Turbulence Drag m_Overridden: 1 - m_Value: 0.1 @@ -2040,37 +2044,37 @@ VisualEffect: - m_Value: {x: 0.0000076293945, y: 7.0167104e-15, z: 7.0167096e-15} m_Name: Avatar_Position_angles m_Overridden: 1 - - m_Value: {x: 0.0000076293945, y: 7.0167324e-15, z: 7.016691e-15} + - m_Value: {x: 16.687815, y: 353.51944, z: 271.8279} m_Name: Avatar_RHand_angles m_Overridden: 1 - - m_Value: {x: -56.40912, y: 4.8659143, z: 40.596066} + - m_Value: {x: -57.446564, y: 4.210495, z: 37.737324} m_Name: Avatar_RHand_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_RHand_scale m_Overridden: 1 - - m_Value: {x: 0.00000079920613, y: -0.00000085377536, z: 0.0000012806603} + - m_Value: {x: 345.18158, y: 73.657074, z: 28.937296} m_Name: Avatar_LHand_angles m_Overridden: 1 - - m_Value: {x: -57.876472, y: 4.8661785, z: 40.596943} + - m_Value: {x: -57.917633, y: 4.2794337, z: 38.012947} m_Name: Avatar_LHand_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_LHand_scale m_Overridden: 1 - - m_Value: {x: 0.0000076293945, y: -4.0016466e-13, z: 9.329016e-10} + - m_Value: {x: 36.098698, y: 17.51802, z: 5.683695} m_Name: Avatar_LFoot_angles m_Overridden: 1 - - m_Value: {x: -57.257637, y: 3.5575283, z: 40.733955} + - m_Value: {x: -57.900444, y: 3.6001697, z: 38.024235} m_Name: Avatar_LFoot_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_LFoot_scale m_Overridden: 1 - - m_Value: {x: 0.000014459583, y: 1.8387572e-12, z: -0.000000005922642} + - m_Value: {x: 1.0171636, y: 33.283607, z: 3.9552004} m_Name: Avatar_RFoot_angles m_Overridden: 1 - - m_Value: {x: -57.030643, y: 3.5596564, z: 40.73985} + - m_Value: {x: -57.604168, y: 3.5840583, z: 37.906548} m_Name: Avatar_RFoot_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} @@ -2079,7 +2083,7 @@ VisualEffect: - m_Value: {x: -55.18705, y: 3.54, z: 40.65} m_Name: Center m_Overridden: 1 - - m_Value: {x: -56.86055, y: 4.15338, z: 40.818745} + - m_Value: {x: -57.353508, y: 4.0634294, z: 37.907326} m_Name: EffectorPosition m_Overridden: 1 - m_Value: {x: 0, y: 0, z: 0} @@ -2097,10 +2101,10 @@ VisualEffect: - m_Value: {x: 0, y: 1, z: 0} m_Name: Wave Offset m_Overridden: 1 - - m_Value: {x: 0.0000076293945, y: 7.0167104e-15, z: 7.0167096e-15} + - m_Value: {x: 7.146392, y: 12.960629, z: 3.0606406} m_Name: Center1_angles m_Overridden: 1 - - m_Value: {x: -57.14382, y: 4.4493146, z: 40.677822} + - m_Value: {x: -57.668106, y: 4.3591704, z: 37.87204} m_Name: Center1_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} @@ -2944,7 +2948,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ExecuteInEditor: 1 - m_Bindings: [] + m_Bindings: + - {fileID: 624892996} m_VisualEffect: {fileID: 624892999} --- !u!73398921 &624892998 VFXRenderer: @@ -2954,7 +2959,7 @@ VFXRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 624892995} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -4819,11 +4824,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ExecuteInEditor: 1 - m_Bindings: - - {fileID: 994417484} - - {fileID: 994417483} - - {fileID: 994417482} - - {fileID: 994417481} + m_Bindings: [] m_VisualEffect: {fileID: 994417487} --- !u!73398921 &994417486 VFXRenderer: @@ -4833,7 +4834,7 @@ VFXRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 994417479} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -4947,37 +4948,37 @@ VisualEffect: - m_Value: {x: 0.0000076293945, y: 7.0167104e-15, z: 7.0167096e-15} m_Name: Avatar_Position_angles m_Overridden: 1 - - m_Value: {x: 0.0000076293945, y: 7.0167324e-15, z: 7.016691e-15} + - m_Value: {x: 51.705082, y: 215.76134, z: 2.5663092} m_Name: Avatar_RHand_angles m_Overridden: 1 - - m_Value: {x: -56.40912, y: 4.8659143, z: 40.596066} + - m_Value: {x: -59.333324, y: 5.314154, z: 37.174553} m_Name: Avatar_RHand_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_RHand_scale m_Overridden: 1 - - m_Value: {x: 0.00000079920613, y: -0.00000085377536, z: 0.0000012806603} + - m_Value: {x: 322.9721, y: 61.560112, z: 282.9886} m_Name: Avatar_LHand_angles m_Overridden: 1 - - m_Value: {x: -57.876472, y: 4.8661785, z: 40.596943} + - m_Value: {x: -58.5642, y: 3.6906347, z: 35.91907} m_Name: Avatar_LHand_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_LHand_scale m_Overridden: 1 - - m_Value: {x: 0.0000076293945, y: -4.0016466e-13, z: 9.329016e-10} + - m_Value: {x: 17.470661, y: 315.79675, z: 88.659996} m_Name: Avatar_LFoot_angles m_Overridden: 1 - - m_Value: {x: -57.257637, y: 3.5575283, z: 40.733955} + - m_Value: {x: -57.872345, y: 3.0800154, z: 37.79303} m_Name: Avatar_LFoot_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_LFoot_scale m_Overridden: 1 - - m_Value: {x: 0.000014459583, y: 1.8387572e-12, z: -0.000000005922642} + - m_Value: {x: 6.4699483, y: 306.65536, z: 10.111746} m_Name: Avatar_RFoot_angles m_Overridden: 1 - - m_Value: {x: -57.030643, y: 3.5596564, z: 40.73985} + - m_Value: {x: -58.04721, y: 3.3094149, z: 39.154106} m_Name: Avatar_RFoot_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} @@ -7253,7 +7254,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ExecuteInEditor: 1 - m_Bindings: [] + m_Bindings: + - {fileID: 1784750459} + - {fileID: 1784750458} + - {fileID: 1784750457} + - {fileID: 1784750456} + - {fileID: 1784750454} m_VisualEffect: {fileID: 1784750463} --- !u!73398921 &1784750461 VFXRenderer: @@ -7263,7 +7269,7 @@ VFXRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1784750452} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -7427,37 +7433,37 @@ VisualEffect: - m_Value: {x: 0.0000076293945, y: 7.0167104e-15, z: 7.0167096e-15} m_Name: Avatar_Position_angles m_Overridden: 1 - - m_Value: {x: 0.0000076293945, y: 7.0167324e-15, z: 7.016691e-15} + - m_Value: {x: 16.687815, y: 353.51944, z: 271.8279} m_Name: Avatar_RHand_angles m_Overridden: 1 - - m_Value: {x: -56.40912, y: 4.8659143, z: 40.596066} + - m_Value: {x: -57.446564, y: 4.210495, z: 37.737324} m_Name: Avatar_RHand_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_RHand_scale m_Overridden: 1 - - m_Value: {x: 0.00000079920613, y: -0.00000085377536, z: 0.0000012806603} + - m_Value: {x: 345.18158, y: 73.657074, z: 28.937296} m_Name: Avatar_LHand_angles m_Overridden: 1 - - m_Value: {x: -57.876472, y: 4.8661785, z: 40.596943} + - m_Value: {x: -57.917633, y: 4.2794337, z: 38.012947} m_Name: Avatar_LHand_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_LHand_scale m_Overridden: 1 - - m_Value: {x: 0.0000076293945, y: -4.0016466e-13, z: 9.329016e-10} + - m_Value: {x: 36.098698, y: 17.51802, z: 5.683695} m_Name: Avatar_LFoot_angles m_Overridden: 1 - - m_Value: {x: -57.257637, y: 3.5575283, z: 40.733955} + - m_Value: {x: -57.900444, y: 3.6001697, z: 38.024235} m_Name: Avatar_LFoot_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_LFoot_scale m_Overridden: 1 - - m_Value: {x: 0.000014459583, y: 1.8387572e-12, z: -0.000000005922642} + - m_Value: {x: 1.0171636, y: 33.283607, z: 3.9552004} m_Name: Avatar_RFoot_angles m_Overridden: 1 - - m_Value: {x: -57.030643, y: 3.5596564, z: 40.73985} + - m_Value: {x: -57.604168, y: 3.5840583, z: 37.906548} m_Name: Avatar_RFoot_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} @@ -7466,7 +7472,7 @@ VisualEffect: - m_Value: {x: -55.18705, y: 3.54, z: 40.65} m_Name: Center m_Overridden: 1 - - m_Value: {x: -56.86055, y: 4.15338, z: 40.818745} + - m_Value: {x: -57.353508, y: 4.0634294, z: 37.907326} m_Name: EffectorPosition m_Overridden: 1 - m_Value: {x: 0, y: 0, z: 0} @@ -7484,10 +7490,10 @@ VisualEffect: - m_Value: {x: 0, y: 1, z: 0} m_Name: Wave Offset m_Overridden: 1 - - m_Value: {x: 0.0000076293945, y: 7.0167104e-15, z: 7.0167096e-15} + - m_Value: {x: 7.146392, y: 12.960629, z: 3.0606406} m_Name: Center1_angles m_Overridden: 1 - - m_Value: {x: -57.14382, y: 4.4493146, z: 40.677822} + - m_Value: {x: -57.668106, y: 4.3591704, z: 37.87204} m_Name: Center1_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} @@ -10789,7 +10795,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ExecuteInEditor: 1 - m_Bindings: [] + m_Bindings: + - {fileID: 6838811691639781629} m_VisualEffect: {fileID: 6838811691639781632} --- !u!73398921 &6838811691639781631 VFXRenderer: @@ -10799,7 +10806,7 @@ VFXRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 919132147822999300} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 0 m_DynamicOccludee: 1 diff --git a/Assets/Animations/Act-3/ForestVFX.anim b/Assets/Animations/Act-3/ForestVFX.anim index b603cbe..07a5a9a 100644 --- a/Assets/Animations/Act-3/ForestVFX.anim +++ b/Assets/Animations/Act-3/ForestVFX.anim @@ -31,7 +31,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 120.683334 value: 0 inSlope: 0 outSlope: 0 @@ -40,7 +40,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 261.3 + time: 121.683334 value: 0 inSlope: 0 outSlope: 0 @@ -49,7 +49,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 331.4 + time: 381.98334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 452.08334 value: 1 inSlope: 0 outSlope: 0 @@ -58,7 +67,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 351.64716 + time: 472.33334 value: 0 inSlope: 0 outSlope: 0 @@ -67,7 +76,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 752.26666 + time: 872.95 value: 0 inSlope: 0 outSlope: 0 @@ -97,7 +106,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 120.683334 value: 0 inSlope: 0 outSlope: 0 @@ -106,7 +115,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 261.3 + time: 121.683334 value: 0 inSlope: 0 outSlope: 0 @@ -115,7 +124,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 303.63333 + time: 381.98334 value: 0 inSlope: 0 outSlope: 0 @@ -124,7 +133,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 752.26666 + time: 424.31668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 872.95 value: 0 inSlope: 0 outSlope: 0 @@ -154,7 +172,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 120.683334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 121.683334 value: 1 inSlope: 0 outSlope: 0 @@ -163,7 +190,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 261.3 + time: 381.98334 value: 0.72304153 inSlope: -0.00030479915 outSlope: -0.00030479915 @@ -172,7 +199,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 303.38333 + time: 424.06668 value: 0.7 inSlope: 0 outSlope: 0 @@ -202,7 +229,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 120.683334 value: 20 inSlope: 0 outSlope: 0 @@ -211,7 +238,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 261.3 + time: 121.683334 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 381.98334 value: 0 inSlope: 0 outSlope: 0 @@ -220,16 +256,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 303.38333 + time: 424.06668 value: 10 - inSlope: 0.21444628 - outSlope: 0.21444628 + inSlope: 0.21444637 + outSlope: 0.21444637 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 328.73334 + time: 449.41666 value: 14.460831 inSlope: 0 outSlope: 0 @@ -238,7 +274,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 352.18332 + time: 472.86667 value: 1.79 inSlope: 0 outSlope: 0 @@ -259,7 +295,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 1 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -268,7 +304,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 262.53333 + time: 121.683334 value: 0 inSlope: 0 outSlope: 0 @@ -277,7 +313,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 307.01666 + time: 383.21667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 427.7 value: 3 inSlope: 0 outSlope: 0 @@ -286,7 +331,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 314.5 + time: 435.18332 value: 0 inSlope: 0 outSlope: 0 @@ -316,7 +361,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 314.8 + time: 120.683334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 435.48334 value: 1 inSlope: 0 outSlope: 0 @@ -338,7 +392,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -346,7 +400,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 120.683334 value: 0 inSlope: 0 outSlope: 0 @@ -355,7 +409,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 262.53333 + time: 121.683334 value: 0 inSlope: 0 outSlope: 0 @@ -364,7 +418,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 326.16666 + time: 383.21667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 446.85 value: 0.13 inSlope: 0 outSlope: 0 @@ -373,7 +436,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 348.28333 + time: 468.96667 value: 0.13 inSlope: 0 outSlope: 0 @@ -382,7 +445,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 353.41666 + time: 474.1 value: 0 inSlope: 0 outSlope: 0 @@ -412,7 +475,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 345.38333 + time: 120.683334 + value: 5000000 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 466.06668 value: 5000000 inSlope: 0 outSlope: 0 @@ -421,7 +493,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 351.43332 + time: 472.11667 value: 0 inSlope: 0 outSlope: 0 @@ -523,7 +595,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 752.26666 + m_StopTime: 872.95 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -553,7 +625,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 120.683334 value: 0 inSlope: 0 outSlope: 0 @@ -562,7 +634,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 261.3 + time: 121.683334 value: 0 inSlope: 0 outSlope: 0 @@ -571,7 +643,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 331.4 + time: 381.98334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 452.08334 value: 1 inSlope: 0 outSlope: 0 @@ -580,7 +661,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 351.64716 + time: 472.33334 value: 0 inSlope: 0 outSlope: 0 @@ -589,7 +670,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 752.26666 + time: 872.95 value: 0 inSlope: 0 outSlope: 0 @@ -619,7 +700,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 120.683334 value: 0 inSlope: 0 outSlope: 0 @@ -628,7 +709,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 261.3 + time: 121.683334 value: 0 inSlope: 0 outSlope: 0 @@ -637,7 +718,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 303.63333 + time: 381.98334 value: 0 inSlope: 0 outSlope: 0 @@ -646,7 +727,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 752.26666 + time: 424.31668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 872.95 value: 0 inSlope: 0 outSlope: 0 @@ -676,7 +766,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 120.683334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 121.683334 value: 1 inSlope: 0 outSlope: 0 @@ -685,7 +784,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 261.3 + time: 381.98334 value: 0.72304153 inSlope: -0.00030479915 outSlope: -0.00030479915 @@ -694,7 +793,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 303.38333 + time: 424.06668 value: 0.7 inSlope: 0 outSlope: 0 @@ -724,7 +823,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 120.683334 value: 20 inSlope: 0 outSlope: 0 @@ -733,7 +832,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 261.3 + time: 121.683334 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 381.98334 value: 0 inSlope: 0 outSlope: 0 @@ -742,16 +850,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 303.38333 + time: 424.06668 value: 10 - inSlope: 0.21444628 - outSlope: 0.21444628 + inSlope: 0.21444637 + outSlope: 0.21444637 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 328.73334 + time: 449.41666 value: 14.460831 inSlope: 0 outSlope: 0 @@ -760,7 +868,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 352.18332 + time: 472.86667 value: 1.79 inSlope: 0 outSlope: 0 @@ -781,7 +889,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 1 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -790,7 +898,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 262.53333 + time: 121.683334 value: 0 inSlope: 0 outSlope: 0 @@ -799,7 +907,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 307.01666 + time: 383.21667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 427.7 value: 3 inSlope: 0 outSlope: 0 @@ -808,7 +925,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 314.5 + time: 435.18332 value: 0 inSlope: 0 outSlope: 0 @@ -838,7 +955,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 314.8 + time: 120.683334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 435.48334 value: 1 inSlope: 0 outSlope: 0 @@ -860,7 +986,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -868,7 +994,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 120.683334 value: 0 inSlope: 0 outSlope: 0 @@ -877,7 +1003,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 262.53333 + time: 121.683334 value: 0 inSlope: 0 outSlope: 0 @@ -886,7 +1012,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 326.16666 + time: 383.21667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 446.85 value: 0.13 inSlope: 0 outSlope: 0 @@ -895,7 +1030,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 348.28333 + time: 468.96667 value: 0.13 inSlope: 0 outSlope: 0 @@ -904,7 +1039,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 353.41666 + time: 474.1 value: 0 inSlope: 0 outSlope: 0 @@ -934,7 +1069,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 345.38333 + time: 120.683334 + value: 5000000 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 466.06668 value: 5000000 inSlope: 0 outSlope: 0 @@ -943,7 +1087,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 351.43332 + time: 472.11667 value: 0 inSlope: 0 outSlope: 0 diff --git a/Assets/Animations/ForestCamera.anim b/Assets/Animations/ForestCamera.anim index 96a96c8..8addedc 100644 --- a/Assets/Animations/ForestCamera.anim +++ b/Assets/Animations/ForestCamera.anim @@ -23,6 +23,15 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.02 value: 1 inSlope: Infinity outSlope: Infinity @@ -141,6 +150,24 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 23.44 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 27.36 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 46.716667 value: 0 @@ -207,15 +234,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 23.433332 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - serializedVersion: 3 time: 27.35 value: 0 @@ -897,6 +915,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 185.04 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 191.61667 value: 0 @@ -1199,6 +1226,15 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.02 value: 1 inSlope: Infinity outSlope: Infinity @@ -1317,6 +1353,24 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 23.44 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 27.36 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 46.716667 value: 0 @@ -1383,15 +1437,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 23.433332 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - serializedVersion: 3 time: 27.35 value: 0 @@ -2073,6 +2118,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 185.04 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 191.61667 value: 0 diff --git a/Assets/Mocap/Act-3/1_Wave/3/Waves_03.fbx.meta b/Assets/Mocap/Act-3/1_Wave/3/Waves_03.fbx.meta index 828b329..7ff69db 100644 --- a/Assets/Mocap/Act-3/1_Wave/3/Waves_03.fbx.meta +++ b/Assets/Mocap/Act-3/1_Wave/3/Waves_03.fbx.meta @@ -33,10 +33,10 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: Armature.001|wave_003_chr02_remap + name: Wave_03 takeName: Armature.001|wave_003_chr02_remap internalID: 7367129674682746216 - firstFrame: 0 + firstFrame: 15 lastFrame: 24826 wrapMode: 0 orientationOffsetY: 0 diff --git a/Assets/Timeline/Timeline_Act-3.playable b/Assets/Timeline/Timeline_Act-3.playable index 25dc73a..116b671 100644 --- a/Assets/Timeline/Timeline_Act-3.playable +++ b/Assets/Timeline/Timeline_Act-3.playable @@ -49,6 +49,29 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &-7425482069381130582 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3} + m_Name: 1_Wave + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: [] + m_Markers: + m_Objects: [] --- !u!114 &-7386935002846153082 MonoBehaviour: m_ObjectHideFlags: 1 @@ -74,7 +97,7 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: 3118240297865946232} - m_Duration: 357.372737596035 + m_Duration: 477.372737596035 m_TimeScale: 1 m_ParentTrack: {fileID: -7386935002846153082} m_EaseInDuration: 0 @@ -164,7 +187,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0 + m_Start: 120 m_ClipIn: 0 m_Asset: {fileID: -7592605335208407247} m_Duration: 442 @@ -230,7 +253,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 0 + m_PreExtrapolationTime: 120 m_DisplayName: RainVFX m_Markers: m_Objects: [] @@ -274,7 +297,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 370.84 + m_Start: 490.84 m_ClipIn: 0 m_Asset: {fileID: -2818861152549081936} m_Duration: 68.96666666666667 @@ -340,7 +363,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 370.84 + m_PreExtrapolationTime: 490.84 m_DisplayName: RainCamera m_Markers: m_Objects: [] @@ -374,6 +397,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: +--- !u!114 &-3564566744382150811 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3} + m_Name: AnimationPlayableAsset + m_EditorClassIdentifier: + m_Clip: {fileID: 7367129674682746216, guid: b4a7f49b87b200e4ca219e27aa9de13d, type: 3} + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_UseTrackMatchFields: 1 + m_MatchTargetFields: 63 + m_RemoveStartOffset: 1 + m_ApplyFootIK: 1 + m_Loop: 0 + m_Version: 1 + m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &-3204762823092263369 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3} + m_Name: AnimationPlayableAsset(Clone) + m_EditorClassIdentifier: + m_Clip: {fileID: 7367129674682746216, guid: b4a7f49b87b200e4ca219e27aa9de13d, type: 3} + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_UseTrackMatchFields: 1 + m_MatchTargetFields: 63 + m_RemoveStartOffset: 1 + m_ApplyFootIK: 1 + m_Loop: 0 + m_Version: 1 + m_Rotation: {x: 0, y: 0, z: 0, w: 1} --- !u!114 &-3107550097849730194 MonoBehaviour: m_ObjectHideFlags: 1 @@ -396,7 +463,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0 + m_Start: 120 m_ClipIn: 0 m_Asset: {fileID: 5886879004025118602} m_Duration: 274.1723689765875 @@ -462,7 +529,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 0 + m_PreExtrapolationTime: 120 m_DisplayName: New Animation m_Markers: m_Objects: [] @@ -540,7 +607,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 260.75 + m_Start: 380.74999999999994 m_ClipIn: 0 m_Asset: {fileID: 6145864015414691018} m_Duration: 181.25 @@ -606,7 +673,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 260.75 + m_PreExtrapolationTime: 380.74999999999994 m_DisplayName: Scaler_1 m_Markers: m_Objects: [] @@ -650,7 +717,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0 + m_Start: 120 m_ClipIn: 0 m_Asset: {fileID: 8519552782111419857} m_Duration: 274.1723689765875 @@ -716,7 +783,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 0 + m_PreExtrapolationTime: 120 m_DisplayName: ActionCamera m_Markers: m_Objects: [] @@ -784,6 +851,7 @@ MonoBehaviour: - {fileID: 2473529526698824547} - {fileID: -419457854300647495} - {fileID: 1349503484654777824} + - {fileID: -7425482069381130582} m_FixedDuration: 498.57382524790796 m_EditorSettings: m_Framerate: 50 @@ -812,7 +880,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 353.78 + m_Start: 473.7799999999999 m_ClipIn: 0 m_Asset: {fileID: -2979222298370509899} m_Duration: 244.200016123124 @@ -905,7 +973,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 260.81666666666666 + m_Start: 380.81666666666666 m_ClipIn: 10.173793001659192 m_Asset: {fileID: 2319682401240640659} m_Duration: 181.18333333333334 @@ -971,7 +1039,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 260.81666666666666 + m_PreExtrapolationTime: 380.81666666666666 m_DisplayName: Celestial_04 m_Markers: m_Objects: [] @@ -1037,7 +1105,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 260.75 + m_Start: 380.74999999999994 m_ClipIn: 0 m_Asset: {fileID: -3732194075671857097} m_Duration: 110.14999999999998 @@ -1130,7 +1198,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 260.75 + m_Start: 380.74999999999994 m_ClipIn: 0 m_Asset: {fileID: 7635435063596826306} m_Duration: 181.25 @@ -1196,7 +1264,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 260.75 + m_PreExtrapolationTime: 380.74999999999994 m_DisplayName: Scaler_1 m_Markers: m_Objects: [] @@ -1268,7 +1336,7 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: 3068492762530256040} - m_Duration: 357.372737596035 + m_Duration: 477.372737596035 m_TimeScale: 1 m_ParentTrack: {fileID: 1600104813654549158} m_EaseInDuration: 0 @@ -1378,7 +1446,7 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: 6655884608388458675} - m_Duration: 350.88 + m_Duration: 470.98 m_TimeScale: 1 m_ParentTrack: {fileID: 2247824736269328672} m_EaseInDuration: 0 @@ -1519,7 +1587,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 343.86 + m_Start: 463.85999999999996 m_ClipIn: 42.839999999999975 m_Asset: {fileID: 7712334628637458472} m_Duration: 98.13999999999999 @@ -1585,7 +1653,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 343.86 + m_PreExtrapolationTime: 463.85999999999996 m_DisplayName: Rain_02 m_Markers: m_Objects: [] @@ -1685,7 +1753,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 343.86 + m_Start: 463.85999999999996 m_ClipIn: 0 m_Asset: {fileID: 8241874687516542759} m_Duration: 98.13999999999999 @@ -1778,7 +1846,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 260.75 + m_Start: 380.74999999999994 m_ClipIn: 0 m_Asset: {fileID: 6697501090524896331} m_Duration: 90.13 @@ -1915,7 +1983,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 260.75 + m_Start: 380.74999999999994 m_ClipIn: 0 m_Asset: {fileID: 732666395255865865} m_Duration: 110.29000000000002 @@ -1981,7 +2049,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 260.75 + m_PreExtrapolationTime: 380.74999999999994 m_DisplayName: Celestial_Camera m_Markers: m_Objects: [] @@ -2003,6 +2071,28 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!114 &6510936041366241059 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3} + m_Name: AnimationPlayableAsset(Clone) + m_EditorClassIdentifier: + m_Clip: {fileID: 7367129674682746216, guid: b4a7f49b87b200e4ca219e27aa9de13d, type: 3} + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_UseTrackMatchFields: 1 + m_MatchTargetFields: 63 + m_RemoveStartOffset: 1 + m_ApplyFootIK: 1 + m_Loop: 0 + m_Version: 1 + m_Rotation: {x: 0, y: 0, z: 0, w: 1} --- !u!114 &6655884608388458675 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2105,7 +2195,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0 + m_Start: 120 m_ClipIn: 0 m_Asset: {fileID: 2582463008070874236} m_Duration: 260.81666666666666 @@ -2117,25 +2207,7 @@ MonoBehaviour: m_BlendOutDuration: -1 m_MixInCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2156,7 +2228,7 @@ MonoBehaviour: m_PreExtrapolationTime: 0 m_DisplayName: Forest_01 - m_Version: 1 - m_Start: 260.81666666666666 + m_Start: 380.81666666666666 m_ClipIn: 10.173793001659192 m_Asset: {fileID: 8571807166900324300} m_Duration: 227.58336557958194 @@ -2168,49 +2240,13 @@ MonoBehaviour: m_BlendOutDuration: -1 m_MixInCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 m_MixOutCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2224,6 +2260,105 @@ MonoBehaviour: m_PostExtrapolationTime: Infinity m_PreExtrapolationTime: 0 m_DisplayName: Celestial_04 + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: -3204762823092263369} + m_Duration: 34.75999999999999 + m_TimeScale: 1 + m_ParentTrack: {fileID: 8310784043916664888} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: 0 + m_MixInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 1 + m_PreExtrapolationMode: 1 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Wave_03 + - m_Version: 1 + m_Start: 34.759999999999984 + m_ClipIn: 67.84000000000003 + m_Asset: {fileID: 6510936041366241059} + m_Duration: 49.37999999999989 + m_TimeScale: 1 + m_ParentTrack: {fileID: 8310784043916664888} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: 0 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 1 + m_PreExtrapolationMode: 1 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Wave_03 + - m_Version: 1 + m_Start: 84.13999999999987 + m_ClipIn: 165.55999999999995 + m_Asset: {fileID: -3564566744382150811} + m_Duration: 35.86000000000013 + m_TimeScale: 1 + m_ParentTrack: {fileID: 8310784043916664888} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 + m_MixInCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_MixOutCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_BlendInCurveMode: 0 + m_BlendOutCurveMode: 0 + m_ExposedParameterNames: [] + m_AnimationCurves: {fileID: 0} + m_Recordable: 0 + m_PostExtrapolationMode: 1 + m_PreExtrapolationMode: 1 + m_PostExtrapolationTime: 0 + m_PreExtrapolationTime: 0 + m_DisplayName: Wave_03 m_Markers: m_Objects: [] m_InfiniteClipPreExtrapolation: 0 diff --git a/Assets/VFX/PointCloud.vfx b/Assets/VFX/PointCloud.vfx index 80144f0..3ee5a4f 100644 --- a/Assets/VFX/PointCloud.vfx +++ b/Assets/VFX/PointCloud.vfx @@ -4841,7 +4841,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: True + m_SerializableObject: False m_Space: 2147483647 m_Property: name: _vfx_enabled @@ -6126,7 +6126,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: False + m_SerializableObject: True m_Space: 2147483647 m_Property: name: _vfx_enabled diff --git a/Packages/manifest.json b/Packages/manifest.json index 5f3bc60..0a32a46 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,7 +5,6 @@ "com.unity.recorder": "4.0.1", "com.unity.render-pipelines.high-definition": "14.0.8", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.8.0", "jp.keijiro.klak.ndi": "2.1.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 923f687..b0601e7 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -191,8 +191,8 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.6", - "depth": 0, + "version": "1.7.5", + "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.director": "1.0.0",