Compare commits

...

26 Commits

Author SHA1 Message Date
semantic-release-bot c34c2ec0c2 chore(release): 5.11.10 [skip ci]
## [5.11.10](https://github.com/mob-sakai/UIEffect/compare/5.11.9...5.11.10) (2026-11-17)

### Bug Fixes

* added "Show Readme" to the auto-import menu ([27629cd](https://github.com/mob-sakai/UIEffect/commit/27629cdd7c9dd64c053a92fcd69119efffe4a127))
* fix font path in demo ([3ca1214](https://github.com/mob-sakai/UIEffect/commit/3ca121423382668eee335fbb8bf8308b7f04159b))
* fix potential NPE in code ([6e8aaf3](https://github.com/mob-sakai/UIEffect/commit/6e8aaf36f00e4a42f7b9d6f79e065d4022b567c2))
* fix potential NPE in code ([d41d1ad](https://github.com/mob-sakai/UIEffect/commit/d41d1ad21f3b4ce38bb1fae870cf8621ed61a1e8))
* fix project setting inspector ([d359086](https://github.com/mob-sakai/UIEffect/commit/d359086ed4baaf2bc0bfb64742492e3ea6d6d4b6))
2026-11-17 02:22:15 +00: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
160 changed files with 6287 additions and 3406 deletions
+34 -5
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
@@ -97,7 +126,7 @@ jobs:
${{ env.PROJECT_PATH }}-Library-
- name: 🛠️ Build Unity Project (Test)
uses: game-ci/unity-builder@main
uses: mob-sakai/unity-builder@fix/support-unity6.6
timeout-minutes: 45
with:
customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
@@ -111,7 +140,7 @@ jobs:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
# - name: 🧪 Run tests
# uses: game-ci/unity-test-runner@main
# uses: mob-sakai/unity-test-runner@fix/support-unity6.6
# timeout-minutes: 45
# with:
# customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
+34 -5
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
@@ -97,7 +126,7 @@ jobs:
${{ env.PROJECT_PATH }}-Library-
- name: 🛠️ Build Unity Project (Test)
uses: game-ci/unity-builder@main
uses: mob-sakai/unity-builder@fix/support-unity6.6
timeout-minutes: 45
with:
customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
@@ -111,7 +140,7 @@ jobs:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
- name: 🧪 Run tests
uses: game-ci/unity-test-runner@main
uses: mob-sakai/unity-test-runner@fix/support-unity6.6
timeout-minutes: 45
with:
customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
+2 -1
View File
@@ -26,4 +26,5 @@ bin/
UserSettings/
*.app/
Build/
Assets/TextMeshPro Support*
Assets/Samples*
Packages/src/Samples~/*.meta
@@ -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: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9379b7b2236ab4c0e9f8d9f7db9936a8
guid: 4c1191089341846fcb754b6aab3dd435
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
File diff suppressed because one or more lines are too long
@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: ebc947de92b024b329663fe914a7d168
folderAsset: yes
DefaultImporter:
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: 69f569585a2b5439b830cc115efdf867
folderAsset: yes
guid: 064c6ea9a4d6f4cc1938d0878e91e3d6
DefaultImporter:
externalObjects: {}
userData:
-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",
+49
View File
@@ -1,3 +1,52 @@
## [5.11.10](https://github.com/mob-sakai/UIEffect/compare/5.11.9...5.11.10) (2026-11-17)
### Bug Fixes
* added "Show Readme" to the auto-import menu ([27629cd](https://github.com/mob-sakai/UIEffect/commit/27629cdd7c9dd64c053a92fcd69119efffe4a127))
* fix font path in demo ([3ca1214](https://github.com/mob-sakai/UIEffect/commit/3ca121423382668eee335fbb8bf8308b7f04159b))
* fix potential NPE in code ([6e8aaf3](https://github.com/mob-sakai/UIEffect/commit/6e8aaf36f00e4a42f7b9d6f79e065d4022b567c2))
* fix potential NPE in code ([d41d1ad](https://github.com/mob-sakai/UIEffect/commit/d41d1ad21f3b4ce38bb1fae870cf8621ed61a1e8))
* fix project setting inspector ([d359086](https://github.com/mob-sakai/UIEffect/commit/d359086ed4baaf2bc0bfb64742492e3ea6d6d4b6))
## [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)
+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()
@@ -92,6 +92,7 @@ namespace Coffee.UIEffects.Editors
{
if (tweener == null) return;
EditorGUI.BeginDisabledGroup(!tweener.enabled);
EditorGUILayout.Space(4);
GUILayout.Label(GUIContent.none, "sv_iconselector_sep", GUILayout.ExpandWidth(true));
@@ -101,6 +102,7 @@ namespace Coffee.UIEffects.Editors
if (GUI.Button(rResetTimeButton, EditorGUIUtility.IconContent("animation.firstkey"), "IconButton"))
{
ResetTime();
EditorApplication.QueuePlayerLoopUpdate();
}
var rPlayButton = new Rect(r.x + 20, r.y, 20, r.height);
@@ -148,12 +150,15 @@ namespace Coffee.UIEffects.Editors
if (EditorGUI.EndChangeCheck())
{
SetTime(time);
EditorApplication.QueuePlayerLoopUpdate();
}
if (Application.isPlaying && tweener.isActiveAndEnabled)
{
Repaint();
}
EditorGUI.EndDisabledGroup();
}
private static float DrawBackground(Rect r, float width, Color color)
@@ -168,6 +173,7 @@ namespace Coffee.UIEffects.Editors
{
foreach (var tweener in targets.OfType<UIEffectTweener>())
{
if (!tweener.enabled) continue;
tweener.SetTime(time);
}
}
@@ -176,6 +182,7 @@ namespace Coffee.UIEffects.Editors
{
foreach (var tweener in targets.OfType<UIEffectTweener>())
{
if (!tweener.enabled) continue;
tweener.ResetTime(tweener.direction);
}
}
@@ -210,6 +217,7 @@ namespace Coffee.UIEffects.Editors
_lastTime = EditorApplication.timeSinceStartup;
foreach (var tweener in targets.OfType<UIEffectTweener>())
{
if (!tweener.enabled) continue;
tweener.UpdateTime(tweener.direction == UIEffectTweener.Direction.Forward ? delta : -delta);
}
@@ -58,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);
}
@@ -97,6 +100,8 @@ 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 != null)
@@ -119,6 +124,8 @@ 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 != null)
{
@@ -164,6 +164,8 @@ namespace Coffee.UIEffectInternal
protected void DrawPreLoadSettingsInBuild(string packageName)
{
if (_preLoadSettingsInBuild == null) return;
EditorGUILayout.PropertyField(_preLoadSettingsInBuild);
if (!_preLoadSettingsInBuild.boolValue)
{
@@ -298,9 +300,13 @@ namespace Coffee.UIEffectInternal
}
_target = instance;
if (_target == null) return;
_editor = Editor.CreateEditor(_target);
}
if (_editor == null) return;
_editor.OnInspectorGUI();
}
}
@@ -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)
{
@@ -29,6 +29,12 @@ namespace Coffee.UIEffectInternal
/// </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);
}
@@ -37,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);
}
@@ -45,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);
}
@@ -53,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);
}
@@ -49,6 +49,8 @@ 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(onShaderFind(x))
{
@@ -62,6 +64,8 @@ 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(onShaderFind(x.shaderName))
{
@@ -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;
@@ -67,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);
}
@@ -102,12 +103,17 @@ 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(typeof(IconAttribute));
var scripts = MonoImporter.GetAllRuntimeMonoScripts();
@@ -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);
@@ -11,14 +11,20 @@ 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;
@@ -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.
@@ -112,7 +139,8 @@ namespace Coffee.UIEffectInternal
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)
@@ -75,18 +75,18 @@ 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];
@@ -105,6 +105,8 @@ namespace Coffee.UIEffectInternal
/// </summary>
public Shader FindShaderByName(string name)
{
if (string.IsNullOrEmpty(name)) return null;
if (_shaderByName != null && _shaderByName.TryGetValue(name, out var shader) && shader != null)
{
return shader;
@@ -120,6 +122,16 @@ namespace Coffee.UIEffectInternal
{
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();
if (_cachedOptionalShaders.TryGetValue(id, out var optionalShaderName))
@@ -141,6 +153,8 @@ 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 == null) continue;
@@ -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();
}
@@ -213,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))
@@ -279,6 +304,7 @@ namespace Coffee.UIEffectInternal
if (m_Asset == null) return;
var so = new SerializedObject(m_Asset);
var shaders = so.FindProperty("m_Shaders");
if (shaders == null) return;
// Get all shaders in the SVC, ignoring nulls and duplicates.
var shadersInSVC = Enumerable.Range(0, shaders.arraySize)
@@ -288,8 +314,11 @@ namespace Coffee.UIEffectInternal
.Distinct()
.ToList();
// If the registered shaders are already in sync with the SVC, no need to update.
if (m_RegisteredShaders.SequenceEqual(shadersInSVC))
// 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))
{
return;
}
@@ -302,6 +331,7 @@ namespace Coffee.UIEffectInternal
internal void RegisterVariant(Material material, string path)
{
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);
@@ -66,9 +66,16 @@ namespace Coffee.UIEffectInternal
CanvasUpdateRegistry.IsRebuildingLayout();
#if TMP_ENABLE
// Explicitly set `Canvas.willRenderCanvases += TMP_UpdateManager.DoRebuilds`.
var _ = 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;
@@ -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;
}
}
@@ -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;
@@ -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;
+22 -7
View File
@@ -843,7 +843,7 @@ namespace Coffee.UIEffects
if (m_ShadowMode == value) return;
context.m_ShadowMode = m_ShadowMode = value;
SetVerticesDirty();
SetVerticesDirty();
SetMaterialDirty();
}
}
@@ -1473,6 +1473,7 @@ namespace Coffee.UIEffects
protected override void OnDestroy()
{
base.OnDestroy();
InternalListPool<UIEffectReplica>.Return(ref _replicas);
}
@@ -1487,6 +1488,8 @@ 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 != null && selection.Contains(x.gameObject)));
@@ -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);
}
}
@@ -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;
+31 -17
View File
@@ -137,7 +137,10 @@ namespace Coffee.UIEffects
private void OnAfterCanvasRebuild()
{
if (_material == null || graphic == null || canvas == null || 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,12 +170,17 @@ 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);
}
}
@@ -178,6 +191,7 @@ namespace Coffee.UIEffects
// 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.
@@ -251,22 +265,22 @@ namespace Coffee.UIEffects
public virtual void SetVerticesDirty()
{
if (graphic != null)
{
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 != null)
{
graphic.SetMaterialDirty();
SetMaterialContextDirty();
Misc.QueuePlayerLoopUpdate();
}
var g = graphic;
if (g == null) return;
g.SetMaterialDirty();
SetMaterialContextDirty();
Misc.QueuePlayerLoopUpdate();
}
public virtual void SetMaterialContextDirty()
+5 -2
View File
@@ -589,7 +589,7 @@ namespace Coffee.UIEffects
public void UpdateViewMatrix(Material material, RectTransform transitionRoot, Canvas canvas)
{
if (material == null) 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);
@@ -715,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);
@@ -722,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);
@@ -849,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;
}
}
}
+2
View File
@@ -121,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]
@@ -106,6 +108,7 @@ namespace Coffee.UIEffects
const string tmpSupport = "TextMeshPro Support";
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)
+9 -11
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;
@@ -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++)
+14 -5
View File
@@ -213,6 +213,12 @@ namespace Coffee.UIEffects
private static void ModifyMesh(TextMeshProUGUI textMeshProUGUI)
{
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();
@@ -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 != null)
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)
{
@@ -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
{
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: a1b972071582443e2845278a859a1533
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because one or more lines are too long
@@ -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
}
}
}
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9d5fb70c6201e408ebe2e8941a0e5944
guid: 1982008f495034475a69725f8ac1e89f
DefaultImporter:
externalObjects: {}
userData:
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e428a82723f244e77b64d08fd256159d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 63a1dba10bff94661a909d63808a9a3b
guid: aaea88b5c038546249cc2fbbfd433653
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d1cb940e3804b4adcaf9b22083fadfad
guid: d7fcf3435fe6345a5995f77557af7796
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 03ea49e29b5ad4fbe8e340af208fe8e7
guid: 3c531490ebb14455cb551108307bb116
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 26b66f9b09b8d4ac6a2790c3fa8b21c1
guid: 55cf683721795488da0a0a4c9f0fa332
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 16f26337621974eaf998b9857bac39c6
guid: 4ded3bac41bfc44e3a4447d0be85c08c
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2c69b4dabb5c24ae99889f581c8b556a
guid: 8fe156fcf62a54b759dc5bec502a8c9b
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e65241fa80a374114b3f55ed746c04d9
guid: f5d4bd451a37b4eb8860cf3dd4b129a3
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 935b7be1c88464d2eb87204fdfab5a38
guid: f6f2e0de33d59456b938ec04c8f0d67c
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 63a1dba10bff94661a909d63808a9a3b
guid: 24dc83ddf0a1e405fb4cf0681d406d4c
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d1cb940e3804b4adcaf9b22083fadfad
guid: 36fc35f9173a94cccad668822e734163
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 03ea49e29b5ad4fbe8e340af208fe8e7
guid: 2781baedc85ac445a996f8eeb4939d1b
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 26b66f9b09b8d4ac6a2790c3fa8b21c1
guid: 938504e5c12b54ce687575dee50e937f
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 16f26337621974eaf998b9857bac39c6
guid: 7b97f55ebcb3e42039b018a6f53625a7
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2c69b4dabb5c24ae99889f581c8b556a
guid: 9a6439db4f462425493a9f700811ab24
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e65241fa80a374114b3f55ed746c04d9
guid: 954723453fc764349bff25b0ee558a7a
ShaderImporter:
externalObjects: {}
defaultTextures: []
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 935b7be1c88464d2eb87204fdfab5a38
guid: 66a4a1859515f485cb0071b732623634
ShaderImporter:
externalObjects: {}
defaultTextures: []

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