You've already forked ParticleEffectForUGUI
mirror of
https://github.com/mob-sakai/ParticleEffectForUGUI.git
synced 2026-05-16 05:00:07 +00:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc81428921 | ||
|
|
e82c833d04 | ||
|
|
2ec3748336 | ||
|
|
2eff411bd9 | ||
|
|
46c300b347 | ||
|
|
e1863f25d3 | ||
|
|
89289c052f |
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
@@ -7,6 +7,7 @@ name: 🧪 Test
|
|||||||
env:
|
env:
|
||||||
# MINIMUM_VERSION: The minimum version of Unity.
|
# MINIMUM_VERSION: The minimum version of Unity.
|
||||||
MINIMUM_VERSION: 2019.4
|
MINIMUM_VERSION: 2019.4
|
||||||
|
# EXCLUDE_FILTER: The excluded versions of Unity.
|
||||||
EXCLUDE_FILTER: '(2020.2.0)'
|
EXCLUDE_FILTER: '(2020.2.0)'
|
||||||
|
|
||||||
on:
|
on:
|
||||||
@@ -35,7 +36,8 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "==== Target Unity Versions ===="
|
echo "==== Target Unity Versions ===="
|
||||||
LATEST_VERSIONS=`npx unity-changeset list --versions --latest-patch --min ${MINIMUM_VERSION} --json --all`
|
LATEST_VERSIONS=`npx unity-changeset list --versions --latest-patch --min ${MINIMUM_VERSION} --json --all`
|
||||||
ADDITIONAL_VERSIONS=`npx unity-changeset list --versions --grep '0f' --min ${MINIMUM_VERSION} --json`
|
# ADDITIONAL_VERSIONS=`npx unity-changeset list --versions --grep '0f' --min ${MINIMUM_VERSION} --json`
|
||||||
|
ADDITIONAL_VERSIONS=[]
|
||||||
|
|
||||||
VERSIONS=`echo "[${LATEST_VERSIONS}, ${ADDITIONAL_VERSIONS}]" \
|
VERSIONS=`echo "[${LATEST_VERSIONS}, ${ADDITIONAL_VERSIONS}]" \
|
||||||
| jq -c '[ flatten | sort | unique | .[] | select( test("${{ env.EXCLUDE_FILTER }}") | not ) ]'`
|
| jq -c '[ flatten | sort | unique | .[] | select( test("${{ env.EXCLUDE_FILTER }}") | not ) ]'`
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,4 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: a81f9cd434f104e1fad7ffa20eb7a3d4
|
|
||||||
DefaultImporter:
|
|
||||||
userData:
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -26,9 +26,9 @@ A clear and concise description of what you expected to happen.
|
|||||||
If applicable, add screenshots to help explain your problem.
|
If applicable, add screenshots to help explain your problem.
|
||||||
|
|
||||||
**Environment (please complete the following information):**
|
**Environment (please complete the following information):**
|
||||||
- Version [e.g. 1.0.0]
|
- Version [e.g. 4.0.0]
|
||||||
- Platform: [e.g. Editor(Windows/Mac), Standalone(Windows/Mac), iOS, Android, WebGL]
|
- Platform: [e.g. Editor(Windows/Mac), Standalone(Windows/Mac), iOS, Android, WebGL]
|
||||||
- Unity version: [e.g. 2018.2.8f1]
|
- Unity version: [e.g. 2022.3.0f1]
|
||||||
- Build options: [e.g. IL2CPP, .Net 4.x, LWRP]
|
- Build options: [e.g. IL2CPP, .Net 4.x, LWRP]
|
||||||
|
|
||||||
**Additional context**
|
**Additional context**
|
||||||
@@ -1,3 +1,12 @@
|
|||||||
|
## [4.6.3](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.2...v4.6.3) (2024-04-04)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* if only Trail Material is used, it will not be displayed ([2eff411](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/2eff411bd97eb4e6947d29a02b85b414bfdaee3a)), closes [#294](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/294)
|
||||||
|
* if the UIParticle parents do not have Canvas, an exception is thrown in OnEnable ([e82c833](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/e82c833d04b819f103984931ba29a3616ef50908)), closes [#300](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/300)
|
||||||
|
* particle size too small due to auto scaling ([2ec3748](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/2ec374833614d64406e7c3207ca5fe234a749dcb)), closes [#295](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/295)
|
||||||
|
|
||||||
## [4.6.2](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.1...v4.6.2) (2024-02-01)
|
## [4.6.2](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.1...v4.6.2) (2024-02-01)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -100,9 +100,6 @@ namespace Coffee.UIExtensions
|
|||||||
"UIParticle: UIParticle.scale will be adjusted.")]
|
"UIParticle: UIParticle.scale will be adjusted.")]
|
||||||
private AutoScalingMode m_AutoScalingMode = AutoScalingMode.Transform;
|
private AutoScalingMode m_AutoScalingMode = AutoScalingMode.Transform;
|
||||||
|
|
||||||
[SerializeField]
|
|
||||||
private bool m_ResetScaleOnEnable;
|
|
||||||
|
|
||||||
private readonly List<UIParticleRenderer> _renderers = new List<UIParticleRenderer>();
|
private readonly List<UIParticleRenderer> _renderers = new List<UIParticleRenderer>();
|
||||||
private int _groupId;
|
private int _groupId;
|
||||||
private Camera _orthoCamera;
|
private Camera _orthoCamera;
|
||||||
@@ -297,13 +294,6 @@ namespace Coffee.UIExtensions
|
|||||||
}
|
}
|
||||||
|
|
||||||
base.OnEnable();
|
base.OnEnable();
|
||||||
|
|
||||||
// Reset scale for upgrade.
|
|
||||||
if (m_ResetScaleOnEnable)
|
|
||||||
{
|
|
||||||
m_ResetScaleOnEnable = false;
|
|
||||||
transform.localScale = Vector3.one;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -345,17 +335,6 @@ namespace Coffee.UIExtensions
|
|||||||
m_IgnoreCanvasScaler = false;
|
m_IgnoreCanvasScaler = false;
|
||||||
m_AutoScaling = false;
|
m_AutoScaling = false;
|
||||||
m_AutoScalingMode = AutoScalingMode.Transform;
|
m_AutoScalingMode = AutoScalingMode.Transform;
|
||||||
m_ResetScaleOnEnable = true;
|
|
||||||
|
|
||||||
#if UNITY_EDITOR
|
|
||||||
EditorApplication.delayCall += () =>
|
|
||||||
{
|
|
||||||
if (!this || !gameObject || !transform || Application.isPlaying) return;
|
|
||||||
transform.localScale = Vector3.one;
|
|
||||||
m_ResetScaleOnEnable = false;
|
|
||||||
EditorUtility.SetDirty(this);
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_AbsoluteMode)
|
if (m_AbsoluteMode)
|
||||||
|
|||||||
@@ -328,7 +328,8 @@ namespace Coffee.UIExtensions
|
|||||||
|
|
||||||
// Bake mesh.
|
// Bake mesh.
|
||||||
Profiler.BeginSample("[UIParticleRenderer] Bake Mesh");
|
Profiler.BeginSample("[UIParticleRenderer] Bake Mesh");
|
||||||
if (_isTrail && _parent.canSimulate && 0 < s_CombineInstances[0].mesh.vertexCount)
|
s_CombineInstances[0].mesh.Clear(false);
|
||||||
|
if (_isTrail && _parent.canSimulate && 0 < _particleSystem.particleCount)
|
||||||
{
|
{
|
||||||
#if PS_BAKE_API_V2
|
#if PS_BAKE_API_V2
|
||||||
_renderer.BakeTrailsMesh(s_CombineInstances[0].mesh, bakeCamera,
|
_renderer.BakeTrailsMesh(s_CombineInstances[0].mesh, bakeCamera,
|
||||||
@@ -337,7 +338,7 @@ namespace Coffee.UIExtensions
|
|||||||
_renderer.BakeTrailsMesh(s_CombineInstances[0].mesh, bakeCamera, true);
|
_renderer.BakeTrailsMesh(s_CombineInstances[0].mesh, bakeCamera, true);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else if (_renderer.CanBakeMesh())
|
else if (!_isTrail && _renderer.CanBakeMesh())
|
||||||
{
|
{
|
||||||
_particleSystem.ValidateShape();
|
_particleSystem.ValidateShape();
|
||||||
#if PS_BAKE_API_V2
|
#if PS_BAKE_API_V2
|
||||||
@@ -347,10 +348,6 @@ namespace Coffee.UIExtensions
|
|||||||
_renderer.BakeMesh(s_CombineInstances[0].mesh, bakeCamera, true);
|
_renderer.BakeMesh(s_CombineInstances[0].mesh, bakeCamera, true);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
s_CombineInstances[0].mesh.Clear(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Too many vertices to render.
|
// Too many vertices to render.
|
||||||
if (65535 <= s_CombineInstances[0].mesh.vertexCount)
|
if (65535 <= s_CombineInstances[0].mesh.vertexCount)
|
||||||
@@ -517,7 +514,8 @@ namespace Coffee.UIExtensions
|
|||||||
var scale = _parent.scale3DForCalc.GetScaled(_parent.parentScale);
|
var scale = _parent.scale3DForCalc.GetScaled(_parent.parentScale);
|
||||||
|
|
||||||
if (_parent.autoScalingMode == UIParticle.AutoScalingMode.UIParticle
|
if (_parent.autoScalingMode == UIParticle.AutoScalingMode.UIParticle
|
||||||
&& _particleSystem.main.scalingMode == ParticleSystemScalingMode.Local)
|
&& _particleSystem.main.scalingMode == ParticleSystemScalingMode.Local
|
||||||
|
&& _parent.canvas)
|
||||||
{
|
{
|
||||||
scale = scale.GetScaled(_parent.canvas.transform.localScale);
|
scale = scale.GetScaled(_parent.canvas.transform.localScale);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"name": "com.coffee.ui-particle",
|
"name": "com.coffee.ui-particle",
|
||||||
"displayName": "UI Particle",
|
"displayName": "UI Particle",
|
||||||
"description": "This package provides a component to render particle effects for uGUI.\nThe particle rendering is maskable and sortable, without the need for an extra Camera, RenderTexture, or Canvas.",
|
"description": "This package provides a component to render particle effects for uGUI.\nThe particle rendering is maskable and sortable, without the need for an extra Camera, RenderTexture, or Canvas.",
|
||||||
"version": "4.6.2",
|
"version": "4.6.3",
|
||||||
"unity": "2018.2",
|
"unity": "2018.2",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
Reference in New Issue
Block a user