From bb095697f735753ec935b03d20e7d69ea0242bb2 Mon Sep 17 00:00:00 2001 From: Philipp Walser <12547596+Iblis@users.noreply.github.com> Date: Fri, 12 Jul 2024 19:01:59 +0200 Subject: [PATCH 1/2] added versionDefine to set TMP support if ugui is found, too --- .../External/TextMeshPro/UniTask.TextMeshPro.asmdef | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef index 6bb01d7..be131e5 100644 --- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef +++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef @@ -16,7 +16,12 @@ "name": "com.unity.textmeshpro", "expression": "", "define": "UNITASK_TEXTMESHPRO_SUPPORT" + }, + { + "name": "com.unity.ugui", + "expression": "", + "define": "UNITASK_TEXTMESHPRO_SUPPORT" } ], "noEngineReferences": false -} \ No newline at end of file +} From 8d98bbc7ba39c4d6b3c23749f1d7814c73c615d9 Mon Sep 17 00:00:00 2001 From: Philipp Walser <12547596+Iblis@users.noreply.github.com> Date: Fri, 12 Jul 2024 19:05:38 +0200 Subject: [PATCH 2/2] added version contraint, tmp is part of ugui since v2.0.0 --- .../Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef index be131e5..3ac90fb 100644 --- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef +++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef @@ -19,7 +19,7 @@ }, { "name": "com.unity.ugui", - "expression": "", + "expression": "2.0.0", "define": "UNITASK_TEXTMESHPRO_SUPPORT" } ],