From f99edbfd94b6b6569d9d70b3259521eb6d9dfbf0 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Tue, 14 Feb 2023 03:57:07 +0800 Subject: [PATCH] bug fix, add outline width setting --- .../StandaloneFileBrowser/Plugins/Linux.meta | 10 - .../Plugins/Linux/x86_64.meta | 10 - .../Linux/x86_64/libStandaloneFileBrowser.so | Bin 26984 -> 0 bytes .../x86_64/libStandaloneFileBrowser.so.meta | 126 ---- .../Plugins/Ookii.Dialogs.dll.meta | 4 +- .../Plugins/StandaloneFileBrowser.bundle.meta | 3 + .../Plugins/StandaloneFileBrowser.jslib.meta | 7 +- .../Plugins/System.Windows.Forms.dll.meta | 103 +-- .../StandaloneFileBrowserLinux.cs | 115 --- .../StandaloneFileBrowserLinux.cs.meta | 3 - .../StandaloneFileBrowserMac.cs | 119 ---- .../StandaloneFileBrowserMac.cs.meta | 12 - Assets/Scenes/Version2.unity | 659 +++++++++++++++++- Assets/Scripts/UmaViewerBuilder.cs | 10 + Assets/Scripts/UmaViewerUI.cs | 5 + ProjectSettings/ProjectSettings.asset | 2 +- 16 files changed, 670 insertions(+), 518 deletions(-) delete mode 100644 Assets/Plugins/StandaloneFileBrowser/Plugins/Linux.meta delete mode 100644 Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64.meta delete mode 100644 Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so delete mode 100644 Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so.meta delete mode 100644 Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs delete mode 100644 Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs.meta delete mode 100644 Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserMac.cs delete mode 100644 Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserMac.cs.meta diff --git a/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux.meta b/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux.meta deleted file mode 100644 index 12e971a..0000000 --- a/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 82666e520ab4d4cf08bebbb8059cd6f4 -folderAsset: yes -timeCreated: 1538224809 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64.meta b/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64.meta deleted file mode 100644 index 7f52bde..0000000 --- a/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: bd198408642944765b9305bd99404136 -folderAsset: yes -timeCreated: 1538230728 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so b/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so deleted file mode 100644 index 344084e5b50162962b072b74f6f5b50b59811366..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26984 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 E-{|r>Gynhq diff --git a/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so.meta b/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so.meta deleted file mode 100644 index f925612..0000000 --- a/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so.meta +++ /dev/null @@ -1,126 +0,0 @@ -fileFormatVersion: 2 -guid: b8c465928f1784a3fac8dc3766f7201c -timeCreated: 1538230728 -licenseType: Free -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 0 - Exclude LinuxUniversal: 0 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude SamsungTV: 1 - Exclude Tizen: 1 - Exclude WebGL: 1 - Exclude Win: 0 - Exclude Win64: 0 - Exclude iOS: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Linux - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Samsung TV: SamsungTV - second: - enabled: 0 - settings: - STV_MODEL: STANDARD_15 - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll.meta b/Assets/Plugins/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll.meta index ae7d573..7b6a559 100644 --- a/Assets/Plugins/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll.meta +++ b/Assets/Plugins/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll.meta @@ -44,14 +44,16 @@ PluginImporter: - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: enabled: 1 settings: + CPU: AnyCPU DefaultValueInitialized: true + OS: AnyOS - first: Facebook: Win second: diff --git a/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta b/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta index c7bdac6..da839a1 100644 --- a/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta +++ b/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta @@ -6,8 +6,11 @@ PluginImporter: serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: Any: diff --git a/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.jslib.meta b/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.jslib.meta index 9ba582b..66ad872 100644 --- a/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.jslib.meta +++ b/Assets/Plugins/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.jslib.meta @@ -5,11 +5,14 @@ PluginImporter: serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: - '': Any + : Any second: enabled: 0 settings: @@ -61,7 +64,7 @@ PluginImporter: second: enabled: 0 settings: - CPU: x86_64 + CPU: AnyCPU - first: Standalone: LinuxUniversal second: diff --git a/Assets/Plugins/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll.meta b/Assets/Plugins/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll.meta index 5416966..cd42442 100644 --- a/Assets/Plugins/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll.meta +++ b/Assets/Plugins/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d459a96865cc4aaab657012c6dc4833 +guid: cf7cd152578c2c9488c752cb5f9b692d PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,120 +11,23 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 0 - Exclude Win64: 0 - Exclude iOS: 1 - - first: - : Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - OS: AnyOS - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor second: - enabled: 1 + enabled: 0 settings: DefaultValueInitialized: true - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU - first: Windows Store Apps: WindowsStoreApps second: enabled: 0 settings: CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs b/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs deleted file mode 100644 index ba27ec0..0000000 --- a/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs +++ /dev/null @@ -1,115 +0,0 @@ -#if UNITY_STANDALONE_LINUX - -using System; -using System.IO; -using System.Runtime.InteropServices; -using UnityEngine; - -namespace SFB { - - public class StandaloneFileBrowserLinux : IStandaloneFileBrowser { - - private static Action _openFileCb; - private static Action _openFolderCb; - private static Action _saveFileCb; - - [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate void AsyncCallback(string path); - - [DllImport("StandaloneFileBrowser")] - private static extern void DialogInit(); - [DllImport("StandaloneFileBrowser")] - private static extern IntPtr DialogOpenFilePanel(string title, string directory, string extension, bool multiselect); - [DllImport("StandaloneFileBrowser")] - private static extern void DialogOpenFilePanelAsync(string title, string directory, string extension, bool multiselect, AsyncCallback callback); - [DllImport("StandaloneFileBrowser")] - private static extern IntPtr DialogOpenFolderPanel(string title, string directory, bool multiselect); - [DllImport("StandaloneFileBrowser")] - private static extern void DialogOpenFolderPanelAsync(string title, string directory, bool multiselect, AsyncCallback callback); - [DllImport("StandaloneFileBrowser")] - private static extern IntPtr DialogSaveFilePanel(string title, string directory, string defaultName, string extension); - [DllImport("StandaloneFileBrowser")] - private static extern void DialogSaveFilePanelAsync(string title, string directory, string defaultName, string extension, AsyncCallback callback); - - public StandaloneFileBrowserLinux() - { - DialogInit(); - } - - public string[] OpenFilePanel(string title, string directory, ExtensionFilter[] extensions, bool multiselect) { - var paths = Marshal.PtrToStringAnsi(DialogOpenFilePanel( - title, - directory, - GetFilterFromFileExtensionList(extensions), - multiselect)); - return paths.Split((char)28); - } - - public void OpenFilePanelAsync(string title, string directory, ExtensionFilter[] extensions, bool multiselect, Action cb) { - _openFileCb = cb; - DialogOpenFilePanelAsync( - title, - directory, - GetFilterFromFileExtensionList(extensions), - multiselect, - (string result) => { _openFileCb.Invoke(result.Split((char)28)); }); - } - - public string[] OpenFolderPanel(string title, string directory, bool multiselect) { - var paths = Marshal.PtrToStringAnsi(DialogOpenFolderPanel( - title, - directory, - multiselect)); - return paths.Split((char)28); - } - - public void OpenFolderPanelAsync(string title, string directory, bool multiselect, Action cb) { - _openFolderCb = cb; - DialogOpenFolderPanelAsync( - title, - directory, - multiselect, - (string result) => { _openFolderCb.Invoke(result.Split((char)28)); }); - } - - public string SaveFilePanel(string title, string directory, string defaultName, ExtensionFilter[] extensions) { - return Marshal.PtrToStringAnsi(DialogSaveFilePanel( - title, - directory, - defaultName, - GetFilterFromFileExtensionList(extensions))); - } - - public void SaveFilePanelAsync(string title, string directory, string defaultName, ExtensionFilter[] extensions, Action cb) { - _saveFileCb = cb; - DialogSaveFilePanelAsync( - title, - directory, - defaultName, - GetFilterFromFileExtensionList(extensions), - (string result) => { _saveFileCb.Invoke(result); }); - } - - private static string GetFilterFromFileExtensionList(ExtensionFilter[] extensions) { - if (extensions == null) { - return ""; - } - - var filterString = ""; - foreach (var filter in extensions) { - filterString += filter.Name + ";"; - - foreach (var ext in filter.Extensions) { - filterString += ext + ","; - } - - filterString = filterString.Remove(filterString.Length - 1); - filterString += "|"; - } - filterString = filterString.Remove(filterString.Length - 1); - return filterString; - } - } -} - -#endif \ No newline at end of file diff --git a/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs.meta b/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs.meta deleted file mode 100644 index e8bfba1..0000000 --- a/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 5d3a668018554b8a89c3fe12de72b60c -timeCreated: 1538067919 \ No newline at end of file diff --git a/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserMac.cs b/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserMac.cs deleted file mode 100644 index ad9d023..0000000 --- a/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserMac.cs +++ /dev/null @@ -1,119 +0,0 @@ -#if UNITY_STANDALONE_OSX - -using System; -using System.Runtime.InteropServices; - -namespace SFB { - public class StandaloneFileBrowserMac : IStandaloneFileBrowser { - private static Action _openFileCb; - private static Action _openFolderCb; - private static Action _saveFileCb; - - [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate void AsyncCallback(string path); - - [AOT.MonoPInvokeCallback(typeof(AsyncCallback))] - private static void openFileCb(string result) { - _openFileCb.Invoke(result.Split((char)28)); - } - - [AOT.MonoPInvokeCallback(typeof(AsyncCallback))] - private static void openFolderCb(string result) { - _openFolderCb.Invoke(result.Split((char)28)); - } - - [AOT.MonoPInvokeCallback(typeof(AsyncCallback))] - private static void saveFileCb(string result) { - _saveFileCb.Invoke(result); - } - - [DllImport("StandaloneFileBrowser")] - private static extern IntPtr DialogOpenFilePanel(string title, string directory, string extension, bool multiselect); - [DllImport("StandaloneFileBrowser")] - private static extern void DialogOpenFilePanelAsync(string title, string directory, string extension, bool multiselect, AsyncCallback callback); - [DllImport("StandaloneFileBrowser")] - private static extern IntPtr DialogOpenFolderPanel(string title, string directory, bool multiselect); - [DllImport("StandaloneFileBrowser")] - private static extern void DialogOpenFolderPanelAsync(string title, string directory, bool multiselect, AsyncCallback callback); - [DllImport("StandaloneFileBrowser")] - private static extern IntPtr DialogSaveFilePanel(string title, string directory, string defaultName, string extension); - [DllImport("StandaloneFileBrowser")] - private static extern void DialogSaveFilePanelAsync(string title, string directory, string defaultName, string extension, AsyncCallback callback); - - public string[] OpenFilePanel(string title, string directory, ExtensionFilter[] extensions, bool multiselect) { - var paths = Marshal.PtrToStringAnsi(DialogOpenFilePanel( - title, - directory, - GetFilterFromFileExtensionList(extensions), - multiselect)); - return paths.Split((char)28); - } - - public void OpenFilePanelAsync(string title, string directory, ExtensionFilter[] extensions, bool multiselect, Action cb) { - _openFileCb = cb; - DialogOpenFilePanelAsync( - title, - directory, - GetFilterFromFileExtensionList(extensions), - multiselect, - openFileCb); - } - - public string[] OpenFolderPanel(string title, string directory, bool multiselect) { - var paths = Marshal.PtrToStringAnsi(DialogOpenFolderPanel( - title, - directory, - multiselect)); - return paths.Split((char)28); - } - - public void OpenFolderPanelAsync(string title, string directory, bool multiselect, Action cb) { - _openFolderCb = cb; - DialogOpenFolderPanelAsync( - title, - directory, - multiselect, - openFolderCb); - } - - public string SaveFilePanel(string title, string directory, string defaultName, ExtensionFilter[] extensions) { - return Marshal.PtrToStringAnsi(DialogSaveFilePanel( - title, - directory, - defaultName, - GetFilterFromFileExtensionList(extensions))); - } - - public void SaveFilePanelAsync(string title, string directory, string defaultName, ExtensionFilter[] extensions, Action cb) { - _saveFileCb = cb; - DialogSaveFilePanelAsync( - title, - directory, - defaultName, - GetFilterFromFileExtensionList(extensions), - saveFileCb); - } - - private static string GetFilterFromFileExtensionList(ExtensionFilter[] extensions) { - if (extensions == null) { - return ""; - } - - var filterString = ""; - foreach (var filter in extensions) { - filterString += filter.Name + ";"; - - foreach (var ext in filter.Extensions) { - filterString += ext + ","; - } - - filterString = filterString.Remove(filterString.Length - 1); - filterString += "|"; - } - filterString = filterString.Remove(filterString.Length - 1); - return filterString; - } - } -} - -#endif \ No newline at end of file diff --git a/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserMac.cs.meta b/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserMac.cs.meta deleted file mode 100644 index 4a2ffc3..0000000 --- a/Assets/Plugins/StandaloneFileBrowser/StandaloneFileBrowserMac.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: bcb49ddb0ed5644fda9c3b055cafa27a -timeCreated: 1483902788 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index d601f0b..4167c48 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -823,6 +823,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &21869129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 21869130} + - component: {fileID: 21869132} + - component: {fileID: 21869131} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &21869130 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21869129} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 833989149} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &21869131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21869129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &21869132 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21869129} + m_CullTransparentMesh: 1 --- !u!1 &32867438 GameObject: m_ObjectHideFlags: 0 @@ -3229,7 +3304,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 35.3, y: 0} + m_AnchoredPosition: {x: 57.00003, y: 0} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 1, y: 0.5} --- !u!114 &154309967 @@ -4262,6 +4337,85 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &247611888 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 247611889} + - component: {fileID: 247611891} + - component: {fileID: 247611890} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &247611889 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 247611888} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 833989149} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 20.01001} + m_SizeDelta: {x: 180, y: 30} + m_Pivot: {x: 0, y: 0} +--- !u!114 &247611890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 247611888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Outline Width +--- !u!222 &247611891 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 247611888} + m_CullTransparentMesh: 1 --- !u!1 &248521853 GameObject: m_ObjectHideFlags: 0 @@ -8610,8 +8764,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -22.849854, y: 0} - m_SizeDelta: {x: 45.70025, y: 0} + m_AnchoredPosition: {x: -29.999865, y: 0} + m_SizeDelta: {x: 60.00027, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &437051806 MonoBehaviour: @@ -11874,6 +12028,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 538877080} m_CullTransparentMesh: 1 +--- !u!1 &542589989 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 542589990} + - component: {fileID: 542589992} + - component: {fileID: 542589991} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &542589990 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542589989} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1509401544} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &542589991 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542589989} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &542589992 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542589989} + m_CullTransparentMesh: 1 --- !u!1 &542685195 GameObject: m_ObjectHideFlags: 0 @@ -12301,13 +12530,14 @@ RectTransform: - {fileID: 1798338064} - {fileID: 482905334} - {fileID: 1424772036} + - {fileID: 1516585111} m_Father: {fileID: 1704906816} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 149.6035} + m_SizeDelta: {x: 0, y: 220} m_Pivot: {x: 1, y: 0.5} --- !u!114 &548276325 MonoBehaviour: @@ -13364,7 +13594,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 35.3, y: 0} + m_AnchoredPosition: {x: 57, y: 0} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 1, y: 0.5} --- !u!114 &606433962 @@ -17165,7 +17395,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -19.999924, y: 0} m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &784878933 @@ -18929,6 +19159,122 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 831508057} m_CullTransparentMesh: 1 +--- !u!1 &833989148 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 833989149} + - component: {fileID: 833989150} + m_Layer: 5 + m_Name: OutlineSlider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &833989149 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 833989148} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 247611889} + - {fileID: 21869130} + - {fileID: 2070214619} + - {fileID: 1509401544} + - {fileID: 1299263365} + m_Father: {fileID: 1516585111} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 106, y: -34} + m_SizeDelta: {x: 180, y: 20} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &833989150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 833989148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 542589991} + m_FillRect: {fileID: 1999129488} + m_HandleRect: {fileID: 542589990} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 0.5 + m_WholeNumbers: 0 + m_Value: 0.1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1299263367} + m_TargetAssemblyTypeName: SliderDisplay, Assembly-CSharp + m_MethodName: UpdateDisplay + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1564959567} + m_TargetAssemblyTypeName: UmaViewerUI, umamusume + m_MethodName: ChangeOutlineWidth + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &834921853 GameObject: m_ObjectHideFlags: 0 @@ -19415,7 +19761,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -19.999924, y: 0} m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &845364686 @@ -26253,7 +26599,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1882365342} m_Direction: 2 m_Value: 1 - m_Size: 0.92577153 + m_Size: 0.8701734 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -29327,6 +29673,98 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &1299263364 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1299263365} + - component: {fileID: 1299263368} + - component: {fileID: 1299263367} + - component: {fileID: 1299263366} + m_Layer: 5 + m_Name: SliderDisplay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1299263365 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299263364} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 833989149} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 95, y: 0} + m_SizeDelta: {x: 79.15, y: 30} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1299263366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299263364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 0.1 +--- !u!114 &1299263367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299263364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da09db22068c39445a2454d09ac5b09c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &1299263368 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299263364} + m_CullTransparentMesh: 1 --- !u!1 &1300114663 GameObject: m_ObjectHideFlags: 0 @@ -30147,7 +30585,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -19.999924, y: 0} m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1364855927 @@ -32522,6 +32960,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1505249813} m_CullTransparentMesh: 1 +--- !u!1 &1509401543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1509401544} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1509401544 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509401543} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 542589990} + m_Father: {fileID: 833989149} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1509789524 GameObject: m_ObjectHideFlags: 0 @@ -32830,6 +33304,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1516377149} m_CullTransparentMesh: 1 +--- !u!1 &1516585110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1516585111} + m_Layer: 5 + m_Name: Outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1516585111 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516585110} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 833989149} + m_Father: {fileID: 548276324} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -150} + m_SizeDelta: {x: 283, y: 70} + m_Pivot: {x: 0, y: 1} --- !u!1 &1522574862 GameObject: m_ObjectHideFlags: 0 @@ -34276,8 +34786,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -22.849878, y: 0} - m_SizeDelta: {x: 45.700245, y: 0} + m_AnchoredPosition: {x: -12.6592, y: 0} + m_SizeDelta: {x: 25.3188, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1595752502 MonoBehaviour: @@ -34333,7 +34843,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -35977,7 +36487,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 35.3, y: 0} + m_AnchoredPosition: {x: 57.00003, y: 0} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1661690231 @@ -36339,8 +36849,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -22.849878, y: 0} - m_SizeDelta: {x: 45.700245, y: 0} + m_AnchoredPosition: {x: -12.6592, y: 0} + m_SizeDelta: {x: 25.3188, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1677453986 MonoBehaviour: @@ -36396,7 +36906,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -42915,8 +43425,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -22.849876, y: 0} - m_SizeDelta: {x: 45.70025, y: 0} + m_AnchoredPosition: {x: -12.6592, y: 0} + m_SizeDelta: {x: 25.3188, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1981379721 MonoBehaviour: @@ -42972,7 +43482,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -43311,6 +43821,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1996799647} m_CullTransparentMesh: 1 +--- !u!1 &1999129487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1999129488} + - component: {fileID: 1999129490} + - component: {fileID: 1999129489} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1999129488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999129487} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2070214619} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1999129489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999129487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1999129490 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999129487} + m_CullTransparentMesh: 1 --- !u!1 &2000582226 GameObject: m_ObjectHideFlags: 0 @@ -45243,6 +45828,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2062531603} m_CullTransparentMesh: 1 +--- !u!1 &2070214618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2070214619} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2070214619 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070214618} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1999129488} + m_Father: {fileID: 833989149} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5.000046, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2073237535 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 30dfca0..2b70754 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -856,6 +856,16 @@ public class UmaViewerBuilder : MonoBehaviour m.shader = bodyAlphaShader; } + + if (m.shader.name.Contains("Noline")&& m.shader.name.Contains("TSER")) + { + var s = ShaderList.Find(a=>a.name == m.shader.name.Replace("Noline", "")); //Generic costume shader need to change manually. + if (s) + { + m.shader = s; + } + } + switch (costumeIdShort.Split('_')[0]) //costume ID { case "0001": diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index e1a8cf6..6f29238 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -1186,4 +1186,9 @@ public class UmaViewerUI : MonoBehaviour } } + public void ChangeOutlineWidth(float val) + { + Shader.SetGlobalFloat("_GlobalOutlineWidth", val); + } + } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 991aaa3..f9215ae 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -723,7 +723,7 @@ PlayerSettings: assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: - Standalone: 6 + Standalone: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_3D