mirror of
https://github.com/mob-sakai/UIEffect.git
synced 2026-11-19 17:22:37 +08:00
Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2c1d857119 | |||
| e856b0b939 | |||
| 6cbb793d8d | |||
| 485e2df9fc | |||
| 4a49e9a8b2 | |||
| af0ae7bdf7 | |||
| d1fa0d143f | |||
| 55a7f27204 | |||
| ff824c2341 | |||
| 014bba3f56 | |||
| f533d02977 | |||
| 8bb782c90a | |||
| 2617f77c6a | |||
| 1f4427c3d5 | |||
| 2dcb7f7e86 | |||
| 0a4229907d | |||
| dbf8ae00f5 | |||
| cacb9fde45 | |||
| 9d980961d6 |
@@ -8,17 +8,28 @@ run-name: 🧪 Test URP (${{ github.event.pull_request.title || github.ref_name
|
||||
env:
|
||||
# MINIMUM_VERSION: The minimum version of Unity.
|
||||
MINIMUM_VERSION: 6000.0
|
||||
MAXIMUM_VERSION:
|
||||
# EXCLUDE_FILTER: The excluded versions of Unity.
|
||||
EXCLUDE_FILTER: "(2017|2018|2023.3)"
|
||||
IGNORE_ALPHA: false
|
||||
IGNORE_BETA: false
|
||||
PROJECT_PATH: UIEffectURP
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
unityVersions:
|
||||
description: 'Specify the Unity versions to test. (eg. [ "2019.4.41f2", "2020.3.15f2" ])'
|
||||
required: false
|
||||
default: '[ "6000.0.0f1", "6000.1.0f1" ]'
|
||||
usePeriodVersions:
|
||||
description: "Use the period versions (.0f1, .10f1, 20f1, ...)."
|
||||
description: 'Use the period versions (.0f1, .10f1, 20f1, ...).'
|
||||
required: false
|
||||
default: "true"
|
||||
overrideFindOptions:
|
||||
description: 'Specify options for unity-changeset. (eg. --ignore-alpha --max 2020.3 )'
|
||||
required: false
|
||||
default: '--min 6000.0 --max 9999.9 --ignore-alpha --ignore-beta'
|
||||
push:
|
||||
branches:
|
||||
- develop
|
||||
@@ -60,9 +71,27 @@ jobs:
|
||||
id: setup
|
||||
run: |
|
||||
echo "==== Target Unity Versions ===="
|
||||
LATEST_VERSIONS=`npx -y unity-changeset@latest list --json --versions --all --latest-patch --ignore-alpha --min ${MINIMUM_VERSION}`
|
||||
|
||||
# Check if specific Unity versions are provided via inputs (for workflow_dispatch)
|
||||
if [ -n "${{ inputs.unityVersions }}" ]; then
|
||||
echo "* Using specified Unity versions" | tee $GITHUB_OUTPUT
|
||||
echo 'unityVersions=${{ inputs.unityVersions }}' | tee $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Formulate find options based on inputs and environment variables
|
||||
FIND_OPTIONS=""
|
||||
[ "${{ env.IGNORE_ALPHA }}" = "true" ] && FIND_OPTIONS+=" --ignore-alpha"
|
||||
[ "${{ env.IGNORE_BETA }}" = "true" ] && FIND_OPTIONS+=" --ignore-beta"
|
||||
[ -n "${{ env.MINIMUM_VERSION }}" ] && FIND_OPTIONS+=" --min ${MINIMUM_VERSION}"
|
||||
[ -n "${{ env.MAXIMUM_VERSION }}" ] && FIND_OPTIONS+=" --max ${MAXIMUM_VERSION}"
|
||||
[ -n "${{ inputs.overrideFindOptions }}" ] && FIND_OPTIONS="${inputs.overrideFindOptions}"
|
||||
echo "find options: $FIND_OPTIONS"
|
||||
|
||||
# Find the latest Unity versions if no specific versions are provided
|
||||
LATEST_VERSIONS=`npx -y unity-changeset@latest list --json --versions --all --latest-patch $FIND_OPTIONS`
|
||||
if [ "${{ inputs.usePeriodVersions }}" = "true" ]; then
|
||||
ADDITIONAL_VERSIONS=`npx -y unity-changeset@latest list --json --versions --ignore-alpha --min ${MINIMUM_VERSION} --grep '0f'`
|
||||
ADDITIONAL_VERSIONS=`npx -y unity-changeset@latest list --json --versions $FIND_OPTIONS --grep '0f'`
|
||||
else
|
||||
ADDITIONAL_VERSIONS=[]
|
||||
fi
|
||||
@@ -97,7 +126,7 @@ jobs:
|
||||
${{ env.PROJECT_PATH }}-Library-
|
||||
|
||||
- name: 🛠️ Build Unity Project (Test)
|
||||
uses: game-ci/unity-builder@main
|
||||
uses: mob-sakai/unity-builder@fix/support-unity6.6
|
||||
timeout-minutes: 45
|
||||
with:
|
||||
customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
|
||||
@@ -111,7 +140,7 @@ jobs:
|
||||
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
|
||||
|
||||
# - name: 🧪 Run tests
|
||||
# uses: game-ci/unity-test-runner@main
|
||||
# uses: mob-sakai/unity-test-runner@fix/support-unity6.6
|
||||
# timeout-minutes: 45
|
||||
# with:
|
||||
# customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
|
||||
|
||||
@@ -8,17 +8,28 @@ run-name: 🧪 Test (${{ github.event.pull_request.title || github.ref_name }})
|
||||
env:
|
||||
# MINIMUM_VERSION: The minimum version of Unity.
|
||||
MINIMUM_VERSION: 2020.3
|
||||
MAXIMUM_VERSION:
|
||||
# EXCLUDE_FILTER: The excluded versions of Unity.
|
||||
EXCLUDE_FILTER: "(2017|2018|2023.3)"
|
||||
IGNORE_ALPHA: false
|
||||
IGNORE_BETA: false
|
||||
PROJECT_PATH: .
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
unityVersions:
|
||||
description: 'Specify the Unity versions to test. (eg. [ "2019.4.41f2", "2020.3.15f2" ])'
|
||||
required: false
|
||||
default: '[ "2019.4.41f2", "2020.3.15f2" ]'
|
||||
usePeriodVersions:
|
||||
description: "Use the period versions (.0f1, .10f1, 20f1, ...)."
|
||||
description: 'Use the period versions (.0f1, .10f1, 20f1, ...).'
|
||||
required: false
|
||||
default: "true"
|
||||
overrideFindOptions:
|
||||
description: 'Specify options for unity-changeset. (eg. --ignore-alpha --max 2020.3 )'
|
||||
required: false
|
||||
default: '--min 2019.4 --max 9999.9 --ignore-alpha --ignore-beta'
|
||||
push:
|
||||
branches:
|
||||
- develop
|
||||
@@ -60,9 +71,27 @@ jobs:
|
||||
id: setup
|
||||
run: |
|
||||
echo "==== Target Unity Versions ===="
|
||||
LATEST_VERSIONS=`npx -y unity-changeset@latest list --json --versions --all --latest-patch --ignore-alpha --min ${MINIMUM_VERSION}`
|
||||
|
||||
# Check if specific Unity versions are provided via inputs (for workflow_dispatch)
|
||||
if [ -n "${{ inputs.unityVersions }}" ]; then
|
||||
echo "* Using specified Unity versions" | tee $GITHUB_OUTPUT
|
||||
echo 'unityVersions=${{ inputs.unityVersions }}' | tee $GITHUB_OUTPUT
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Formulate find options based on inputs and environment variables
|
||||
FIND_OPTIONS=""
|
||||
[ "${{ env.IGNORE_ALPHA }}" = "true" ] && FIND_OPTIONS+=" --ignore-alpha"
|
||||
[ "${{ env.IGNORE_BETA }}" = "true" ] && FIND_OPTIONS+=" --ignore-beta"
|
||||
[ -n "${{ env.MINIMUM_VERSION }}" ] && FIND_OPTIONS+=" --min ${MINIMUM_VERSION}"
|
||||
[ -n "${{ env.MAXIMUM_VERSION }}" ] && FIND_OPTIONS+=" --max ${MAXIMUM_VERSION}"
|
||||
[ -n "${{ inputs.overrideFindOptions }}" ] && FIND_OPTIONS="${inputs.overrideFindOptions}"
|
||||
echo "find options: $FIND_OPTIONS"
|
||||
|
||||
# Find the latest Unity versions if no specific versions are provided
|
||||
LATEST_VERSIONS=`npx -y unity-changeset@latest list --json --versions --all --latest-patch $FIND_OPTIONS`
|
||||
if [ "${{ inputs.usePeriodVersions }}" = "true" ]; then
|
||||
ADDITIONAL_VERSIONS=`npx -y unity-changeset@latest list --json --versions --ignore-alpha --min ${MINIMUM_VERSION} --grep '0f'`
|
||||
ADDITIONAL_VERSIONS=`npx -y unity-changeset@latest list --json --versions $FIND_OPTIONS --grep '0f'`
|
||||
else
|
||||
ADDITIONAL_VERSIONS=[]
|
||||
fi
|
||||
@@ -97,7 +126,7 @@ jobs:
|
||||
${{ env.PROJECT_PATH }}-Library-
|
||||
|
||||
- name: 🛠️ Build Unity Project (Test)
|
||||
uses: game-ci/unity-builder@main
|
||||
uses: mob-sakai/unity-builder@fix/support-unity6.6
|
||||
timeout-minutes: 45
|
||||
with:
|
||||
customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
|
||||
@@ -111,7 +140,7 @@ jobs:
|
||||
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
|
||||
|
||||
- name: 🧪 Run tests
|
||||
uses: game-ci/unity-test-runner@main
|
||||
uses: mob-sakai/unity-test-runner@fix/support-unity6.6
|
||||
timeout-minutes: 45
|
||||
with:
|
||||
customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
|
||||
|
||||
@@ -1,3 +1,55 @@
|
||||
## [5.11.9](https://github.com/mob-sakai/UIEffect/compare/5.11.8...5.11.9) (2026-11-14)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* color filter does not reflect the correct color space. ([6cbb793](https://github.com/mob-sakai/UIEffect/commit/6cbb793d8d421a14c6c694ea08914506607171fc)), closes [#409](https://github.com/mob-sakai/UIEffect/issues/409)
|
||||
* improve tweener editor ([4a49e9a](https://github.com/mob-sakai/UIEffect/commit/4a49e9a8b22e7c77851eef6810c3106e716cbb93))
|
||||
* support Unity 6.6+ with ShaderGraph package ([e856b0b](https://github.com/mob-sakai/UIEffect/commit/e856b0b9396025c3352054e65b090421ab2e3b40))
|
||||
* tweener does not affect multi-font glyphs (TMP_SubMeshUI) ([485e2df](https://github.com/mob-sakai/UIEffect/commit/485e2df9fc305db20aa473972f4a11e219cac7be)), closes [#413](https://github.com/mob-sakai/UIEffect/issues/413)
|
||||
|
||||
## [5.11.8](https://github.com/mob-sakai/UIEffect/compare/5.11.7...5.11.8) (2026-11-06)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* remove conflicting FormerlySerializedAs on UIEffectTweener.m_PlayOnEnable ([55a7f27](https://github.com/mob-sakai/UIEffect/commit/55a7f272042e869e6659f7a2603f9a16dbb3ab65))
|
||||
|
||||
## [5.11.7](https://github.com/mob-sakai/UIEffect/compare/5.11.6...5.11.7) (2026-08-27)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* ignore shader registry order changes ([014bba3](https://github.com/mob-sakai/UIEffect/commit/014bba3f5687ecfe41caa00d454f196baf7e3483)), closes [#407](https://github.com/mob-sakai/UIEffect/issues/407)
|
||||
|
||||
## [5.11.6](https://github.com/mob-sakai/UIEffect/compare/5.11.5...5.11.6) (2026-08-17)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* refresh material when changing shadow mode ([8bb782c](https://github.com/mob-sakai/UIEffect/commit/8bb782c90afb42d6569d8dfcfe022b007171f97e))
|
||||
|
||||
## [5.11.5](https://github.com/mob-sakai/UIEffect/compare/5.11.4...5.11.5) (2026-07-23)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* fix memory leak ([2dcb7f7](https://github.com/mob-sakai/UIEffect/commit/2dcb7f7e8678a2ffcf3832d0c5011aa1da6c3677)), closes [#405](https://github.com/mob-sakai/UIEffect/issues/405)
|
||||
|
||||
## [5.11.4](https://github.com/mob-sakai/UIEffect/compare/5.11.3...5.11.4) (2026-07-22)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* infinite asset import loop caused by unchanged ProjectSettings being marked dirty ([dbf8ae0](https://github.com/mob-sakai/UIEffect/commit/dbf8ae00f50470912d458fda853a34ef94d7d533)), closes [#404](https://github.com/mob-sakai/UIEffect/issues/404)
|
||||
|
||||
## [5.11.3](https://github.com/mob-sakai/UIEffect/compare/5.11.2...5.11.3) (2026-07-04)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* TextMeshPro support is not working ([9d98096](https://github.com/mob-sakai/UIEffect/commit/9d980961d6cf45e519ad96bf2e7260ed515f0f70)), closes [#402](https://github.com/mob-sakai/UIEffect/issues/402)
|
||||
|
||||
## [5.11.2](https://github.com/mob-sakai/UIEffect/compare/5.11.1...5.11.2) (2026-07-02)
|
||||
|
||||
|
||||
|
||||
@@ -24,8 +24,8 @@ namespace Coffee.UIEffects.Editors
|
||||
|
||||
private static bool expandOthers
|
||||
{
|
||||
set => UIEffectEditorSettings.instance.m_ExpandOthers = value;
|
||||
get => UIEffectEditorSettings.instance.m_ExpandOthers;
|
||||
set => UIEffectEditorSettings.instance.m_ExpandOthers = value;
|
||||
}
|
||||
|
||||
protected override void OnEnable()
|
||||
|
||||
@@ -92,6 +92,7 @@ namespace Coffee.UIEffects.Editors
|
||||
{
|
||||
if (tweener == null) return;
|
||||
|
||||
EditorGUI.BeginDisabledGroup(!tweener.enabled);
|
||||
EditorGUILayout.Space(4);
|
||||
GUILayout.Label(GUIContent.none, "sv_iconselector_sep", GUILayout.ExpandWidth(true));
|
||||
|
||||
@@ -101,6 +102,7 @@ namespace Coffee.UIEffects.Editors
|
||||
if (GUI.Button(rResetTimeButton, EditorGUIUtility.IconContent("animation.firstkey"), "IconButton"))
|
||||
{
|
||||
ResetTime();
|
||||
EditorApplication.QueuePlayerLoopUpdate();
|
||||
}
|
||||
|
||||
var rPlayButton = new Rect(r.x + 20, r.y, 20, r.height);
|
||||
@@ -148,12 +150,15 @@ namespace Coffee.UIEffects.Editors
|
||||
if (EditorGUI.EndChangeCheck())
|
||||
{
|
||||
SetTime(time);
|
||||
EditorApplication.QueuePlayerLoopUpdate();
|
||||
}
|
||||
|
||||
if (Application.isPlaying && tweener.isActiveAndEnabled)
|
||||
{
|
||||
Repaint();
|
||||
}
|
||||
|
||||
EditorGUI.EndDisabledGroup();
|
||||
}
|
||||
|
||||
private static float DrawBackground(Rect r, float width, Color color)
|
||||
@@ -168,6 +173,7 @@ namespace Coffee.UIEffects.Editors
|
||||
{
|
||||
foreach (var tweener in targets.OfType<UIEffectTweener>())
|
||||
{
|
||||
if (!tweener.enabled) continue;
|
||||
tweener.SetTime(time);
|
||||
}
|
||||
}
|
||||
@@ -176,6 +182,7 @@ namespace Coffee.UIEffects.Editors
|
||||
{
|
||||
foreach (var tweener in targets.OfType<UIEffectTweener>())
|
||||
{
|
||||
if (!tweener.enabled) continue;
|
||||
tweener.ResetTime(tweener.direction);
|
||||
}
|
||||
}
|
||||
@@ -210,6 +217,7 @@ namespace Coffee.UIEffects.Editors
|
||||
_lastTime = EditorApplication.timeSinceStartup;
|
||||
foreach (var tweener in targets.OfType<UIEffectTweener>())
|
||||
{
|
||||
if (!tweener.enabled) continue;
|
||||
tweener.UpdateTime(tweener.direction == UIEffectTweener.Direction.Forward ? delta : -delta);
|
||||
}
|
||||
|
||||
|
||||
@@ -113,8 +113,8 @@ namespace Coffee.UIEffectInternal
|
||||
self.GetColors(colors);
|
||||
self.GetUVs(0, uv0);
|
||||
self.GetUVs(1, uv1);
|
||||
self.GetUVs(2, uv1);
|
||||
self.GetUVs(3, uv1);
|
||||
self.GetUVs(2, uv2);
|
||||
self.GetUVs(3, uv3);
|
||||
self.GetNormals(normals);
|
||||
self.GetTangents(tangents);
|
||||
self.GetIndices(indices, 0);
|
||||
|
||||
@@ -279,18 +279,25 @@ namespace Coffee.UIEffectInternal
|
||||
if (m_Asset == null) return;
|
||||
var so = new SerializedObject(m_Asset);
|
||||
var shaders = so.FindProperty("m_Shaders");
|
||||
m_RegisteredShaders.Clear();
|
||||
for (var i = 0; i < shaders.arraySize; i++)
|
||||
|
||||
// Get all shaders in the SVC, ignoring nulls and duplicates.
|
||||
var shadersInSVC = Enumerable.Range(0, shaders.arraySize)
|
||||
.Select(i =>
|
||||
shaders.GetArrayElementAtIndex(i).FindPropertyRelative("first").objectReferenceValue as Shader)
|
||||
.Where(s => s != null)
|
||||
.Distinct()
|
||||
.ToList();
|
||||
|
||||
// ShaderVariantCollection entry order is not stable between editor sessions.
|
||||
// The registry is a lookup set, so an order-only difference is already in sync.
|
||||
if (m_RegisteredShaders.Count == shadersInSVC.Count &&
|
||||
new HashSet<Shader>(m_RegisteredShaders).SetEquals(shadersInSVC))
|
||||
{
|
||||
var shaderRef = shaders.GetArrayElementAtIndex(i)
|
||||
.FindPropertyRelative("first")
|
||||
.objectReferenceValue as Shader;
|
||||
if (shaderRef != null && !m_RegisteredShaders.Contains(shaderRef))
|
||||
{
|
||||
m_RegisteredShaders.Add(shaderRef);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
m_RegisteredShaders.Clear();
|
||||
m_RegisteredShaders.AddRange(shadersInSVC);
|
||||
EditorUtility.SetDirty(owner);
|
||||
}
|
||||
|
||||
|
||||
@@ -843,7 +843,7 @@ namespace Coffee.UIEffects
|
||||
if (m_ShadowMode == value) return;
|
||||
context.m_ShadowMode = m_ShadowMode = value;
|
||||
SetVerticesDirty();
|
||||
SetVerticesDirty();
|
||||
SetMaterialDirty();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1473,6 +1473,7 @@ namespace Coffee.UIEffects
|
||||
|
||||
protected override void OnDestroy()
|
||||
{
|
||||
base.OnDestroy();
|
||||
InternalListPool<UIEffectReplica>.Return(ref _replicas);
|
||||
}
|
||||
|
||||
@@ -1605,7 +1606,7 @@ namespace Coffee.UIEffects
|
||||
for (var i = 0; i < count; i++)
|
||||
{
|
||||
if (!replicas[i]) continue;
|
||||
replicas[i].ApplyContextToMaterial(material);
|
||||
replicas[i].ApplyContextToMaterial(replicas[i].effectMaterial);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -849,7 +849,7 @@ namespace Coffee.UIEffects
|
||||
|
||||
private static Color ApplyColorSpace(Color color)
|
||||
{
|
||||
return QualitySettings.activeColorSpace == ColorSpace.Linear ? color.linear : color;
|
||||
return QualitySettings.activeColorSpace == ColorSpace.Linear ? color : color.gamma;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
using Coffee.UIEffectInternal;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Events;
|
||||
using UnityEngine.Serialization;
|
||||
|
||||
namespace Coffee.UIEffects
|
||||
{
|
||||
@@ -94,7 +93,6 @@ namespace Coffee.UIEffects
|
||||
[Range(0f, 10)]
|
||||
private float m_Interval;
|
||||
|
||||
[FormerlySerializedAs("m_ResetTimeOnEnable")]
|
||||
[Tooltip("Play the tween when the component is enabled.")]
|
||||
[SerializeField]
|
||||
private PlayOnEnable m_PlayOnEnable = PlayOnEnable.Forward;
|
||||
|
||||
+5
@@ -170,7 +170,12 @@ namespace UnityEditor.Rendering.BuiltIn.ShaderGraph
|
||||
BlockFields.SurfaceDescription.Alpha,
|
||||
BlockFields.SurfaceDescription.AlphaClipThreshold
|
||||
};
|
||||
|
||||
#if UNITY_6000_6_OR_NEWER
|
||||
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, graphItem, name, null, null);
|
||||
#else
|
||||
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, graphItem, name, null, null);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "com.coffee.ui-effect",
|
||||
"displayName": "UI Effect",
|
||||
"description": "UIEffect is an open-source package that allows you to intuitively apply rich UI effects directly from the Inspector or via code.\nCombine various filters, such as grayscale, blur, and dissolve, to decorate your UI with a unique visual style!",
|
||||
"version": "5.11.2",
|
||||
"version": "5.11.9",
|
||||
"unity": "2020.3",
|
||||
"license": "MIT",
|
||||
"repository": {
|
||||
|
||||
Reference in New Issue
Block a user