From dd7fa022735fdec12a495cd6cddedb73f9b1b169 Mon Sep 17 00:00:00 2001 From: unknown <john.schihada@hotmail.com> Date: Fri, 20 Nov 2020 12:34:51 +0100 Subject: [PATCH] Fixed highlighting/animation bug --- .../AngleFactAnimation/MakeNormal.anim | 87 +++++- .../AngleFactAnimation/MakeRed.anim | 189 ++++++++---- .../AngleFactAnimation/Pulsating.anim | 93 +++++- Assets/Animations/PointFact/MakeNormal.anim | 285 +++--------------- Assets/Animations/PointFact/MakeRed.anim | 281 +++-------------- Assets/Animations/PointFact/Pulsating.anim | 281 +++-------------- Assets/Materials/PointMaterial.mat | 2 +- Assets/Resources/Prefabs/Sphere.prefab | 94 ++++++ Assets/Scenes/TreeWorld_02.unity | 9 + 9 files changed, 523 insertions(+), 798 deletions(-) diff --git a/Assets/Animations/AngleFactAnimation/MakeNormal.anim b/Assets/Animations/AngleFactAnimation/MakeNormal.anim index 8409cb1a..2c845c6e 100644 --- a/Assets/Animations/AngleFactAnimation/MakeNormal.anim +++ b/Assets/Animations/AngleFactAnimation/MakeNormal.anim @@ -22,7 +22,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9787419 + value: 0.99216 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -31,7 +31,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.99216 + value: 0.9787419 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -50,7 +50,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.990566 + value: 0.101 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -59,7 +59,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.101 + value: 0.990566 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -106,7 +106,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4 + value: 0.6274 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -115,7 +115,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.6274 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -129,6 +129,34 @@ AnimationClip: path: AngleInner classID: 23 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2000 + inSlope: 2000 + outSlope: 1000 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 3000 + inSlope: 1000 + outSlope: 2000 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_RendererPriority + path: AngleInner + classID: 23 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -158,6 +186,13 @@ AnimationClip: typeID: 23 customType: 22 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2726337748 + attribute: 1232391921 + script: {fileID: 0} + typeID: 23 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2726337748 attribute: 1840221041 @@ -192,7 +227,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9787419 + value: 0.99216 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -201,7 +236,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.99216 + value: 0.9787419 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -220,7 +255,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.990566 + value: 0.101 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -229,7 +264,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.101 + value: 0.990566 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -276,7 +311,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4 + value: 0.6274 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -285,7 +320,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.6274 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -299,6 +334,34 @@ AnimationClip: path: AngleInner classID: 23 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2000 + inSlope: 2000 + outSlope: 1000 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 3000 + inSlope: 1000 + outSlope: 2000 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_RendererPriority + path: AngleInner + classID: 23 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/AngleFactAnimation/MakeRed.anim b/Assets/Animations/AngleFactAnimation/MakeRed.anim index 59fe1f8c..811e643c 100644 --- a/Assets/Animations/AngleFactAnimation/MakeRed.anim +++ b/Assets/Animations/AngleFactAnimation/MakeRed.anim @@ -22,7 +22,35 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9056604 + value: 2000 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 2000 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_RendererPriority + path: AngleInner + classID: 23 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9787419 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -31,7 +59,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.992 + value: 0.99216 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -41,16 +69,16 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.r - path: - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + attribute: material._Color.r + path: AngleInner + classID: 23 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.8992144 + value: 0.990566 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -69,16 +97,16 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.g - path: - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + attribute: material._Color.g + path: AngleInner + classID: 23 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.004271993 + value: 0.032707386 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -87,7 +115,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.0327 + value: 0.032707386 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -97,16 +125,16 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.b - path: - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + attribute: material._Color.b + path: AngleInner + classID: 23 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.21568628 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -125,10 +153,10 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.a - path: - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + attribute: material._Color.a + path: AngleInner + classID: 23 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -138,33 +166,40 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 - attribute: 2526845255 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 + path: 2726337748 + attribute: 1303350129 + script: {fileID: 0} + typeID: 23 + customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 0 - attribute: 4215373228 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 + path: 2726337748 + attribute: 1571785585 + script: {fileID: 0} + typeID: 23 + customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 0 - attribute: 2334886179 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 - customType: 0 + path: 2726337748 + attribute: 2108656497 + script: {fileID: 0} + typeID: 23 + customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 0 - attribute: 304273561 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - typeID: 114 + path: 2726337748 + attribute: 1232391921 + script: {fileID: 0} + typeID: 23 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2726337748 + attribute: 1840221041 + script: {fileID: 0} + typeID: 23 + customType: 22 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -192,7 +227,35 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9056604 + value: 2000 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 2000 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_RendererPriority + path: AngleInner + classID: 23 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9787419 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -201,7 +264,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.992 + value: 0.99216 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -211,16 +274,16 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.r - path: - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + attribute: material._Color.r + path: AngleInner + classID: 23 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.8992144 + value: 0.990566 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -239,16 +302,16 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.g - path: - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + attribute: material._Color.g + path: AngleInner + classID: 23 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.004271993 + value: 0.032707386 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -257,7 +320,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.0327 + value: 0.032707386 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -267,16 +330,16 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.b - path: - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + attribute: material._Color.b + path: AngleInner + classID: 23 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.21568628 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -295,10 +358,10 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Color.a - path: - classID: 114 - script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + attribute: material._Color.a + path: AngleInner + classID: 23 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/AngleFactAnimation/Pulsating.anim b/Assets/Animations/AngleFactAnimation/Pulsating.anim index c822f505..7cf7b5e9 100644 --- a/Assets/Animations/AngleFactAnimation/Pulsating.anim +++ b/Assets/Animations/AngleFactAnimation/Pulsating.anim @@ -22,7 +22,35 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.99215686 + value: 2000 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 2000 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_RendererPriority + path: AngleInner + classID: 23 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9787419 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -31,7 +59,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.99215686 + value: 0.99216 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -50,7 +78,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.101960786 + value: 0.990566 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -59,7 +87,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.101960786 + value: 0.101 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -106,7 +134,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.627451 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -115,7 +143,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.19607843 + value: 0.6274 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -139,25 +167,32 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 2726337748 - attribute: 2108656497 + attribute: 1303350129 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 path: 2726337748 - attribute: 1303350129 + attribute: 1571785585 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 path: 2726337748 - attribute: 1571785585 + attribute: 2108656497 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2726337748 + attribute: 1232391921 + script: {fileID: 0} + typeID: 23 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2726337748 attribute: 1840221041 @@ -192,7 +227,35 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.99215686 + value: 2000 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 2000 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_RendererPriority + path: AngleInner + classID: 23 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9787419 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -201,7 +264,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.99215686 + value: 0.99216 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -220,7 +283,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.101960786 + value: 0.990566 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -229,7 +292,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.101960786 + value: 0.101 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -276,7 +339,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.627451 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -285,7 +348,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.19607843 + value: 0.6274 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/PointFact/MakeNormal.anim b/Assets/Animations/PointFact/MakeNormal.anim index 142d29ad..4bff25aa 100644 --- a/Assets/Animations/PointFact/MakeNormal.anim +++ b/Assets/Animations/PointFact/MakeNormal.anim @@ -31,7 +31,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.9787 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -42,7 +42,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.r - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -59,7 +59,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.9905 + value: 0.2349 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -70,7 +70,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.g - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -87,7 +87,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.0327 + value: 0.9717 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -98,7 +98,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.b - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -115,7 +115,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.4 + value: 0.11373 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -126,7 +126,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.a - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -134,111 +134,27 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.99216 + value: 2000 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: 1000 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.9787 - inSlope: 0 + value: 3000 + inSlope: 1000 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._Color.r - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.101 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.9905 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.g - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.b - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.6274 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.a - path: Sphere + attribute: m_RendererPriority + path: SphereAnimate classID: 23 script: {fileID: 0} m_PPtrCurves: [] @@ -250,60 +166,39 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 1651653052 + path: 3062612795 attribute: 1303350129 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1651653052 + path: 3062612795 attribute: 1571785585 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1651653052 - attribute: 2108656497 - script: {fileID: 0} - typeID: 23 - customType: 22 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1381327793 - attribute: 1303350129 - script: {fileID: 0} - typeID: 23 - customType: 22 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1381327793 - attribute: 1571785585 + path: 3062612795 + attribute: 1840221041 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1381327793 + path: 3062612795 attribute: 2108656497 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1651653052 - attribute: 1840221041 + path: 3062612795 + attribute: 1232391921 script: {fileID: 0} typeID: 23 - customType: 22 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1381327793 - attribute: 1840221041 - script: {fileID: 0} - typeID: 23 - customType: 22 + customType: 0 isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: @@ -341,7 +236,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.9787 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -352,7 +247,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.r - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -369,7 +264,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.9905 + value: 0.2349 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -380,7 +275,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.g - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -397,7 +292,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.0327 + value: 0.9717 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -408,7 +303,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.b - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -425,7 +320,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.4 + value: 0.11373 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -436,7 +331,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.a - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -444,111 +339,27 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.99216 + value: 2000 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: 1000 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.9787 - inSlope: 0 + value: 3000 + inSlope: 1000 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._Color.r - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.101 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.9905 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.g - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.b - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.6274 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.a - path: Sphere + attribute: m_RendererPriority + path: SphereAnimate classID: 23 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Animations/PointFact/MakeRed.anim b/Assets/Animations/PointFact/MakeRed.anim index 8409b46c..839894fd 100644 --- a/Assets/Animations/PointFact/MakeRed.anim +++ b/Assets/Animations/PointFact/MakeRed.anim @@ -22,7 +22,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9787 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -42,7 +42,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.r - path: Sphere + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -50,7 +50,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9905 + value: 0.23494856 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -70,7 +70,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.g - path: Sphere + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -78,7 +78,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.0327 + value: 0.9716981 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -98,7 +98,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.b - path: Sphere + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -106,7 +106,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4 + value: 0.11372549 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -126,91 +126,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.a - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9787 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.99216 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.r - path: Cylinder - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9905 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.101 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.g - path: Cylinder - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.b - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -218,27 +134,27 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4 + value: 2000 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.6274 - inSlope: 0 + value: 2000 + inSlope: -0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._Color.a - path: Cylinder + attribute: m_RendererPriority + path: SphereAnimate classID: 23 script: {fileID: 0} m_PPtrCurves: [] @@ -250,60 +166,39 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 1381327793 + path: 3062612795 attribute: 1303350129 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1381327793 + path: 3062612795 attribute: 1571785585 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1381327793 - attribute: 2108656497 - script: {fileID: 0} - typeID: 23 - customType: 22 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1651653052 - attribute: 1303350129 - script: {fileID: 0} - typeID: 23 - customType: 22 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1651653052 - attribute: 1571785585 + path: 3062612795 + attribute: 1840221041 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1651653052 + path: 3062612795 attribute: 2108656497 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1381327793 - attribute: 1840221041 + path: 3062612795 + attribute: 1232391921 script: {fileID: 0} typeID: 23 - customType: 22 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1651653052 - attribute: 1840221041 - script: {fileID: 0} - typeID: 23 - customType: 22 + customType: 0 isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: @@ -332,7 +227,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9787 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -352,7 +247,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.r - path: Sphere + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -360,7 +255,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9905 + value: 0.23494856 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -380,7 +275,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.g - path: Sphere + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -388,7 +283,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.0327 + value: 0.9716981 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -408,7 +303,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.b - path: Sphere + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -416,7 +311,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4 + value: 0.11372549 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -436,91 +331,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.a - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9787 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.99216 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.r - path: Cylinder - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9905 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.101 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.g - path: Cylinder - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.b - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -528,27 +339,27 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4 + value: 2000 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.6274 - inSlope: 0 + value: 2000 + inSlope: -0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._Color.a - path: Cylinder + attribute: m_RendererPriority + path: SphereAnimate classID: 23 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Animations/PointFact/Pulsating.anim b/Assets/Animations/PointFact/Pulsating.anim index 6da39e47..8e3f5f38 100644 --- a/Assets/Animations/PointFact/Pulsating.anim +++ b/Assets/Animations/PointFact/Pulsating.anim @@ -22,7 +22,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9787 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -42,7 +42,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.r - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -50,7 +50,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9905 + value: 0.23494856 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -70,7 +70,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.g - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -78,7 +78,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.0327 + value: 0.9716981 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -98,7 +98,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.b - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -106,7 +106,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4 + value: 0.11372549 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -126,91 +126,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.a - path: Cylinder - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9787 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.99216 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.r - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9905 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.101 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.g - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.b - path: Sphere + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -218,27 +134,27 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4 + value: 2000 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.6274 - inSlope: 0 + value: 2000 + inSlope: -0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._Color.a - path: Sphere + attribute: m_RendererPriority + path: SphereAnimate classID: 23 script: {fileID: 0} m_PPtrCurves: [] @@ -250,60 +166,39 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 1651653052 + path: 3062612795 attribute: 1303350129 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1651653052 + path: 3062612795 attribute: 1571785585 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1651653052 - attribute: 2108656497 - script: {fileID: 0} - typeID: 23 - customType: 22 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1381327793 - attribute: 1303350129 - script: {fileID: 0} - typeID: 23 - customType: 22 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1381327793 - attribute: 1571785585 + path: 3062612795 + attribute: 1840221041 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1381327793 + path: 3062612795 attribute: 2108656497 script: {fileID: 0} typeID: 23 customType: 22 isPPtrCurve: 0 - serializedVersion: 2 - path: 1651653052 - attribute: 1840221041 + path: 3062612795 + attribute: 1232391921 script: {fileID: 0} typeID: 23 - customType: 22 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1381327793 - attribute: 1840221041 - script: {fileID: 0} - typeID: 23 - customType: 22 + customType: 0 isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: @@ -332,7 +227,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9787 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -352,7 +247,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.r - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -360,7 +255,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9905 + value: 0.23494856 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -380,7 +275,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.g - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -388,7 +283,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.0327 + value: 0.9716981 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -408,7 +303,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.b - path: Cylinder + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -416,7 +311,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4 + value: 0.11372549 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -436,91 +331,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: material._Color.a - path: Cylinder - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9787 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.99216 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.r - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9905 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.101 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.g - path: Sphere - classID: 23 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.0327 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Color.b - path: Sphere + path: SphereAnimate classID: 23 script: {fileID: 0} - curve: @@ -528,27 +339,27 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.4 + value: 2000 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.6274 - inSlope: 0 + value: 2000 + inSlope: -0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._Color.a - path: Sphere + attribute: m_RendererPriority + path: SphereAnimate classID: 23 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Materials/PointMaterial.mat b/Assets/Materials/PointMaterial.mat index 556feb8d..ffab6518 100644 --- a/Assets/Materials/PointMaterial.mat +++ b/Assets/Materials/PointMaterial.mat @@ -79,5 +79,5 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 0.84705883} + - _Color: {r: 253, g: 249, b: 0, a: 216} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Resources/Prefabs/Sphere.prefab b/Assets/Resources/Prefabs/Sphere.prefab index 1dfc9bc2..a38211a7 100644 --- a/Assets/Resources/Prefabs/Sphere.prefab +++ b/Assets/Resources/Prefabs/Sphere.prefab @@ -35,6 +35,7 @@ Transform: - {fileID: 338274751687282010} - {fileID: 5939570736350582895} - {fileID: 206589483256967431} + - {fileID: 1665942822042087142} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -349,6 +350,99 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Cam: {fileID: 0} +--- !u!1 &1080099159142297029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1665942822042087142} + - component: {fileID: 8049191569390305507} + - component: {fileID: 2096485946797826695} + - component: {fileID: 3155620005283274030} + m_Layer: 10 + m_Name: SphereAnimate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1665942822042087142 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080099159142297029} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_Children: [] + m_Father: {fileID: 7110486964728869325} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8049191569390305507 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080099159142297029} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2096485946797826695 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080099159142297029} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!135 &3155620005283274030 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080099159142297029} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7522635739010457072 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TreeWorld_02.unity b/Assets/Scenes/TreeWorld_02.unity index 06bc392a..0cd667b6 100644 --- a/Assets/Scenes/TreeWorld_02.unity +++ b/Assets/Scenes/TreeWorld_02.unity @@ -40088,6 +40088,10 @@ PrefabInstance: propertyPath: directionalLight value: objectReference: {fileID: 138245305} + - target: {fileID: 1661088669, guid: 2ba8d552442ba664e8e567adee683a11, type: 3} + propertyPath: highlightMaterial + value: + objectReference: {fileID: 2100000, guid: c7daa82e15f0cf04d92d0f41ce84f9df, type: 2} - target: {fileID: 1661088670, guid: 2ba8d552442ba664e8e567adee683a11, type: 3} propertyPath: snapZoneTop value: @@ -40156,6 +40160,11 @@ PrefabInstance: propertyPath: m_Name value: MainPlayer objectReference: {fileID: 0} + - target: {fileID: 2600518978782301977, guid: 2ba8d552442ba664e8e567adee683a11, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ba8d552442ba664e8e567adee683a11, type: 3} --- !u!114 &2120427837 stripped -- GitLab