Compare commits

...

46 Commits

Author SHA1 Message Date
mob-sakai 692153f50a feat: "Additional Resource" can be installed as a package instead of importing as a sample
This allows you to use the necessary features without adding samples to the `Assets` directory in your project.
2026-11-16 23:32:09 +09:00
mob-sakai da6651ae65 chore: update development package 2026-11-16 23:31:48 +09:00
mob-sakai 255d600275 chore: change sample pathes 2026-11-16 23:28:30 +09:00
mob-sakai d359086ed4 fix: fix project setting inspector 2026-11-16 23:10:47 +09:00
mob-sakai 6e8aaf36f0 fix: fix potential NPE in code 2026-11-16 23:10:18 +09:00
mob-sakai 27629cdd7c fix: added "Show Readme" to the auto-import menu 2026-11-16 23:07:55 +09:00
mob-sakai bb2efc0790 chore: update development package 2026-11-16 17:36:02 +09:00
mob-sakai d41d1ad21f fix: fix potential NPE in code 2026-11-16 17:36:02 +09:00
mob-sakai 739ae50549 chore: legacy test will be skipped in Unity 7 or later 2026-11-16 17:36:02 +09:00
mob-sakai 3ca1214233 fix: fix font path in demo 2026-11-16 17:36:02 +09:00
mob-sakai fb75fd4817 chore: tmpro fallback test 2026-11-15 14:19:28 +09:00
semantic-release-bot 2c1d857119 chore(release): 5.11.9 [skip ci]
## [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)
2026-11-14 23:50:06 +00:00
mob-sakai e856b0b939 fix: support Unity 6.6+ with ShaderGraph package 2026-11-14 21:01:13 +09:00
mob-sakai 6cbb793d8d fix: color filter does not reflect the correct color space.
close #409
2026-11-14 10:57:33 +09:00
mob-sakai 485e2df9fc fix: tweener does not affect multi-font glyphs (TMP_SubMeshUI)
close #413
2026-11-14 08:44:09 +09:00
mob-sakai 4a49e9a8b2 fix: improve tweener editor
- fixed an issue in legacy versions of Unity where changes made using the seek bar were not immediately reflected on the screen
- fixed an issue where even disabled tweener objects could be controlled using the seek bar
2026-11-14 08:35:52 +09:00
mob-sakai af0ae7bdf7 chore: update test wf 2026-11-06 13:46:17 +09:00
semantic-release-bot d1fa0d143f chore(release): 5.11.8 [skip ci]
## [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))
2026-11-06 04:01:27 +00:00
armadavalor 55a7f27204 fix: remove conflicting FormerlySerializedAs on UIEffectTweener.m_PlayOnEnable 2026-11-06 12:46:15 +09:00
semantic-release-bot ff824c2341 chore(release): 5.11.7 [skip ci]
## [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)
2026-08-27 08:13:55 +00:00
형군 014bba3f56 fix: ignore shader registry order changes
close #407
2026-08-27 17:11:11 +09:00
semantic-release-bot f533d02977 chore(release): 5.11.6 [skip ci]
## [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))
2026-08-17 08:44:25 +00:00
ZeroGreen86 8bb782c90a fix: refresh material when changing shadow mode 2026-08-17 17:43:18 +09:00
mob-sakai 2617f77c6a chore: test wf 2026-07-23 17:34:01 +09:00
semantic-release-bot 1f4427c3d5 chore(release): 5.11.5 [skip ci]
## [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)
2026-07-23 08:29:23 +00:00
mob-sakai 2dcb7f7e86 fix: fix memory leak
close #405
2026-07-23 17:27:24 +09:00
semantic-release-bot 0a4229907d chore(release): 5.11.4 [skip ci]
## [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)
2026-07-22 08:27:02 +00:00
mob-sakai dbf8ae00f5 fix: infinite asset import loop caused by unchanged ProjectSettings being marked dirty
close #404
2026-07-22 15:14:47 +09:00
semantic-release-bot cacb9fde45 chore(release): 5.11.3 [skip ci]
## [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)
2026-07-04 05:53:01 +00:00
mob-sakai 9d980961d6 fix: TextMeshPro support is not working
close #402
2026-07-04 14:40:26 +09:00
semantic-release-bot 399f25db2a chore(release): 5.11.2 [skip ci]
## [5.11.2](https://github.com/mob-sakai/UIEffect/compare/5.11.1...5.11.2) (2026-07-02)

### Bug Fixes

* add null check ([161fc54](https://github.com/mob-sakai/UIEffect/commit/161fc546cad251ad798c2fd9e9472d687aa7f2c3))
2026-07-02 06:57:35 +00:00
mob-sakai 161fc546ca fix: add null check 2026-07-02 15:57:03 +09:00
semantic-release-bot 96f9d09ac7 chore(release): 5.11.1 [skip ci]
## [5.11.1](https://github.com/mob-sakai/UIEffect/compare/5.11.0...5.11.1) (2026-06-29)

### Bug Fixes

* support "disable domain reload" on Unity 6.6 or later ([a556c28](https://github.com/mob-sakai/UIEffect/commit/a556c282210303d9e7a7c284bb4b41ef3a35e3e1))
2026-06-29 05:12:13 +00:00
mob-sakai cb07e1f25e chore: update wf 2026-06-28 20:46:49 +09:00
mob-sakai 7525c782ef chore: update internal 2026-06-28 20:39:19 +09:00
mob-sakai 9aaa0de59d docs: update readme 2026-06-28 19:51:08 +09:00
mob-sakai a556c28221 fix: support "disable domain reload" on Unity 6.6 or later 2026-06-28 13:27:51 +09:00
semantic-release-bot 0fb08bf202 chore(release): 5.11.0 [skip ci]
# [5.11.0](https://github.com/mob-sakai/UIEffect/compare/5.10.9...5.11.0) (2026-06-25)

### Bug Fixes

* enable/disable Gameobject break effect with 'TrueShadow' ([730aa2b](https://github.com/mob-sakai/UIEffect/commit/730aa2bb4d872ddab63f2dad611a063cefa07064)), closes [#400](https://github.com/mob-sakai/UIEffect/issues/400)
* select TMP submesh by mesh before material ([f538ef2](https://github.com/mob-sakai/UIEffect/commit/f538ef2cba3d4d76f6683bccee65d5a9694dad37))
* some fix ([b6b538f](https://github.com/mob-sakai/UIEffect/commit/b6b538f64f0b06ddfb4ad2edd6b7db6dc1d067d8))
* Support for skipping "reload domain" ([ec3fb13](https://github.com/mob-sakai/UIEffect/commit/ec3fb13c111638781bf852e2a4a4747fbfeb7d3a))

### Features

* add option to remove from preloadedAssets when build player ([e955715](https://github.com/mob-sakai/UIEffect/commit/e955715c99c474881e0b27ecc325061ce0d866a0)), closes [#393](https://github.com/mob-sakai/UIEffect/issues/393)
* support XBOX One/Series ([72bb1c5](https://github.com/mob-sakai/UIEffect/commit/72bb1c51318829e7ced3b1436892a5969aedd9a3)), closes [#385](https://github.com/mob-sakai/UIEffect/issues/385) [#394](https://github.com/mob-sakai/UIEffect/issues/394)
2026-06-25 11:09:58 +00:00
mob-sakai 55e3030dd2 chore: update internal 2026-06-25 04:04:35 +09:00
mob-sakai d2c0789375 chore: update shader version 2026-06-25 03:15:54 +09:00
mob-sakai a373cf772b chore: remove Implicit bool conversions 2026-06-25 03:15:54 +09:00
mob-sakai ec3fb13c11 fix: Support for skipping "reload domain" 2026-06-25 03:15:09 +09:00
mob-sakai 514d5f0347 chore: update internal 2026-06-25 03:13:49 +09:00
mob-sakai dfe91edac1 style: fix style 2026-06-22 12:03:03 +09:00
mob-sakai 8f3c990a3a chore: hot-update fix 2026-06-21 16:37:22 +09:00
mob-sakai e8b1b5f89e chore: update internal 2026-06-21 16:36:47 +09:00
195 changed files with 8851 additions and 3631 deletions
+2 -1
View File
@@ -25,7 +25,7 @@ jobs:
tag: ${{ steps.release.outputs.new_release_git_tag }}
steps:
- name: 🚚 Checkout (${{ github.ref_name }})
uses: actions/checkout@v6
uses: actions/checkout@v7
- name: 🔖 Run semantic release
uses: cycjimmy/semantic-release-action@v6
@@ -34,6 +34,7 @@ jobs:
working_directory: Packages/src
extra_plugins: |
@semantic-release/changelog
@semantic-release/exec
@semantic-release/git
env:
GITHUB_TOKEN: ${{ github.token }}
+36 -7
View File
@@ -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
@@ -85,10 +114,10 @@ jobs:
unityVersion: ${{ fromJson(needs.setup.outputs.unityVersions) }}
steps:
- name: 🚚 Checkout ($${{ github.ref }})
uses: actions/checkout@v6
uses: actions/checkout@v7
- name: 📥 Cache library
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ${{ env.PROJECT_PATH }}/Library
key: ${{ env.PROJECT_PATH }}-Library-${{ matrix.unityVersion }}-${{ github.event.pull_request.head.sha || github.sha }}
@@ -97,7 +126,7 @@ jobs:
${{ env.PROJECT_PATH }}-Library-
- name: 🛠️ Build Unity Project (Test)
uses: game-ci/unity-builder@v5
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@v4
# uses: mob-sakai/unity-test-runner@fix/support-unity6.6
# timeout-minutes: 45
# with:
# customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
+36 -7
View File
@@ -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: 6000.7.99
# 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
@@ -85,10 +114,10 @@ jobs:
unityVersion: ${{ fromJson(needs.setup.outputs.unityVersions) }}
steps:
- name: 🚚 Checkout ($${{ github.ref }})
uses: actions/checkout@v6
uses: actions/checkout@v7
- name: 📥 Cache library
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: ${{ env.PROJECT_PATH }}/Library
key: ${{ env.PROJECT_PATH }}-Library-${{ matrix.unityVersion }}-${{ github.event.pull_request.head.sha || github.sha }}
@@ -97,7 +126,7 @@ jobs:
${{ env.PROJECT_PATH }}-Library-
- name: 🛠️ Build Unity Project (Test)
uses: game-ci/unity-builder@v5
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@v4
uses: mob-sakai/unity-test-runner@fix/support-unity6.6
timeout-minutes: 45
with:
customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
+2 -1
View File
@@ -26,4 +26,5 @@ bin/
UserSettings/
*.app/
Build/
Assets/TextMeshPro Support*
Assets/Samples*
Packages/src/Samples~/*.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 69f569585a2b5439b830cc115efdf867
guid: 6d68f022c46564bf6ac355588397507a
folderAsset: yes
DefaultImporter:
externalObjects: {}
@@ -1,6 +1,5 @@
fileFormatVersion: 2
guid: ebc947de92b024b329663fe914a7d168
folderAsset: yes
guid: 96c707d74b3d841a5a3015029fa74330
DefaultImporter:
externalObjects: {}
userData:
@@ -0,0 +1,34 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7e3976da977cb49238499ea3b4c237ae, type: 3}
m_Name: ProfileDataSourceSettings
m_EditorClassIdentifier:
profileGroupTypes:
- m_GroupTypePrefix: Built-In
m_Variables:
- m_Suffix: BuildPath
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
- m_Suffix: LoadPath
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
- m_GroupTypePrefix: Editor Hosted
m_Variables:
- m_Suffix: BuildPath
m_Value: ServerData/[BuildTarget]
- m_Suffix: LoadPath
m_Value: http://[PrivateIpAddress]:[HostingServicePort]
environments: []
currentEnvironment:
id:
projectId:
projectGenesisId:
name:
isDefault: 0
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9379b7b2236ab4c0e9f8d9f7db9936a8
guid: 4ecf31fe7c4aa4565ad61fab272f22b8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
+92 -10
View File
@@ -1,22 +1,104 @@
using System.Collections;
using Coffee.UIEffects;
using System.Text;
using UnityEngine;
using UnityEngine.AddressableAssets;
using UnityEngine.ResourceManagement.AsyncOperations;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class HotUpdate : MonoBehaviour
{
private IEnumerator Start()
[SerializeField]
private string m_Address;
[SerializeField]
private Text m_Log;
[SerializeField]
private bool m_ExecuteOnStart;
private readonly StringBuilder _sb = new StringBuilder(1024);
private Coroutine _co;
private void Start()
{
const string k_SettingsAddress = "Assets/ProjectSettings/UIEffectProjectSettings.asset";
yield return Addressables.LoadAssetAsync<UIEffectProjectSettings>(k_SettingsAddress);
if (m_ExecuteOnStart)
{
Execute();
}
}
#if UNITY_2022_2_OR_NEWER
while (UIEffectProjectSettings.shaderVariantCollection.WarmUpProgressively(5) == false) yield return null;
#else
UIEffectProjectSettings.shaderVariantCollection.WarmUp();
#endif
private void AddLog(string message)
{
Debug.Log(message);
_sb.AppendLine(message);
if (m_Log)
{
m_Log.text = _sb.ToString();
}
}
yield return SceneManager.LoadSceneAsync(gameObject.scene.buildIndex + 1, LoadSceneMode.Single);
public void Execute()
{
if (string.IsNullOrEmpty(m_Address))
{
AddLog($"*** Address is empty. Please set the address of the asset to load.");
return;
}
if (_co != null)
{
AddLog($"*** Execution is already in progress. Please wait until it completes.");
return;
}
_co = StartCoroutine(Co_Execute());
}
public void LoadNextScene()
{
SceneManager.LoadScene(gameObject.scene.buildIndex + 1, LoadSceneMode.Single);
}
private IEnumerator Co_Execute()
{
AddLog($"########################################");
AddLog($"Hot update starting...");
AddLog($"########################################");
AddLog("");
AddLog($"Loading '{m_Address}'...");
var handle = Addressables.LoadAssetAsync<Object>(m_Address);
while (handle.IsDone == false)
{
yield return new WaitForSeconds(0.1f);
AddLog($" Progress: {handle.PercentComplete:P}");
}
if (handle.Status == AsyncOperationStatus.Succeeded)
{
AddLog($" Loaded '{m_Address}' successfully.");
}
else
{
AddLog($" *** Failed to load '{m_Address}'.");
AddLog($" *** {handle.OperationException.Message}");
yield break;
}
AddLog("");
AddLog($"Hot-Update complete !");
AddLog("");
AddLog($" -> Load next scene in: 3");
yield return new WaitForSeconds(1f);
AddLog($" -> Load next scene in: 2");
yield return new WaitForSeconds(1f);
AddLog($" -> Load next scene in: 1");
yield return new WaitForSeconds(1f);
LoadNextScene();
}
}
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,286 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!28 &-6111546302731763495
Texture2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NotoSansJP-Regular Atlas
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 2
m_Width: 0
m_Height: 0
m_CompleteImageSize: 0
m_MipsStripped: 0
m_TextureFormat: 1
m_MipCount: 1
m_IsReadable: 1
m_IsPreProcessed: 0
m_IgnoreMasterTextureLimit: 0
m_StreamingMipmaps: 0
m_StreamingMipmapsPriority: 0
m_VTOnly: 0
m_AlphaIsTransparency: 0
m_ImageCount: 1
m_TextureDimension: 2
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 0
m_WrapV: 0
m_WrapW: 0
m_LightmapFormat: 0
m_ColorSpace: 0
m_PlatformBlob:
image data: 0
_typelessdata:
m_StreamData:
serializedVersion: 2
offset: 0
size: 0
path:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
m_Name: NotoSansJP-Regular SDF - Dynamic
m_EditorClassIdentifier:
hashCode: -1410962959
material: {fileID: 444162133241932390}
materialHashCode: -1336267599
m_Version: 1.1.0
m_SourceFontFileGUID: 3b86b3f5141924393b3a212d6a5ec9e0
m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 3b86b3f5141924393b3a212d6a5ec9e0,
type: 3}
m_SourceFontFile: {fileID: 12800000, guid: 3b86b3f5141924393b3a212d6a5ec9e0, type: 3}
m_AtlasPopulationMode: 1
m_FaceInfo:
m_FaceIndex: 0
m_FamilyName: Noto Sans JP
m_StyleName: Regular
m_PointSize: 24
m_Scale: 1
m_LineHeight: 34.752
m_AscentLine: 27.839998
m_CapLine: 18
m_MeanLine: 14
m_Baseline: 0
m_DescentLine: -6.9119997
m_SuperscriptOffset: 27.839998
m_SuperscriptSize: 0.5
m_SubscriptOffset: -6.9119997
m_SubscriptSize: 0.5
m_UnderlineOffset: -3.6
m_UnderlineThickness: 1.1999999
m_StrikethroughOffset: 5.6
m_StrikethroughThickness: 1.1999999
m_TabWidth: 5
m_GlyphTable: []
m_CharacterTable: []
m_AtlasTextures:
- {fileID: -6111546302731763495}
m_AtlasTextureIndex: 0
m_IsMultiAtlasTexturesEnabled: 0
m_ClearDynamicDataOnBuild: 1
m_UsedGlyphRects: []
m_FreeGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 1023
m_Height: 1023
m_fontInfo:
Name:
PointSize: 0
Scale: 0
CharacterCount: 0
LineHeight: 0
Baseline: 0
Ascender: 0
CapHeight: 0
Descender: 0
CenterLine: 0
SuperscriptOffset: 0
SubscriptOffset: 0
SubSize: 0
Underline: 0
UnderlineThickness: 0
strikethrough: 0
strikethroughThickness: 0
TabWidth: 0
Padding: 0
AtlasWidth: 0
AtlasHeight: 0
atlas: {fileID: 0}
m_AtlasWidth: 1024
m_AtlasHeight: 1024
m_AtlasPadding: 9
m_AtlasRenderMode: 4165
m_glyphInfoList: []
m_KerningTable:
kerningPairs: []
m_FontFeatureTable:
m_GlyphPairAdjustmentRecords: []
fallbackFontAssets: []
m_FallbackFontAssetTable: []
m_CreationSettings:
sourceFontFileName:
sourceFontFileGUID: 3b86b3f5141924393b3a212d6a5ec9e0
pointSizeSamplingMode: 0
pointSize: 24
padding: 9
packingMode: 0
atlasWidth: 1024
atlasHeight: 1024
characterSetSelectionMode: 7
characterSequence:
referencedFontAssetGUID:
referencedTextAssetGUID:
fontStyle: 0
fontStyleModifier: 0
renderMode: 4165
includeFontFeatures: 0
m_FontWeightTable:
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
fontWeights: []
normalStyle: 0
normalSpacingOffset: 0
boldStyle: 0.75
boldSpacing: 7
italicStyle: 35
tabSize: 10
--- !u!21 &444162133241932390
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: NotoSansJP-Regular Atlas Material
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Cube:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FaceTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: -6111546302731763495}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OutlineTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Ambient: 0.5
- _Bevel: 0.5
- _BevelClamp: 0
- _BevelOffset: 0
- _BevelRoundness: 0
- _BevelWidth: 0
- _BumpFace: 0
- _BumpOutline: 0
- _ColorMask: 15
- _CullMode: 0
- _Diffuse: 0.5
- _FaceDilate: 0
- _FaceUVSpeedX: 0
- _FaceUVSpeedY: 0
- _GlowInner: 0.05
- _GlowOffset: 0
- _GlowOuter: 0.05
- _GlowPower: 0.75
- _GradientScale: 10
- _LightAngle: 3.1416
- _MaskSoftnessX: 0
- _MaskSoftnessY: 0
- _OutlineSoftness: 0
- _OutlineUVSpeedX: 0
- _OutlineUVSpeedY: 0
- _OutlineWidth: 0
- _PerspectiveFilter: 0.875
- _Reflectivity: 10
- _ScaleRatioA: 1
- _ScaleRatioB: 1
- _ScaleRatioC: 1
- _ScaleX: 1
- _ScaleY: 1
- _ShaderFlags: 0
- _Sharpness: 0
- _SpecularPower: 2
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _TextureHeight: 1024
- _TextureWidth: 1024
- _UnderlayDilate: 0
- _UnderlayOffsetX: 0
- _UnderlayOffsetY: 0
- _UnderlaySoftness: 0
- _VertexOffsetX: 0
- _VertexOffsetY: 0
- _WeightBold: 0.75
- _WeightNormal: 0
m_Colors:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
- _FaceColor: {r: 1, g: 1, b: 1, a: 1}
- _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
- _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
- _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
m_BuildTextureStacks: []
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4c1191089341846fcb754b6aab3dd435
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because one or more lines are too long
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 52ffdb2a86f414090abb93192f599f6f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 3b86b3f5141924393b3a212d6a5ec9e0
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- Noto Sans JP
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
@@ -1,6 +1,5 @@
fileFormatVersion: 2
guid: a1b972071582443e2845278a859a1533
folderAsset: yes
guid: 064c6ea9a4d6f4cc1938d0878e91e3d6
DefaultImporter:
externalObjects: {}
userData:
@@ -43,6 +43,46 @@ ShaderVariantCollection:
passType: 0
- keywords: GLOW_ON TRANSITION_SHINY UNDERLAY_ON
passType: 0
- keywords: GLOW_ON TONE_RETRO UNDERLAY_ON
passType: 0
- keywords: COLOR_FILTER GLOW_ON UNDERLAY_ON
passType: 0
- keywords: GLOW_ON SAMPLING_BLUR_DETAIL UNDERLAY_ON
passType: 0
- keywords: GLOW_ON SAMPLING_PIXELATION UNDERLAY_ON
passType: 0
- keywords: SAMPLING_PIXELATION TONE_RETRO
passType: 0
- keywords: GLOW_ON SAMPLING_RGB_SHIFT UNDERLAY_ON
passType: 0
- keywords: GLOW_ON SAMPLING_EDGE_LUMINANCE UNDERLAY_ON
passType: 0
- keywords: TRANSITION_DISSOLVE
passType: 0
- keywords: GLOW_ON TRANSITION_DISSOLVE UNDERLAY_ON
passType: 0
- keywords: TRANSITION_SHINY
passType: 0
- keywords: GLOW_ON TRANSITION_SHINY UNDERLAY_ON
passType: 0
- keywords: TRANSITION_MELT
passType: 0
- keywords: GLOW_ON TRANSITION_MELT UNDERLAY_ON
passType: 0
- keywords: TRANSITION_BURN
passType: 0
- keywords: GLOW_ON TRANSITION_BURN UNDERLAY_ON
passType: 0
- keywords: COLOR_FILTER GLOW_ON TRANSITION_BURN UNDERLAY_ON
passType: 0
- keywords: TRANSITION_PATTERN
passType: 0
- keywords: GLOW_ON TRANSITION_PATTERN UNDERLAY_ON
passType: 0
- keywords: EDGE_PLAIN GLOW_ON UNDERLAY_ON
passType: 0
- keywords: COLOR_FILTER GLOW_ON GRADATION_GRADIENT UNDERLAY_ON
passType: 0
- first: {fileID: 4800000, guid: 96246b1ead49a4c5a996fd477bc5a117, type: 3}
second:
variants:
@@ -160,6 +200,114 @@ ShaderVariantCollection:
passType: 0
- keywords: TRANSITION_SHINY UNITY_UI_CLIP_RECT
passType: 0
- keywords: TONE_GRAYSCALE
passType: 0
- keywords: TONE_SEPIA
passType: 0
- keywords: TONE_NEGATIVE
passType: 0
- keywords: TONE_RETRO
passType: 0
- keywords: TONE_POSTERIZE
passType: 0
- keywords: COLOR_FILTER
passType: 0
- keywords: SAMPLING_BLUR_FAST
passType: 0
- keywords: COLOR_FILTER SAMPLING_BLUR_FAST
passType: 0
- keywords: COLOR_FILTER SAMPLING_BLUR_FAST UNITY_UI_CLIP_RECT
passType: 0
- keywords: COLOR_FILTER SAMPLING_BLUR_FAST TONE_GRAYSCALE
passType: 0
- keywords: SAMPLING_BLUR_MEDIUM
passType: 0
- keywords: SAMPLING_BLUR_DETAIL
passType: 0
- keywords: SAMPLING_PIXELATION
passType: 0
- keywords: SAMPLING_PIXELATION TONE_RETRO
passType: 0
- keywords: SAMPLING_PIXELATION TONE_RETRO UNITY_UI_CLIP_RECT
passType: 0
- keywords: SAMPLING_RGB_SHIFT
passType: 0
- keywords: SAMPLING_EDGE_LUMINANCE
passType: 0
- keywords: SAMPLING_EDGE_ALPHA
passType: 0
- keywords: TRANSITION_FADE
passType: 0
- keywords: TRANSITION_CUTOFF
passType: 0
- keywords: TRANSITION_DISSOLVE
passType: 0
- keywords: TRANSITION_DISSOLVE UNITY_UI_CLIP_RECT
passType: 0
- keywords: COLOR_FILTER SAMPLING_BLUR_FAST TONE_GRAYSCALE TRANSITION_DISSOLVE
passType: 0
- keywords: TRANSITION_SHINY
passType: 0
- keywords: TRANSITION_SHINY UNITY_UI_CLIP_RECT
passType: 0
- keywords: TRANSITION_MASK
passType: 0
- keywords: SAMPLING_EDGE_LUMINANCE TRANSITION_MASK
passType: 0
- keywords: TRANSITION_MELT
passType: 0
- keywords: TRANSITION_MELT UNITY_UI_CLIP_RECT
passType: 0
- keywords: COLOR_FILTER TRANSITION_MELT
passType: 0
- keywords: TRANSITION_BURN
passType: 0
- keywords: TRANSITION_BURN UNITY_UI_CLIP_RECT
passType: 0
- keywords: TRANSITION_PATTERN
passType: 0
- keywords: TRANSITION_PATTERN UNITY_UI_CLIP_RECT
passType: 0
- keywords: TRANSITION_BLAZE
passType: 0
- keywords: EDGE_PLAIN
passType: 0
- keywords: COLOR_FILTER EDGE_PLAIN
passType: 0
- keywords: EDGE_PLAIN TRANSITION_PATTERN
passType: 0
- keywords: COLOR_FILTER EDGE_PLAIN TRANSITION_PATTERN
passType: 0
- keywords: EDGE_SHINY
passType: 0
- keywords: COLOR_FILTER EDGE_SHINY
passType: 0
- keywords: EDGE_SHINY SAMPLING_EDGE_ALPHA
passType: 0
- keywords: EDGE_SHINY TRANSITION_PATTERN
passType: 0
- keywords: DETAIL_MASKING
passType: 0
- keywords: DETAIL_MULTIPLY
passType: 0
- keywords: DETAIL_ADDITIVE
passType: 0
- keywords: DETAIL_SUBTRACTIVE
passType: 0
- keywords: DETAIL_REPLACE
passType: 0
- keywords: DETAIL_MULTIPLY_ADDITIVE
passType: 0
- keywords: COLOR_FILTER TARGET_HUE
passType: 0
- keywords: COLOR_FILTER TARGET_LUMINANCE
passType: 0
- keywords: GRADATION_GRADIENT
passType: 0
- keywords: GRADATION_COLOR2
passType: 0
- keywords: GRADATION_COLOR4
passType: 0
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -172,7 +320,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7d43f626d9b5f4d729097092ded48bdb, type: 3}
m_Name: UIEffectProjectSettings
m_EditorClassIdentifier:
m_PreLoadSettingsInBuild: 1
m_PreLoadSettingsInBuild: 0
m_RuntimePresets: []
m_RuntimePresetsV2:
- {fileID: 11400000, guid: 460881a8263ce454799a8c689c28d8c9, type: 2}
-1
View File
@@ -1 +0,0 @@
../Packages/src/Samples~
+4 -4
View File
@@ -5,14 +5,14 @@
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "4a182298bd6293c4e6e33dd40bb7a050847190d8"
"hash": "d5d12cb14184509b0d4ab12fa22dd3e6f6b50f16"
},
"com.coffee.minimal-resource": {
"version": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/MinimalResource",
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "4a182298bd6293c4e6e33dd40bb7a050847190d8"
"hash": "d5d12cb14184509b0d4ab12fa22dd3e6f6b50f16"
},
"com.coffee.nano-monitor": {
"version": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/NanoMonitor",
@@ -21,14 +21,14 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"hash": "4a182298bd6293c4e6e33dd40bb7a050847190d8"
"hash": "d5d12cb14184509b0d4ab12fa22dd3e6f6b50f16"
},
"com.coffee.symbolic-linker": {
"version": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/SymbolicLinker",
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "4a182298bd6293c4e6e33dd40bb7a050847190d8"
"hash": "d5d12cb14184509b0d4ab12fa22dd3e6f6b50f16"
},
"com.coffee.ui-effect": {
"version": "file:src",
+16 -1
View File
@@ -12,13 +12,28 @@
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/changelog",
[
"@semantic-release/exec",
{
"prepareCmd": "node ./Samples~/sync-sample-package-versions.js ${nextRelease.version}"
}
],
[
"@semantic-release/npm",
{
"npmPublish": false
}
],
"@semantic-release/git",
[
"@semantic-release/git",
{
"assets": [
"CHANGELOG.md",
"package.json",
"Samples~/**/package.json"
]
}
],
"@semantic-release/github"
]
}
+82
View File
@@ -1,3 +1,85 @@
## [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)
### Bug Fixes
* add null check ([161fc54](https://github.com/mob-sakai/UIEffect/commit/161fc546cad251ad798c2fd9e9472d687aa7f2c3))
## [5.11.1](https://github.com/mob-sakai/UIEffect/compare/5.11.0...5.11.1) (2026-06-29)
### Bug Fixes
* support "disable domain reload" on Unity 6.6 or later ([a556c28](https://github.com/mob-sakai/UIEffect/commit/a556c282210303d9e7a7c284bb4b41ef3a35e3e1))
# [5.11.0](https://github.com/mob-sakai/UIEffect/compare/5.10.9...5.11.0) (2026-06-25)
### Bug Fixes
* enable/disable Gameobject break effect with 'TrueShadow' ([730aa2b](https://github.com/mob-sakai/UIEffect/commit/730aa2bb4d872ddab63f2dad611a063cefa07064)), closes [#400](https://github.com/mob-sakai/UIEffect/issues/400)
* select TMP submesh by mesh before material ([f538ef2](https://github.com/mob-sakai/UIEffect/commit/f538ef2cba3d4d76f6683bccee65d5a9694dad37))
* some fix ([b6b538f](https://github.com/mob-sakai/UIEffect/commit/b6b538f64f0b06ddfb4ad2edd6b7db6dc1d067d8))
* Support for skipping "reload domain" ([ec3fb13](https://github.com/mob-sakai/UIEffect/commit/ec3fb13c111638781bf852e2a4a4747fbfeb7d3a))
### Features
* add option to remove from preloadedAssets when build player ([e955715](https://github.com/mob-sakai/UIEffect/commit/e955715c99c474881e0b27ecc325061ce0d866a0)), closes [#393](https://github.com/mob-sakai/UIEffect/issues/393)
* support XBOX One/Series ([72bb1c5](https://github.com/mob-sakai/UIEffect/commit/72bb1c51318829e7ced3b1436892a5969aedd9a3)), closes [#385](https://github.com/mob-sakai/UIEffect/issues/385) [#394](https://github.com/mob-sakai/UIEffect/issues/394)
## [5.10.9](https://github.com/mob-sakai/UIEffect/compare/5.10.8...5.10.9) (2026-06-08)
@@ -14,7 +14,7 @@ namespace Coffee.UIEffects.Timeline
public override void DrawBackground(TimelineClip clip, ClipBackgroundRegion region)
{
var director = TimelineEditor.inspectedDirector;
if (!director) return;
if (director == null) return;
var viewDuration = region.endTime - region.startTime;
var inDuration = (float)Math.Max(clip.easeInDuration, clip.blendInDuration);
@@ -38,7 +38,7 @@ namespace Coffee.UIEffects.Timeline
}
var floatClip = clip.asset as UIEffectFloatClip;
if (floatClip)
if (floatClip != null)
{
if (track is GradationRotationTrack || track is GradationOffsetTrack)
{
@@ -60,7 +60,7 @@ namespace Coffee.UIEffects.Timeline
protected override void DrawBackground(Rect rect, TimelineClip clip)
{
var asset = clip.asset as UIEffectFloatClip;
if (!asset) return;
if (asset == null) return;
if (s_FromStyle == null)
{
@@ -97,7 +97,7 @@ namespace Coffee.UIEffects.Timeline
protected override void DrawBackground(Rect p, TimelineClip clip)
{
var asset = clip.asset as UIEffectColorClip;
if (!asset) return;
if (asset == null) return;
var d = asset.m_Data;
if (d.m_Tween)
+1 -1
View File
@@ -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()
@@ -10,27 +10,24 @@ using UnityEditorInternal;
namespace Coffee.UIEffects.Editors
{
[CustomEditor(typeof(UIEffectProjectSettings))]
public class UIEffectProjectSettingsEditor : Editor
internal class UIEffectProjectSettingsEditor : PreloadedProjectSettingsEditor
{
private ReorderableList _reorderableList;
private SerializedProperty _runtimePresets;
private SerializedProperty _runtimePresetsV2;
private SerializedProperty _useHDRColorPicker;
private SerializedProperty _preLoadSettingsInBuild;
private bool _isInitialized;
private ShaderVariantRegistryEditor _shaderVariantRegistryEditor;
private UIEffect[] _legacyPresets;
private bool _expandRuntimePresets;
private bool _expandLegacyPrefabs;
private void InitializeIfNeeded()
protected override void OnEnable()
{
if (_isInitialized) return;
base.OnEnable();
_legacyPresets = UIEffectProjectSettings.LoadEditorPresets();
_useHDRColorPicker = serializedObject.FindProperty("m_UseHDRColorPicker");
_runtimePresets = serializedObject.FindProperty("m_RuntimePresets");
_runtimePresetsV2 = serializedObject.FindProperty("m_RuntimePresetsV2");
_preLoadSettingsInBuild = serializedObject.FindProperty("m_PreLoadSettingsInBuild");
_reorderableList = new ReorderableList(serializedObject, _runtimePresetsV2, true, true, true, true);
_reorderableList.drawHeaderCallback = rect => EditorGUI.LabelField(rect, "Runtime Presets");
@@ -41,7 +38,7 @@ namespace Coffee.UIEffects.Editors
rect.y += 2;
rect.height = EditorGUIUtility.singleLineHeight;
EditorGUI.BeginDisabledGroup(effect && effect.hideFlags == HideFlags.NotEditable);
EditorGUI.BeginDisabledGroup(effect != null && effect.hideFlags == HideFlags.NotEditable);
EditorGUI.PropertyField(rect, element, GUIContent.none);
EditorGUI.EndDisabledGroup();
};
@@ -52,23 +49,18 @@ namespace Coffee.UIEffects.Editors
UIEffectProjectSettings.RegisterRuntimePreset);
};
_isInitialized = true;
}
private void OnEnable()
{
_legacyPresets = UIEffectProjectSettings.LoadEditorPresets();
}
private void OnDisable()
{
_isInitialized = false;
_shaderVariantRegistryEditor = ShaderVariantRegistryEditor.Create(serializedObject, "(UIEffect)",
() =>
{
UIEffectProjectSettings.shaderRegistry
.RegisterOptionalShaders(UIEffectProjectSettings.instance);
});
}
public override void OnInspectorGUI()
{
serializedObject.Update();
InitializeIfNeeded();
EditorGUIUtility.labelWidth = 180;
base.OnInspectorGUI();
// Settings
// Runtime Presets
@@ -79,52 +71,24 @@ namespace Coffee.UIEffects.Editors
// Editor
// Use HDR color pickers.
EditorGUIUtility.labelWidth = 200;
EditorGUILayout.PropertyField(_useHDRColorPicker);
// Shader
// Shader registry
EditorGUILayout.Space();
EditorGUILayout.LabelField("Shader", EditorStyles.boldLabel);
if (_shaderVariantRegistryEditor == null)
{
var property = serializedObject.FindProperty("m_ShaderVariantRegistry");
_shaderVariantRegistryEditor = new ShaderVariantRegistryEditor(property, "(UIEffect)",
() =>
{
UIEffectProjectSettings.shaderRegistry
.RegisterOptionalShaders(UIEffectProjectSettings.instance);
});
}
_shaderVariantRegistryEditor.Draw();
EditorGUILayout.Space();
EditorGUILayout.LabelField("Advanced", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(_preLoadSettingsInBuild);
if (!_preLoadSettingsInBuild.boolValue)
{
EditorGUILayout.BeginHorizontal();
EditorGUILayout.HelpBox("UIEffectProjectSettings asset will not be built in." +
"please load manually from Resources, AssetBundle, or Addressables before using UIEffect.",
MessageType.Warning);
if (GUILayout.Button("Ping"))
{
EditorGUIUtility.PingObject(target);
}
EditorGUILayout.EndHorizontal();
}
GUILayout.FlexibleSpace();
DrawPreLoadSettingsInBuild("UIEffect");
serializedObject.ApplyModifiedProperties();
GUILayout.FlexibleSpace();
}
private void DrawLegacyPresets()
{
for (var i = _runtimePresets.arraySize - 1; 0 <= i; i--)
{
if (!_runtimePresets.GetArrayElementAtIndex(i).objectReferenceValue)
if (_runtimePresets.GetArrayElementAtIndex(i).objectReferenceValue == null)
{
_runtimePresets.DeleteArrayElementAtIndex(i);
}
@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 1a9c54e67e8c9495fa77bfe119825877
timeCreated: 1487152293
licenseType: Pro
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
+2 -2
View File
@@ -34,7 +34,7 @@ namespace Coffee.UIEffects.Editors
var r = EditorGUILayout.GetControlRect();
r.width -= 120;
if (_preset.objectReferenceValue)
if (_preset.objectReferenceValue != null)
{
EditorGUI.PropertyField(r, _preset);
}
@@ -81,7 +81,7 @@ namespace Coffee.UIEffects.Editors
EditorGUILayout.PropertyField(_allowToModifyMeshShape);
var parent = _target.objectReferenceValue ?? _preset.objectReferenceValue;
if (parent)
if (parent != null)
{
EditorGUI.BeginDisabledGroup(true);
CreateCachedEditor(parent, null, ref _uiEffectEditor);
+9 -1
View File
@@ -90,8 +90,9 @@ namespace Coffee.UIEffects.Editors
private void DrawPlayer(UIEffectTweener tweener)
{
if (!tweener) return;
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);
}
+68 -8
View File
@@ -123,7 +123,7 @@ _This package requires **Unity 2020.3 or later**._
```
- To update the package, use Package Manager UI (`Window > Package Manager`) or run the following command with `@{version}`:
```
openupm add com.coffee.ui-effect@5.9.0
openupm add com.coffee.ui-effect@5.12.0
```
### Install via UPM (with Package Manager UI)
@@ -132,7 +132,7 @@ _This package requires **Unity 2020.3 or later**._
- Click `+ > Add package from git URL...` and input the repository URL: `https://github.com/mob-sakai/UIEffect.git?path=Packages/src`
![](https://github.com/mob-sakai/mob-sakai/releases/download/docs/upm-add-from-url.png)
- To update the package, change suffix `#{version}` to the target version.
- e.g. `https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.9.0`
- e.g. `https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.12.0`
### Install via UPM (Manually)
@@ -147,7 +147,7 @@ _This package requires **Unity 2020.3 or later**._
```
- To update the package, change suffix `#{version}` to the target version.
- e.g. `"com.coffee.ui-effect": "https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.9.0",`
- e.g. `"com.coffee.ui-effect": "https://github.com/mob-sakai/UIEffect.git?path=Packages/src#5.12.0",`
### Install as Embedded Package
@@ -167,6 +167,53 @@ Additional resources can be imported to extend functionality.
- [Usage with TextMeshPro](#usage-with-textmeshpro)
- [Usage with ShaderGraph](#usage-with-shadergraph)
#### Install Additional Resources as Packages
Starting with v5.12.0, you can install optional resources as separate UPM packages instead of importing them as samples.
This lets you use the features you need without adding their assets to your project's `Assets/Samples` directory.
> [!TIP]
> Use the **same version as the UIEffect package**.
> If you have already imported a resource as a sample, delete its corresponding sample from `Assets/Samples/UI Effect/{version}` before installing the package.
The following optional packages are available from the OpenUPM registry.
Choose the package that matches your Unity version and render pipeline, then replace `5.12.0` with your UIEffect package version if needed.
```sh
# TextMeshPro support (Unity 2023.2 or earlier)
openupm add com.coffee.ui-effect.textmeshpro-legacy@5.12.0
# TextMeshPro support (Unity 2023.3 or later)
openupm add com.coffee.ui-effect.textmeshpro@5.12.0
# ShaderGraph support (Unity 6, Built-in Render Pipeline)
openupm add com.coffee.ui-effect.shadergraph-builtin@5.12.0
# ShaderGraph support (Unity 6, URP)
openupm add com.coffee.ui-effect.shadergraph-urp@5.12.0
# v4 compatible components
openupm add com.coffee.ui-effect.v4-compatible-components@5.12.0
```
For manual installation, add the desired package entries to your `Packages/manifest.json` file, install the package through Package Manager, or embed the package in your project.
The following is a valid `manifest.json` dependencies example; remove entries for resources you do not need.
Use only one TextMeshPro support package, and select the ShaderGraph package for your render pipeline.
```json
{
"dependencies": {
// TextMeshPro Support (2023.2 or earlier):
"com.coffee.ui-effect.textmeshpro-legacy": "https://github.com/mob-sakai/UIEffect.git?path=Packages/src/Samples~/com.coffee.ui-effect.textmeshpro-legacy#5.12.0",
// TextMeshPro Support (2023.3, 6000.0 or later):
"com.coffee.ui-effect.textmeshpro": "https://github.com/mob-sakai/UIEffect.git?path=Packages/src/Samples~/com.coffee.ui-effect.textmeshpro#5.12.0",
// ShaderGraph Support (Unity 6, Builtin):
"com.coffee.ui-effect.shadergraph-builtin": "https://github.com/mob-sakai/UIEffect.git?path=Packages/src/Samples~/com.coffee.ui-effect.shadergraph-builtin#5.12.0",
// ShaderGraph Support (Unity 6, URP):
"com.coffee.ui-effect.shadergraph-urp": "https://github.com/mob-sakai/UIEffect.git?path=Packages/src/Samples~/com.coffee.ui-effect.shadergraph-urp#5.12.0",
// v4 Compatible Components:
"com.coffee.ui-effect.v4-compatible-components": "https://github.com/mob-sakai/UIEffect.git?path=Packages/src/Samples~/com.coffee.ui-effect.v4-compatible-components#5.12.0",
...
}
}
```
<br><br>
## 🔄 Upgrading from v4 to v5
@@ -185,6 +232,10 @@ If upgrading from UIEffect v4 to v5, note the following breaking changes:
```
2. Import the `v4 Compatible Components` sample from the Package Manager window.
> [!TIP]
> "Additional Resources" can be installed as a package from v5.12.0 or later.
> For more information, please refer to the [Install Additional Resources](#import-additional-resources) section.
3. All v4 components are obsolete.
- v4 `UIEffect` component is now `UIEffectV4` component. Change the reference in the code.
@@ -211,9 +262,10 @@ If upgrading from UIEffect v4 to v5, note the following breaking changes:
![](https://github.com/mob-sakai/mob-sakai/releases/download/docs/1744308178360.gif)
5. From the top menu, you can load/append preset.
> [!TIP]
> `Load` overwrites all properties with the preset, while `Append` only overwrites enabled filters and modes with the preset.
> You can easily build effects by combining them with `Append`.
> [!TIP]
>
> `Load` overwrites all properties with the preset, while `Append` only overwrites enabled filters and modes with the preset.
> You can easily build effects by combining them with `Append`.
![](https://github.com/mob-sakai/mob-sakai/releases/download/docs/1744800851739.gif)
@@ -459,8 +511,8 @@ You can preview the animation using the seek bar and play button.
The `UIEffectReplica` component applies visual effects to UI elements by replicating the settings of another `UIEffect` component. This allows the same effect to be applied across multiple UI elements simultaneously.
- **Target**: The target `UIEffect` component to replicate.
> [!TIP]
> You can specify a preset as well as an instance as the target for `UIEffectReplica`.
> [!TIP]
> You can specify a preset as well as an instance as the target for `UIEffectReplica`.
- **Use Target Transform**: Use the target's transform for some effects.
![](https://github.com/mob-sakai/mob-sakai/releases/download/docs/uieffect5.7.0-sample-custom-root.gif)
- **Custom Root**: Use the custom transform for some effects.
@@ -471,6 +523,10 @@ The `UIEffectReplica` component applies visual effects to UI elements by replica
### Usage with TextMeshPro
> [!TIP]
> "Additional Resources" can be installed as a package from v5.12.0 or later.
> For more information, please refer to the [Install Additional Resources](#import-additional-resources) section.
To use UIEffect with TextMeshPro, you need to import additional resources.
When a shader included in the samples is requested, an import dialog will automatically appear.
Click the `Import` button.
@@ -515,6 +571,10 @@ Click the `Import` button.
### Usage with ShaderGraph
> [!TIP]
> "Additional Resources" can be installed as a package from v5.12.0 or later.
> For more information, please refer to the [Install Additional Resources](#import-additional-resources) section.
⚠️ ShaderGraph support is available only in Unity 2023.2/6.0 or later.
![](https://github.com/mob-sakai/mob-sakai/releases/download/docs/1744307236288.png)
@@ -12,6 +12,33 @@ namespace Coffee.UIEffectInternal
/// </summary>
internal static class ComponentExtensions
{
#if !UNITY_2019_2_OR_NEWER
public static bool TryGetComponent<T>(this GameObject self, out T component)
where T : Component
{
if (self == null)
{
component = null;
return false;
}
component = self.GetComponent<T>();
return component != null;
}
public static bool TryGetComponent<T>(this Component self, out T component)
where T : Component
{
if (self == null)
{
component = null;
return false;
}
return self.gameObject.TryGetComponent(out component);
}
#endif
/// <summary>
/// Get components in children of a specific type in the hierarchy of a GameObject.
/// </summary>
@@ -31,7 +58,10 @@ namespace Coffee.UIEffectInternal
public static void GetComponentsInChildren<T>(this Component self, List<T> results, int depth)
where T : Component
{
if (results == null) return;
results.Clear();
if (self == null) return;
self.GetComponentsInChildren_Internal(results, depth);
}
@@ -70,9 +100,11 @@ namespace Coffee.UIEffectInternal
/// </summary>
public static T GetRootComponent<T>(this Component self) where T : Component
{
if (self == null) return null;
T component = null;
var transform = self.transform;
while (transform)
while (transform != null)
{
if (transform.TryGetComponent<T>(out var c))
{
@@ -92,8 +124,10 @@ namespace Coffee.UIEffectInternal
Predicate<T> valid)
where T : Component
{
if (self == null || valid == null) return null;
var tr = includeSelf ? self.transform : self.transform.parent;
while (tr)
while (tr != null)
{
if (tr.TryGetComponent<T>(out var c) && valid(c)) return c;
if (tr == stopAfter) return null;
@@ -170,7 +204,7 @@ namespace Coffee.UIEffectInternal
if (!includeInactive) return self.GetComponentInParent<T>();
var current = self.transform;
while (current)
while (current != null)
{
if (current.TryGetComponent<T>(out var c)) return c;
current = current.parent;
@@ -19,7 +19,7 @@ namespace Coffee.UIEffectInternal
mesh => mesh,
mesh =>
{
if (mesh)
if (mesh != null)
{
mesh.Clear();
}
@@ -37,7 +37,7 @@ namespace Coffee.UIEffectInternal
public static void CopyTo(this Mesh self, Mesh dst)
{
if (!self || !dst) return;
if (self == null || dst == null) return;
var vector3List = InternalListPool<Vector3>.Rent();
var vector4List = InternalListPool<Vector4>.Rent();
@@ -84,14 +84,12 @@ namespace Coffee.UIEffectInternal
{
if (self == null || dst == null) return;
dst.Clear(false);
self.FillMesh(dst);
dst.RecalculateBounds();
}
public static void CopyTo(this Mesh self, VertexHelper dst)
{
if (!self || dst == null) return;
if (self == null || dst == null) return;
var vertexCount = self.vertexCount;
var indexCount = self.triangles.Length;
@@ -100,12 +98,14 @@ namespace Coffee.UIEffectInternal
public static void CopyTo(this Mesh self, VertexHelper dst, int vertexCount, int indexCount)
{
if (!self || dst == null) return;
if (self == null || dst == null) return;
var positions = InternalListPool<Vector3>.Rent();
var normals = InternalListPool<Vector3>.Rent();
var uv0 = InternalListPool<Vector4>.Rent();
var uv1 = InternalListPool<Vector4>.Rent();
var uv2 = InternalListPool<Vector4>.Rent();
var uv3 = InternalListPool<Vector4>.Rent();
var tangents = InternalListPool<Vector4>.Rent();
var colors = InternalListPool<Color32>.Rent();
var indices = InternalListPool<int>.Rent();
@@ -113,6 +113,8 @@ namespace Coffee.UIEffectInternal
self.GetColors(colors);
self.GetUVs(0, uv0);
self.GetUVs(1, uv1);
self.GetUVs(2, uv2);
self.GetUVs(3, uv3);
self.GetNormals(normals);
self.GetTangents(tangents);
self.GetIndices(indices, 0);
@@ -121,7 +123,7 @@ namespace Coffee.UIEffectInternal
for (var i = 0; i < vertexCount; i++)
{
dst.AddVert(positions.GetOrDefault(i), colors.GetOrDefault(i), uv0.GetOrDefault(i), uv1.GetOrDefault(i),
normals.GetOrDefault(i), tangents.GetOrDefault(i));
uv2.GetOrDefault(i), uv3.GetOrDefault(i), normals.GetOrDefault(i), tangents.GetOrDefault(i));
}
var count = Mathf.Clamp(indexCount, 0, indices.Count);
@@ -134,6 +136,8 @@ namespace Coffee.UIEffectInternal
InternalListPool<Vector3>.Return(ref normals);
InternalListPool<Vector4>.Return(ref uv0);
InternalListPool<Vector4>.Return(ref uv1);
InternalListPool<Vector4>.Return(ref uv2);
InternalListPool<Vector4>.Return(ref uv3);
InternalListPool<Vector4>.Return(ref tangents);
InternalListPool<Color32>.Return(ref colors);
InternalListPool<int>.Return(ref indices);
@@ -15,38 +15,37 @@ namespace Coffee.UIEffectInternal
#if UNITY_EDITOR
{
[Tooltip("When enabled, this settings asset will be added to PlayerSettings.preloadedAssets in build.\n\n" +
"When disable, you should load this settings via Resources, AssetBundles or " +
"Addressables to use UIEffect.")]
"When disable, you should load this settings via Resources, AssetBundles or Addressables to use.")]
[SerializeField]
[Header("Advanced")]
[HideInInspector]
private bool m_PreLoadSettingsInBuild = true;
protected static bool s_BuildingPlayer;
private class Postprocessor : AssetPostprocessor
private class EditorEvents : AssetPostprocessor, IPreprocessBuildWithReport, IPostprocessBuildWithReport
{
int IOrderedCallback.callbackOrder => 0;
private static void OnPostprocessAllAssets(string[] _, string[] __, string[] ___, string[] ____)
{
Initialize();
}
}
private class ExcludeFromBuild : IPreprocessBuildWithReport, IPostprocessBuildWithReport
{
int IOrderedCallback.callbackOrder => 0;
void IPreprocessBuildWithReport.OnPreprocessBuild(BuildReport report)
{
AssetDatabase.Refresh();
Initialize();
s_BuildingPlayer = true;
foreach (var t in TypeCache.GetTypesDerivedFrom(typeof(PreloadedProjectSettings<>)))
{
var settings = GetDefaultSettings(t);
if (!settings || settings.m_PreLoadSettingsInBuild) continue;
if (settings == null || settings.m_PreLoadSettingsInBuild) continue;
PlayerSettings.SetPreloadedAssets(
PlayerSettings.GetPreloadedAssets()
.Where(x => x && x.GetType() != t)
.Where(x => x != null && x.GetType() != t)
.ToArray());
Debug.Log($"[PreloadedProjectSettings] Build started: removed '{settings.name}' " +
@@ -69,9 +68,12 @@ namespace Coffee.UIEffectInternal
var defaultSettings = GetDefaultSettings(t);
if (defaultSettings == null)
{
// When create a new instance, automatically set it as default settings.
defaultSettings = CreateInstance(t) as PreloadedProjectSettings;
if (!s_BuildingPlayer) SetDefaultSettings(defaultSettings);
if (!s_BuildingPlayer)
{
// When create a new instance, automatically set it as default settings.
defaultSettings = CreateInstance(t) as PreloadedProjectSettings;
SetDefaultSettings(defaultSettings);
}
}
else if (GetPreloadedSettings(t).Length != 1)
{
@@ -103,7 +105,7 @@ namespace Coffee.UIEffectInternal
protected static PreloadedProjectSettings GetDefaultSettings(Type type)
{
return GetPreloadedSettings(type).FirstOrDefault() as PreloadedProjectSettings
?? AssetDatabase.FindAssets($"t:{nameof(PreloadedProjectSettings)}")
?? AssetDatabase.FindAssets($"t:{type.Name}")
.Select(AssetDatabase.GUIDToAssetPath)
.Select(AssetDatabase.LoadAssetAtPath<PreloadedProjectSettings>)
.FirstOrDefault(x => x != null && x.GetType() == type);
@@ -150,6 +152,37 @@ namespace Coffee.UIEffectInternal
{
}
}
internal abstract class PreloadedProjectSettingsEditor : Editor
{
private SerializedProperty _preLoadSettingsInBuild;
protected virtual void OnEnable()
{
_preLoadSettingsInBuild = serializedObject.FindProperty("m_PreLoadSettingsInBuild");
}
protected void DrawPreLoadSettingsInBuild(string packageName)
{
if (_preLoadSettingsInBuild == null) return;
EditorGUILayout.PropertyField(_preLoadSettingsInBuild);
if (!_preLoadSettingsInBuild.boolValue)
{
EditorGUILayout.BeginHorizontal();
EditorGUILayout.HelpBox(
$"{target.GetType().Name} asset will not be built in.\n" +
$"please load manually from Resources, AssetBundle, or Addressables before using {packageName}.",
MessageType.Warning);
if (GUILayout.Button("Ping"))
{
EditorGUIUtility.PingObject(target);
}
EditorGUILayout.EndHorizontal();
}
}
}
#else
{
}
@@ -188,7 +221,7 @@ namespace Coffee.UIEffectInternal
private void OnPlayModeStateChanged(PlayModeStateChange state)
{
if (!this) return;
if (this == null) return;
switch (state)
{
@@ -206,7 +239,7 @@ namespace Coffee.UIEffectInternal
}
}
#else
public static T instance => s_Instance != null ? s_Instance : s_Instance = CreateInstance<T>();
public static T instance => s_Instance != null ? s_Instance : s_Instance = CreateInstance<T>();
#endif
/// <summary>
@@ -222,9 +255,10 @@ namespace Coffee.UIEffectInternal
return;
}
EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
#else
if (s_Instance && s_Instance != this)
if (s_Instance != null && s_Instance != this)
{
Destroy(s_Instance);
}
@@ -259,16 +293,20 @@ namespace Coffee.UIEffectInternal
{
if (_target == null)
{
if (_editor)
if (_editor != null)
{
DestroyImmediate(_editor);
_editor = null;
}
_target = instance;
if (_target == null) return;
_editor = Editor.CreateEditor(_target);
}
if (_editor == null) return;
_editor.OnInspectorGUI();
}
}
@@ -36,7 +36,7 @@ namespace Coffee.UIEffectInternal
foreach (var shaderName in s_ShaderNames)
{
var shader = Shader.Find(shaderName);
if (!shader) continue;
if (shader == null) continue;
var hasCgincError = ShaderUtil.GetShaderMessages(shader)
.Any(x => Regex.IsMatch(x.message, $"Couldn't open include file.*{s_CgincPattern}"));
@@ -51,6 +51,8 @@ namespace Coffee.UIEffectInternal
/// </summary>
protected void Invoke(Action<T> callback)
{
if (callback == null) return;
var node = _delegates.First;
while (node != null)
{
@@ -66,11 +68,6 @@ namespace Coffee.UIEffectInternal
node = node.Next;
}
}
public void Clear()
{
_delegates.Clear();
}
}
/// <summary>
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
namespace Coffee.UIEffectInternal
@@ -8,25 +9,32 @@ namespace Coffee.UIEffectInternal
{
private static readonly Dictionary<Type, IFrameCache> s_Caches = new Dictionary<Type, IFrameCache>();
static FrameCache()
{
s_Caches.Clear();
UIExtraCallbacks.onLateAfterCanvasRebuild += ClearAllCache;
}
#if UNITY_EDITOR
#if UNITY_EDITOR && UNITY_2019_3_OR_NEWER
[InitializeOnLoadMethod]
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
#elif UNITY_EDITOR
[InitializeOnLoadMethod]
#else
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
#endif
private static void Clear()
{
s_Caches.Clear();
UIExtraCallbacks.onLateAfterCanvasRebuild -= ClearAllCache;
UIExtraCallbacks.onLateAfterCanvasRebuild += ClearAllCache;
}
#endif
/// <summary>
/// Tries to retrieve a value from the frame cache with a specified key.
/// </summary>
public static bool TryGet<T>(object key1, string key2, out T result)
{
if (key1 == null || key2 == null)
{
result = default;
return false;
}
return GetFrameCache<T>().TryGet((key1.GetHashCode(), key2.GetHashCode()), out result);
}
@@ -35,6 +43,12 @@ namespace Coffee.UIEffectInternal
/// </summary>
public static bool TryGet<T>(object key1, string key2, int key3, out T result)
{
if (key1 == null || key2 == null)
{
result = default;
return false;
}
return GetFrameCache<T>().TryGet((key1.GetHashCode(), key2.GetHashCode() + key3), out result);
}
@@ -43,6 +57,8 @@ namespace Coffee.UIEffectInternal
/// </summary>
public static void Set<T>(object key1, string key2, T result)
{
if (key1 == null || key2 == null) return;
GetFrameCache<T>().Set((key1.GetHashCode(), key2.GetHashCode()), result);
}
@@ -51,6 +67,8 @@ namespace Coffee.UIEffectInternal
/// </summary>
public static void Set<T>(object key1, string key2, int key3, T result)
{
if (key1 == null || key2 == null) return;
GetFrameCache<T>().Set((key1.GetHashCode(), key2.GetHashCode() + key3), result);
}
@@ -13,7 +13,9 @@ namespace Coffee.UIEffectInternal
public static int count => s_Repository.count;
#if UNITY_EDITOR
public static Func<string, Shader> onShaderFind = Shader.Find;
#if UNITY_EDITOR && UNITY_2019_3_OR_NEWER
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
public static void Clear()
{
@@ -47,8 +49,10 @@ namespace Coffee.UIEffectInternal
/// </summary>
public static void Get(Hash128 hash, ref Material material, string shaderName)
{
if (onShaderFind == null) return;
Profiler.BeginSample("(COF)[MaterialRepository] Get");
s_Repository.Get(hash, ref material, x => new Material(Shader.Find(x))
s_Repository.Get(hash, ref material, x => new Material(onShaderFind(x))
{
hideFlags = HideFlags.DontSave | HideFlags.NotEditable
}, shaderName);
@@ -60,8 +64,10 @@ namespace Coffee.UIEffectInternal
/// </summary>
public static void Get(Hash128 hash, ref Material material, string shaderName, string[] keywords)
{
if (onShaderFind == null) return;
Profiler.BeginSample("(COF)[MaterialRepository] Get");
s_Repository.Get(hash, ref material, x => new Material(Shader.Find(x.shaderName))
s_Repository.Get(hash, ref material, x => new Material(onShaderFind(x.shaderName))
{
hideFlags = HideFlags.DontSave | HideFlags.NotEditable,
shaderKeywords = x.keywords
+12 -11
View File
@@ -3,6 +3,7 @@ using System.Diagnostics;
using UnityEditor;
using UnityEngine;
using Object = UnityEngine.Object;
using Debug = UnityEngine.Debug;
#if UNITY_EDITOR
using System.IO;
using System.Linq;
@@ -48,15 +49,10 @@ namespace Coffee.UIEffectInternal
{
if (obj == null) return;
#if UNITY_EDITOR
if (Application.isEditor)
{
Object.DestroyImmediate(obj);
}
else
Object.DestroyImmediate(obj, true);
#else
Object.Destroy(obj);
#endif
{
Object.Destroy(obj);
}
}
[Conditional("UNITY_EDITOR")]
@@ -72,7 +68,7 @@ namespace Coffee.UIEffectInternal
public static T[] GetAllComponentsInPrefabStage<T>() where T : Component
{
var prefabStage = PrefabStageUtility.GetCurrentPrefabStage();
if (prefabStage == null) return Array.Empty<T>();
if (prefabStage == null || prefabStage.prefabContentsRoot == null) return Array.Empty<T>();
return prefabStage.prefabContentsRoot.GetComponentsInChildren<T>(true);
}
@@ -107,14 +103,19 @@ namespace Coffee.UIEffectInternal
#if UNITY_EDITOR
private static Action<Object, Texture2D> s_SetIconForObject = typeof(EditorGUIUtility)
.GetMethod("SetIconForObject", BindingFlags.Static | BindingFlags.NonPublic)
.CreateDelegate(typeof(Action<Object, Texture2D>), null) as Action<Object, Texture2D>;
?.CreateDelegate(typeof(Action<Object, Texture2D>), null) as Action<Object, Texture2D>;
[InitializeOnLoadMethod]
private static void InitializeOnLoadMethod()
{
if (Misc.isBatchOrBuilding) return;
if (s_SetIconForObject == null)
{
Debug.LogError("Could not retrieve the object icon API.");
return;
}
var types = TypeCache.GetTypesWithAttribute<IconAttribute>();
var types = TypeCache.GetTypesWithAttribute(typeof(IconAttribute));
var scripts = MonoImporter.GetAllRuntimeMonoScripts();
foreach (var type in types)
{
@@ -71,6 +71,8 @@ namespace Coffee.UIEffectInternal
/// </summary>
public void Get(Hash128 hash, ref T obj, Func<T> onCreate)
{
if (onCreate == null) return;
if (GetFromCache(hash, ref obj)) return;
Add(hash, ref obj, onCreate());
}
@@ -80,6 +82,8 @@ namespace Coffee.UIEffectInternal
/// </summary>
public void Get<TS>(Hash128 hash, ref T obj, Func<TS, T> onCreate, TS source)
{
if (onCreate == null) return;
if (GetFromCache(hash, ref obj)) return;
Add(hash, ref obj, onCreate(source));
}
@@ -92,7 +96,7 @@ namespace Coffee.UIEffectInternal
{
if (entry.storedObject == null)
{
Release(ref entry.storedObject);
Remove(entry);
Profiler.EndSample();
return false;
}
@@ -127,10 +131,11 @@ namespace Coffee.UIEffectInternal
Profiler.BeginSample("(COF)[ObjectRepository] Add");
var newEntry = 0 < _pool.Count ? _pool.Pop() : new Entry();
newEntry.storedObject = newObject;
newEntry.objectId = newObject.GetHashCode();
newEntry.hash = hash;
newEntry.reference = 1;
_cache[hash] = newEntry;
_objectKey[newObject.GetHashCode()] = hash;
_objectKey[newEntry.objectId] = hash;
Logger.Log(_name, $"<color=#03c700>Add</color>(total#{count}): {newEntry}");
Release(ref obj);
obj = newObject;
@@ -175,7 +180,7 @@ namespace Coffee.UIEffectInternal
Profiler.BeginSample("(COF)[ObjectRepository] Remove");
_cache.Remove(entry.hash);
_objectKey.Remove(entry.storedObject.GetHashCode());
_objectKey.Remove(entry.objectId);
_pool.Push(entry);
entry.reference = 0;
Logger.Log(_name, $"<color=#f29e03>Remove</color>(total#{_cache.Count}): {entry}");
@@ -186,12 +191,14 @@ namespace Coffee.UIEffectInternal
private class Entry
{
public Hash128 hash;
public int objectId;
public int reference;
public T storedObject;
public void Release(Action<T> onRelease)
{
reference = 0;
objectId = 0;
if (storedObject != null)
{
onRelease?.Invoke(storedObject);
@@ -1,5 +1,4 @@
#if UNITY_EDITOR
using System;
using System.Collections.Generic;
using System.IO;
using UnityEngine;
@@ -12,17 +11,24 @@ namespace Coffee.UIEffectInternal
{
internal static class ShaderSampleImporter
{
private static string s_ReadmeUrl;
private static (string shaderName, string sampleName, string version)[] s_Samples;
private static (string guid, string fileName)[] s_DeprecatedShaders;
private static readonly Dictionary<string, string> s_SampleNames = new Dictionary<string, string>();
private static readonly Dictionary<string, string> s_ShaderAliases = new Dictionary<string, string>();
public static void RegisterReadmeUrl(string url)
{
s_ReadmeUrl = url;
}
public static void RegisterShaderSamples((string shaderName, string sampleName, string version)[] samples)
{
if (IsBatchOrBuilding()) return;
if (samples == null || IsBatchOrBuilding()) return;
// Collect sample names.
s_Samples = samples;
s_SampleNames.Clear();
foreach (var (shaderName, sampleName, _) in samples)
{
s_SampleNames[shaderName] = sampleName;
@@ -31,6 +37,8 @@ namespace Coffee.UIEffectInternal
public static void RegisterShaderAliases((string, string)[] aliases)
{
if (aliases == null) return;
foreach (var (from, to) in aliases)
{
s_ShaderAliases[from] = to;
@@ -51,7 +59,7 @@ namespace Coffee.UIEffectInternal
/// </summary>
public static bool ImportShaderIfSelected(string shaderName)
{
if (IsBatchOrBuilding()) return false;
if (string.IsNullOrEmpty(shaderName) || IsBatchOrBuilding()) return false;
if (s_ShaderAliases.TryGetValue(shaderName, out var alias))
{
@@ -62,6 +70,11 @@ namespace Coffee.UIEffectInternal
if (s_SampleNames.TryGetValue(shaderName, out var sampleName))
{
var message = $"Import the sample '{sampleName}' to use the shader '{shaderName}'.";
if (!string.IsNullOrWhiteSpace(s_ReadmeUrl))
{
message += "\n\nFor details, please see the readme.";
}
return ImportSampleIfSelected(sampleName, message);
}
@@ -85,8 +98,22 @@ namespace Coffee.UIEffectInternal
// Import the sample if selected.
if (!string.IsNullOrEmpty(message))
{
var selected = EditorUtility.DisplayDialog($"Import {sampleName}", message, "Import", "Cancel");
if (!selected) return false;
if (!string.IsNullOrWhiteSpace(s_ReadmeUrl))
{
var selected = EditorUtility.DisplayDialogComplex(
$"Import {sampleName}", message, "Import", "Cancel", "Show Readme");
if (selected == 2)
{
Application.OpenURL(s_ReadmeUrl);
return false;
}
if (selected != 0) return false;
}
else if (!EditorUtility.DisplayDialog($"Import {sampleName}", message, "Import", "Cancel"))
{
return false;
}
}
// Remove the imported sample name from the list.
@@ -107,18 +134,19 @@ namespace Coffee.UIEffectInternal
if (string.IsNullOrEmpty(shaderName)) return null;
var shader = Shader.Find(shaderName);
if (!shader) return null;
if (shader == null) return null;
var path = AssetDatabase.GetAssetPath(shader);
if (string.IsNullOrEmpty(path)) return null;
return AssetImporter.GetAtPath(path).userData;
var importer = AssetImporter.GetAtPath(path);
return importer != null ? importer.userData : null;
}
private static void DeleteShader(string shaderName)
{
var shader = Shader.Find(shaderName);
if (shader)
if (shader != null)
{
AssetDatabase.DeleteAsset(AssetDatabase.GetAssetPath(shader));
}
@@ -156,12 +184,15 @@ namespace Coffee.UIEffectInternal
}
// Remove deprecated shaders.
foreach (var (guid, fileName) in s_DeprecatedShaders)
if (s_DeprecatedShaders != null)
{
var path = AssetDatabase.GUIDToAssetPath(guid);
if (!string.IsNullOrEmpty(path) && Path.GetFileName(path) == fileName)
foreach (var (guid, fileName) in s_DeprecatedShaders)
{
AssetDatabase.DeleteAsset(path);
var path = AssetDatabase.GUIDToAssetPath(guid);
if (!string.IsNullOrEmpty(path) && Path.GetFileName(path) == fileName)
{
AssetDatabase.DeleteAsset(path);
}
}
}
@@ -75,22 +75,22 @@ namespace Coffee.UIEffectInternal
/// </summary>
public void InitializeShaderLookup()
{
var count = m_RegisteredShaders.Count;
if (count == 0) return;
if (_shaderByName == null)
{
_shaderByName = new Dictionary<string, Shader>(count);
_shaderByName = new Dictionary<string, Shader>();
}
else
{
_shaderByName.Clear();
}
if (m_RegisteredShaders == null) return;
var count = m_RegisteredShaders.Count;
for (var i = 0; i < count; i++)
{
var s = m_RegisteredShaders[i];
if (s)
if (s != null)
{
_shaderByName[s.name] = s;
}
@@ -105,7 +105,9 @@ namespace Coffee.UIEffectInternal
/// </summary>
public Shader FindShaderByName(string name)
{
if (_shaderByName != null && _shaderByName.TryGetValue(name, out var shader) && shader)
if (string.IsNullOrEmpty(name)) return null;
if (_shaderByName != null && _shaderByName.TryGetValue(name, out var shader) && shader != null)
{
return shader;
}
@@ -118,7 +120,17 @@ namespace Coffee.UIEffectInternal
string format,
string defaultOptionalShaderName)
{
if (!shader) return null;
if (shader == null) return null;
if (_cachedOptionalShaders == null)
{
_cachedOptionalShaders = new Dictionary<int, string>();
}
if (m_OptionalShaders == null)
{
m_OptionalShaders = new List<StringPair>();
}
// Already cached.
var id = shader.GetHashCode();
@@ -141,9 +153,11 @@ namespace Coffee.UIEffectInternal
for (var i = 0; i < count; i++)
{
var pair = m_OptionalShaders[i];
if (pair == null) continue;
if (pair.key != shaderName) continue;
optionalShader = FindShaderByName(pair.value);
if (!optionalShader) continue;
if (optionalShader == null) continue;
_cachedOptionalShaders[id] = pair.value;
return optionalShader;
}
@@ -151,7 +165,7 @@ namespace Coffee.UIEffectInternal
// Find optional shader by format.
optionalShaderName = string.Format(format, shaderName);
optionalShader = FindShaderByName(optionalShaderName);
if (optionalShader)
if (optionalShader != null)
{
_cachedOptionalShaders[id] = optionalShaderName;
return optionalShader;
@@ -178,7 +192,15 @@ namespace Coffee.UIEffectInternal
public void ClearCache()
{
_cachedOptionalShaders.Clear();
if (_cachedOptionalShaders == null)
{
_cachedOptionalShaders = new Dictionary<int, string>();
}
else
{
_cachedOptionalShaders.Clear();
}
_cachedVariants.Clear();
}
@@ -188,6 +210,7 @@ namespace Coffee.UIEffectInternal
/// </summary>
public void RegisterOptionalShaders(Object owner)
{
if (owner == null) return;
var shaderPaths = ShaderUtil.GetAllShaderInfo()
.Select(s => AssetDatabase.GetAssetPath(Shader.Find(s.name)))
.Where(path => !string.IsNullOrEmpty(path) && path.EndsWith(".shader"))
@@ -204,6 +227,7 @@ namespace Coffee.UIEffectInternal
/// </summary>
private void RegisterOptionalShaders(Object owner, string path)
{
if (owner == null) return;
if (!File.Exists(path) || !path.EndsWith(".shader")) return;
var packageName = PackageInfo.FindForAssembly(typeof(ShaderVariantRegistry).Assembly)?.name;
@@ -211,7 +235,10 @@ namespace Coffee.UIEffectInternal
// Register optional shader names by shader comment.
var pattern = $"// \\[OptionalShader\\] {packageName}: (.*)$";
var registeredKeys = new HashSet<string>(m_OptionalShaders.Select(x => x.key));
m_OptionalShaders = m_OptionalShaders ?? new List<StringPair>();
var registeredKeys = new HashSet<string>(m_OptionalShaders
.Where(x => x != null)
.Select(x => x.key));
var keys = File.ReadLines(path)
.Take(10)
.Select(line => Regex.Match(line, pattern))
@@ -222,7 +249,7 @@ namespace Coffee.UIEffectInternal
{
// Find shader.
var shader = AssetDatabase.LoadAssetAtPath<Shader>(path);
if (!shader) return;
if (shader == null) return;
var shaderName = shader.name;
foreach (var key in keys)
@@ -236,14 +263,15 @@ namespace Coffee.UIEffectInternal
public void InitializeIfNeeded(Object owner)
{
if (owner == null) return;
Profiler.BeginSample("(EDITOR/COF)[ShaderVariantRegistry] InitializeIfNeeded");
if (!m_Asset && AssetDatabase.IsMainAsset(owner))
if (m_Asset == null && AssetDatabase.IsMainAsset(owner))
{
// Find ShaderVariantCollection in owner.
var path = AssetDatabase.GetAssetPath(owner);
var collection = AssetDatabase.LoadAssetAtPath<ShaderVariantCollection>(path);
if (collection)
if (collection != null)
{
m_Asset = collection;
}
@@ -272,26 +300,38 @@ namespace Coffee.UIEffectInternal
/// </summary>
private void SyncRegisteredShaders(Object owner)
{
if (owner == null) return;
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++)
if (shaders == null) return;
// 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.
m_RegisteredShaders = m_RegisteredShaders ?? new List<Shader>();
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 && !m_RegisteredShaders.Contains(shaderRef))
{
m_RegisteredShaders.Add(shaderRef);
}
return;
}
m_RegisteredShaders.Clear();
m_RegisteredShaders.AddRange(shadersInSVC);
EditorUtility.SetDirty(owner);
}
internal void RegisterVariant(Material material, string path)
{
if (!material || !material.shader || !m_Asset) return;
if (material == null || material.shader == null || m_Asset == null) return;
m_UnregisteredVariants = m_UnregisteredVariants ?? new List<StringPair>();
Profiler.BeginSample("(EDITOR/COF)[ShaderVariantRegistry] RegisterVariant");
var (variant, pair) = GetVariant(material);
@@ -394,7 +434,30 @@ namespace Coffee.UIEffectInternal
private bool _expandOptionalShaders;
private bool _expandUnregisteredVariants;
public ShaderVariantRegistryEditor(SerializedProperty property, string optionName, Action onFindOptions)
public static ShaderVariantRegistryEditor CreateWithoutOption(SerializedObject so)
{
var property = so.FindProperty("m_ShaderVariantRegistry");
return new ShaderVariantRegistryEditor(property, null, null);
}
public static ShaderVariantRegistryEditor CreateWithoutOption(SerializedProperty property)
{
return new ShaderVariantRegistryEditor(property, null, null);
}
public static ShaderVariantRegistryEditor Create(SerializedObject so, string optionName, Action onFindOptions)
{
var property = so.FindProperty("m_ShaderVariantRegistry");
return new ShaderVariantRegistryEditor(property, optionName, onFindOptions);
}
public static ShaderVariantRegistryEditor Create(SerializedProperty property, string optionName,
Action onFindOptions)
{
return new ShaderVariantRegistryEditor(property, optionName, onFindOptions);
}
private ShaderVariantRegistryEditor(SerializedProperty property, string optionName, Action onFindOptions)
{
var so = property.serializedObject;
var optionalShaders = property.FindPropertyRelative("m_OptionalShaders");
@@ -402,6 +465,54 @@ namespace Coffee.UIEffectInternal
_errorOnUnregisteredVariant = property.FindPropertyRelative("m_ErrorOnUnregisteredVariant");
_asset = property.FindPropertyRelative("m_Asset");
_rlUnregisteredVariants = new ReorderableList(so, unregisteredVariants, false, true, false, true);
_rlUnregisteredVariants.drawHeaderCallback = rect =>
{
var rWarning = new Rect(rect.x, rect.y, 20, rect.height);
var icon = EditorGUIUtility.TrIconContent("warning",
"These variants are not registered.\nRegister them to use in player.");
EditorGUI.LabelField(rWarning, icon);
var rLabel = new Rect(rect.x + 20, rect.y, 200, rect.height);
EditorGUI.LabelField(rLabel, "Unregistered Shader Variants");
var rButton = new Rect(rect.x + rect.width - 60, rect.y, 60, rect.height - 4);
if (GUI.Button(rButton, "Clear All", EditorStyles.miniButton))
{
unregisteredVariants.ClearArray();
}
};
_rlUnregisteredVariants.elementHeight = EditorGUIUtility.singleLineHeight * 2 + 4;
_rlUnregisteredVariants.drawElementCallback = (r, index, isActive, isFocused) =>
{
if (unregisteredVariants.arraySize <= index) return;
var element = unregisteredVariants.GetArrayElementAtIndex(index);
if (element == null) return;
var key = element.FindPropertyRelative("key");
var value = element.FindPropertyRelative("value");
var h = EditorGUIUtility.singleLineHeight;
var rKey = new Rect(r.x, r.y + 2, r.width, h);
EditorGUI.LabelField(rKey, key.stringValue, EditorStyles.popup);
var rValue = new Rect(r.x + 20, r.y + h + 5, r.width - 40, 14);
var keywords = string.IsNullOrEmpty(value.stringValue) ? "<no keywords>" : value.stringValue;
EditorGUI.TextField(rValue, GUIContent.none, keywords, "LODRenderersText");
var rButton = new Rect(r.x + r.width - 20, r.y + h + 4, 20, h);
if (GUI.Button(rButton, EditorGUIUtility.IconContent("icons/toolbar plus.png"), "iconbutton"))
{
var collection = _asset.objectReferenceValue as ShaderVariantCollection;
AddVariant(collection, key.stringValue, value.stringValue);
unregisteredVariants.DeleteArrayElementAtIndex(index);
}
};
// Optional shaders.
if (string.IsNullOrEmpty(optionName)) return;
_rlOptionalShaders = new ReorderableList(so, optionalShaders, true, true, true, true);
_rlOptionalShaders.drawHeaderCallback = rect =>
{
@@ -448,56 +559,15 @@ namespace Coffee.UIEffectInternal
ShowShaderDropdown(value);
}
};
_rlUnregisteredVariants = new ReorderableList(so, unregisteredVariants, false, true, false, true);
_rlUnregisteredVariants.drawHeaderCallback = rect =>
{
var rWarning = new Rect(rect.x, rect.y, 20, rect.height);
var icon = EditorGUIUtility.TrIconContent("warning",
"These variants are not registered.\nRegister them to use in player.");
EditorGUI.LabelField(rWarning, icon);
var rLabel = new Rect(rect.x + 20, rect.y, 200, rect.height);
EditorGUI.LabelField(rLabel, "Unregistered Shader Variants");
var rButton = new Rect(rect.x + rect.width - 60, rect.y, 60, rect.height - 4);
if (GUI.Button(rButton, "Clear All", EditorStyles.miniButton))
{
unregisteredVariants.ClearArray();
}
};
_rlUnregisteredVariants.elementHeight = EditorGUIUtility.singleLineHeight * 2 + 4;
_rlUnregisteredVariants.drawElementCallback = (r, index, isActive, isFocused) =>
{
if (unregisteredVariants.arraySize <= index) return;
var element = unregisteredVariants.GetArrayElementAtIndex(index);
if (element == null) return;
var key = element.FindPropertyRelative("key");
var value = element.FindPropertyRelative("value");
var h = EditorGUIUtility.singleLineHeight;
var rKey = new Rect(r.x, r.y + 2, r.width, h);
EditorGUI.LabelField(rKey, key.stringValue, EditorStyles.popup);
var rValue = new Rect(r.x + 20, r.y + h + 5, r.width - 40, 14);
var keywords = string.IsNullOrEmpty(value.stringValue) ? "<no keywords>" : value.stringValue;
EditorGUI.TextField(rValue, GUIContent.none, keywords, "LODRenderersText");
var rButton = new Rect(r.x + r.width - 20, r.y + h + 4, 20, h);
if (GUI.Button(rButton, EditorGUIUtility.IconContent("icons/toolbar plus.png"), "iconbutton"))
{
var collection = _asset.objectReferenceValue as ShaderVariantCollection;
AddVariant(collection, key.stringValue, value.stringValue);
unregisteredVariants.DeleteArrayElementAtIndex(index);
}
};
}
public void Draw()
{
DrawOptionalShaders(ref _expandOptionalShaders, _rlOptionalShaders);
if (_rlOptionalShaders != null)
{
DrawOptionalShaders(ref _expandOptionalShaders, _rlOptionalShaders);
}
DrawRegisteredShaderVariants(ref _expandUnregisteredVariants, _asset, ref _editor);
if (0 < _rlUnregisteredVariants.serializedProperty.arraySize)
{
@@ -514,7 +584,7 @@ namespace Coffee.UIEffectInternal
if (collection == null) return;
var shader = Shader.Find(shaderName);
if (!shader) return;
if (shader == null) return;
collection.Add(new ShaderVariantCollection.ShaderVariant
{
@@ -47,12 +47,12 @@ namespace Coffee.UIEffectInternal
private static bool HasChanged_Internal(this Transform self, Transform baseTransform, ref Matrix4x4 prev,
float epsilon)
{
if (!self) return false;
if (self == null) return false;
var hash = baseTransform ? baseTransform.GetHashCode() : 0;
var hash = baseTransform != null ? baseTransform.GetHashCode() : 0;
if (FrameCache.TryGet(self, nameof(HasChanged), hash, out bool result)) return result;
var matrix = baseTransform
var matrix = baseTransform != null
? baseTransform.worldToLocalMatrix * self.localToWorldMatrix
: self.localToWorldMatrix;
var current = matrix * Matrix4x4.Scale(Vector3.one * 10000);
@@ -18,12 +18,6 @@ namespace Coffee.UIEffectInternal
private static readonly FastAction s_OnScreenSizeChangedAction = new FastAction();
private static Vector2Int s_LastScreenSize;
static UIExtraCallbacks()
{
Canvas.willRenderCanvases += OnBeforeCanvasRebuild;
Logger.LogMulticast(typeof(Canvas), "willRenderCanvases", message: "ctor");
}
/// <summary>
/// Event that occurs after canvas rebuilds.
/// </summary>
@@ -72,9 +66,16 @@ namespace Coffee.UIEffectInternal
CanvasUpdateRegistry.IsRebuildingLayout();
#if TMP_ENABLE
// Explicitly set `Canvas.willRenderCanvases += TMP_UpdateManager.DoRebuilds`.
typeof(TMPro.TMP_UpdateManager)
.GetProperty("instance", BindingFlags.NonPublic | BindingFlags.Static)
.GetValue(null);
var property = typeof(TMPro.TMP_UpdateManager)
.GetProperty("instance", BindingFlags.NonPublic | BindingFlags.Static);
if (property == null)
{
Debug.LogError("Could not retrieve the TextMeshPro update manager.");
}
else
{
var _ = property.GetValue(null);
}
#endif
Canvas.willRenderCanvases -= OnAfterCanvasRebuild;
Canvas.willRenderCanvases += OnAfterCanvasRebuild;
@@ -82,14 +83,27 @@ namespace Coffee.UIEffectInternal
message: "InitializeAfterCanvasRebuild");
}
#if UNITY_EDITOR
#if UNITY_EDITOR && UNITY_2019_3_OR_NEWER
[InitializeOnLoadMethod]
#endif
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
#elif UNITY_EDITOR
[InitializeOnLoadMethod]
#else
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
#endif
private static void InitializeOnLoad()
{
#if UNITY_2019_4 || UNITY_2020_2_OR_NEWER
Canvas.preWillRenderCanvases -= OnBeforeCanvasRebuild;
Canvas.preWillRenderCanvases += OnBeforeCanvasRebuild;
#else
Canvas.willRenderCanvases -= OnBeforeCanvasRebuild;
Canvas.willRenderCanvases += OnBeforeCanvasRebuild;
#endif
Canvas.willRenderCanvases -= OnAfterCanvasRebuild;
s_IsInitializedAfterCanvasRebuild = false;
s_LastScreenSize = default;
Logger.LogMulticast(typeof(Canvas), "willRenderCanvases", message: "ctor");
}
/// <summary>
@@ -22,7 +22,7 @@ namespace Coffee.UIEffects.Timeline
public Color Get(float time)
{
return m_Tween
? Color.Lerp(m_From, m_Value, m_Curve.Evaluate(time))
? Color.Lerp(m_From, m_Value, m_Curve != null ? m_Curve.Evaluate(time) : time)
: m_Value;
}
}
@@ -20,7 +20,7 @@ namespace Coffee.UIEffects.Timeline
public float Get(float time)
{
return m_Tween
? Mathf.Lerp(m_From, m_Value, m_Curve.Evaluate(time))
? Mathf.Lerp(m_From, m_Value, m_Curve != null ? m_Curve.Evaluate(time) : time)
: m_Value;
}
}
@@ -62,7 +62,7 @@ namespace Coffee.UIEffects.Timeline
public override void GatherProperties(PlayableDirector director, IPropertyCollector driver)
{
var trackBinding = director.GetGenericBinding(this) as UIEffect;
if (!trackBinding) return;
if (trackBinding == null) return;
driver.AddFromName<UIEffect>(trackBinding.gameObject, fieldName);
base.GatherProperties(director, driver);
@@ -88,7 +88,7 @@ namespace Coffee.UIEffects.Timeline
public override Playable CreatePlayable(PlayableGraph graph, GameObject owner)
{
var playable = ScriptPlayable<T>.Create(graph, m_Data);
var playable = ScriptPlayable<T>.Create(graph, m_Data ??= new T());
var behaviour = playable.GetBehaviour();
behaviour.clip = this;
return playable;
@@ -113,7 +113,7 @@ namespace Coffee.UIEffects.Timeline
public override void ProcessFrame(Playable playable, FrameData info, object playerData)
{
InitializeIfNeeded(playerData as UIEffect);
if (!effect) return;
if (effect == null) return;
var inputCount = playable.GetInputCount();
var value = default(T);
@@ -126,7 +126,11 @@ namespace Coffee.UIEffects.Timeline
var playableInput = (ScriptPlayable<TBehavior>)playable.GetInput(i);
var input = playableInput.GetBehaviour();
var normalizedTime = (float)(playableInput.GetTime() / input.clip.timelineClip.duration);
var clip = input != null ? input.clip : null;
var timelineClip = clip != null ? clip.timelineClip : null;
if (timelineClip == null || timelineClip.duration <= 0) return;
var normalizedTime = (float)(playableInput.GetTime() / timelineClip.duration);
value = Add(value, input.Get(normalizedTime), weight / totalWeight);
totalWeight += weight;
@@ -137,7 +141,7 @@ namespace Coffee.UIEffects.Timeline
public override void OnPlayableDestroy(Playable playable)
{
if (effect)
if (effect != null)
{
currentValue = _defaultValue;
}
@@ -159,13 +163,13 @@ namespace Coffee.UIEffects.Timeline
{
if (effect == newEffect) return;
if (effect)
if (effect != null)
{
currentValue = _defaultValue;
}
effect = newEffect;
_defaultValue = newEffect ? currentValue : default;
_defaultValue = newEffect != null ? currentValue : default;
}
protected abstract T Add(T current, T value, float weight);
+31 -16
View File
@@ -843,7 +843,7 @@ namespace Coffee.UIEffects
if (m_ShadowMode == value) return;
context.m_ShadowMode = m_ShadowMode = value;
SetVerticesDirty();
SetVerticesDirty();
SetMaterialDirty();
}
}
@@ -1451,7 +1451,7 @@ namespace Coffee.UIEffects
}
}
public override RectTransform transitionRoot => m_CustomRoot
public override RectTransform transitionRoot => m_CustomRoot != null
? m_CustomRoot
: transform as RectTransform;
@@ -1473,6 +1473,7 @@ namespace Coffee.UIEffects
protected override void OnDestroy()
{
base.OnDestroy();
InternalListPool<UIEffectReplica>.Return(ref _replicas);
}
@@ -1487,14 +1488,16 @@ namespace Coffee.UIEffects
internal override void SetEnablePreviewIfSelected(GameObject[] selection)
{
if (selection == null) return;
var selected = 0 < selection.Length
&& (selection.Contains(gameObject)
|| replicas.Any(x => x && selection.Contains(x.gameObject)));
|| replicas.Any(x => x != null && selection.Contains(x.gameObject)));
context.SetEnablePreview(selected, effectMaterial);
foreach (var r in replicas)
{
if (!r || !r.isActiveAndEnabled || r.context == null) continue;
if (r == null || !r.isActiveAndEnabled || r.context == null) continue;
r.context.SetEnablePreview(selected, r.effectMaterial);
}
}
@@ -1506,7 +1509,7 @@ namespace Coffee.UIEffects
var count = replicas.Count;
for (var i = 0; i < count; i++)
{
if (!replicas[i]) continue;
if (replicas[i] == null) continue;
replicas[i].SetVerticesDirty();
}
}
@@ -1517,7 +1520,7 @@ namespace Coffee.UIEffects
var count = replicas.Count;
for (var i = 0; i < count; i++)
{
if (!replicas[i]) continue;
if (replicas[i] == null) continue;
replicas[i].SetMaterialDirty();
}
}
@@ -1528,7 +1531,7 @@ namespace Coffee.UIEffects
var count = replicas.Count;
for (var i = 0; i < count; i++)
{
if (!replicas[i]) continue;
if (replicas[i] == null) continue;
replicas[i].SetMaterialContextDirty();
}
}
@@ -1538,6 +1541,7 @@ namespace Coffee.UIEffects
/// </summary>
public void SetGradientKeys(Gradient gradient)
{
if (gradient == null) return;
SetGradientKeys(gradient.colorKeys, gradient.alphaKeys, gradient.mode);
}
@@ -1557,6 +1561,7 @@ namespace Coffee.UIEffects
/// </summary>
public void SetTransitionGradientKeys(Gradient gradient)
{
if (gradient == null) return;
SetTransitionGradientKeys(gradient.colorKeys, gradient.alphaKeys, gradient.mode);
}
@@ -1605,7 +1610,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);
}
}
@@ -1716,7 +1721,7 @@ namespace Coffee.UIEffects
/// </summary>
public void LoadPreset(UIEffect src, bool append)
{
if (!src) return;
if (src == null) return;
var dst = this;
if (!append || src.m_ToneFilter != ToneFilter.None)
@@ -1848,7 +1853,7 @@ namespace Coffee.UIEffects
/// </summary>
public void LoadPreset(UIEffectPreset src, bool append)
{
if (!src) return;
if (src == null) return;
var dst = this;
if (!append || src.m_ToneFilter != ToneFilter.None)
@@ -1977,7 +1982,7 @@ namespace Coffee.UIEffects
public void SavePreset(UIEffectPreset dst, bool append)
{
if (!dst) return;
if (dst == null) return;
var src = this;
if (!append || src.m_ToneFilter != ToneFilter.None)
@@ -2020,9 +2025,13 @@ namespace Coffee.UIEffects
dst.m_TransitionColorGlow = src.m_TransitionColorGlow;
dst.m_TransitionPatternReverse = src.m_TransitionPatternReverse;
dst.m_TransitionAutoPlaySpeed = src.m_TransitionAutoPlaySpeed;
dst.m_TransitionGradient.SetKeys(src.m_TransitionGradient.colorKeys,
src.m_TransitionGradient.alphaKeys);
dst.m_TransitionGradient.mode = src.m_TransitionGradient.mode;
if (src.m_TransitionGradient != null)
{
dst.m_TransitionGradient ??= new Gradient();
dst.m_TransitionGradient.SetKeys(src.m_TransitionGradient.colorKeys,
src.m_TransitionGradient.alphaKeys);
dst.m_TransitionGradient.mode = src.m_TransitionGradient.mode;
}
}
if (!append || src.m_TargetMode != TargetMode.None)
@@ -2075,8 +2084,14 @@ namespace Coffee.UIEffects
dst.m_GradationColor2 = src.m_GradationColor2;
dst.m_GradationColor3 = src.m_GradationColor3;
dst.m_GradationColor4 = src.m_GradationColor4;
dst.m_GradationGradient.SetKeys(src.m_GradationGradient.colorKeys, src.m_GradationGradient.alphaKeys);
dst.m_GradationGradient.mode = src.m_GradationGradient.mode;
if (src.m_GradationGradient != null)
{
dst.m_GradationGradient ??= new Gradient();
dst.m_GradationGradient.SetKeys(src.m_GradationGradient.colorKeys,
src.m_GradationGradient.alphaKeys);
dst.m_GradationGradient.mode = src.m_GradationGradient.mode;
}
dst.m_GradationOffset = src.m_GradationOffset;
dst.m_GradationScale = src.m_GradationScale;
dst.m_GradationRotation = src.m_GradationRotation;
+40 -26
View File
@@ -37,7 +37,7 @@ namespace Coffee.UIEffects
private bool _isContextDirty;
public Material effectMaterial => _material;
public Graphic graphic => _graphic ? _graphic : _graphic = GetComponent<Graphic>();
public Graphic graphic => _graphic != null ? _graphic : _graphic = GetComponent<Graphic>();
public virtual uint effectId => (uint)GetHashCode();
public virtual float actualSamplingScale => 1;
public virtual bool canModifyShape => true;
@@ -50,7 +50,7 @@ namespace Coffee.UIEffects
_canvasCached = true;
_canvas = GetComponentInParent<Canvas>();
if (!_canvas || !_canvas.isActiveAndEnabled)
if (_canvas == null || !_canvas.isActiveAndEnabled)
{
_canvas = null;
_canvasCached = false;
@@ -79,10 +79,10 @@ namespace Coffee.UIEffects
if (!isActiveAndEnabled) return null;
var g = graphic;
if (!g) return null;
if (g == null) return null;
var canvasRenderer = g.canvasRenderer;
if (!canvasRenderer || canvasRenderer.materialCount == 0) return null;
if (canvasRenderer == null || canvasRenderer.materialCount == 0) return null;
return canvasRenderer.GetMaterial();
}
@@ -137,7 +137,10 @@ namespace Coffee.UIEffects
private void OnAfterCanvasRebuild()
{
if (!_material || !graphic || !canvas || context == null) return;
var g = graphic;
var c = canvas;
var ctx = context;
if (_material == null || g == null || c == null || ctx == null) return;
if (_isContextDirty)
{
@@ -145,9 +148,14 @@ namespace Coffee.UIEffects
ApplyContextToMaterial(GetCurrentMaterial());
}
if (!context.useViewMatrix) return;
if (!ctx.useViewMatrix) return;
context.UpdateViewMatrix(GetCurrentMaterial(), transitionRoot, canvas.rootCanvas);
var material = GetCurrentMaterial();
var root = transitionRoot;
var rootCanvas = c.rootCanvas;
if (material == null || root == null || rootCanvas == null) return;
ctx.UpdateViewMatrix(material, root, rootCanvas);
}
protected override void OnCanvasHierarchyChanged()
@@ -162,22 +170,28 @@ namespace Coffee.UIEffects
public virtual void ModifyMesh(VertexHelper vh)
{
if (!isActiveAndEnabled || context == null) return;
if (!isActiveAndEnabled || vh == null) return;
var g = graphic;
var ctx = context;
var root = transitionRoot;
if (g == null || ctx == null || root == null) return;
_canModifyMesh = CanModifyMesh();
if (_canModifyMesh)
{
context.ModifyMesh(graphic, canvas, transitionRoot, vh, canModifyShape);
ctx.ModifyMesh(g, canvas, root, vh, canModifyShape);
}
}
private bool CanModifyMesh()
{
if (!graphic || !graphic.isActiveAndEnabled) return false;
if (graphic == null || !graphic.isActiveAndEnabled) return false;
if (!isActiveAndEnabled) return false;
// The transitionRoot is same as the transform => true.
var root = transitionRoot;
if (root == null) return false;
if (transform == root) return true;
// The transitionRoot is not visible => false.
@@ -196,7 +210,7 @@ namespace Coffee.UIEffects
Profiler.BeginSample("(UIE)[UIEffect] GetModifiedMaterial");
var samplingScaleId = (uint)(Mathf.InverseLerp(0.01f, 100, actualSamplingScale) * uint.MaxValue);
var rootId = (uint)(transitionRoot ? transitionRoot.GetHashCode() : 0);
var rootId = (uint)(transitionRoot != null ? transitionRoot.GetHashCode() : 0);
var hash = new Hash128((uint)baseMaterial.GetHashCode(), effectId, samplingScaleId, rootId);
if (!MaterialRepository.Valid(hash, _material))
{
@@ -251,22 +265,22 @@ namespace Coffee.UIEffects
public virtual void SetVerticesDirty()
{
if (graphic)
{
graphic.SetVerticesDirty();
GraphicProxy.Find(graphic).SetVerticesDirty(graphic, enabled);
Misc.QueuePlayerLoopUpdate();
}
var g = graphic;
if (g == null) return;
g.SetVerticesDirty();
GraphicProxy.Find(g)?.SetVerticesDirty(g, enabled);
Misc.QueuePlayerLoopUpdate();
}
public virtual void SetMaterialDirty()
{
if (graphic)
{
graphic.SetMaterialDirty();
SetMaterialContextDirty();
Misc.QueuePlayerLoopUpdate();
}
var g = graphic;
if (g == null) return;
g.SetMaterialDirty();
SetMaterialContextDirty();
Misc.QueuePlayerLoopUpdate();
}
public virtual void SetMaterialContextDirty()
@@ -283,7 +297,7 @@ namespace Coffee.UIEffects
public virtual void ApplyContextToMaterial(Material material)
{
if (!isActiveAndEnabled || context == null || !material) return;
if (!isActiveAndEnabled || context == null || material == null) return;
_isContextDirty = false;
context.ApplyToMaterial(material, actualSamplingScale);
@@ -310,7 +324,7 @@ namespace Coffee.UIEffects
public void OnControlTimeStart()
{
if (this)
if (this != null)
{
enabled = true;
}
@@ -318,7 +332,7 @@ namespace Coffee.UIEffects
public void OnControlTimeStop()
{
if (this)
if (this != null)
{
enabled = false;
}
+12 -7
View File
@@ -290,7 +290,7 @@ namespace Coffee.UIEffects
get
{
if (m_GradationGradient == null) return null;
if (!_gradationRampTex) _gradationRampTex = s_TexturePool.Rent();
if (_gradationRampTex == null) _gradationRampTex = s_TexturePool.Rent();
if (!_isGradientDirty) return _gradationRampTex;
_isGradientDirty = false;
@@ -317,7 +317,7 @@ namespace Coffee.UIEffects
get
{
if (m_TransitionGradient == null) return null;
if (!_transitionRampTex) _transitionRampTex = s_TexturePool.Rent();
if (_transitionRampTex == null) _transitionRampTex = s_TexturePool.Rent();
if (!_isTransitionGradientDirty) return _transitionRampTex;
_isTransitionGradientDirty = false;
@@ -449,7 +449,7 @@ namespace Coffee.UIEffects
public void ApplyToMaterial(Material material, float actualSamplingScale = 1f)
{
if (!material) return;
if (material == null) return;
Profiler.BeginSample("(UIE)[UIEffect] ApplyToMaterial");
@@ -527,7 +527,9 @@ namespace Coffee.UIEffects
#pragma warning disable CS0612 // Type or member is obsolete
|| m_GradationMode == GradationMode.RadialDetail
#pragma warning restore CS0612
|| m_GradationMode == GradationMode.RadialGradient ? 1 : 0);
|| m_GradationMode == GradationMode.RadialGradient
? 1
: 0);
material.SetFloat(s_DetailIntensity, Mathf.Clamp01(m_DetailIntensity));
material.SetColor(s_DetailColor, ApplyColorSpace(m_DetailColor));
@@ -578,7 +580,7 @@ namespace Coffee.UIEffects
public void SetEnablePreview(bool enable, Material material)
{
if (!material) return;
if (material == null) return;
material.SetVector(s_TransitionTex_Speed, enable ? (Vector4)m_TransitionTexSpeed : Vector4.zero);
material.SetVector(s_DetailTex_Speed, enable ? (Vector4)m_DetailTexSpeed : Vector4.zero);
material.SetFloat(s_TransitionAutoPlaySpeed, enable ? m_TransitionAutoPlaySpeed : 0);
@@ -587,7 +589,7 @@ namespace Coffee.UIEffects
public void UpdateViewMatrix(Material material, RectTransform transitionRoot, Canvas canvas)
{
if (!material) return;
if (material == null || transitionRoot == null || canvas == null) return;
var size = transitionRoot.rect.size;
var scale = new Vector3(1f / size.x, 1f / size.y, 1f);
@@ -713,6 +715,8 @@ namespace Coffee.UIEffects
public void ModifyMesh(Graphic graphic, Canvas canvas, RectTransform transitionRoot, VertexHelper vh,
bool canModifyShape)
{
if (graphic == null || transitionRoot == null || vh == null) return;
// Apply flip (without effect).
ApplyFlipWithoutEffect(vh, m_Flip);
@@ -720,6 +724,7 @@ namespace Coffee.UIEffects
if (!willModifyVertex || count == 0) return;
var effectProxy = GraphicProxy.Find(graphic);
if (effectProxy == null) return;
var isText = effectProxy.IsText(graphic);
effectProxy.OnPreModifyMesh(graphic, canvas);
@@ -847,7 +852,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;
}
}
}
+17 -2
View File
@@ -8,11 +8,24 @@ namespace Coffee.UIEffects
[ExecuteAlways]
public class UIEffectPreset : ScriptableObject
{
internal static UIEffectPreset s_DefaultPreset;
private static UIEffectPreset s_DefaultPreset;
#if UNITY_EDITOR && UNITY_2019_3_OR_NEWER
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
private static void OnDomainReload()
{
if (s_DefaultPreset != null)
{
Misc.DestroyImmediate(s_DefaultPreset);
}
s_DefaultPreset = null;
}
#endif
internal static UIEffectPreset GetDefaultPreset()
{
if (!s_DefaultPreset)
if (s_DefaultPreset == null)
{
s_DefaultPreset = CreateInstance<UIEffectPreset>();
s_DefaultPreset.hideFlags = HideFlags.HideAndDontSave;
@@ -108,6 +121,8 @@ namespace Coffee.UIEffects
public void UpdateContext(UIEffectContext dst)
{
if (dst == null) return;
var src = this;
dst.m_ToneFilter = src.m_ToneFilter;
dst.m_ToneIntensity = src.m_ToneIntensity;
@@ -13,15 +13,17 @@ namespace Coffee.UIEffects
{
public class UIEffectProjectSettings : PreloadedProjectSettings<UIEffectProjectSettings>
{
[Header("Setting")]
[HideInInspector]
[SerializeField]
internal List<UIEffect> m_RuntimePresets = new List<UIEffect>();
[HideInInspector]
[SerializeField]
internal List<UIEffectPreset> m_RuntimePresetsV2 = new List<UIEffectPreset>();
[Header("Editor")]
[Tooltip("Use HDR color pickers on color fields.")]
[HideInInspector]
[SerializeField] private bool m_UseHDRColorPicker = true;
[HideInInspector]
@@ -45,7 +47,7 @@ namespace Coffee.UIEffects
public static void RegisterRuntimePreset(UIEffectPreset preset)
{
// Already registered.
if (!preset || instance.m_RuntimePresetsV2.Contains(preset)) return;
if (preset == null || instance.m_RuntimePresetsV2.Contains(preset)) return;
instance.m_RuntimePresetsV2.Add(preset);
#if UNITY_EDITOR
@@ -59,7 +61,7 @@ namespace Coffee.UIEffects
for (var i = 0; i < instance.m_RuntimePresets.Count; i++)
{
var preset = instance.m_RuntimePresets[i];
if (preset && preset.name == presetName)
if (preset != null && preset.name == presetName)
{
return preset;
}
@@ -73,7 +75,7 @@ namespace Coffee.UIEffects
for (var i = 0; i < instance.m_RuntimePresetsV2.Count; i++)
{
var preset = instance.m_RuntimePresetsV2[i];
if (preset && preset.name == presetName)
if (preset != null && preset.name == presetName)
{
return preset;
}
@@ -101,11 +103,12 @@ namespace Coffee.UIEffects
{
#if !LEGACY_TMP_ENABLE
const string tmpSupport = "TextMeshPro Support (Unity 6)";
const string version = "v5.9.0 (Unity 6)";
const string version = "v5.11.0 (Unity 6)";
#else
const string tmpSupport = "TextMeshPro Support";
const string version = "v5.9.0";
const string version = "v5.11.0";
#endif
ShaderSampleImporter.RegisterReadmeUrl("https://github.com/mob-sakai/UIEffect#import-additional-resources");
ShaderSampleImporter.RegisterShaderSamples(new[]
{
// TextMeshPro Support/TextMeshPro Support (Unity 6)
@@ -119,8 +122,8 @@ namespace Coffee.UIEffects
("Hidden/TextMeshPro/Mobile/Distance Field (UIEffect)", tmpSupport, version),
// ShaderGraph Support
("Shader Graphs/UISample (UIEffect)", "ShaderGraph Support (Unity 6 BuiltIn)", "v5.9.0"),
("Shader Graphs/UISampleURP (UIEffect)", "ShaderGraph Support (Unity 6 URP)", "v5.9.0")
("Shader Graphs/UISample (UIEffect)", "ShaderGraph Support (Unity 6 BuiltIn)", "v5.11.0"),
("Shader Graphs/UISampleURP (UIEffect)", "ShaderGraph Support (Unity 6 URP)", "v5.11.0")
});
ShaderSampleImporter.RegisterShaderAliases(new[]
{
+17 -17
View File
@@ -99,9 +99,9 @@ namespace Coffee.UIEffects
public override bool canModifyShape => m_AllowToModifyMeshShape;
public override uint effectId => target
public override uint effectId => target != null
? target.effectId
: preset
: preset != null
? (uint)preset.GetHashCode()
: (uint)GetHashCode();
@@ -111,10 +111,10 @@ namespace Coffee.UIEffects
get
{
// Following the preset/preset-target.
if (preset || (target && !isTargetInScene)) return base.context;
if (preset != null || (target != null && !isTargetInScene)) return base.context;
// Following the instantiated target.
return target && target.isActiveAndEnabled && isTargetInScene
return target != null && target.isActiveAndEnabled && isTargetInScene
? target.context
: null;
}
@@ -126,7 +126,7 @@ namespace Coffee.UIEffects
{
if (useTargetTransform)
{
if (preset && !m_CustomRoot && graphic && canvas)
if (preset != null && m_CustomRoot == null && graphic != null && canvas != null)
{
return canvas.transform as RectTransform;
}
@@ -137,15 +137,15 @@ namespace Coffee.UIEffects
}
}
return m_CustomRoot ? m_CustomRoot : transform as RectTransform;
return m_CustomRoot != null ? m_CustomRoot : transform as RectTransform;
}
}
private bool isTargetInScene => target && target.gameObject.scene.IsValid();
private bool isTargetInScene => target != null && target.gameObject.scene.IsValid();
protected override void OnEnable()
{
if (!preset)
if (preset == null)
{
RefreshTarget(target);
}
@@ -170,7 +170,7 @@ namespace Coffee.UIEffects
{
RefreshTarget(target);
if (preset || (target && !isTargetInScene))
if (preset != null || (target != null && !isTargetInScene))
{
context?.SetGradationDirty();
context?.SetTransitionGradationDirty();
@@ -197,12 +197,12 @@ namespace Coffee.UIEffects
private void RefreshTarget(UIEffect newTarget)
{
if (_currentTarget == newTarget) return;
if (_currentTarget)
if (_currentTarget != null)
{
_currentTarget.replicas.Remove(this);
}
if (newTarget)
if (newTarget != null)
{
_currentTarget = newTarget;
if (isTargetInScene)
@@ -219,12 +219,12 @@ namespace Coffee.UIEffects
internal override void UpdateContext(UIEffectContext dst)
{
// Following the preset.
if (preset)
if (preset != null)
{
preset.UpdateContext(dst);
}
// Following the preset-target.
else if (target && !isTargetInScene)
else if (target != null && !isTargetInScene)
{
target.UpdateContext(dst);
}
@@ -232,10 +232,10 @@ namespace Coffee.UIEffects
public override void ApplyContextToMaterial(Material material)
{
if (!isActiveAndEnabled && !preset && !target) return;
if (!isActiveAndEnabled && preset == null && target == null) return;
// Following the preset/preset-target.
if (preset || (target && !isTargetInScene))
if (preset != null || (target != null && !isTargetInScene))
{
base.ApplyContextToMaterial(material);
}
@@ -264,11 +264,11 @@ namespace Coffee.UIEffects
public void OnAfterDeserialize()
{
if (m_Preset)
if (m_Preset != null)
{
m_Target = null;
}
else if (m_Target)
else if (m_Target != null)
{
m_Preset = null;
}
+11 -13
View File
@@ -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;
@@ -134,7 +132,7 @@ namespace Coffee.UIEffects
/// <summary>
/// The target UIMaterialPropertyInjector to tween.
/// </summary>
private UIEffectBase target => _target ? _target : _target = GetComponent<UIEffectBase>();
private UIEffectBase target => _target != null ? _target : _target = GetComponent<UIEffectBase>();
/// <summary>
/// The culling mask of the tween.
@@ -167,7 +165,7 @@ namespace Coffee.UIEffects
_rate = value;
if (!target || cullingMask == 0) return;
if (target == null || cullingMask == 0) return;
var currentCurve = curve;
if (separateReverseCurve)
@@ -315,7 +313,7 @@ namespace Coffee.UIEffects
/// </summary>
public AnimationCurve curve
{
get => m_Curve;
get => m_Curve ??= AnimationCurve.Linear(0, 0, 1, 1);
set => m_Curve = value;
}
@@ -327,19 +325,19 @@ namespace Coffee.UIEffects
public AnimationCurve reverseCurve
{
get => m_ReverseCurve;
get => m_ReverseCurve ??= AnimationCurve.Linear(0, 0, 1, 1);
set => m_ReverseCurve = value;
}
/// <summary>
/// Event to invoke when the tween has completed.
/// </summary>
public UnityEvent onComplete => m_OnComplete;
public UnityEvent onComplete => m_OnComplete ??= new UnityEvent();
/// <summary>
/// Event to invoke when the rate was changed.
/// </summary>
public TweenerEvent onChangedRate => m_OnChangedRate;
public TweenerEvent onChangedRate => m_OnChangedRate ??= new TweenerEvent();
/// <summary>
/// Is the tween playing?
@@ -423,7 +421,7 @@ namespace Coffee.UIEffects
if (!isTweening)
{
m_OnComplete.Invoke();
onComplete.Invoke();
}
}
@@ -444,7 +442,7 @@ namespace Coffee.UIEffects
if (!isTweening)
{
m_OnComplete.Invoke();
onComplete.Invoke();
}
}
@@ -465,7 +463,7 @@ namespace Coffee.UIEffects
if (!isTweening)
{
m_OnComplete.Invoke();
onComplete.Invoke();
}
}
@@ -542,7 +540,7 @@ namespace Coffee.UIEffects
if (prevTweening && !isTweening)
{
m_OnComplete.Invoke();
onComplete.Invoke();
}
return;
@@ -576,7 +574,7 @@ namespace Coffee.UIEffects
if (prevTweening && !isTweening)
{
m_OnComplete.Invoke();
onComplete.Invoke();
}
}
}
@@ -14,6 +14,8 @@ namespace Coffee.UIEffects
public static void Register(GraphicProxy proxy)
{
if (proxy == null) throw new ArgumentNullException(nameof(proxy));
// Register only once.
var count = s_Proxies.Count;
for (var i = 0; i < count; i++)
@@ -27,7 +29,7 @@ namespace Coffee.UIEffects
public static GraphicProxy Find(Graphic graphic)
{
if (!graphic) return null;
if (graphic == null) return null;
var count = s_Proxies.Count;
for (var i = count - 1; i >= 0; i--)
@@ -44,7 +46,7 @@ namespace Coffee.UIEffects
/// </summary>
protected virtual bool IsValid(Graphic graphic)
{
return graphic;
return graphic != null;
}
/// <summary>
@@ -64,7 +66,7 @@ namespace Coffee.UIEffects
ShadowUtil.onMarkAsShadow = s_OnMarkAsShadow;
UIEffectContext.onModifyVertex = s_OnModifyVertex;
if (canvas)
if (canvas != null)
{
canvas.additionalShaderChannels |= AdditionalCanvasShaderChannels.TexCoord1;
}
+1 -1
View File
@@ -20,7 +20,7 @@ namespace Coffee.UIEffects
/// </summary>
protected override bool IsValid(Graphic graphic)
{
if (!graphic) return false;
if (graphic == null) return false;
if (graphic is Image) return true;
return false;
}
+28 -18
View File
@@ -17,12 +17,12 @@ namespace Coffee.UIEffects
/// </summary>
protected override bool IsValid(Graphic graphic)
{
if (!graphic) return false;
if (graphic == null) return false;
if (graphic is TextMeshProUGUI) return true;
if (graphic is TMP_SubMeshUI sub)
{
// If TMP_SubMeshUI is used for text
return !sub.spriteAsset
return sub.spriteAsset == null
|| sub.sharedMaterial != sub.spriteAsset.material;
}
@@ -46,7 +46,7 @@ namespace Coffee.UIEffects
ShadowUtil.onMarkAsShadow = s_OnMarkAsShadow;
UIEffectContext.onModifyVertex = s_OnModifyVertex;
if (canvas)
if (canvas != null)
{
canvas.additionalShaderChannels |= AdditionalCanvasShaderChannels.TexCoord2;
}
@@ -145,7 +145,7 @@ namespace Coffee.UIEffects
var toRemove = InternalListPool<TextMeshProUGUI>.Rent();
foreach (var textMeshProUGUI in s_RegisteredInstances)
{
if (textMeshProUGUI
if (textMeshProUGUI != null
&& textMeshProUGUI.isActiveAndEnabled
&& !textMeshProUGUI.isTextObjectScaleStatic)
{
@@ -183,7 +183,7 @@ namespace Coffee.UIEffects
{
foreach (var textMeshProUGUI in s_ChangedInstances)
{
if (!textMeshProUGUI || !textMeshProUGUI.isActiveAndEnabled) continue;
if (textMeshProUGUI == null || !textMeshProUGUI.isActiveAndEnabled) continue;
if (!textMeshProUGUI.TryGetComponent<IMeshModifier>(out var _)) continue;
s_RegisteredInstances.Add(textMeshProUGUI);
@@ -198,7 +198,7 @@ namespace Coffee.UIEffects
{
foreach (var textMeshProUGUI in s_RegisteredInstances)
{
if (!textMeshProUGUI || !textMeshProUGUI.isActiveAndEnabled) continue;
if (textMeshProUGUI == null || !textMeshProUGUI.isActiveAndEnabled) continue;
if (textMeshProUGUI.TryGetComponent<UIEffectBase>(out var effect) && effect.isActiveAndEnabled)
{
effect.ReleaseMaterial();
@@ -213,7 +213,13 @@ namespace Coffee.UIEffects
private static void ModifyMesh(TextMeshProUGUI textMeshProUGUI)
{
if (!s_Mesh)
if (!textMeshProUGUI || !textMeshProUGUI.isActiveAndEnabled) return;
if (textMeshProUGUI.textInfo == null || textMeshProUGUI.textInfo.meshInfo == null) return;
var canvasRenderer = textMeshProUGUI.canvasRenderer;
if (canvasRenderer == null) return;
if (s_Mesh == null)
{
s_Mesh = new Mesh();
s_Mesh.MarkDynamic();
@@ -229,18 +235,18 @@ namespace Coffee.UIEffects
for (var i = 0; i < textMeshProUGUI.textInfo.meshInfo.Length; i++)
{
var meshInfo = textMeshProUGUI.textInfo.meshInfo[i];
if (meshInfo.vertexCount == 0)
if (meshInfo.vertexCount == 0 || meshInfo.mesh == null)
{
// Clear mesh if no vertices.
s_Mesh.Clear(false);
if (i == 0)
{
textMeshProUGUI.canvasRenderer.SetMesh(s_Mesh);
canvasRenderer.SetMesh(s_Mesh);
}
else
{
var subMeshUI = GetSubMeshUI(subMeshes, meshInfo.material, meshInfo.mesh, i - 1);
if (subMeshUI)
if (subMeshUI != null && subMeshUI.canvasRenderer != null)
{
subMeshUI.canvasRenderer.SetMesh(s_Mesh);
}
@@ -259,7 +265,7 @@ namespace Coffee.UIEffects
}
s_VertexHelper.FillMesh(s_Mesh);
textMeshProUGUI.canvasRenderer.SetMesh(s_Mesh);
canvasRenderer.SetMesh(s_Mesh);
}
else if (i - 1 < subMeshes.Count)
{
@@ -270,7 +276,7 @@ namespace Coffee.UIEffects
}
var subMeshUI = GetSubMeshUI(subMeshes, meshInfo.material, meshInfo.mesh, i - 1);
if (!subMeshUI) break;
if (subMeshUI == null) break;
// fix: TMP Text sprite submesh lost when changing fontMaterial (#368)
if (!subMeshUI.TryGetComponent<UIEffectReplica>(out var replica))
@@ -278,7 +284,7 @@ namespace Coffee.UIEffects
replica = subMeshUI.gameObject.AddComponent<UIEffectReplica>();
textMeshProUGUI.RegisterDirtyMaterialCallback(() =>
{
if (subMeshUI) subMeshUI.SetMaterialDirty();
if (subMeshUI != null) subMeshUI.SetMaterialDirty();
});
}
@@ -290,7 +296,10 @@ namespace Coffee.UIEffects
}
s_VertexHelper.FillMesh(s_Mesh);
subMeshUI.canvasRenderer.SetMesh(s_Mesh);
if (subMeshUI.canvasRenderer != null)
{
subMeshUI.canvasRenderer.SetMesh(s_Mesh);
}
}
else
{
@@ -305,15 +314,16 @@ namespace Coffee.UIEffects
Misc.QueuePlayerLoopUpdate();
}
private static TMP_SubMeshUI GetSubMeshUI(List<TMP_SubMeshUI> subMeshes, Material material, Mesh mesh, int start)
private static TMP_SubMeshUI GetSubMeshUI(List<TMP_SubMeshUI> subMeshes, Material material, Mesh mesh,
int start)
{
var count = subMeshes.Count;
if (mesh)
if (mesh != null)
{
for (var j = 0; j < count; j++)
{
var s = subMeshes[(j + start + count) % count];
if (!s) continue;
if (s == null) continue;
if (s.mesh == mesh) return s;
}
}
@@ -321,7 +331,7 @@ namespace Coffee.UIEffects
for (var j = 0; j < count; j++)
{
var s = subMeshes[(j + start + count) % count];
if (!s) continue;
if (s == null) continue;
if (s.sharedMaterial == material) return s;
}
File diff suppressed because one or more lines are too long
@@ -25,29 +25,29 @@ public class UIEffect_TweenerControler : MonoBehaviour
private void Update()
{
if (m_Info)
if (m_Info != null)
{
var tw = tweener;
m_Info.text =
$"{tw.time:F2}/{tw.totalTime:F2} ({tw.rate:F2}), {tw.direction}, isTweening={tw.isTweening}, isDelaying={tw.isDelaying}, isPaused={tw.isPaused}";
}
if (m_SeekBar)
if (m_SeekBar != null)
{
m_SeekBar.value = tweener.time / tweener.totalTime;
}
if (m_SeekBarBgInterval1)
if (m_SeekBarBgInterval1 != null)
{
m_SeekBarBgInterval1.SetActive(UIEffectTweener.WrapMode.Loop <= tweener.wrapMode);
}
if (m_SeekBarBgDuration2)
if (m_SeekBarBgDuration2 != null)
{
m_SeekBarBgDuration2.SetActive(UIEffectTweener.WrapMode.PingPongOnce <= tweener.wrapMode);
}
if (m_SeekBarBgInterval2)
if (m_SeekBarBgInterval2 != null)
{
m_SeekBarBgInterval2.SetActive(UIEffectTweener.WrapMode.PingPongLoop <= tweener.wrapMode);
}
@@ -541,8 +541,8 @@ MonoBehaviour:
m_Calls: []
m_text: Combination! <sprite=5>
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8,
m_fontAsset: {fileID: 11400000, guid: bc6ef582a0efa420683ff976adff235a, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: bc6ef582a0efa420683ff976adff235a,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
@@ -952,8 +952,8 @@ MonoBehaviour:
m_Calls: []
m_text: Soft Outline! <sprite=1>
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8,
m_fontAsset: {fileID: 11400000, guid: bc6ef582a0efa420683ff976adff235a, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: bc6ef582a0efa420683ff976adff235a,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
@@ -1966,8 +1966,8 @@ MonoBehaviour:
m_Calls: []
m_text: RETRO! <sprite=4>
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8,
m_fontAsset: {fileID: 11400000, guid: bc6ef582a0efa420683ff976adff235a, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: bc6ef582a0efa420683ff976adff235a,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
@@ -2119,8 +2119,8 @@ MonoBehaviour:
m_Calls: []
m_text: Transition! <sprite=4>
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8,
m_fontAsset: {fileID: 11400000, guid: bc6ef582a0efa420683ff976adff235a, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: bc6ef582a0efa420683ff976adff235a,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
@@ -3271,8 +3271,8 @@ MonoBehaviour:
m_Calls: []
m_text: Feaver! <sprite=11>
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8,
m_fontAsset: {fileID: 11400000, guid: bc6ef582a0efa420683ff976adff235a, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: bc6ef582a0efa420683ff976adff235a,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
@@ -4570,8 +4570,8 @@ MonoBehaviour:
m_Calls: []
m_text: Shiny! <sprite=3>
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8,
m_fontAsset: {fileID: 11400000, guid: bc6ef582a0efa420683ff976adff235a, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: bc6ef582a0efa420683ff976adff235a,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
@@ -4942,8 +4942,8 @@ MonoBehaviour:
m_Calls: []
m_text: Scratch! <sprite=10>
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8,
m_fontAsset: {fileID: 11400000, guid: bc6ef582a0efa420683ff976adff235a, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: bc6ef582a0efa420683ff976adff235a,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
@@ -5335,8 +5335,8 @@ MonoBehaviour:
m_Calls: []
m_text: Dot Pattern! <sprite=2>
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: 9379b7b2236ab4c0e9f8d9f7db9936a8,
m_fontAsset: {fileID: 11400000, guid: bc6ef582a0efa420683ff976adff235a, type: 2}
m_sharedMaterial: {fileID: 4843226154402761971, guid: bc6ef582a0efa420683ff976adff235a,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
@@ -631,16 +631,16 @@ MonoBehaviour:
m_SamplingWidth: 1
m_SamplingScale: 1
m_TransitionFilter: 7
m_TransitionRate: 0.25
m_TransitionRate: 0.187
m_TransitionReverse: 1
m_TransitionTex: {fileID: 2800000, guid: 54e40a17ecd6a4b5a8a73a28042cdaa0, type: 3}
m_TransitionTexScale: {x: 1.46, y: 2.46}
m_TransitionTexScale: {x: 1.46, y: 2.4}
m_TransitionTexOffset: {x: 0, y: 0}
m_TransitionTexSpeed: {x: 0.02, y: 0}
m_TransitionTexSpeed: {x: 0.05, y: 0}
m_TransitionRotation: 0
m_TransitionKeepAspectRatio: 1
m_TransitionWidth: 0.709
m_TransitionSoftness: 0.39
m_TransitionWidth: 1
m_TransitionSoftness: 0.592
m_TransitionRange:
m_Min: 0
m_Max: 1
@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: e428a82723f244e77b64d08fd256159d
@@ -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
}
}
}
@@ -4,7 +4,7 @@ ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData: v5.9.0
userData: v5.11.0
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
@@ -0,0 +1,24 @@
{
"name": "com.coffee.ui-effect.shadergraph-builtin",
"displayName": "UI Effect - ShaderGraph Support (Unity 6 BuiltIn)",
"description": "An extension for UI Effect that adds ShaderGraph support (Unity 6 BuiltIn).",
"version": "5.11.9",
"unity": "2020.3",
"license": "MIT",
"repository": {
"type": "git",
"url": "git+https://github.com/mob-sakai/UIEffect.git"
},
"author": {
"name": "mob-sakai",
"email": "sakai861104@gmail.com",
"url": "https://github.com/mob-sakai"
},
"dependencies": {
"com.coffee.ui-effect": "5.11.9"
},
"keywords": [
"ui",
"effect"
]
}
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2243ea0ee3ea34ea096e46b623d926bd
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9d5fb70c6201e408ebe2e8941a0e5944
guid: 1982008f495034475a69725f8ac1e89f
DefaultImporter:
externalObjects: {}
userData:
@@ -4,7 +4,7 @@ ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData: v5.9.0
userData: v5.11.0
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e428a82723f244e77b64d08fd256159d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,25 @@
{
"name": "com.coffee.ui-effect.shadergraph-urp",
"displayName": "UI Effect - ShaderGraph Support (Unity 6 URP)",
"description": "An extension for UI Effect that adds ShaderGraph support (Unity 6 URP).",
"version": "5.11.9",
"unity": "2020.3",
"license": "MIT",
"repository": {
"type": "git",
"url": "git+https://github.com/mob-sakai/UIEffect.git"
},
"author": {
"name": "mob-sakai",
"email": "sakai861104@gmail.com",
"url": "https://github.com/mob-sakai"
},
"dependencies": {
"com.coffee.ui-effect": "5.11.9",
"com.coffee.ui-effect-shadergraph-builtin": "5.11.9"
},
"keywords": [
"ui",
"effect"
]
}
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c3e0358c9a5534ade85d2ae0f2847c55
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,9 +1,9 @@
fileFormatVersion: 2
guid: 63a1dba10bff94661a909d63808a9a3b
guid: aaea88b5c038546249cc2fbbfd433653
ShaderImporter:
externalObjects: {}
defaultTextures: []
nonModifiableTextures: []
userData: v5.9.0
userData: v5.11.0
assetBundleName:
assetBundleVariant:
@@ -1,9 +1,9 @@
fileFormatVersion: 2
guid: d1cb940e3804b4adcaf9b22083fadfad
guid: d7fcf3435fe6345a5995f77557af7796
ShaderImporter:
externalObjects: {}
defaultTextures: []
nonModifiableTextures: []
userData: v5.9.0
userData: v5.11.0
assetBundleName:
assetBundleVariant:
@@ -1,9 +1,9 @@
fileFormatVersion: 2
guid: 03ea49e29b5ad4fbe8e340af208fe8e7
guid: 3c531490ebb14455cb551108307bb116
ShaderImporter:
externalObjects: {}
defaultTextures: []
nonModifiableTextures: []
userData: v5.9.0
userData: v5.11.0
assetBundleName:
assetBundleVariant:
@@ -1,9 +1,9 @@
fileFormatVersion: 2
guid: 26b66f9b09b8d4ac6a2790c3fa8b21c1
guid: 55cf683721795488da0a0a4c9f0fa332
ShaderImporter:
externalObjects: {}
defaultTextures: []
nonModifiableTextures: []
userData: v5.9.0
userData: v5.11.0
assetBundleName:
assetBundleVariant:
@@ -1,9 +1,9 @@
fileFormatVersion: 2
guid: 16f26337621974eaf998b9857bac39c6
guid: 4ded3bac41bfc44e3a4447d0be85c08c
ShaderImporter:
externalObjects: {}
defaultTextures: []
nonModifiableTextures: []
userData: v5.9.0
userData: v5.11.0
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More