From e32a38c6c7e48fd2f94ad270f1695ecd2741db92 Mon Sep 17 00:00:00 2001 From: katboi01 <59540382+katboi01@users.noreply.github.com> Date: Sat, 12 Jul 2025 13:36:19 +0200 Subject: [PATCH] Refactor: Moved settings panels to their own classes (#89) This should not affect any functionalities --- .gitignore | 1 + Assets/Scenes/Version2.unity | 989 ++++++------------ Assets/Scripts/CameraOrbit.cs | 88 +- Assets/Scripts/Pose/PoseManager.cs | 12 +- Assets/Scripts/Screenshot.cs | 29 +- Assets/Scripts/Settings.meta | 8 + .../Scripts/Settings/UISettingsAnimation.cs | 129 +++ .../Settings/UISettingsAnimation.cs.meta | 11 + Assets/Scripts/Settings/UISettingsAssets.cs | 58 + .../Scripts/Settings/UISettingsAssets.cs.meta | 11 + Assets/Scripts/Settings/UISettingsCamera.cs | 135 +++ .../Scripts/Settings/UISettingsCamera.cs.meta | 11 + .../Scripts/Settings/UISettingsEnvironment.cs | 73 ++ .../Settings/UISettingsEnvironment.cs.meta | 11 + Assets/Scripts/Settings/UISettingsModel.cs | 112 ++ .../Scripts/Settings/UISettingsModel.cs.meta | 11 + Assets/Scripts/Settings/UISettingsOther.cs | 95 ++ .../Scripts/Settings/UISettingsOther.cs.meta | 11 + .../Scripts/Settings/UISettingsScreenshot.cs | 22 + .../Settings/UISettingsScreenshot.cs.meta | 11 + Assets/Scripts/Settings/UISettingsSound.cs | 89 ++ .../Scripts/Settings/UISettingsSound.cs.meta | 11 + Assets/Scripts/UmaContainerCharacter.cs | 8 +- Assets/Scripts/UmaViewerBuilder.cs | 29 +- Assets/Scripts/UmaViewerUI.cs | 519 +-------- Assets/Scripts/uGIF/CaptureToGIFCustom.cs | 6 +- ProjectSettings/ProjectSettings.asset | 8 +- UserSettings/EditorUserSettings.asset | 54 - 28 files changed, 1234 insertions(+), 1318 deletions(-) create mode 100644 Assets/Scripts/Settings.meta create mode 100644 Assets/Scripts/Settings/UISettingsAnimation.cs create mode 100644 Assets/Scripts/Settings/UISettingsAnimation.cs.meta create mode 100644 Assets/Scripts/Settings/UISettingsAssets.cs create mode 100644 Assets/Scripts/Settings/UISettingsAssets.cs.meta create mode 100644 Assets/Scripts/Settings/UISettingsCamera.cs create mode 100644 Assets/Scripts/Settings/UISettingsCamera.cs.meta create mode 100644 Assets/Scripts/Settings/UISettingsEnvironment.cs create mode 100644 Assets/Scripts/Settings/UISettingsEnvironment.cs.meta create mode 100644 Assets/Scripts/Settings/UISettingsModel.cs create mode 100644 Assets/Scripts/Settings/UISettingsModel.cs.meta create mode 100644 Assets/Scripts/Settings/UISettingsOther.cs create mode 100644 Assets/Scripts/Settings/UISettingsOther.cs.meta create mode 100644 Assets/Scripts/Settings/UISettingsScreenshot.cs create mode 100644 Assets/Scripts/Settings/UISettingsScreenshot.cs.meta create mode 100644 Assets/Scripts/Settings/UISettingsSound.cs create mode 100644 Assets/Scripts/Settings/UISettingsSound.cs.meta delete mode 100644 UserSettings/EditorUserSettings.asset diff --git a/.gitignore b/.gitignore index b362d9a..4959423 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ Config.json /Assets/AmplifyShaderEditor.meta /BuildDev /UserSettings/Layouts/default-2022.dwlt +/UserSettings/EditorUserSettings.asset diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 741427a..778f02a 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -3349,6 +3349,7 @@ GameObject: - component: {fileID: 93905317} - component: {fileID: 93905316} - component: {fileID: 93905315} + - component: {fileID: 93905318} m_Layer: 5 m_Name: Other m_TagString: Untagged @@ -3379,7 +3380,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -1022.18} + m_AnchoredPosition: {x: 141.5, y: -535} m_SizeDelta: {x: 283, y: 350} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &93905315 @@ -3446,6 +3447,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 93905313} m_CullTransparentMesh: 1 +--- !u!114 &93905318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 93905313} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49e773074de12594e9980542be5a673b, type: 3} + m_Name: + m_EditorClassIdentifier: + UpdateDBButton: {fileID: 1516377151} + RegionDropdown: {fileID: 647681493} + WorkModeDropdown: {fileID: 1909384047} + LanguageDropdown: {fileID: 308207822} --- !u!1 &97643175 GameObject: m_ObjectHideFlags: 0 @@ -7875,7 +7892,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &262195461 @@ -8929,7 +8946,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 292348637} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 375781856} + m_TargetAssemblyTypeName: UISettingsAnimation, umamusume + m_MethodName: Pause + m_Mode: 1 + 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 &293213723 GameObject: m_ObjectHideFlags: 0 @@ -9259,8 +9288,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 548276327} + m_TargetAssemblyTypeName: UISettingsModel, umamusume m_MethodName: ExportModel m_Mode: 1 m_Arguments: @@ -9482,8 +9511,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 93905318} + m_TargetAssemblyTypeName: UISettingsOther, umamusume m_MethodName: ChangeLanguage m_Mode: 0 m_Arguments: @@ -9882,7 +9911,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 283, y: -275} + m_AnchoredPosition: {x: 283, y: -325} m_SizeDelta: {x: 283, y: 50} m_Pivot: {x: 1, y: 0.5} --- !u!222 &324606080 @@ -10379,7 +10408,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &334859485 @@ -10399,6 +10428,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 339844723} + - component: {fileID: 339844724} m_Layer: 5 m_Name: Environment m_TagString: Untagged @@ -10428,6 +10458,23 @@ RectTransform: m_AnchoredPosition: {x: 141.5, y: -420} m_SizeDelta: {x: 283, y: 390} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &339844724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 339844722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 463147a12f484cc4dbe150fb97b22392, type: 3} + m_Name: + m_EditorClassIdentifier: + BackGroundList: {fileID: 394733025} + BackGroundPageCtrl: {fileID: 2093223150} + BG_Canvas: {fileID: 1085021150} + BG_HSVPickerObj: {fileID: 582796021} + BG_Image: {fileID: 1682865917} --- !u!1 &343750187 GameObject: m_ObjectHideFlags: 0 @@ -11384,81 +11431,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 357312446} m_CullTransparentMesh: 1 ---- !u!1 &365084184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 365084185} - - component: {fileID: 365084187} - - component: {fileID: 365084186} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &365084185 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 365084184} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 469445773} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.47368422, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &365084186 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 365084184} - 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 &365084187 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 365084184} - m_CullTransparentMesh: 1 --- !u!1 &370099769 GameObject: m_ObjectHideFlags: 0 @@ -11759,6 +11731,7 @@ GameObject: - component: {fileID: 375781853} - component: {fileID: 375781855} - component: {fileID: 375781854} + - component: {fileID: 375781856} m_Layer: 5 m_Name: AnimationPlayer m_TagString: Untagged @@ -11787,7 +11760,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 283, y: -300.065} + m_AnchoredPosition: {x: 283, y: -812.245} m_SizeDelta: {x: 283, y: 240.13} m_Pivot: {x: 1, y: 0.5} --- !u!114 &375781854 @@ -11828,6 +11801,25 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 375781852} m_CullTransparentMesh: 1 +--- !u!114 &375781856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 375781852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bb219ac831519664dbea3c160315d0ec, type: 3} + m_Name: + m_EditorClassIdentifier: + TitleText: {fileID: 1118881288} + ProgressText: {fileID: 1286450786} + ProgressSlider: {fileID: 1349413338} + PlayButton: {fileID: 292348639} + SpeedText: {fileID: 1623091784} + SpeedSlider: {fileID: 994851660} + VMDButton: {fileID: 668484488} --- !u!1 &375965192 GameObject: m_ObjectHideFlags: 0 @@ -13598,7 +13590,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &451396666 @@ -13754,7 +13746,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &455827295 @@ -13848,7 +13840,7 @@ PrefabInstance: - target: {fileID: 11423364, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 1564959567} + objectReference: {fileID: 339844724} - target: {fileID: 11423364, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -13859,7 +13851,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11423364, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UmaViewerUI, Assembly-CSharp + value: UISettingsEnvironment, umamusume objectReference: {fileID: 0} - target: {fileID: 11423364, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -14419,19 +14411,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22499384, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224930228632997228, guid: 916ee089a0d7b63419075f91e1c657ec, type: 3} @@ -15127,42 +15119,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 469001213} m_CullTransparentMesh: 1 ---- !u!1 &469445772 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 469445773} - 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 &469445773 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 469445772} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 365084185} - m_Father: {fileID: 864436235} - 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, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &469633674 GameObject: m_ObjectHideFlags: 0 @@ -15461,7 +15417,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &477680983 @@ -16421,7 +16377,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &499497008 @@ -17332,7 +17288,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &512008714 @@ -18505,141 +18461,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 542589989} m_CullTransparentMesh: 1 ---- !u!1 &542685195 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 542685196} - - component: {fileID: 542685197} - - component: {fileID: 542685198} - m_Layer: 5 - m_Name: GifQualityLabel (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &542685196 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542685195} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2134049658} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -208.5} - m_SizeDelta: {x: 243, y: 23.4} - m_Pivot: {x: 0, y: 1} ---- !u!222 &542685197 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542685195} - m_CullTransparentMesh: 1 ---- !u!114 &542685198 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542685195} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'Quality: 10 (default: 10)' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 309c10a796fa90746889302436dac032, type: 2} - m_sharedMaterial: {fileID: 1876532955194943090, guid: 309c10a796fa90746889302436dac032, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &544177723 GameObject: m_ObjectHideFlags: 0 @@ -18913,6 +18734,7 @@ GameObject: - component: {fileID: 548276324} - component: {fileID: 548276326} - component: {fileID: 548276325} + - component: {fileID: 548276327} m_Layer: 5 m_Name: ModelSettings m_TagString: Untagged @@ -18944,7 +18766,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 283, y: -902.18} + m_AnchoredPosition: {x: 283, y: -390} m_SizeDelta: {x: 283, y: 600} m_Pivot: {x: 1, y: 0.5} --- !u!114 &548276325 @@ -18985,6 +18807,25 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 548276323} m_CullTransparentMesh: 1 +--- !u!114 &548276327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 548276323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f61fc8a1e0ca2cf49a9f794b613665f0, type: 3} + m_Name: + m_EditorClassIdentifier: + _lockCharacter: {fileID: 1364855927} + _openWithTPose: {fileID: 2033590193} + _enablePhysics: {fileID: 845364686} + _lookAtCamera: {fileID: 784878933} + _faceOverride: {fileID: 1026628213} + _outlineWidthSlider: {fileID: 833989150} + MaterialsList: {fileID: 2057017232} --- !u!1 &548963527 GameObject: m_ObjectHideFlags: 0 @@ -19109,7 +18950,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &548963530 @@ -19571,8 +19412,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959568} - m_TargetAssemblyTypeName: UmaViewerBuilder, umamusume + - m_Target: {fileID: 93905318} + m_TargetAssemblyTypeName: UISettingsOther, umamusume m_MethodName: UnloadAllBundle m_Mode: 1 m_Arguments: @@ -21336,7 +21177,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -48.436043} + m_AnchoredPosition: {x: 116.5, y: -75.54505} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &640511296 @@ -21677,8 +21518,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 93905318} + m_TargetAssemblyTypeName: UISettingsOther, umamusume m_MethodName: ChangeRegion m_Mode: 0 m_Arguments: @@ -21811,8 +21652,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 2126459765} + m_TargetAssemblyTypeName: UISettingsAssets, umamusume m_MethodName: CopyAllLoadedAssetsPath m_Mode: 1 m_Arguments: @@ -27144,8 +26985,8 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 548276327} + m_TargetAssemblyTypeName: UISettingsModel, umamusume m_MethodName: SetEyeTrackingEnable m_Mode: 0 m_Arguments: @@ -28667,7 +28508,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &808848176 @@ -29459,8 +29300,8 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 548276327} + m_TargetAssemblyTypeName: UISettingsModel, umamusume m_MethodName: ChangeOutlineWidth m_Mode: 0 m_Arguments: @@ -29968,8 +29809,8 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, Assembly-CSharp + - m_Target: {fileID: 548276327} + m_TargetAssemblyTypeName: UISettingsModel, umamusume m_MethodName: SetDynamicBoneEnable m_Mode: 0 m_Arguments: @@ -30667,108 +30508,6 @@ RectTransform: m_AnchoredPosition: {x: -5.000046, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &864436234 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 864436235} - - component: {fileID: 864436236} - m_Layer: 5 - m_Name: GifQualitySlider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &864436235 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 864436234} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1643862708} - - {fileID: 469445773} - - {fileID: 1759556421} - m_Father: {fileID: 2134049658} - 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: -84.4} - m_SizeDelta: {x: 243, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &864436236 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 864436234} - 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: 1927596726} - m_FillRect: {fileID: 365084185} - m_HandleRect: {fileID: 1927596725} - m_Direction: 0 - m_MinValue: 1 - m_MaxValue: 20 - m_WholeNumbers: 1 - m_Value: 10 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume - m_MethodName: UpdateGifQualityLabel - 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 &866273075 GameObject: m_ObjectHideFlags: 0 @@ -33190,8 +32929,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 6878219666121841228} + m_TargetAssemblyTypeName: UISettingsCamera, umamusume m_MethodName: ChangeAntiAliasing m_Mode: 0 m_Arguments: @@ -33297,7 +33036,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -75} + m_AnchoredPosition: {x: 141.5, y: -125} m_SizeDelta: {x: 283, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &964213175 @@ -34716,7 +34455,7 @@ GameObject: - component: {fileID: 994851659} - component: {fileID: 994851660} m_Layer: 5 - m_Name: Slider + m_Name: SpeedSlider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -34795,7 +34534,19 @@ MonoBehaviour: m_Value: 1 m_OnValueChanged: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 375781856} + m_TargetAssemblyTypeName: UISettingsAnimation, umamusume + m_MethodName: ChangeSpeed + 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 &995526742 GameObject: m_ObjectHideFlags: 0 @@ -35232,8 +34983,8 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 548276327} + m_TargetAssemblyTypeName: UISettingsModel, umamusume m_MethodName: SetFaceOverrideEnable m_Mode: 0 m_Arguments: @@ -35509,8 +35260,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 93905318} + m_TargetAssemblyTypeName: UISettingsOther, umamusume m_MethodName: OpenConfig m_Mode: 1 m_Arguments: @@ -36319,7 +36070,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1065889394 @@ -38041,7 +37792,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1118653630 @@ -38213,7 +37964,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1127600556 @@ -40214,8 +39965,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 93905318} + m_TargetAssemblyTypeName: UISettingsOther, umamusume m_MethodName: ChangeDataPath m_Mode: 1 m_Arguments: @@ -40789,6 +40540,7 @@ GameObject: - component: {fileID: 1209823365} - component: {fileID: 1209823367} - component: {fileID: 1209823366} + - component: {fileID: 1209823368} m_Layer: 5 m_Name: AudioPlayer m_TagString: Untagged @@ -40816,7 +40568,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 283, y: -725.855} + m_AnchoredPosition: {x: 283, y: -213.675} m_SizeDelta: {x: 283, y: 157.35} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1209823366 @@ -40857,6 +40609,23 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1209823364} m_CullTransparentMesh: 1 +--- !u!114 &1209823368 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1209823364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 85575792b20387a409179c22b616f5f2, type: 3} + m_Name: + m_EditorClassIdentifier: + TitleText: {fileID: 255869798} + ProgressText: {fileID: 1113721207} + ProgressSlider: {fileID: 2083721901} + PlayButton: {fileID: 2108171289} + LyricsText: {fileID: 123935079} --- !u!1 &1210994109 GameObject: m_ObjectHideFlags: 0 @@ -41189,7 +40958,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1222475467 @@ -41368,7 +41137,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 283, y: -225} + m_AnchoredPosition: {x: 283, y: -275} m_SizeDelta: {x: 283, y: 50} m_Pivot: {x: 1, y: 0.5} --- !u!222 &1226114735 @@ -43383,7 +43152,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1286532568 @@ -44934,7 +44703,19 @@ MonoBehaviour: m_Image: {fileID: 0} m_OnValueChanged: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 6878219666121841228} + m_TargetAssemblyTypeName: UISettingsCamera, umamusume + m_MethodName: UpdateSettingsPanel + m_Mode: 1 + 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_AlphaFadeSpeed: 0.15 --- !u!1 &1327085887 GameObject: @@ -45703,7 +45484,7 @@ GameObject: - component: {fileID: 1349413337} - component: {fileID: 1349413338} m_Layer: 5 - m_Name: Slider + m_Name: ProgressSlider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -45782,7 +45563,19 @@ MonoBehaviour: m_Value: 0 m_OnValueChanged: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 375781856} + m_TargetAssemblyTypeName: UISettingsAnimation, umamusume + m_MethodName: ChangeProgress + 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!224 &1351796501 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1608283224055752807, guid: 14d034506760e5049a12fd1cf057a8b3, @@ -46276,8 +46069,8 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 548276327} + m_TargetAssemblyTypeName: UISettingsModel, umamusume m_MethodName: SetHeadFix m_Mode: 0 m_Arguments: @@ -47188,7 +46981,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1400426659 @@ -47323,7 +47116,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1400934332 @@ -47734,8 +47527,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, Assembly-CSharp + - m_Target: {fileID: 339844724} + m_TargetAssemblyTypeName: UISettingsEnvironment, umamusume m_MethodName: ChangeBackground m_Mode: 0 m_Arguments: @@ -48922,7 +48715,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1443588236 @@ -50657,8 +50450,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 93905318} + m_TargetAssemblyTypeName: UISettingsOther, umamusume m_MethodName: UpdateGameDB m_Mode: 1 m_Arguments: @@ -51778,7 +51571,6 @@ MonoBehaviour: PropList: {fileID: 1878249919} PropPageCtrl: {fileID: 1552044446} SceneList: {fileID: 835845609} - MaterialsList: {fileID: 2057017232} ScenePageCtrl: {fileID: 1045478985} MessageScrollRect: {fileID: 755865960} MessageText: {fileID: 1111410415} @@ -51798,22 +51590,6 @@ MonoBehaviour: NormalSubSoundList: {fileID: 2143388125} NormalSoundCtrl: {fileID: 1351796502} HandlesPanel: {fileID: 1242224847} - AudioSlider: {fileID: 2083721901} - AudioPlayButton: {fileID: 2108171289} - TitleText: {fileID: 255869798} - ProgressText: {fileID: 1113721207} - LyricsText: {fileID: 123935079} - AnimationSlider: {fileID: 1349413338} - AnimationSpeedSlider: {fileID: 994851660} - AnimationPlayButton: {fileID: 292348639} - AnimationTitleText: {fileID: 1118881288} - AnimationSpeedText: {fileID: 1623091784} - AnimationProgressText: {fileID: 1286450786} - BackGroundList: {fileID: 394733025} - BackGroundPageCtrl: {fileID: 2093223150} - BG_Canvas: {fileID: 1085021150} - BG_HSVPickerObj: {fileID: 582796021} - BG_Image: {fileID: 1682865917} CharaIconDefault: {fileID: 21300000, guid: fcb07487bdd0f054f81d8865b4800c13, type: 3} CostumeIconDefault: {fileID: 21300000, guid: 74c10446f10883c4683a526eb8380a5b, type: 3} CurrentSeletChara: {fileID: 0} @@ -51824,22 +51600,13 @@ MonoBehaviour: LiveSelectList: {fileID: 605931265} LiveSelectImage: {fileID: 1781049853} LiveSelectInfoText: {fileID: 116348346} - SSWidth: {fileID: 1509789528} - SSHeight: {fileID: 343750191} - SSTransparent: {fileID: 1592069527} - GifWidth: {fileID: 357312448} - GifHeight: {fileID: 2038268040} - GifTransparent: {fileID: 2094069102} - GifQuality: {fileID: 864436236} - GifQualityLabel: {fileID: 542685198} - GifSlider: {fileID: 864436236} - GifButton: {fileID: 964213177} - VMDButton: {fileID: 668484488} - UpdateDBButton: {fileID: 1516377151} - RegionDropdown: {fileID: 647681493} - WorkModeDropdown: {fileID: 1909384047} - LanguageDropdown: {fileID: 308207822} - AntialiasingDropdown: {fileID: 960194351} + CameraSettings: {fileID: 6878219666121841228} + ModelSettings: {fileID: 548276327} + AudioSettings: {fileID: 1209823368} + AnimationSettings: {fileID: 375781856} + ScreenshotSettings: {fileID: 2134049663} + AssetSettings: {fileID: 2126459765} + OtherSettings: {fileID: 93905318} TogglablePanels: - {fileID: 1974252710} - {fileID: 87578738} @@ -51864,15 +51631,8 @@ MonoBehaviour: type: 3} UmaContainerTogglePrefab: {fileID: 5821056583242898604, guid: ff1d9411962b540449867d8ba74f77d9, type: 3} - LoadedAssetPageCtrl: {fileID: 1913585099} - LoadedAssetScrollRect: {fileID: 910450304} UIColor1: {r: 1, g: 1, b: 1, a: 0.39215687} UIColor2: {r: 1, g: 1, b: 1, a: 1} - isHeadFix: 0 - isTPose: 0 - DynamicBoneEnable: 1 - EnableEyeTracking: 1 - EnableFaceOverride: 1 CurrentHeadCostumeId: LiveTime: 0 isRecordVMD: 0 @@ -53228,7 +52988,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1623614603 @@ -53836,81 +53596,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1639618428} m_CullTransparentMesh: 1 ---- !u!1 &1643862707 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1643862708} - - component: {fileID: 1643862710} - - component: {fileID: 1643862709} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1643862708 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1643862707} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 864436235} - 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 &1643862709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1643862707} - 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 &1643862710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1643862707} - m_CullTransparentMesh: 1 --- !u!1 &1644135483 GameObject: m_ObjectHideFlags: 0 @@ -58487,42 +58172,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1756215861} m_CullTransparentMesh: 1 ---- !u!1 &1759556420 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1759556421} - 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 &1759556421 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1759556420} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1927596725} - m_Father: {fileID: 864436235} - 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 &1760921987 GameObject: m_ObjectHideFlags: 0 @@ -62752,8 +62401,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 93905318} + m_TargetAssemblyTypeName: UISettingsOther, umamusume m_MethodName: ChangeWorkMode m_Mode: 0 m_Arguments: @@ -63444,81 +63093,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1923765414} m_CullTransparentMesh: 1 ---- !u!1 &1927596724 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1927596725} - - component: {fileID: 1927596727} - - component: {fileID: 1927596726} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1927596725 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1927596724} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1759556421} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.47368422, y: 0} - m_AnchorMax: {x: 0.47368422, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1927596726 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1927596724} - 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 &1927596727 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1927596724} - m_CullTransparentMesh: 1 --- !u!1 &1934648060 GameObject: m_ObjectHideFlags: 0 @@ -64564,7 +64138,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1972501104 @@ -65824,7 +65398,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &2004987470 @@ -66197,7 +65771,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &2016037560 @@ -66866,8 +66440,8 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1564959567} - m_TargetAssemblyTypeName: UmaViewerUI, umamusume + - m_Target: {fileID: 548276327} + m_TargetAssemblyTypeName: UISettingsModel, umamusume m_MethodName: SetTPose m_Mode: 0 m_Arguments: @@ -67308,7 +66882,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: English + m_text: Global m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 309c10a796fa90746889302436dac032, type: 2} m_sharedMaterial: {fileID: 1876532955194943090, guid: 309c10a796fa90746889302436dac032, @@ -68221,7 +67795,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 283, y: -175} + m_AnchoredPosition: {x: 283, y: -225} m_SizeDelta: {x: 283, y: 50} m_Pivot: {x: 1, y: 0.5} --- !u!222 &2073237538 @@ -68398,7 +67972,19 @@ MonoBehaviour: m_Value: 0 m_OnValueChanged: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1209823368} + m_TargetAssemblyTypeName: UISettingsSound, umamusume + m_MethodName: AudioProgressChange + 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 &2090219183 GameObject: m_ObjectHideFlags: 0 @@ -69676,7 +69262,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2108171287} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1209823368} + m_TargetAssemblyTypeName: UISettingsSound, umamusume + m_MethodName: PauseAudio + m_Mode: 1 + 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 &2119296307 GameObject: m_ObjectHideFlags: 0 @@ -69824,7 +69422,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 141.5, y: -125} + m_AnchoredPosition: {x: 141.5, y: -175} m_SizeDelta: {x: 283, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2126459760 @@ -69839,6 +69437,7 @@ GameObject: - component: {fileID: 2126459763} - component: {fileID: 2126459762} - component: {fileID: 2126459764} + - component: {fileID: 2126459765} m_Layer: 5 m_Name: AssetList m_TagString: Untagged @@ -69932,6 +69531,20 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &2126459765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2126459760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01ee252c6096dbc45a4d5bea9fc25274, type: 3} + m_Name: + m_EditorClassIdentifier: + LoadedAssetPageCtrl: {fileID: 1913585099} + LoadedAssetScrollRect: {fileID: 910450304} --- !u!1 &2129326812 GameObject: m_ObjectHideFlags: 0 @@ -70263,6 +69876,7 @@ GameObject: - component: {fileID: 2134049659} - component: {fileID: 2134049661} - component: {fileID: 2134049662} + - component: {fileID: 2134049663} m_Layer: 5 m_Name: Screenshot m_TagString: Untagged @@ -70292,8 +69906,6 @@ RectTransform: - {fileID: 548963528} - {fileID: 2038268039} - {fileID: 2094069101} - - {fileID: 864436235} - - {fileID: 542685196} - {fileID: 964213176} m_Father: {fileID: 1704906816} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -70365,6 +69977,25 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stop: 0 +--- !u!114 &2134049663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2134049657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ac07fd922c37624db9cca1147588e2c, type: 3} + m_Name: + m_EditorClassIdentifier: + _width: {fileID: 1509789528} + _height: {fileID: 343750191} + _transparent: {fileID: 1592069527} + _gifWidth: {fileID: 357312448} + _gifHeight: {fileID: 2038268040} + _gifTransparent: {fileID: 2094069102} + GifButton: {fileID: 964213177} --- !u!1 &2135901616 GameObject: m_ObjectHideFlags: 0 @@ -71967,6 +71598,7 @@ GameObject: - component: {fileID: 6878219666121841224} - component: {fileID: 6878219666121841222} - component: {fileID: 6878219666121841225} + - component: {fileID: 6878219666121841228} m_Layer: 5 m_Name: CameraSettings m_TagString: Untagged @@ -71974,6 +71606,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &6878219666121841228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6878219666121841227} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d1f60c359f123945a317ebc3a71d7d3, type: 3} + m_Name: + m_EditorClassIdentifier: + AAModeDropdown: {fileID: 960194351} + CameraModeDropdown: {fileID: 1326438621} + FreeCameraSettingsTab: {fileID: 6878219668012581469} + FOVFree: {fileID: 6878219666344224906} + CameraRotationFree: {fileID: 640511296} + MovementSpeedFree: {fileID: 6878219666699436343} + RotationSpeedSlider: {fileID: 6878219666687767556} + OrbitCameraSettingsTab: {fileID: 6878219667498913899} + FOVOrbit: {fileID: 6878219667749320559} + CameraDistance: {fileID: 6878219666060843938} + CameraHeightSlider: {fileID: 6878219667201417076} + CameraRotationOrbit: {fileID: 800374507} + TargetHeightSlider: {fileID: 6878219666814184522} + ZoomSpeedSlider: {fileID: 6878219667777225674} + MovementSpeedOrbit: {fileID: 6878219665895574065} + UseAnimationCamera: {fileID: 1436688548} --- !u!114 &6878219666163837328 MonoBehaviour: m_ObjectHideFlags: 0 @@ -73734,7 +73394,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -145.30814} + m_AnchoredPosition: {x: 116.5, y: -226.63516} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6878219666695190520 @@ -73834,7 +73494,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -96.872086} + m_AnchoredPosition: {x: 116.5, y: -151.0901} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666699436343 @@ -75087,19 +74747,6 @@ MonoBehaviour: CameraTargetHelper: {fileID: 1174230681} TargetCenter: {x: 0, y: 0, z: 0} eventSystem: {fileID: 859153091} - OrbitCamSettingsTab: {fileID: 6878219667498913899} - OrbitCamFovSlider: {fileID: 6878219667749320559} - OrbitCamZoomSlider: {fileID: 6878219666060843938} - OrbitCamZoomSpeedSlider: {fileID: 6878219667777225674} - OrbitCamTargetHeightSlider: {fileID: 6878219666814184522} - OrbitCamHeightSlider: {fileID: 6878219667201417076} - OrbitCamRotationSlider: {fileID: 800374507} - OrbitCamSpeedSlider: {fileID: 6878219665895574065} - FreeCamSettingsTab: {fileID: 6878219668012581469} - FreeCamFovSlider: {fileID: 6878219666344224906} - FreeCamRotationSlider: {fileID: 640511296} - FreeCamMoveSpeedSlider: {fileID: 6878219666699436343} - FreeCamRotateSpeedSlider: {fileID: 6878219666687767556} --- !u!222 &6878219667420713328 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CameraOrbit.cs b/Assets/Scripts/CameraOrbit.cs index fd3ac56..4f10262 100644 --- a/Assets/Scripts/CameraOrbit.cs +++ b/Assets/Scripts/CameraOrbit.cs @@ -1,7 +1,6 @@ using TMPro; using UnityEngine; using UnityEngine.EventSystems; -using UnityEngine.UI; public class CameraOrbit : MonoBehaviour { @@ -19,32 +18,20 @@ public class CameraOrbit : MonoBehaviour public EventSystem eventSystem; bool controlOn; - [Header("Orbit Camera")] - public GameObject OrbitCamSettingsTab; - public Slider OrbitCamFovSlider; - public Slider OrbitCamZoomSlider; - public Slider OrbitCamZoomSpeedSlider; - public Slider OrbitCamTargetHeightSlider; - public Slider OrbitCamHeightSlider; - public Slider OrbitCamRotationSlider; - public Slider OrbitCamSpeedSlider; float camDistMin = 1, camDistMax = 15; [Header("Free Camera")] - public GameObject FreeCamSettingsTab; - public Slider FreeCamFovSlider; - public Slider FreeCamRotationSlider; - public Slider FreeCamMoveSpeedSlider; - public Slider FreeCamRotateSpeedSlider; bool FreeCamLeft = false; bool FreeCamRight = false; private Quaternion lookRotation; + private UISettingsCamera CameraSettings => UmaViewerUI.Instance.CameraSettings; + void Start() { - OrbitCamZoomSlider.minValue = camDistMin; - OrbitCamZoomSlider.maxValue = camDistMax; + CameraSettings.CameraDistance.minValue = camDistMin; + CameraSettings.CameraDistance.maxValue = camDistMax; lookRotation = transform.localRotation; instance = this; @@ -54,37 +41,25 @@ public class CameraOrbit : MonoBehaviour { if (HandleManager.InteractionInProgress) return; - if(CameraMode != CameraModeDropdown.value) + bool cameraModeChanged = CameraMode != CameraSettings.CameraMode; + if (cameraModeChanged) { - switch (CameraMode) //old - { - case 0: - OrbitCamSettingsTab.SetActive(false); - break; - case 1: - FreeCamSettingsTab.SetActive(false); - break; - } - switch (CameraModeDropdown.value) //new - { - case 0: - OrbitCamSettingsTab.SetActive(true); - break; - case 1: - FreeCamSettingsTab.SetActive(true); - lookRotation.y = transform.eulerAngles.y; - break; - } - CameraMode = CameraModeDropdown.value; + CameraMode = CameraSettings.CameraMode; } - switch (CameraModeDropdown.value) + switch (CameraMode) { case 0: OrbitAround(); OrbitLight(); break; - case 1: FreeCamera(); break; + case 1: + if (cameraModeChanged) + { + lookRotation.y = transform.eulerAngles.y; + } + FreeCamera(); + break; } } @@ -108,7 +83,7 @@ public class CameraOrbit : MonoBehaviour { TargetCenter = Vector3.zero; - Camera.main.fieldOfView = OrbitCamFovSlider.value; + Camera.main.fieldOfView = CameraSettings.FOV; Vector3 position = transform.position; if (Input.GetMouseButtonDown(0) && !eventSystem.IsPointerOverGameObject()) @@ -117,8 +92,8 @@ public class CameraOrbit : MonoBehaviour } if (Input.GetMouseButton(0) && controlOn) { - position -= Input.GetAxis("Mouse X") * transform.right * OrbitCamSpeedSlider.value; - OrbitCamHeightSlider.value -= Input.GetAxis("Mouse Y") * OrbitCamSpeedSlider.value; + position -= Input.GetAxis("Mouse X") * transform.right * CameraSettings.MovementSpeed; + CameraSettings.CameraHeight -= Input.GetAxis("Mouse Y") * CameraSettings.MovementSpeed; } else { @@ -127,7 +102,7 @@ public class CameraOrbit : MonoBehaviour if (!eventSystem.IsPointerOverGameObject()) { - OrbitCamZoomSlider.value -= Input.mouseScrollDelta.y * OrbitCamZoomSpeedSlider.value; + CameraSettings.CameraDistance.value -= Input.mouseScrollDelta.y * CameraSettings.ZoomSpeed; } if ((Input.GetMouseButtonDown(2) || Input.GetKeyDown(KeyCode.LeftControl)) && !eventSystem.IsPointerOverGameObject()) @@ -136,25 +111,24 @@ public class CameraOrbit : MonoBehaviour } if ((Input.GetMouseButton(2) || Input.GetKey(KeyCode.LeftControl)) && CameraTargetHelper.activeSelf) { - OrbitCamTargetHeightSlider.value -= Input.GetAxis("Mouse Y"); - CameraTargetHelper.transform.position = OrbitCamTargetHeightSlider.value * Vector3.up; + CameraSettings.TargetHeight -= Input.GetAxis("Mouse Y"); + CameraTargetHelper.transform.position = CameraSettings.TargetHeight * Vector3.up; } if (Input.GetMouseButtonUp(2) || Input.GetKeyUp(KeyCode.LeftControl)) { CameraTargetHelper.SetActive(false); } + float camDist = CameraSettings.CameraDistance.value; + CameraSettings.CameraHeightSlider.maxValue = camDist + 1 - camDist * 0.2f; + CameraSettings.CameraHeightSlider.minValue = -camDist + 1 + camDist * 0.2f; - float camDist = OrbitCamZoomSlider.value; - OrbitCamHeightSlider.maxValue = camDist + 1 - camDist * 0.2f; - OrbitCamHeightSlider.minValue = -camDist + 1 + camDist * 0.2f; + Vector3 target = TargetCenter + CameraSettings.TargetHeight * Vector3.up; //set target offsets - Vector3 target = TargetCenter + OrbitCamTargetHeightSlider.value * Vector3.up; //set target offsets - - position.y = TargetCenter.y + OrbitCamHeightSlider.value; //set camera height + position.y = TargetCenter.y + CameraSettings.CameraHeight; //set camera height transform.position = position; //set final position of camera at target transform.LookAt(target); //look at target position - transform.Rotate(0,0,OrbitCamRotationSlider.value); + transform.Rotate(0,0, CameraSettings.CameraRotation); transform.position = target - transform.forward * camDist; //move away from target } @@ -163,9 +137,9 @@ public class CameraOrbit : MonoBehaviour /// void FreeCamera() { - Camera.main.fieldOfView = FreeCamFovSlider.value; - float moveSpeed = FreeCamMoveSpeedSlider.value; - float rotateSpeed = FreeCamRotateSpeedSlider.value; + Camera.main.fieldOfView = CameraSettings.FOV; + float moveSpeed = CameraSettings.MovementSpeed;; + float rotateSpeed = CameraSettings.RotationSpeed; if (Input.GetMouseButtonDown(0) && !eventSystem.IsPointerOverGameObject()) { @@ -185,7 +159,7 @@ public class CameraOrbit : MonoBehaviour { FreeCamLeft = false; } - transform.localRotation = Quaternion.Euler(lookRotation.x, lookRotation.y, FreeCamRotationSlider.value); + transform.localRotation = Quaternion.Euler(lookRotation.x, lookRotation.y, CameraSettings.CameraRotation); if (Input.GetMouseButtonDown(1) && !eventSystem.IsPointerOverGameObject()) { diff --git a/Assets/Scripts/Pose/PoseManager.cs b/Assets/Scripts/Pose/PoseManager.cs index 7dd86ed..c432488 100644 --- a/Assets/Scripts/Pose/PoseManager.cs +++ b/Assets/Scripts/Pose/PoseManager.cs @@ -114,10 +114,10 @@ public class PoseManager : MonoBehaviour { if (PoseModeOn) return; - var ui = UmaViewerUI.Instance; + var modelSettings = UmaViewerUI.Instance.ModelSettings; var builder = UmaViewerBuilder.Instance; - ui.SetEyeTrackingEnable(false); - ui.SetDynamicBoneEnable(false); + modelSettings.SetEyeTrackingEnable(false); + modelSettings.SetDynamicBoneEnable(false); HandleCanvas.SetActive(true); if (builder.CurrentUMAContainer && builder.CurrentUMAContainer.UmaAnimator) @@ -135,10 +135,10 @@ public class PoseManager : MonoBehaviour UIPoseContainer.CreateBackupFromScene(); - var ui = UmaViewerUI.Instance; + var modelSettings = UmaViewerUI.Instance.ModelSettings; var builder = UmaViewerBuilder.Instance; - ui.SetEyeTrackingEnable(true); - ui.SetDynamicBoneEnable(true); + modelSettings.SetEyeTrackingEnable(true); + modelSettings.SetDynamicBoneEnable(true); HandleCanvas.SetActive(false); if (builder.CurrentUMAContainer != null && builder.CurrentUMAContainer.UmaAnimator != null) diff --git a/Assets/Scripts/Screenshot.cs b/Assets/Scripts/Screenshot.cs index 4dbe6c1..766c6e3 100644 --- a/Assets/Scripts/Screenshot.cs +++ b/Assets/Scripts/Screenshot.cs @@ -12,6 +12,9 @@ public class Screenshot : MonoBehaviour public static Screenshot Instance; bool recording = false; + static UISettingsAnimation AnimationSettings => UmaViewerUI.Instance.AnimationSettings; + static UISettingsScreenshot ScreenshotSettings => UmaViewerUI.Instance.ScreenshotSettings; + private void Awake() { Instance = this; @@ -20,11 +23,11 @@ public class Screenshot : MonoBehaviour public static void TakeScreenshot() { var camera = GetActiveCamera(); - int width = int.Parse(UmaViewerUI.Instance.SSWidth.text); - int height = int.Parse(UmaViewerUI.Instance.SSHeight.text); + int width = ScreenshotSettings.Width; + int height = ScreenshotSettings.Height; width = width == -1 ? Screen.width : width; height = height == -1 ? Screen.height : height; - var image = GrabFrame(camera, width, height, UmaViewerUI.Instance.SSTransparent.isOn); + var image = GrabFrame(camera, width, height, ScreenshotSettings.Transparent); #if UNITY_ANDROID && !UNITY_EDITOR string fileDirectory = Application.persistentDataPath + "/../Screenshots/"; @@ -46,9 +49,8 @@ public class Screenshot : MonoBehaviour { if (recording || UmaViewerBuilder.Instance.CurrentUMAContainer == null) return; recording = true; - UmaViewerUI.Instance.GifButton.interactable = false; - UmaViewerUI.Instance.GifSlider.value = 0; - StartCoroutine(RecordGif(int.Parse(UmaViewerUI.Instance.GifWidth.text), int.Parse(UmaViewerUI.Instance.GifHeight.text), UmaViewerUI.Instance.GifTransparent.isOn, 10)); //(int)UmaViewerUI.Instance.GifQuality.value)); + ScreenshotSettings.GifButton.interactable = false; + StartCoroutine(RecordGif(ScreenshotSettings.GifWidth, ScreenshotSettings.GifHeight, ScreenshotSettings.GifTransparent, 10)); //(int)UmaViewerUI.Instance.GifQuality.value)); } @@ -68,14 +70,14 @@ public class Screenshot : MonoBehaviour var clipFrameCount = Mathf.RoundToInt(animeClip.length * animeClip.frameRate); StartCoroutine(CaptureToGIFCustom.Instance.Encode(animeClip.frameRate, quality)); - UmaViewerUI.Instance.AnimationSpeedChange(0); - UmaViewerUI.Instance.AnimationProgressChange(0); + + AnimationSettings.ChangeSpeed(0); + AnimationSettings.ChangeProgress(0); yield return new WaitForSeconds(1); //wait for dynamicBone to settle; while (frame < clipFrameCount) { - UmaViewerUI.Instance.GifSlider.value = (float)frame / clipFrameCount; - UmaViewerUI.Instance.AnimationProgressChange((float)frame / clipFrameCount); + AnimationSettings.ChangeProgress((float)frame / clipFrameCount); yield return new WaitForEndOfFrame(); var tex = GrabFrame(camera, width, height, transparent); CaptureToGIFCustom.Instance.Frames.Add(new Image(tex)); @@ -84,12 +86,11 @@ public class Screenshot : MonoBehaviour } recording = false; - UmaViewerUI.Instance.AnimationProgressChange(0); - UmaViewerUI.Instance.AnimationSpeedChange(1); + AnimationSettings.ChangeProgress(0); + AnimationSettings.ChangeSpeed(1); ppLayer.enabled = oldPpState; CaptureToGIFCustom.Instance.stop = true; - UmaViewerUI.Instance.GifButton.interactable = true; - UmaViewerUI.Instance.GifSlider.value = 1; + ScreenshotSettings.GifButton.interactable = true; } public static Texture2D GrabFrame(Camera cam, int width, int height, bool transparent = true) diff --git a/Assets/Scripts/Settings.meta b/Assets/Scripts/Settings.meta new file mode 100644 index 0000000..982426c --- /dev/null +++ b/Assets/Scripts/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8d7e1044e61c69a488a814761bd18101 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/UISettingsAnimation.cs b/Assets/Scripts/Settings/UISettingsAnimation.cs new file mode 100644 index 0000000..0d90efa --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsAnimation.cs @@ -0,0 +1,129 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class UISettingsAnimation : MonoBehaviour +{ + static UmaViewerBuilder Builder => UmaViewerBuilder.Instance; + + public TextMeshProUGUI TitleText; + public TextMeshProUGUI ProgressText; + public Slider ProgressSlider; + public Button PlayButton; + public TextMeshProUGUI SpeedText; + public Slider SpeedSlider; + public Button VMDButton; + + internal void UpdateAnimationInfo(UmaContainerCharacter umaContainer) + { + if (umaContainer.OverrideController["clip_2"].name != "clip_2") + { + bool isLoop = umaContainer.OverrideController["clip_2"].name.Contains("_loop"); + var AnimeState = umaContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0); + var AnimeClip = umaContainer.OverrideController["clip_2"]; + if (AnimeClip && umaContainer.UmaAnimator.speed != 0) + { + var normalizedTime = (isLoop) ? Mathf.Repeat(AnimeState.normalizedTime, 1) : Mathf.Min(AnimeState.normalizedTime, 1); + TitleText.text = AnimeClip.name; + ProgressText.text = string.Format("{0} / {1}", ToFrameFormat(normalizedTime * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate)); + ProgressSlider.SetValueWithoutNotify(normalizedTime); + } + } + } + + public void Pause() + { + var container = Builder.CurrentUMAContainer; + if (!container || !container.UmaAnimator) return; + if (Builder.OverrideController.animationClips.Length == 0) return; + + var animator = container.UmaAnimator; + var animator_face = container.UmaFaceAnimator; + var animator_cam = Builder.AnimationCameraAnimator; + var AnimeState = animator.GetCurrentAnimatorStateInfo(0); + var state = animator.speed > 0f; + if (state) + { + animator.speed = 0; + if (animator_face) + animator_face.speed = 0; + animator_cam.speed = 0; + } + else if (AnimeState.normalizedTime < 1f) + { + animator.speed = SpeedSlider.value; + animator_cam.speed = SpeedSlider.value; + if (animator_face) + animator_face.speed = SpeedSlider.value; + } + else + { + animator.speed = SpeedSlider.value; + animator.Play(0, 0, 0); + animator.Play(0, 2, 0); + animator_cam.speed = SpeedSlider.value; + animator_cam.Play(0, -1, 0); + if (animator_face) + { + animator_face.speed = SpeedSlider.value; + animator_face.Play(0, 0, 0); + animator_face.Play(0, 1, 0); + } + } + } + + public void ChangeProgress(float val) + { + var container = Builder.CurrentUMAContainer; + if (!container) return; + var animator = container.UmaAnimator; + var animator_face = container.UmaFaceAnimator; + var animator_cam = Builder.AnimationCameraAnimator; + if (animator != null) + { + var AnimeClip = container.OverrideController["clip_2"]; + + // Pause and Seek; + animator.speed = 0; + animator.Play(0, 0, val); + animator.Play(0, 2, val); + if (animator_cam.runtimeAnimatorController) + { + animator_cam.speed = 0; + animator_cam.Play(0, -1, val); + } + if (animator_face) + { + animator_face.speed = 0; + animator_face.Play(0, 0, val); + animator_face.Play(0, 1, val); + } + + ProgressText.text = string.Format("{0} / {1}", ToFrameFormat(val * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate)); + } + } + + public void ChangeSpeed(float val) + { + var container = Builder.CurrentUMAContainer; + SpeedText.text = string.Format("Speed: {0:F2}", val); + + if (!container || !container.UmaAnimator) return; + + container.UmaAnimator.speed = val; + Builder.AnimationCameraAnimator.speed = val; + if (container.UmaFaceAnimator) + { + container.UmaFaceAnimator.speed = val; + } + } + + public static string ToFrameFormat(float time, float frameRate) + { + int frames = Mathf.FloorToInt(time % 1 * frameRate); + int seconds = (int)time; + int minute = seconds % 3600 / 60; + seconds = seconds % 3600 % 60; + return string.Format("{0:D2}m:{1:D2}s:{2:D2}f", minute, seconds, frames); + } +} diff --git a/Assets/Scripts/Settings/UISettingsAnimation.cs.meta b/Assets/Scripts/Settings/UISettingsAnimation.cs.meta new file mode 100644 index 0000000..30a8374 --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bb219ac831519664dbea3c160315d0ec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/UISettingsAssets.cs b/Assets/Scripts/Settings/UISettingsAssets.cs new file mode 100644 index 0000000..ecbef51 --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsAssets.cs @@ -0,0 +1,58 @@ +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Text; +using UnityEngine; +using UnityEngine.UI; +using static PageManager; + +public class UISettingsAssets : MonoBehaviour +{ + private Dictionary LoadedAssetEntries = new Dictionary(); + public PageManager LoadedAssetPageCtrl; + public ScrollRect LoadedAssetScrollRect; + + public void LoadedAssetsAdd(UmaDatabaseEntry entry) + { + if (!LoadedAssetPageCtrl) return; + if (LoadedAssetEntries.ContainsKey(entry.Name)) return; + var file_name = Path.GetFileName(entry.Name); + string filePath = entry.FilePath.Replace("/", "\\"); + var assetentry = new Entry() + { + Name = file_name, + FontSize = 18, + OnClick = (container) => + { + Process.Start("explorer.exe", "/select," + filePath); + } + }; + LoadedAssetEntries.Add(entry.Name, assetentry); + LoadedAssetPageCtrl.AddEntries(assetentry); + } + + public void LoadedAssetsClear() + { + LoadedAssetEntries.Clear(); + if (LoadedAssetPageCtrl) + { + LoadedAssetPageCtrl.ResetCtrl(); + LoadedAssetPageCtrl.Initialize(LoadedAssetEntries.Values.ToList(), LoadedAssetScrollRect); + } + } + + public void CopyAllLoadedAssetsPath() + { + StringBuilder sb = new StringBuilder(); + foreach (var entry in LoadedAssetEntries.Keys) + { + if (UmaViewerMain.Instance.AbList.TryGetValue(entry, out var asset)) + { + sb.AppendLine(asset.FilePath); + } + } + GUIUtility.systemCopyBuffer = sb.ToString(); + UmaViewerUI.Instance.ShowMessage($"{LoadedAssetEntries.Count} Path copied", UIMessageType.Success); + } +} diff --git a/Assets/Scripts/Settings/UISettingsAssets.cs.meta b/Assets/Scripts/Settings/UISettingsAssets.cs.meta new file mode 100644 index 0000000..1baa7e6 --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsAssets.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 01ee252c6096dbc45a4d5bea9fc25274 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/UISettingsCamera.cs b/Assets/Scripts/Settings/UISettingsCamera.cs new file mode 100644 index 0000000..8ad1552 --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsCamera.cs @@ -0,0 +1,135 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class UISettingsCamera : MonoBehaviour +{ + public TMPro.TMP_Dropdown AAModeDropdown; + public TMPro.TMP_Dropdown CameraModeDropdown; + + [Header("Free Camera")] + public GameObject FreeCameraSettingsTab; + public Slider FOVFree; + public Slider CameraRotationFree; + public Slider MovementSpeedFree; + public Slider RotationSpeedSlider; + + [Header("Orbit Camera")] + public GameObject OrbitCameraSettingsTab; + public Slider FOVOrbit; + public Slider CameraDistance; + public Slider CameraHeightSlider; + public Slider CameraRotationOrbit; + public Slider TargetHeightSlider; + public Slider ZoomSpeedSlider; + public Slider MovementSpeedOrbit; + + [Space] + public Toggle UseAnimationCamera; + + public int CameraMode + { + get { return CameraModeDropdown.value; } + set { CameraModeDropdown.value = value; UpdateSettingsPanel(); } + } + + public float FOV + { + get { return CameraMode == 0 ? FOVOrbit.value : FOVFree.value; } + set { + if (CameraMode == 0) + { + FOVOrbit.value = value; + } + else + { + FOVFree.value = value; + } + } + } + + public float CameraRotation + { + get { return CameraMode == 0 ? CameraRotationOrbit.value : CameraRotationFree.value; } + set + { + if (CameraMode == 0) + { + CameraRotationOrbit.value = value; + } + else + { + CameraRotationFree.value = value; + } + } + } + + public float ZoomSpeed + { + get { return ZoomSpeedSlider.value; } + set { ZoomSpeedSlider.value = value; } + } + + public float MovementSpeed + { + get { return CameraMode == 0 ? MovementSpeedOrbit.value : MovementSpeedFree.value; } + set + { + if (CameraMode == 0) + { + MovementSpeedOrbit.value = value; + } + else + { + MovementSpeedFree.value = value; + } + } + } + + public float RotationSpeed + { + get { return RotationSpeedSlider.value; } + set { RotationSpeedSlider.value = value; } + } + + public float CameraHeight + { + get { return CameraHeightSlider.value; } + set { CameraHeightSlider.value = value; } + } + + public float TargetHeight + { + get { return TargetHeightSlider.value; } + set { TargetHeightSlider.value = value; } + } + + public void UpdateSettingsPanel() + { + if (CameraMode == 0) + { + OrbitCameraSettingsTab.SetActive(true); + FreeCameraSettingsTab.SetActive(false); + } + else + { + FreeCameraSettingsTab.SetActive(true); + OrbitCameraSettingsTab.SetActive(false); + } + } + + /// Converts values 1-4 to valid AA values + public void ChangeAntiAliasing(int value) + { + int[] aaValues = { 0, 2, 4, 8 }; + + QualitySettings.antiAliasing = aaValues[value]; + + if (Config.Instance.AntiAliasing != value) + { + Config.Instance.AntiAliasing = value; + Config.Instance.UpdateConfig(false); + } + } +} diff --git a/Assets/Scripts/Settings/UISettingsCamera.cs.meta b/Assets/Scripts/Settings/UISettingsCamera.cs.meta new file mode 100644 index 0000000..6c12f64 --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsCamera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0d1f60c359f123945a317ebc3a71d7d3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/UISettingsEnvironment.cs b/Assets/Scripts/Settings/UISettingsEnvironment.cs new file mode 100644 index 0000000..a720bca --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsEnvironment.cs @@ -0,0 +1,73 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using UnityEngine; +using UnityEngine.UI; + +public class UISettingsEnvironment : MonoBehaviour +{ + public ScrollRect BackGroundList; + public PageManager BackGroundPageCtrl; + public GameObject BG_Canvas; + public GameObject BG_HSVPickerObj; + public Image BG_Image; + + static UmaViewerMain Main => UmaViewerMain.Instance; + static UmaViewerBuilder Builder => UmaViewerBuilder.Instance; + + public void ChangeBackground(int index) + { + BackGroundPageCtrl.ResetCtrl(); + switch (index) + { + case 0: + Camera.main.clearFlags = CameraClearFlags.Skybox; + break; + case 1: + Camera.main.clearFlags = CameraClearFlags.SolidColor; + break; + case 2: + Camera.main.clearFlags = CameraClearFlags.SolidColor; + ListBackgrounds(); + break; + default: + Camera.main.clearFlags = CameraClearFlags.Skybox; + break; + } + + BG_HSVPickerObj.SetActive(index != 2); + BG_Canvas.SetActive(index == 2); + BackGroundPageCtrl.transform.parent.gameObject.SetActive(index == 2); + } + + public void ChangeBackgroundColor(Color color) + { + Camera.main.backgroundColor = color; + } + + void ListBackgrounds() + { + var pageentrys = new List(); + foreach (var entry in Main.AbList.Where(a => a.Key.StartsWith("bg/bg"))) + { + var pageentry = new PageManager.Entry(); + pageentry.Name = Path.GetFileName(entry.Key); + pageentry.Sprite = Builder.LoadSprite(entry.Value); + if (pageentry.Sprite == null) continue; + pageentry.OnClick = (container) => + { + UmaViewerUI.Instance.HighlightChildImage(BackGroundList.content, container); + BG_Image.sprite = pageentry.Sprite; + BG_Image.SetVerticesDirty(); + }; + + if (BG_Image.sprite == null) + { + BG_Image.sprite = pageentry.Sprite; + BG_Image.SetVerticesDirty(); + } + pageentrys.Add(pageentry); + } + BackGroundPageCtrl.Initialize(pageentrys, BackGroundList); + } +} diff --git a/Assets/Scripts/Settings/UISettingsEnvironment.cs.meta b/Assets/Scripts/Settings/UISettingsEnvironment.cs.meta new file mode 100644 index 0000000..1548c02 --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsEnvironment.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 463147a12f484cc4dbe150fb97b22392 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/UISettingsModel.cs b/Assets/Scripts/Settings/UISettingsModel.cs new file mode 100644 index 0000000..0cd97ed --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsModel.cs @@ -0,0 +1,112 @@ +using SFB; +using UnityEngine; +using UnityEngine.UI; + +public class UISettingsModel : MonoBehaviour +{ + static UmaViewerBuilder Builder => UmaViewerBuilder.Instance; + + [SerializeField] private Toggle _lockCharacter; + [SerializeField] private Toggle _openWithTPose; + [SerializeField] private Toggle _enablePhysics; + [SerializeField] private Toggle _lookAtCamera; + [SerializeField] private Toggle _faceOverride; + [SerializeField] private Slider _outlineWidthSlider; + + public ScrollRect MaterialsList; + + private bool + _isHeadFix, + _isTPose, + _dynamicBoneEnable = true, + _enableEyeTracking = true, + _enableFaceOverride = true; + + private float _outlineWidth; + + public bool IsHeadFix + { + get { return _isHeadFix; } + set { _lockCharacter.SetIsOnWithoutNotify(value); SetHeadFix(value); } + } + + public bool IsTPose + { + get { return _isTPose; } + set { _openWithTPose.SetIsOnWithoutNotify(value); SetTPose(value); } + } + + public bool DynamicBoneEnable + { + get { return _dynamicBoneEnable; } + set { _enablePhysics.SetIsOnWithoutNotify(value); SetDynamicBoneEnable(value); } + } + + public bool EnableEyeTracking + { + get { return _enableEyeTracking; } + set { _lookAtCamera.SetIsOnWithoutNotify(value); SetEyeTrackingEnable(value); } + } + + public bool EnableFaceOverride + { + get { return _enableFaceOverride; } + set { _faceOverride.SetIsOnWithoutNotify(value); SetFaceOverrideEnable(value); } + } + + public float OutlineWidth + { + get { return _outlineWidth; } + set { _outlineWidthSlider.value = value; } + } + + public void SetHeadFix(bool value) + { + _isHeadFix = value; + } + + public void SetTPose(bool value) + { + _isTPose = value; + } + + public void SetDynamicBoneEnable(bool isOn) + { + _dynamicBoneEnable = isOn; + Builder.CurrentUMAContainer?.SetDynamicBoneEnable(isOn); + } + + public void SetEyeTrackingEnable(bool isOn) + { + _enableEyeTracking = isOn; + Builder.CurrentUMAContainer?.SetEyeTracking(isOn); + } + + public void SetFaceOverrideEnable(bool isOn) + { + _enableFaceOverride = isOn; + Builder.CurrentUMAContainer?.SetFaceOverrideData(isOn); + } + + public void ChangeOutlineWidth(float val) + { + _outlineWidth = val; + Shader.SetGlobalFloat("_GlobalOutlineWidth", val); + } + + public void ExportModel() + { +#if !UNITY_ANDROID || UNITY_EDITOR + var container = Builder.CurrentUMAContainer; + if (container) + { + var entry = container.CharaEntry; + var path = StandaloneFileBrowser.SaveFilePanel("Save PMX File", Config.Instance.MainPath, $"{entry.Id}_{entry.GetName()}", "pmx"); + if (!string.IsNullOrEmpty(path)) + { + ModelExporter.ExportModel(container, path); + } + } +#endif + } +} diff --git a/Assets/Scripts/Settings/UISettingsModel.cs.meta b/Assets/Scripts/Settings/UISettingsModel.cs.meta new file mode 100644 index 0000000..2ce42e8 --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsModel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f61fc8a1e0ca2cf49a9f794b613665f0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/UISettingsOther.cs b/Assets/Scripts/Settings/UISettingsOther.cs new file mode 100644 index 0000000..91535e4 --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsOther.cs @@ -0,0 +1,95 @@ +#if !UNITY_ANDROID || UNITY_EDITOR +using SFB; +#endif + +using System.Collections; +using System.Diagnostics; +using System.IO; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class UISettingsOther : MonoBehaviour +{ + public Button UpdateDBButton; + public TMP_Dropdown RegionDropdown; + public TMP_Dropdown WorkModeDropdown; + public TMP_Dropdown LanguageDropdown; + private IEnumerator _updateResVerCoroutine; + + public void ApplySettings() + { + WorkModeDropdown.SetValueWithoutNotify((int)Config.Instance.WorkMode); + RegionDropdown.SetValueWithoutNotify((int)Config.Instance.Region); + LanguageDropdown.SetValueWithoutNotify((int)Config.Instance.Language); + UpdateDBButton.interactable = (Config.Instance.WorkMode == WorkMode.Standalone); + } + + public void ChangeLanguage(int lang) + { + if ((int)Config.Instance.Language != lang) + { + Config.Instance.Language = (Language)lang; + Config.Instance.UpdateConfig(true); + } + } + + public void ChangeRegion(int region) + { + if ((int)Config.Instance.Region != region) + { + Config.Instance.Region = (Region)region; + Config.Instance.UpdateConfig(false); + StartCoroutine(UmaViewerUI.Instance.ApplyGraphicsSettings()); + } + } + + public void ChangeWorkMode(int mode) + { + if ((int)Config.Instance.WorkMode != mode) + { + Config.Instance.WorkMode = (WorkMode)mode; + Config.Instance.UpdateConfig(true); + } + } + + public void UpdateGameDB() + { + if (_updateResVerCoroutine != null && Config.Instance.WorkMode != WorkMode.Standalone) return; + UmaDatabaseController.Instance.CloseAllConnection(); + ManifestDB dB = new ManifestDB(); + _updateResVerCoroutine = dB.UpdateResourceVersion(delegate (string msg, UIMessageType type) { UmaViewerUI.Instance.ShowMessage(msg, type); }); + StartCoroutine(_updateResVerCoroutine); + } + + public void ChangeDataPath() + { +#if !UNITY_ANDROID || UNITY_EDITOR + var path = StandaloneFileBrowser.OpenFolderPanel("Select Folder", Config.Instance.MainPath, false); + if (path != null && path.Length > 0 && !string.IsNullOrEmpty(path[0])) + { + if (path[0] != Config.Instance.MainPath) + { + Config.Instance.MainPath = path[0]; + Config.Instance.UpdateConfig(true); + } + } +#endif + } + + public void OpenConfig() + { +#if !UNITY_ANDROID || UNITY_EDITOR + if (File.Exists(Config.configPath)) + { + Process.Start(new ProcessStartInfo() + { + FileName = Config.configPath, + UseShellExecute = true + }); + } +#endif + } + + public void UnloadAllBundle() => UmaAssetManager.UnloadAllBundle(true); +} diff --git a/Assets/Scripts/Settings/UISettingsOther.cs.meta b/Assets/Scripts/Settings/UISettingsOther.cs.meta new file mode 100644 index 0000000..6d2c68c --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsOther.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 49e773074de12594e9980542be5a673b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/UISettingsScreenshot.cs b/Assets/Scripts/Settings/UISettingsScreenshot.cs new file mode 100644 index 0000000..19ab4ea --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsScreenshot.cs @@ -0,0 +1,22 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class UISettingsScreenshot : MonoBehaviour +{ + public TMP_InputField _width; + public TMP_InputField _height; + public Toggle _transparent; + public TMP_InputField _gifWidth; + public TMP_InputField _gifHeight; + public Toggle _gifTransparent; + public Button GifButton; + + public int Width => int.Parse(_width.text); + public int Height => int.Parse(_height.text); + public bool Transparent => _transparent.isOn; + + public int GifWidth => int.Parse(_gifWidth.text); + public int GifHeight => int.Parse(_gifHeight.text); + public bool GifTransparent => _gifTransparent.isOn; +} diff --git a/Assets/Scripts/Settings/UISettingsScreenshot.cs.meta b/Assets/Scripts/Settings/UISettingsScreenshot.cs.meta new file mode 100644 index 0000000..adcc5c6 --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsScreenshot.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0ac07fd922c37624db9cca1147588e2c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Settings/UISettingsSound.cs b/Assets/Scripts/Settings/UISettingsSound.cs new file mode 100644 index 0000000..2a592b5 --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsSound.cs @@ -0,0 +1,89 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class UISettingsSound : MonoBehaviour +{ + static UmaViewerBuilder Builder => UmaViewerBuilder.Instance; + + public TextMeshProUGUI TitleText; + public TextMeshProUGUI ProgressText; + public Slider ProgressSlider; + public Button PlayButton; + public Text LyricsText; + + internal void UpdateTrack(AudioSource mianSource) + { + TitleText.text = mianSource.clip.name; + ProgressText.text = string.Format("{0} / {1}", ToTimeFormat(mianSource.time), ToTimeFormat(mianSource.clip.length)); + ProgressSlider.SetValueWithoutNotify(mianSource.time / mianSource.clip.length); + LyricsText.text = UmaUtility.GetCurrentLyrics(mianSource.time, UmaViewerBuilder.Instance.CurrentLyrics); + LyricsText.text = LyricsText.text; + } + + public void PauseAudio() + { + var sources = Builder.CurrentAudioSources; + if (sources.Count > 0) + { + AudioSource MainSource = sources[0]; + var state = MainSource.isPlaying; + foreach (AudioSource source in sources) + { + if (state) + { + source.Pause(); + } + else if (source.clip) + { + source.Play(); + } + else + { + source.Stop(); + } + } + } + } + + public void StopAudio() + { + var sources = Builder.CurrentAudioSources; + foreach (AudioSource source in sources) + { + source.Stop(); + } + } + + public void ResetPlayer() + { + TitleText.text = "No Audio"; + ProgressText.text = "00:00:00 / 00:00:00"; + ProgressSlider.SetValueWithoutNotify(0); + LyricsText.text = ""; + } + + public void AudioProgressChange(float val) + { + if (Builder.CurrentAudioSources.Count > 0) + { + var time = Builder.CurrentAudioSources[0].clip.length * val; + foreach (AudioSource source in Builder.CurrentAudioSources) + { + if (source.clip) + { + source.time = Mathf.Clamp(time, 0, source.clip.length); + } + } + } + } + + public static string ToTimeFormat(float time) + { + int seconds = (int)time; + int hour = seconds / 3600; + int minute = seconds % 3600 / 60; + seconds = seconds % 3600 % 60; + return string.Format("{0:D2}:{1:D2}:{2:D2}", hour, minute, seconds); + } +} diff --git a/Assets/Scripts/Settings/UISettingsSound.cs.meta b/Assets/Scripts/Settings/UISettingsSound.cs.meta new file mode 100644 index 0000000..c0b1f7b --- /dev/null +++ b/Assets/Scripts/Settings/UISettingsSound.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 85575792b20387a409179c22b616f5f2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UmaContainerCharacter.cs b/Assets/Scripts/UmaContainerCharacter.cs index cfb81f5..7179862 100644 --- a/Assets/Scripts/UmaContainerCharacter.cs +++ b/Assets/Scripts/UmaContainerCharacter.cs @@ -184,7 +184,7 @@ public class UmaContainerCharacter : UmaContainer { Mat = mat, Renderers = new Dictionary>(), - Toggle = Instantiate(UmaViewerUI.Instance.UmaContainerTogglePrefab, UmaViewerUI.Instance.MaterialsList.content) + Toggle = Instantiate(UI.UmaContainerTogglePrefab, UI.ModelSettings.MaterialsList.content) }; matHlp.Toggle.Name = mat.name; matHlp.Toggle.Toggle.onValueChanged.AddListener((value) => { Debug.Log("e"); matHlp.ToggleMaterials(value); }); @@ -725,7 +725,7 @@ public class UmaContainerCharacter : UmaContainer } //Some setting for Head - EnableEyeTracking = UI.EnableEyeTracking; + EnableEyeTracking = UI.ModelSettings.EnableEyeTracking; foreach (Renderer r in head.GetComponentsInChildren()) { @@ -1340,7 +1340,7 @@ public class UmaContainerCharacter : UmaContainer public void SetEndAnimationCut() { - UmaViewerUI.Instance.AnimationPause(); + UI.AnimationSettings.Pause(); } public void LoadFaceMorph(int id, string costumeId) @@ -1425,7 +1425,7 @@ public class UmaContainerCharacter : UmaContainer FaceDrivenKeyTarget = faceDriven; FaceDrivenKeyTarget.Container = this; FaceOverrideData = faceOverride; - faceOverride?.SetEnable(UI.EnableFaceOverride); + faceOverride?.SetEnable(UI.ModelSettings.EnableFaceOverride); faceDriven.DrivenKeyLocator = locator.transform; faceDriven.Initialize(UmaUtility.ConvertArrayToDictionary(firsehead.GetComponentsInChildren())); diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 63a812b..17cb39e 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -19,6 +19,7 @@ public class UmaViewerBuilder : MonoBehaviour public static UmaViewerBuilder Instance; static UmaViewerMain Main => UmaViewerMain.Instance; static UmaViewerUI UI => UmaViewerUI.Instance; + static UISettingsModel ModelSettings => UmaViewerUI.Instance.ModelSettings; public List Loaded; public List ShaderList = new List(); @@ -61,7 +62,7 @@ public class UmaViewerBuilder : MonoBehaviour umaContainer.CharaData = UmaDatabaseController.ReadCharaData(chara); LoadMobUma(umaContainer, chara, costumeId, loadMotion: true); } - else if (UI.isHeadFix && CurrentHead != null && CurrentHead.chara.IsMob) + else if (ModelSettings.IsHeadFix && CurrentHead != null && CurrentHead.chara.IsMob) { umaContainer.CharaData = UmaDatabaseController.ReadCharaData(CurrentHead.chara); LoadMobUma(umaContainer, CurrentHead.chara, costumeId, chara.Id, true); @@ -210,7 +211,7 @@ public class UmaViewerBuilder : MonoBehaviour string head_costumeId; int tailId = Convert.ToInt32(charaData["tail_model_id"]); - if (UI.isHeadFix && CurrentHead != null) + if (ModelSettings.IsHeadFix && CurrentHead != null) { head_id = CurrentHead.id; head_costumeId = CurrentHead.costumeId; @@ -293,19 +294,19 @@ public class UmaViewerBuilder : MonoBehaviour } umaContainer.LoadPhysics(); - umaContainer.SetDynamicBoneEnable(UI.DynamicBoneEnable); + umaContainer.SetDynamicBoneEnable(ModelSettings.DynamicBoneEnable); umaContainer.LoadFaceMorph(id, costumeId); umaContainer.TearControllers.ForEach(a => a.SetDir(a.CurrentDir)); umaContainer.HeadBone = (GameObject)umaContainer.Body.GetComponent()._assetTable["head"]; umaContainer.EyeHeight = umaContainer.Head.GetComponent()._assetTableValue["head_center_offset_y"]; umaContainer.MergeModel(); umaContainer.SetHeight(-1); - umaContainer.Initialize(!UI.isTPose); + umaContainer.Initialize(!ModelSettings.IsTPose); umaContainer.Position = umaContainer.transform.Find("Position"); umaContainer.SetupBoneHandles(); - if (!UI.isTPose && loadMotion) + if (!ModelSettings.IsTPose && loadMotion) { if (Main.AbList.TryGetValue($"3d/motion/event/body/chara/chr{id}_00/anm_eve_chr{id}_00_idle01_loop", out UmaDatabaseEntry entry)) { @@ -512,7 +513,7 @@ public class UmaViewerBuilder : MonoBehaviour } umaContainer.LoadPhysics(); //Need to load physics before loading FacialMorph - umaContainer.SetDynamicBoneEnable(UI.DynamicBoneEnable); + umaContainer.SetDynamicBoneEnable(ModelSettings.DynamicBoneEnable); //Load FacialMorph umaContainer.LoadFaceMorph(id, costumeId); @@ -522,12 +523,12 @@ public class UmaViewerBuilder : MonoBehaviour umaContainer.EyeHeight = umaContainer.Head.GetComponent()._assetTableValue["head_center_offset_y"]; umaContainer.MergeModel(); umaContainer.SetHeight(-1); - umaContainer.Initialize(!UI.isTPose); + umaContainer.Initialize(!ModelSettings.IsTPose); umaContainer.Position = umaContainer.transform.Find("Position"); umaContainer.SetupBoneHandles(); - if (!UI.isTPose && loadMotion) + if (!ModelSettings.IsTPose && loadMotion) { if (Main.AbList.TryGetValue($"3d/motion/event/body/type00/anm_eve_type00_homestand{personality.PadLeft(2, '0')}_loop", out UmaDatabaseEntry entry)) { @@ -795,7 +796,7 @@ public class UmaViewerBuilder : MonoBehaviour var tmp = CurrentAudioSources[0]; CurrentAudioSources.Clear(); Destroy(tmp.gameObject); - UI.ResetAudioPlayer(); + UI.AudioSettings.ResetPlayer(); } if (subindex == -1) { @@ -994,11 +995,11 @@ public class UmaViewerBuilder : MonoBehaviour if (CurrentUMAContainer != null) { //It seems that OnDestroy will executed after new model loaded, which cause new FacialPanels empty... - UmaViewerUI.Instance.currentFaceDrivenKeyTarget = null; - UmaViewerUI.Instance.LoadEmotionPanels(null); - UmaViewerUI.Instance.LoadFacialPanels(null); - if (UmaViewerUI.Instance.MaterialsList) - foreach (Transform t in UmaViewerUI.Instance.MaterialsList.content) + UI.currentFaceDrivenKeyTarget = null; + UI.LoadEmotionPanels(null); + UI.LoadFacialPanels(null); + if (UI.ModelSettings.MaterialsList) + foreach (Transform t in UI.ModelSettings.MaterialsList.content) { Destroy(t.gameObject); } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 3be7085..3f77c07 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -1,21 +1,14 @@ using Gallop; -#if !UNITY_ANDROID || UNITY_EDITOR -using SFB; -#endif using System; using System.Collections; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.Linq; -using System.Text; using TMPro; using UnityEngine; using UnityEngine.Events; using UnityEngine.Rendering; using UnityEngine.UI; -using static PageManager; -using Debug = UnityEngine.Debug; public class UmaViewerUI : MonoBehaviour { @@ -47,7 +40,6 @@ public class UmaViewerUI : MonoBehaviour public ScrollRect PropList; public PageManager PropPageCtrl; public ScrollRect SceneList; - public ScrollRect MaterialsList; public PageManager ScenePageCtrl; public ScrollRect MessageScrollRect; public Text MessageText; @@ -72,28 +64,6 @@ public class UmaViewerUI : MonoBehaviour [Header("pose mode")] public Transform HandlesPanel; - [Header("audio")] - public Slider AudioSlider; - public Button AudioPlayButton; - public TextMeshProUGUI TitleText; - public TextMeshProUGUI ProgressText; - public Text LyricsText; - - [Header("animations")] - public Slider AnimationSlider; - public Slider AnimationSpeedSlider; - public Button AnimationPlayButton; - public TextMeshProUGUI AnimationTitleText; - public TextMeshProUGUI AnimationSpeedText; - public TextMeshProUGUI AnimationProgressText; - - [Header("backgrounds")] - public ScrollRect BackGroundList; - public PageManager BackGroundPageCtrl; - public GameObject BG_Canvas; - public GameObject BG_HSVPickerObj; - public Image BG_Image; - [Header("live settings")] public Sprite CharaIconDefault; public Sprite CostumeIconDefault; @@ -107,22 +77,13 @@ public class UmaViewerUI : MonoBehaviour private LiveEntry currentLive; [Header("settings")] - public TMP_InputField SSWidth; - public TMP_InputField SSHeight; - public Toggle SSTransparent; - public TMP_InputField GifWidth; - public TMP_InputField GifHeight; - public Toggle GifTransparent; - public Slider GifQuality; - public TextMeshProUGUI GifQualityLabel; - public Slider GifSlider; - public Button GifButton; - public Button VMDButton; - public Button UpdateDBButton; - public TMP_Dropdown RegionDropdown; - public TMP_Dropdown WorkModeDropdown; - public TMP_Dropdown LanguageDropdown; - public TMP_Dropdown AntialiasingDropdown; + public UISettingsCamera CameraSettings; + public UISettingsModel ModelSettings; + public UISettingsSound AudioSettings; + public UISettingsAnimation AnimationSettings; + public UISettingsScreenshot ScreenshotSettings; + public UISettingsAssets AssetSettings; + public UISettingsOther OtherSettings; public List TogglablePanels = new List(); public List TogglableFacials = new List(); @@ -133,17 +94,8 @@ public class UmaViewerUI : MonoBehaviour public GameObject UmaContainerSliderPrefab; public UmaUIContainer UmaContainerTogglePrefab; - private Dictionary LoadedAssetEntries = new Dictionary(); - public PageManager LoadedAssetPageCtrl; - public ScrollRect LoadedAssetScrollRect; - public Color UIColor1, UIColor2; - public bool isHeadFix = false; - public bool isTPose = false; - public bool DynamicBoneEnable = true; - public bool EnableEyeTracking = true; - public bool EnableFaceOverride = true; public string CurrentHeadCostumeId = string.Empty; [Header("Live")] @@ -155,28 +107,18 @@ public class UmaViewerUI : MonoBehaviour public FaceDrivenKeyTarget currentFaceDrivenKeyTarget; - private IEnumerator UpdateResVerCoroutine; - private void Awake() { Instance = this; - AudioPlayButton.onClick.AddListener(PauseAudio); - AudioSlider.onValueChanged.AddListener(AudioProgressChange); - AnimationPlayButton.onClick.AddListener(AnimationPause); - AnimationSlider.onValueChanged.AddListener(AnimationProgressChange); - AnimationSpeedSlider.onValueChanged.AddListener(AnimationSpeedChange); } private void Start() { - WorkModeDropdown.SetValueWithoutNotify((int)Config.Instance.WorkMode); - RegionDropdown.SetValueWithoutNotify((int)Config.Instance.Region); - LanguageDropdown.SetValueWithoutNotify((int)Config.Instance.Language); - AntialiasingDropdown.SetValueWithoutNotify(Config.Instance.AntiAliasing); - UpdateDBButton.interactable = (Config.Instance.WorkMode == WorkMode.Standalone); - LoadedAssetsClear(); - UmaAssetManager.OnLoadedBundleUpdate += LoadedAssetsAdd; - UmaAssetManager.OnLoadedBundleClear += LoadedAssetsClear; + OtherSettings.ApplySettings(); + CameraSettings.AAModeDropdown.SetValueWithoutNotify(Config.Instance.AntiAliasing); + AssetSettings.LoadedAssetsClear(); + UmaAssetManager.OnLoadedBundleUpdate += AssetSettings.LoadedAssetsAdd; + UmaAssetManager.OnLoadedBundleClear += AssetSettings.LoadedAssetsClear; PoseManager.LoadLocalPoseFiles(); #if UNITY_ANDROID && !UNITY_EDITOR @@ -187,8 +129,8 @@ public class UmaViewerUI : MonoBehaviour private void OnDestroy() { - UmaAssetManager.OnLoadedBundleUpdate -= LoadedAssetsAdd; - UmaAssetManager.OnLoadedBundleClear -= LoadedAssetsClear; + UmaAssetManager.OnLoadedBundleUpdate -= AssetSettings.LoadedAssetsAdd; + UmaAssetManager.OnLoadedBundleClear -= AssetSettings.LoadedAssetsClear; } private void Update() @@ -198,38 +140,22 @@ public class UmaViewerUI : MonoBehaviour AudioSource MianSource = Builder.CurrentAudioSources[0]; if (MianSource.clip) { - TitleText.text = MianSource.clip.name; - ProgressText.text = string.Format("{0} / {1}", ToTimeFormat(MianSource.time), ToTimeFormat(MianSource.clip.length)); - AudioSlider.SetValueWithoutNotify(MianSource.time / MianSource.clip.length); - LyricsText.text = UmaUtility.GetCurrentLyrics(MianSource.time, Builder.CurrentLyrics); - LyricsText.text = LyricsText.text; + AudioSettings.UpdateTrack(MianSource); } } var umaContainer = Builder.CurrentUMAContainer; if (umaContainer != null && umaContainer.OverrideController != null) { - if (umaContainer.OverrideController["clip_2"].name != "clip_2") - { - bool isLoop = umaContainer.OverrideController["clip_2"].name.Contains("_loop"); - var AnimeState = umaContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0); - var AnimeClip = umaContainer.OverrideController["clip_2"]; - if (AnimeClip && umaContainer.UmaAnimator.speed != 0) - { - var normalizedTime = (isLoop) ? Mathf.Repeat(AnimeState.normalizedTime, 1) : Mathf.Min(AnimeState.normalizedTime, 1); - AnimationTitleText.text = AnimeClip.name; - AnimationProgressText.text = string.Format("{0} / {1}", ToFrameFormat(normalizedTime * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate)); - AnimationSlider.SetValueWithoutNotify(normalizedTime); - } - } + AnimationSettings.UpdateAnimationInfo(umaContainer); } } /// Some settings may not be saved when set in Start() - private IEnumerator ApplyGraphicsSettings() + public IEnumerator ApplyGraphicsSettings() { yield return 0; - ChangeAntiAliasing(Config.Instance.AntiAliasing); + CameraSettings.ChangeAntiAliasing(Config.Instance.AntiAliasing); GraphicsSettings.renderPipelineAsset = Config.Instance.Region == Region.Global ? null : UmaViewerMain.Instance.DefaultRenderPipeline; } @@ -242,49 +168,6 @@ public class UmaViewerUI : MonoBehaviour } } - public void LoadedAssetsAdd(UmaDatabaseEntry entry) - { - if (!LoadedAssetPageCtrl) return; - if (LoadedAssetEntries.ContainsKey(entry.Name)) return; - var file_name = Path.GetFileName(entry.Name); - string filePath = entry.FilePath.Replace("/", "\\"); - var assetentry = new Entry() - { - Name = file_name, - FontSize = 18, - OnClick = (container) => - { - Process.Start("explorer.exe", "/select," + filePath); - } - }; - LoadedAssetEntries.Add(entry.Name, assetentry); - LoadedAssetPageCtrl.AddEntries(assetentry); - } - - public void LoadedAssetsClear() - { - LoadedAssetEntries.Clear(); - if (LoadedAssetPageCtrl) - { - LoadedAssetPageCtrl.ResetCtrl(); - LoadedAssetPageCtrl.Initialize(LoadedAssetEntries.Values.ToList(), LoadedAssetScrollRect); - } - } - - public void CopyAllLoadedAssetsPath() - { - StringBuilder sb = new StringBuilder(); - foreach(var entry in LoadedAssetEntries.Keys) - { - if (Main.AbList.TryGetValue(entry, out var asset)) - { - sb.AppendLine(asset.FilePath); - } - } - GUIUtility.systemCopyBuffer = sb.ToString(); - ShowMessage($"{LoadedAssetEntries.Count} Path copied", UIMessageType.Success); - } - public void LoadModelPanels() { var containerG = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent(); @@ -645,7 +528,7 @@ public class UmaViewerUI : MonoBehaviour if (selectlist != null) { LiveTime = true; - SetEyeTrackingEnable(false); + ModelSettings.SetEyeTrackingEnable(false); Builder.LoadLive(currentLive, new List(selectlist)); LiveSelectPannel.SetActive(false); } @@ -801,7 +684,7 @@ public class UmaViewerUI : MonoBehaviour list.AddRange(Main.AbChara.Where(a => a.Name.StartsWith("3d/chara/tail"))); list.Add(Main.AbList["3d/animator/drivenkeylocator"]); var motion_path = $"3d/motion/event/body/chara/chr{chara.Id}_00/anm_eve_chr{chara.Id}_00_idle01_loop"; - if (!chara.IsMob && !isHeadFix && Main.AbList.TryGetValue(motion_path, out var motion_entry)) + if (!chara.IsMob && !ModelSettings.IsHeadFix && Main.AbList.TryGetValue(motion_path, out var motion_entry)) { list.Add(motion_entry); } @@ -1001,47 +884,6 @@ public class UmaViewerUI : MonoBehaviour }); } - void ListBackgrounds() - { - var pageentrys = new List(); - foreach (var entry in Main.AbList.Where(a => a.Key.StartsWith("bg/bg"))) - { - var pageentry = new PageManager.Entry(); - pageentry.Name = Path.GetFileName(entry.Key); - pageentry.Sprite = Builder.LoadSprite(entry.Value); - if (pageentry.Sprite == null) continue; - pageentry.OnClick = (container) => - { - HighlightChildImage(BackGroundList.content, container); - BG_Image.sprite = pageentry.Sprite; - BG_Image.SetVerticesDirty(); - }; - - if (BG_Image.sprite == null) - { - BG_Image.sprite = pageentry.Sprite; - BG_Image.SetVerticesDirty(); - } - pageentrys.Add(pageentry); - } - BackGroundPageCtrl.Initialize(pageentrys, BackGroundList); - } - - public void SetHeadFix(bool value) - { - isHeadFix = value; - } - - public void SetTPose(bool value) - { - isTPose = value; - } - - public void UpdateGifQualityLabel(float value) - { - GifQualityLabel.text = $"Quality: {(int)value} (default: 10)"; - } - string getCharaName(string id) { var entry = Main.Characters.FirstOrDefault(a => a.Id.ToString().Equals(id)); @@ -1088,12 +930,12 @@ public class UmaViewerUI : MonoBehaviour { var container = Builder.CurrentUMAContainer; if (!container || !container.UmaAnimator) return; - AnimationSlider.SetValueWithoutNotify(0); + AnimationSettings.ProgressSlider.SetValueWithoutNotify(0); // Reset settings by Panel - container.UmaAnimator.speed = AnimationSpeedSlider.value; - Builder.AnimationCameraAnimator.speed = AnimationSpeedSlider.value; + container.UmaAnimator.speed = AnimationSettings.SpeedSlider.value; + Builder.AnimationCameraAnimator.speed = AnimationSettings.SpeedSlider.value; if (container.UmaFaceAnimator) - container.UmaFaceAnimator.speed = AnimationSpeedSlider.value; + container.UmaFaceAnimator.speed = AnimationSettings.SpeedSlider.value; } /// Toggles one object ON and all others from UI.TogglablePanels list OFF @@ -1126,221 +968,11 @@ public class UmaViewerUI : MonoBehaviour } } - public void ChangeBackground(int index) - { - BackGroundPageCtrl.ResetCtrl(); - switch (index) - { - case 0: - Camera.main.clearFlags = CameraClearFlags.Skybox; - break; - case 1: - Camera.main.clearFlags = CameraClearFlags.SolidColor; - break; - case 2: - Camera.main.clearFlags = CameraClearFlags.SolidColor; - ListBackgrounds(); - break; - default: - Camera.main.clearFlags = CameraClearFlags.Skybox; - break; - } - - BG_HSVPickerObj.SetActive(index != 2); - BG_Canvas.SetActive(index == 2); - BackGroundPageCtrl.transform.parent.gameObject.SetActive(index == 2); - } - - public void ChangeBackgroundColor(Color color) - { - Camera.main.backgroundColor = color; - } - - public void SetDynamicBoneEnable(bool isOn) - { - DynamicBoneEnable = isOn; - Builder.CurrentUMAContainer?.SetDynamicBoneEnable(isOn); - } - - public void SetEyeTrackingEnable(bool isOn) - { - EnableEyeTracking = isOn; - Builder.CurrentUMAContainer?.SetEyeTracking(isOn); - } - - public void SetFaceOverrideEnable(bool isOn) - { - EnableFaceOverride = isOn; - Builder.CurrentUMAContainer?.SetFaceOverrideData(isOn); - } - - public void PauseAudio() - { - var sources = Builder.CurrentAudioSources; - if (sources.Count > 0) - { - AudioSource MainSource = sources[0]; - var state = MainSource.isPlaying; - foreach (AudioSource source in sources) - { - if (state) - { - source.Pause(); - } - else if (source.clip) - { - source.Play(); - } - else - { - source.Stop(); - } - } - } - } - - public void StopAudio() - { - var sources = Builder.CurrentAudioSources; - foreach (AudioSource source in sources) - { - source.Stop(); - } - } - - public void AudioProgressChange(float val) - { - if (Builder.CurrentAudioSources.Count > 0) - { - var time = Builder.CurrentAudioSources[0].clip.length * val; - foreach (AudioSource source in Builder.CurrentAudioSources) - { - if (source.clip) - { - source.time = Mathf.Clamp(time, 0, source.clip.length); - } - } - } - } - - public void AnimationPause() - { - var container = Builder.CurrentUMAContainer; - if (!container || !container.UmaAnimator) return; - if (Builder.OverrideController.animationClips.Length == 0) return; - - var animator = container.UmaAnimator; - var animator_face = container.UmaFaceAnimator; - var animator_cam = Builder.AnimationCameraAnimator; - var AnimeState = animator.GetCurrentAnimatorStateInfo(0); - var state = animator.speed > 0f; - if (state) - { - animator.speed = 0; - if (animator_face) - animator_face.speed = 0; - animator_cam.speed = 0; - } - else if (AnimeState.normalizedTime < 1f) - { - animator.speed = AnimationSpeedSlider.value; - animator_cam.speed = AnimationSpeedSlider.value; - if (animator_face) - animator_face.speed = AnimationSpeedSlider.value; - } - else - { - animator.speed = AnimationSpeedSlider.value; - animator.Play(0, 0, 0); - animator.Play(0, 2, 0); - animator_cam.speed = AnimationSpeedSlider.value; - animator_cam.Play(0, -1, 0); - if (animator_face) - { - animator_face.speed = AnimationSpeedSlider.value; - animator_face.Play(0, 0, 0); - animator_face.Play(0, 1, 0); - } - } - } - - public void AnimationProgressChange(float val) - { - var container = Builder.CurrentUMAContainer; - if (!container) return; - var animator = container.UmaAnimator; - var animator_face = container.UmaFaceAnimator; - var animator_cam = Builder.AnimationCameraAnimator; - if (animator != null) - { - var AnimeClip = container.OverrideController["clip_2"]; - - // Pause and Seek; - animator.speed = 0; - animator.Play(0, 0, val); - animator.Play(0, 2, val); - if (animator_cam.runtimeAnimatorController) - { - animator_cam.speed = 0; - animator_cam.Play(0, -1, val); - } - if (animator_face) - { - animator_face.speed = 0; - animator_face.Play(0, 0, val); - animator_face.Play(0, 1, val); - } - - AnimationProgressText.text = string.Format("{0} / {1}", ToFrameFormat(val * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate)); - } - } - - public void AnimationSpeedChange(float val) - { - var container = Builder.CurrentUMAContainer; - AnimationSpeedText.text = string.Format("Speed: {0:F2}", val); - - if (!container || !container.UmaAnimator) return; - - container.UmaAnimator.speed = val; - Builder.AnimationCameraAnimator.speed = val; - if (container.UmaFaceAnimator) - { - container.UmaFaceAnimator.speed = val; - } - } - - public void ResetAudioPlayer() - { - TitleText.text = "No Audio"; - ProgressText.text = "00:00:00 / 00:00:00"; - AudioSlider.SetValueWithoutNotify(0); - LyricsText.text = ""; - } - - public static string ToTimeFormat(float time) - { - int seconds = (int)time; - int hour = seconds / 3600; - int minute = seconds % 3600 / 60; - seconds = seconds % 3600 % 60; - return string.Format("{0:D2}:{1:D2}:{2:D2}", hour, minute, seconds); - } - - public static string ToFrameFormat(float time, float frameRate) - { - int frames = Mathf.FloorToInt(time % 1 * frameRate); - int seconds = (int)time; - int minute = seconds % 3600 / 60; - seconds = seconds % 3600 % 60; - return string.Format("{0:D2}m:{1:D2}s:{2:D2}f", minute, seconds, frames); - } - public void RecordVMD() { var container = Builder.CurrentUMAContainer; var camera = Builder.AnimationCamera; - var buttonText = VMDButton.GetComponentInChildren(); + var buttonText = AnimationSettings.VMDButton.GetComponentInChildren(); if (!container || container.IsMini) { @@ -1443,91 +1075,6 @@ public class UmaViewerUI : MonoBehaviour } } - public void UpdateGameDB() - { - if (UpdateResVerCoroutine != null && Config.Instance.WorkMode != WorkMode.Standalone) return; - UmaDatabaseController.Instance.CloseAllConnection(); - ManifestDB dB = new ManifestDB(); - UpdateResVerCoroutine = dB.UpdateResourceVersion(delegate (string msg, UIMessageType type) { ShowMessage(msg, type); }); - StartCoroutine(UpdateResVerCoroutine); - } - - public void ChangeLanguage(int lang) - { - if ((int)Config.Instance.Language != lang) - { - Config.Instance.Language = (Language)lang; - Config.Instance.UpdateConfig(true); - } - } - - public void ChangeRegion(int region) - { - if ((int)Config.Instance.Region != region) - { - Config.Instance.Region = (Region)region; - Config.Instance.UpdateConfig(false); - StartCoroutine(ApplyGraphicsSettings()); - } - } - - /// Converts values 1-4 to valid AA values - public void ChangeAntiAliasing(int value) - { - int[] aaValues = { 0, 2, 4, 8 }; - - QualitySettings.antiAliasing = aaValues[value]; - - if (Config.Instance.AntiAliasing != value) - { - Config.Instance.AntiAliasing = value; - Config.Instance.UpdateConfig(false); - } - } - - public void ChangeWorkMode(int mode) - { - if ((int)Config.Instance.WorkMode != mode) - { - Config.Instance.WorkMode = (WorkMode)mode; - Config.Instance.UpdateConfig(true); - } - } - - public void ChangeDataPath() - { - #if !UNITY_ANDROID || UNITY_EDITOR - var path = StandaloneFileBrowser.OpenFolderPanel("Select Folder", Config.Instance.MainPath, false); - if (path != null && path.Length > 0 && !string.IsNullOrEmpty(path[0])) - { - if (path[0] != Config.Instance.MainPath) - { - Config.Instance.MainPath = path[0]; - Config.Instance.UpdateConfig(true); - } - } - #endif - } - - public void OpenConfig() - { - #if !UNITY_ANDROID || UNITY_EDITOR - if (File.Exists(Config.configPath)) - { - Process.Start(new ProcessStartInfo() - { - FileName = Config.configPath, - UseShellExecute = true - }); - } - #endif - } - - public void ChangeOutlineWidth(float val) - { - Shader.SetGlobalFloat("_GlobalOutlineWidth", val); - } - public void SetLiveRecordMode(bool val) { isRecordVMD = val; } public void SetLiveRequireStage(bool val) { isRequireStage = val; } @@ -1547,22 +1094,6 @@ public class UmaViewerUI : MonoBehaviour MessageScrollRect.verticalNormalizedPosition = 0; } - public void ExportModel() - { - #if !UNITY_ANDROID || UNITY_EDITOR - var container = Builder.CurrentUMAContainer; - if (container) - { - var entry = container.CharaEntry; - var path = StandaloneFileBrowser.SaveFilePanel("Save PMX File", Config.Instance.MainPath, $"{entry.Id}_{entry.GetName()}", "pmx"); - if (!string.IsNullOrEmpty(path)) - { - ModelExporter.ExportModel(container, path); - } - } - #endif - } - public void ToggleVisible(GameObject go) { go.SetActive(!go.activeSelf); diff --git a/Assets/Scripts/uGIF/CaptureToGIFCustom.cs b/Assets/Scripts/uGIF/CaptureToGIFCustom.cs index 085fd5f..b2d2510 100644 --- a/Assets/Scripts/uGIF/CaptureToGIFCustom.cs +++ b/Assets/Scripts/uGIF/CaptureToGIFCustom.cs @@ -27,10 +27,10 @@ namespace uGIF { bytes = null; stop = false; - UmaViewerUI.Instance.GifButton.GetComponentInChildren().text = "Recording..."; + UmaViewerUI.Instance.ScreenshotSettings.GifButton.GetComponentInChildren().text = "Recording..."; yield return new WaitForSeconds(0.1f); yield return _Encode(fps, quality); - UmaViewerUI.Instance.GifButton.GetComponentInChildren().text = "Saving gif..."; + UmaViewerUI.Instance.ScreenshotSettings.GifButton.GetComponentInChildren().text = "Saving gif..."; yield return new WaitForSeconds(0.1f); yield return WaitForBytes(); } @@ -52,7 +52,7 @@ namespace uGIF UmaViewerUI.Instance.ShowMessage($"GIF saved: {fullpath}", UIMessageType.Success); Frames.Clear(); stop = false; - UmaViewerUI.Instance.GifButton.GetComponentInChildren().text = "Record GIF"; + UmaViewerUI.Instance.ScreenshotSettings.GifButton.GetComponentInChildren().text = "Record GIF"; } public IEnumerator _Encode (float fps, int quality) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6c526f0..b8192b7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 2.1.26 + bundleVersion: 2.1.27 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -158,6 +158,7 @@ PlayerSettings: m_ColorGamuts: 00000000 targetPixelDensity: 395 resolutionScalingMode: 1 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: @@ -624,8 +625,11 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -818,6 +822,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -866,6 +871,7 @@ PlayerSettings: hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset deleted file mode 100644 index fe0c37a..0000000 --- a/UserSettings/EditorUserSettings.asset +++ /dev/null @@ -1,54 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!162 &1 -EditorUserSettings: - m_ObjectHideFlags: 0 - serializedVersion: 4 - m_ConfigSettings: - RecentlyUsedScenePath-0: - value: 224247031146466b011b0b2b1e30102219180c07233c2f3f23663b3aece13811c9a809cdc217100f7624cd1e2d154e10f40c1a0ee24b2f0d170bfe1a1eed5e061fcc0cdc - flags: 0 - RecentlyUsedScenePath-1: - value: 224247031146466b011b0b2b1e30102219180c07233c2f3f23662d26f2f0312ccfe625fde22870031d27c2133771312dfd1a471ef8021e12 - flags: 0 - RecentlyUsedScenePath-2: - value: 224247031146466b011b0b2b1e30102219180c07233c2f3f23662d26f2f0312ccfe625fde22870031d27c21337712c3afe0f0c4bc51b020e0307fe0f1db1051d18d101 - flags: 0 - RecentlyUsedScenePath-3: - value: 224247031146466b011b0b2b1e30102219180c07233c2f3f23662d26f2f0312ccfe625fde22870031d27c2133771313ee01e000afa4b3a021f00f40016b1051d18d101 - flags: 0 - RecentlyUsedScenePath-4: - value: 224247031146466b011b0b2b1e30102219180c07233c2f3f23663b3aece13811c9a809cdc217100f7623e63144172a70d303044bc51c03051640e80018eb09 - flags: 0 - RecentlyUsedScenePath-5: - value: 224247031146466b011b0b2b1e30102219180c07233c2f3f23663b3aece13811c9a809cdc217100f7634dd152f71370ddb214943de021e4b230bfc0d05f61f1d588b0dcb13dc06 - flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e1c05320430102019041d651e3d282424241814ebfa3937adc22ee8ea2a33390a01ea3201701431fb1e10 - flags: 0 - RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c731900122b292926237e38271427fb - flags: 0 - RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c6b150503563f22213229 - flags: 0 - RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c691504041125227a68252320092a - flags: 0 - UnityRemoteCompression: - value: 29617121 - flags: 0 - vcSharedLogLevel: - value: 0d5e400f0650 - flags: 0 - m_VCAutomaticAdd: 1 - m_VCDebugCom: 0 - m_VCDebugCmd: 0 - m_VCDebugOut: 0 - m_SemanticMergeMode: 2 - m_VCShowFailedCheckout: 1 - m_VCOverwriteFailedCheckoutAssets: 1 - m_VCProjectOverlayIcons: 1 - m_VCHierarchyOverlayIcons: 1 - m_VCOtherOverlayIcons: 1 - m_VCAllowAsyncUpdate: 0