You've already forked ParticleEffectForUGUI
mirror of
https://github.com/mob-sakai/ParticleEffectForUGUI.git
synced 2026-05-16 13:10:07 +00:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
19989cf18c | ||
|
|
30b00762f6 | ||
|
|
154a04c022 | ||
|
|
3eab0979b9 | ||
|
|
01e08eefbd | ||
|
|
a8af984d6f | ||
|
|
1b5c359058 | ||
|
|
ea043524c0 | ||
|
|
c37c014864 |
54
.github/workflows/release.yml
vendored
54
.github/workflows/release.yml
vendored
@@ -4,8 +4,9 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- preview
|
|
||||||
- release
|
- release
|
||||||
|
- release-preview
|
||||||
|
- release-v4
|
||||||
tags-ignore:
|
tags-ignore:
|
||||||
- "**"
|
- "**"
|
||||||
|
|
||||||
@@ -22,7 +23,8 @@ jobs:
|
|||||||
released: ${{ steps.release.outputs.new_release_published }}
|
released: ${{ steps.release.outputs.new_release_published }}
|
||||||
tag: ${{ steps.release.outputs.new_release_git_tag }}
|
tag: ${{ steps.release.outputs.new_release_git_tag }}
|
||||||
version: ${{ steps.release.outputs.new_release_version }}
|
version: ${{ steps.release.outputs.new_release_version }}
|
||||||
notes: ${{ steps.release.outputs.new_release_notes }}
|
merge_to: ${{ steps.summary.outputs.merge_to }}
|
||||||
|
split_to: ${{ steps.summary.outputs.split_to }}
|
||||||
steps:
|
steps:
|
||||||
- name: 🚚 Checkout (${{ github.ref_name }})
|
- name: 🚚 Checkout (${{ github.ref_name }})
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -38,38 +40,51 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ github.token }}
|
GITHUB_TOKEN: ${{ github.token }}
|
||||||
|
|
||||||
- run: |
|
- id: summary
|
||||||
|
run: |
|
||||||
echo "🔖 New release published: '${{ steps.release.outputs.new_release_published }}'" | tee -a $GITHUB_STEP_SUMMARY
|
echo "🔖 New release published: '${{ steps.release.outputs.new_release_published }}'" | tee -a $GITHUB_STEP_SUMMARY
|
||||||
echo "🔖 New release version: '${{ steps.release.outputs.new_release_version }}'" | tee -a $GITHUB_STEP_SUMMARY
|
echo "🔖 New release version: '${{ steps.release.outputs.new_release_version }}'" | tee -a $GITHUB_STEP_SUMMARY
|
||||||
echo "🔖 New release channel: '${{ steps.release.outputs.new_release_channel }}'" | tee -a $GITHUB_STEP_SUMMARY
|
echo "🔖 New release channel: '${{ steps.release.outputs.new_release_channel }}'" | tee -a $GITHUB_STEP_SUMMARY
|
||||||
echo "🔖 New release git tag: '${{ steps.release.outputs.new_release_git_tag }}'" | tee -a $GITHUB_STEP_SUMMARY
|
echo "🔖 New release git tag: '${{ steps.release.outputs.new_release_git_tag }}'" | tee -a $GITHUB_STEP_SUMMARY
|
||||||
echo '${{ steps.release.outputs.new_release_notes }}' | tee -a $GITHUB_STEP_SUMMARY
|
|
||||||
|
if [ '${{ steps.release.outputs.new_release_published }}' = 'false' ]; then
|
||||||
|
echo "No new release published." | tee -a $GITHUB_STEP_SUMMARY
|
||||||
|
elif [ '${{ github.ref_name }}' = 'release' ]; then
|
||||||
|
echo "merge_to=develop" | tee -a $GITHUB_OUTPUT
|
||||||
|
echo "split_to=main" | tee -a $GITHUB_OUTPUT
|
||||||
|
elif [ '${{ github.ref_name }}' = 'release-preview' ]; then
|
||||||
|
echo "merge_to=develop-preview" | tee -a $GITHUB_OUTPUT
|
||||||
|
echo "split_to=preview" | tee -a $GITHUB_OUTPUT
|
||||||
|
elif [ '${{ github.ref_name }}' = 'release-4.x' ]; then
|
||||||
|
echo "merge_to=develop-4.x" | tee -a $GITHUB_OUTPUT
|
||||||
|
echo "split_to=4.x" | tee -a $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
|
|
||||||
merge-to-develop:
|
merge-to:
|
||||||
if: needs.release.outputs.released == 'true'
|
if: needs.release.outputs.merge_to != ''
|
||||||
needs: release
|
needs: release
|
||||||
name: 🔀 Merge to develop
|
name: 🔀 Merge to ${{ needs.release.outputs.merge_to }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
steps:
|
steps:
|
||||||
- name: 🚚 Checkout (develop)
|
- name: 🚚 Checkout (${{ needs.release.outputs.merge_to }})
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
ref: develop
|
ref: ${{ needs.release.outputs.merge_to }}
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: 🔀 Merge '${{ needs.release.outputs.tag }}' into 'develop'
|
- name: 🔀 Merge '${{ needs.release.outputs.tag }}' into '${{ needs.release.outputs.merge_to }}'
|
||||||
run: |
|
run: |
|
||||||
git config --local user.email "github-actions[bot]@users.noreply.github.com"
|
git config --local user.email "github-actions[bot]@users.noreply.github.com"
|
||||||
git config --local user.name "github-actions[bot]"
|
git config --local user.name "github-actions[bot]"
|
||||||
|
|
||||||
git merge ${{ needs.release.outputs.tag }}
|
git merge ${{ needs.release.outputs.tag }}
|
||||||
git push origin develop
|
git push origin ${{ needs.release.outputs.merge_to }}
|
||||||
|
|
||||||
split-to-main:
|
split-to:
|
||||||
if: needs.release.outputs.released == 'true'
|
if: needs.release.outputs.split_to != ''
|
||||||
needs: release
|
needs: release
|
||||||
name: 🔀 Split package
|
name: 🔀 Split package to ${{ needs.release.outputs.split_to }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -79,9 +94,10 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
ref: ${{ needs.release.outputs.tag }}
|
ref: ${{ needs.release.outputs.tag }}
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: 🔀 Split subtree 'Packages/src' to 'main'
|
- name: 🔀 Split subtree 'Packages/src' to '${{ needs.release.outputs.split_to }}'
|
||||||
run: |
|
run: |
|
||||||
git branch main origin/main
|
split_to=${{ needs.release.outputs.split_to }}
|
||||||
git subtree split --prefix=Packages/src --branch main
|
git branch $split_to origin/$split_to
|
||||||
git tag ${{ needs.release.outputs.version }} main
|
git subtree split --prefix=Packages/src --branch $split_to
|
||||||
git push origin ${{ needs.release.outputs.version }} main:main
|
git tag ${{ needs.release.outputs.version }} $split_to
|
||||||
|
git push origin ${{ needs.release.outputs.version }} $split_to:$split_to
|
||||||
|
|||||||
3
.github/workflows/test.yml
vendored
3
.github/workflows/test.yml
vendored
@@ -15,6 +15,8 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- develop
|
- develop
|
||||||
|
- develop-preview
|
||||||
|
- develop-4.x
|
||||||
tags:
|
tags:
|
||||||
- "!*"
|
- "!*"
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
@@ -56,6 +58,7 @@ jobs:
|
|||||||
needs: setup
|
needs: setup
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
max-parallel: 4
|
||||||
matrix:
|
matrix:
|
||||||
unityVersion: ${{ fromJson(needs.setup.outputs.unityVersions) }}
|
unityVersion: ${{ fromJson(needs.setup.outputs.unityVersions) }}
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
{
|
{
|
||||||
"branches": [
|
"branches": [
|
||||||
"release",
|
"release",
|
||||||
|
"release-4.x",
|
||||||
{
|
{
|
||||||
"name": "preview",
|
"name": "release-preview",
|
||||||
"prerelease": true
|
"prerelease": true
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,3 +1,26 @@
|
|||||||
|
## [4.6.6](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.5...v4.6.6) (2024-05-23)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* fix release workflow ([30b0076](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/30b00762f6da166c043587798b1552f27b4cc604))
|
||||||
|
|
||||||
|
## [4.6.5](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.4...v4.6.5) (2024-05-23)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* update workflows (for preview and v4) ([3eab097](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/3eab0979b9b85919b804442ab05735b7120eade5))
|
||||||
|
|
||||||
|
## [4.6.4](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.3...v4.6.4) (2024-05-22)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* assertion failed on expression: 'ps->array_size()' ([1b5c359](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/1b5c359058289895caf5f245fe09abb643bc38eb)), closes [#278](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/278)
|
||||||
|
* lost Material.mainTexture when using AnimatableProperties ([ea04352](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/ea043524c0b00f67cba26a1f9ea537ee4a56d6ff)), closes [#311](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/311)
|
||||||
|
* remove unnecessary code ([c37c014](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/c37c01486499773e3d7e8296c95bb4c3fae94abb))
|
||||||
|
|
||||||
## [4.6.3](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.2...v4.6.3) (2024-04-04)
|
## [4.6.3](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.2...v4.6.3) (2024-04-04)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ namespace Coffee.UIParticleExtensions
|
|||||||
{
|
{
|
||||||
name = $"{baseMat.name}_{id}",
|
name = $"{baseMat.name}_{id}",
|
||||||
hideFlags = HideFlags.DontSave | HideFlags.NotEditable,
|
hideFlags = HideFlags.DontSave | HideFlags.NotEditable,
|
||||||
mainTexture = texture ? texture : null
|
mainTexture = texture ? texture : baseMat.mainTexture
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
s_Entries.Add(e);
|
s_Entries.Add(e);
|
||||||
|
|||||||
@@ -329,6 +329,14 @@ namespace Coffee.UIExtensions
|
|||||||
// Bake mesh.
|
// Bake mesh.
|
||||||
Profiler.BeginSample("[UIParticleRenderer] Bake Mesh");
|
Profiler.BeginSample("[UIParticleRenderer] Bake Mesh");
|
||||||
s_CombineInstances[0].mesh.Clear(false);
|
s_CombineInstances[0].mesh.Clear(false);
|
||||||
|
|
||||||
|
// Assertion failed on expression: 'ps->array_size()' #278
|
||||||
|
var extends = s_CombineInstances[0].mesh.bounds.extents.x;
|
||||||
|
if (!float.IsNaN(extends) && !float.IsInfinity(extends) && 0 < extends)
|
||||||
|
{
|
||||||
|
s_CombineInstances[0].mesh.RecalculateBounds();
|
||||||
|
}
|
||||||
|
|
||||||
if (_isTrail && _parent.canSimulate && 0 < _particleSystem.particleCount)
|
if (_isTrail && _parent.canSimulate && 0 < _particleSystem.particleCount)
|
||||||
{
|
{
|
||||||
#if PS_BAKE_API_V2
|
#if PS_BAKE_API_V2
|
||||||
@@ -352,7 +360,6 @@ namespace Coffee.UIExtensions
|
|||||||
// Too many vertices to render.
|
// Too many vertices to render.
|
||||||
if (65535 <= s_CombineInstances[0].mesh.vertexCount)
|
if (65535 <= s_CombineInstances[0].mesh.vertexCount)
|
||||||
{
|
{
|
||||||
s_CombineInstances[0].mesh.Clear(false);
|
|
||||||
Debug.LogErrorFormat(this,
|
Debug.LogErrorFormat(this,
|
||||||
"Too many vertices to render. index={0}, isTrail={1}, vertexCount={2}(>=65535)",
|
"Too many vertices to render. index={0}, isTrail={1}, vertexCount={2}(>=65535)",
|
||||||
_index,
|
_index,
|
||||||
|
|||||||
@@ -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.3",
|
"version": "4.6.6",
|
||||||
"unity": "2018.2",
|
"unity": "2018.2",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
Reference in New Issue
Block a user