diff --git a/.github/workflows/rununitybuildmultiversion.yml b/.github/workflows/rununitybuildmultiversion.yml index 3a5a542..ffd309c 100644 --- a/.github/workflows/rununitybuildmultiversion.yml +++ b/.github/workflows/rununitybuildmultiversion.yml @@ -18,7 +18,7 @@ jobs: - os: windows unityVersion: 2019.4 build-target: Android - - os: macos + - os: macOS unityVersion: 2019.4 build-target: iOS - os: windows @@ -30,7 +30,7 @@ jobs: - os: windows unityVersion: 2020.3 build-target: Android - - os: macos + - os: macOS unityVersion: 2020.3 build-target: iOS - os: windows @@ -42,7 +42,7 @@ jobs: - os: windows unityVersion: 2021.3 build-target: Android - - os: macos + - os: macOS unityVersion: 2021.3 build-target: iOS - os: windows @@ -54,7 +54,7 @@ jobs: - os: windows unityVersion: 2022.2 build-target: Android - - os: macos + - os: macOS unityVersion: 2022.2 build-target: iOS - os: windows @@ -101,12 +101,12 @@ jobs: } elseif ( $global:PSVersionTable.OS.Contains("Darwin") ) { - $hubPath = "/Applications/Unity Hub.app/Contents/MacOS/Unity Hub" + $hubPath = "/Applications/Unity Hub.app/Contents/macOS/Unity Hub" $editorRootPath = "/Applications/Unity/Hub/Editor/" - $editorFileEx = "/Unity.app/Contents/MacOS/Unity" + $editorFileEx = "/Unity.app/Contents/macOS/Unity" $directorySeparatorChar = "/" - # /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless help + # /Applications/Unity\ Hub.app/Contents/macOS/Unity\ Hub -- --headless help function unity-hub { & $hubPath -- --headless $args.Split(" ") | Out-String -NoNewline @@ -218,7 +218,7 @@ jobs: } elseif ( $global:PSVersionTable.OS.Contains("Darwin") ) { echo 'Building using Mac' - $editorFileEx = "/Unity.app/Contents/MacOS/Unity" + $editorFileEx = "/Unity.app/Contents/macOS/Unity" $editorrunpath = Join-Path $editorRootPath $unityVersion $editorFileEx function unity-editor { diff --git a/.github/workflows/rununitysinglebuild.yml b/.github/workflows/rununitysinglebuild.yml index a6f2e8a..d6ba283 100644 --- a/.github/workflows/rununitysinglebuild.yml +++ b/.github/workflows/rununitysinglebuild.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: include: - - os: macos + - os: macOS build-target: iOS - os: windows build-target: Android diff --git a/Runtime/Scripts/Effects/NicerOutline.cs b/Runtime/Scripts/Effects/NicerOutline.cs index ed69c62..602e5ee 100644 --- a/Runtime/Scripts/Effects/NicerOutline.cs +++ b/Runtime/Scripts/Effects/NicerOutline.cs @@ -134,7 +134,7 @@ namespace UnityEngine.UI.Extensions start += ApplyText(m_Verts, vh, start); } - private int ApplyOutlineNoGC(List verts, Color color, float x, float y, VertexHelper vh, int startIndex) + private int ApplyOutlineNoGC(List verts, Color32 color, float x, float y, VertexHelper vh, int startIndex) { int length = verts.Count; for (int i = 0; i < length; ++i)