diff --git a/Runtime/Scripts/Effects/Gradient2.cs b/Runtime/Scripts/Effects/Gradient2.cs index cbb0485d..c82bb0c7 100644 --- a/Runtime/Scripts/Effects/Gradient2.cs +++ b/Runtime/Scripts/Effects/Gradient2.cs @@ -475,7 +475,7 @@ List FindStops(float zoomOffset, Rect bounds, List stops) var startBoundary = zoomOffset - offset; var endBoundary = (1 - zoomOffset) - offset; - if (_colorKeys == null) _colorKeys = EffectGradient.colorKeys; + _colorKeys = EffectGradient.colorKeys; foreach (var color in _colorKeys) { @@ -485,7 +485,7 @@ List FindStops(float zoomOffset, Rect bounds, List stops) stops.Add((color.time - startBoundary) * Zoom); } - if (_alphaKeys == null) _alphaKeys = _effectGradient.alphaKeys; + _alphaKeys = _effectGradient.alphaKeys; foreach (var alpha in _alphaKeys) { diff --git a/Runtime/Scripts/Layout/CardUI/2D Cards/CardPopup2D.cs b/Runtime/Scripts/Layout/CardUI/2D Cards/CardPopup2D.cs index 14ce7899..a3c4c68d 100644 --- a/Runtime/Scripts/Layout/CardUI/2D Cards/CardPopup2D.cs +++ b/Runtime/Scripts/Layout/CardUI/2D Cards/CardPopup2D.cs @@ -57,8 +57,12 @@ void Update() { isFalling = false; rbody.useGravity = false; - rbody.velocity = Vector3.zero; - transform.position = new Vector3(0, 8, startZPos); +#if UNITY_6000_0_OR_NEWER + rbody.linearVelocity = Vector3.zero; +#else + rbody.velocity = Vector3.zero; +#endif + transform.position = new Vector3(0, 8, startZPos); if (singleScene) { CardEnter();