Skip to content

Compile flag support for Unity6 #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimonDarksideJ merged 3 commits into from
Nov 27, 2025
Merged

Compile flag support for Unity6 #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2ed805
Update CardPopup2D.cs
hugoymh Sep 5, 2025
5db2ea6
Gradient2.ModifyMesh
hugoymh Nov 17, 2025
96e309e
Merge branch 'Gradient2_gradient' into Unity6000_api_support
hugoymh Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Runtime/Scripts/Effects/Gradient2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ List<float> FindStops(float zoomOffset, Rect bounds, List<float> stops)
var startBoundary = zoomOffset - offset;
var endBoundary = (1 - zoomOffset) - offset;

if (_colorKeys == null) _colorKeys = EffectGradient.colorKeys;
_colorKeys = EffectGradient.colorKeys;

foreach (var color in _colorKeys)
{
Expand All @@ -485,7 +485,7 @@ List<float> FindStops(float zoomOffset, Rect bounds, List<float> stops)
stops.Add((color.time - startBoundary) * Zoom);
}

if (_alphaKeys == null) _alphaKeys = _effectGradient.alphaKeys;
_alphaKeys = _effectGradient.alphaKeys;

foreach (var alpha in _alphaKeys)
{
Expand Down
8 changes: 6 additions & 2 deletions Runtime/Scripts/Layout/CardUI/2D Cards/CardPopup2D.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading