Merge remote-tracking branch 'origin/develop' into develop-preview

# Conflicts:
#	Packages/src/CHANGELOG.md
#	Packages/src/package.json
This commit is contained in:
mob-sakai
2025-12-24 20:18:34 +09:00
3 changed files with 13 additions and 9 deletions

View File

@@ -9,6 +9,7 @@ using UnityEngine.Serialization;
using Random = UnityEngine.Random;
[assembly: InternalsVisibleTo("Coffee.UIParticle.Editor")]
[assembly: InternalsVisibleTo("Coffee.UIParticle.Editor.Tests")]
[assembly: InternalsVisibleTo("Coffee.UIParticle.PerformanceDemo")]
[assembly: InternalsVisibleTo("Coffee.UIParticle.Demo")]

View File

@@ -13,11 +13,7 @@ namespace Coffee.UIParticleInternal
{
if (s_TmpParticles.Length < size)
{
while (s_TmpParticles.Length < size)
{
size = Mathf.NextPowerOfTwo(size);
}
size = Mathf.NextPowerOfTwo(size);
s_TmpParticles = new ParticleSystem.Particle[size];
}
@@ -190,6 +186,8 @@ namespace Coffee.UIParticleInternal
if (!self || !parent) return false;
var subEmitters = parent.subEmitters;
if (!subEmitters.enabled) return false; // No sub emitters.
var count = subEmitters.subEmittersCount;
for (var i = 0; i < count; i++)
{