pengtaihao
/
com.unity.uiextensions.nosample
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #446 from wanliyun/release 

Fix Bug!NeicerOutline color.a Lose when m_UseGraphicAlpha is true!
development
Simon (Darkside) Jackson 2023-07-22 16:53:23 +01:00 committed by GitHub
parent 17b69878de 884a8d63f1
commit 69c96ab471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/rununitybuildmultiversion.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
- os: windows - os: windows
unityVersion: 2019.4 unityVersion: 2019.4
build-target: Android build-target: Android
- os: macos - os: macOS
unityVersion: 2019.4 unityVersion: 2019.4
build-target: iOS build-target: iOS
- os: windows - os: windows
@ -30,7 +30,7 @@ jobs:
- os: windows - os: windows
unityVersion: 2020.3 unityVersion: 2020.3
build-target: Android build-target: Android
- os: macos - os: macOS
unityVersion: 2020.3 unityVersion: 2020.3
build-target: iOS build-target: iOS
- os: windows - os: windows
@ -42,7 +42,7 @@ jobs:
- os: windows - os: windows
unityVersion: 2021.3 unityVersion: 2021.3
build-target: Android build-target: Android
- os: macos - os: macOS
unityVersion: 2021.3 unityVersion: 2021.3
build-target: iOS build-target: iOS
- os: windows - os: windows
@ -54,7 +54,7 @@ jobs:
- os: windows - os: windows
unityVersion: 2022.2 unityVersion: 2022.2
build-target: Android build-target: Android
- os: macos - os: macOS
unityVersion: 2022.2 unityVersion: 2022.2
build-target: iOS build-target: iOS
- os: windows - os: windows
@ -101,12 +101,12 @@ jobs:
} }
elseif ( $global:PSVersionTable.OS.Contains("Darwin") ) 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/" $editorRootPath = "/Applications/Unity/Hub/Editor/"
$editorFileEx = "/Unity.app/Contents/MacOS/Unity" $editorFileEx = "/Unity.app/Contents/macOS/Unity"
$directorySeparatorChar = "/" $directorySeparatorChar = "/"
# /Applications/Unity\ Hub.app/Contents/MacOS/Unity\ Hub -- --headless help # /Applications/Unity\ Hub.app/Contents/macOS/Unity\ Hub -- --headless help
function unity-hub function unity-hub
{ {
& $hubPath -- --headless $args.Split(" ") | Out-String -NoNewline & $hubPath -- --headless $args.Split(" ") | Out-String -NoNewline
@ -218,7 +218,7 @@ jobs:
} }
elseif ( $global:PSVersionTable.OS.Contains("Darwin") ) { elseif ( $global:PSVersionTable.OS.Contains("Darwin") ) {
echo 'Building using Mac' echo 'Building using Mac'
$editorFileEx = "/Unity.app/Contents/MacOS/Unity" $editorFileEx = "/Unity.app/Contents/macOS/Unity"
$editorrunpath = Join-Path $editorRootPath $unityVersion $editorFileEx $editorrunpath = Join-Path $editorRootPath $unityVersion $editorFileEx
function unity-editor { function unity-editor {

2
.github/workflows/rununitysinglebuild.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- os: macos - os: macOS
build-target: iOS build-target: iOS
- os: windows - os: windows
build-target: Android build-target: Android

2
Runtime/Scripts/Effects/NicerOutline.cs
View File

@ -134,7 +134,7 @@ namespace UnityEngine.UI.Extensions
start += ApplyText(m_Verts, vh, start); start += ApplyText(m_Verts, vh, start);
} }
private int ApplyOutlineNoGC(List<UIVertex> verts, Color color, float x, float y, VertexHelper vh, int startIndex) private int ApplyOutlineNoGC(List<UIVertex> verts, Color32 color, float x, float y, VertexHelper vh, int startIndex)
{ {
int length = verts.Count; int length = verts.Count;
for (int i = 0; i < length; ++i) for (int i = 0; i < length; ++i)