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 344084e..0000000 Binary files a/Assets/Plugins/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so and /dev/null differ 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