From 3b2bae40cd98545fb040c5645903f714f4302f9b Mon Sep 17 00:00:00 2001 From: katboi01 <59540382+katboi01@users.noreply.github.com> Date: Mon, 9 Sep 2024 10:27:37 +0200 Subject: [PATCH] Merged changed from Croakfang's branch. (#72) * merge (#71) * Bug fix, improved UI layout and live vocals * Bug Fixes, New Live Compatibility --------- Co-authored-by: CroakFang <1605296300@qq.com> * recovered shader functions * Fixed texture loading for costume 0015 --------- Co-authored-by: CroakFang <1605296300@qq.com> --- .../Funcs/Centered_Texture_UV.asset | 29 + .../Funcs/Centered_Texture_UV.asset.meta | 2 +- .../NarsShader/Funcs/Dot_Creation.asset | 42 + .../NarsShader/Funcs/Dot_Creation.asset.meta | 2 +- .../NarsShader/Funcs/FakeLightDir.asset | 27 + .../NarsShader/Funcs/FakeLightDir.asset.meta | 2 +- .../Funcs/Is_There_A_Light.asset.meta | 2 +- .../Funcs/View_Direction_Offset.asset | 33 + .../Funcs/View_Direction_Offset.asset.meta | 2 +- Assets/Resources/Prefabs/CharaSelect.prefab | 123 ++- Assets/Scenes/Version2.unity | 925 +++++++++--------- Assets/Scripts/CameraOrbit.cs | 4 +- Assets/Scripts/UI/LiveCharacterSelect.cs | 4 +- Assets/Scripts/UmaContainerCharacter.cs | 22 +- Assets/Scripts/UmaViewerAudio.cs | 149 ++- Assets/Scripts/UmaViewerBuilder.cs | 37 +- Assets/Scripts/UmaViewerUI.cs | 34 +- .../umamusume/Gallop/CySpringDataContainer.cs | 1 - .../umamusume/Gallop/FaceDrivenKeyTarget.cs | 2 +- .../Live/Cutt/LiveTimelineMotionSequence.cs | 49 +- .../Gallop/Live/Cutt/LiveTimelineWorkSheet.cs | 17 +- .../Live/Cyalume/CyalumeController3D.cs | 13 +- .../Scripts/umamusume/Gallop/Live/Director.cs | 12 +- 23 files changed, 916 insertions(+), 617 deletions(-) diff --git a/Assets/Resources/NarsShader/Funcs/Centered_Texture_UV.asset b/Assets/Resources/NarsShader/Funcs/Centered_Texture_UV.asset index c718942..72d14dd 100644 --- a/Assets/Resources/NarsShader/Funcs/Centered_Texture_UV.asset +++ b/Assets/Resources/NarsShader/Funcs/Centered_Texture_UV.asset @@ -12,3 +12,32 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 78b2425a2284af743826c689403a4924, type: 3} m_Name: Centered_Texture_UV m_EditorClassIdentifier: + m_functionInfo: "// Made with Amplify Shader Editor\n// Available at the Unity + Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=18912\n1274;705;989;646;1611.433;663.2083;2.804105;True;False\nNode;AmplifyShaderEditor.TexCoordVertexDataNode;10;-864.7002,5.2;Inherit;False;0;2;0;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4\nNode;AmplifyShaderEditor.SimpleAddOpNode;2;-58.43505,8.174695;Inherit;False;2;2;0;FLOAT2;0,0;False;1;FLOAT2;0,0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.SimpleMultiplyOpNode;3;83.44295,8.174695;Inherit;False;2;2;0;FLOAT2;0,0;False;1;FLOAT2;0,0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.RangedFloatNode;11;-651.2002,78.7;Inherit;False;Constant;_Float0;Float + 0;0;0;Create;True;0;0;0;False;0;False;0.5;0;0;0;0;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionSwitch;12;-323.1221,3.001092;Inherit;False;PRE + subtract half;True;1;2;0;In 0;In 1;Object;-1;9;0;FLOAT2;0,0;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT;0;False;4;FLOAT;0;False;5;FLOAT;0;False;6;FLOAT;0;False;7;FLOAT;0;False;8;FLOAT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.SimpleSubtractOpNode;1;-480.5436,30.78948;Inherit;False;2;0;FLOAT2;0,0;False;1;FLOAT;0.5;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.SimpleAddOpNode;4;227.5646,62.17469;Inherit;False;2;2;0;FLOAT2;0,0;False;1;FLOAT;0.5;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.FunctionSwitch;13;358.0586,3.687207;Inherit;False;POST + add half;True;1;2;2;In 0;In 1;Object;-1;9;0;FLOAT2;0,0;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT;0;False;4;FLOAT;0;False;5;FLOAT;0;False;6;FLOAT;0;False;7;FLOAT;0;False;8;FLOAT;0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.FunctionInput;6;-649.7002,0.2;Inherit;False;UV;2;0;False;1;0;FLOAT2;0,0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.FunctionInput;8;-269,102.6999;Inherit;False;Offset;2;2;False;1;0;FLOAT2;0,0;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.FunctionInput;7;-84.40004,101.8;Inherit;False;Tiling;2;1;False;1;0;FLOAT2;1,1;False;1;FLOAT2;0\nNode;AmplifyShaderEditor.FunctionOutput;0;598.6,8.8;Inherit;False;True;-1;Out;0;False;1;0;FLOAT2;0,0;False;1;FLOAT2;0\nWireConnection;2;0;12;0\nWireConnection;2;1;8;0\nWireConnection;3;0;2;0\nWireConnection;3;1;7;0\nWireConnection;12;0;6;0\nWireConnection;12;1;1;0\nWireConnection;1;0;6;0\nWireConnection;1;1;11;0\nWireConnection;4;0;3;0\nWireConnection;4;1;11;0\nWireConnection;13;0;3;0\nWireConnection;13;1;4;0\nWireConnection;6;0;10;0\nWireConnection;0;0;13;0\nASEEND*/\n//CHKSM=8A6BF964D6080F50F6ABB0CA940DEC68843F3C90" + m_functionName: + m_description: TexCoord UVs as Default + m_additionalIncludes: + m_additionalIncludes: [] + m_outsideIncludes: [] + m_additionalPragmas: + m_additionalPragmas: [] + m_outsidePragmas: [] + m_additionalDirectives: + m_validData: 0 + m_isDirty: 0 + m_moduleName: ' Additional Directives' + m_independentModule: 1 + m_customEdited: 0 + m_additionalDirectives: [] + m_shaderFunctionDirectives: [] + m_nativeDirectives: [] + m_nativeDirectivesIndex: -1 + m_nativeDirectivesFoldout: 0 + m_directivesSaveItems: [] + m_nodeCategory: 3 + m_customNodeCategory: + m_previewPosition: 0 + m_hidden: 0 diff --git a/Assets/Resources/NarsShader/Funcs/Centered_Texture_UV.asset.meta b/Assets/Resources/NarsShader/Funcs/Centered_Texture_UV.asset.meta index 52c0a9f..23a86c0 100644 --- a/Assets/Resources/NarsShader/Funcs/Centered_Texture_UV.asset.meta +++ b/Assets/Resources/NarsShader/Funcs/Centered_Texture_UV.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b57a5970c828c684cbfd13cde8f02ce5 +guid: 6b8f6fee737fb044f9a10ca148030da2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Resources/NarsShader/Funcs/Dot_Creation.asset b/Assets/Resources/NarsShader/Funcs/Dot_Creation.asset index 1084d80..ce95771 100644 --- a/Assets/Resources/NarsShader/Funcs/Dot_Creation.asset +++ b/Assets/Resources/NarsShader/Funcs/Dot_Creation.asset @@ -12,3 +12,45 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 78b2425a2284af743826c689403a4924, type: 3} m_Name: Dot_Creation m_EditorClassIdentifier: + m_functionInfo: "// Made with Amplify Shader Editor v1.9.2\n// Available at the + Unity Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=19200\nNode;AmplifyShaderEditor.ConditionalIfNode;3;-1267.551,74.28906;Inherit;False;False;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT3;0,0,0;False;3;FLOAT3;0,0,0;False;4;FLOAT;0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.FunctionInput;17;-984.6958,-383.1276;Inherit;False;Light + Direction Setting;1;1;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.DotProductOpNode;50;5.864481,631.6702;Inherit;False;2;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.WorldPosInputsNode;40;-927.6497,508.8965;Inherit;False;0;4;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3\nNode;AmplifyShaderEditor.WorldSpaceLightDirHlpNode;36;-1539.93,-263.8102;Inherit;True;True;1;0;FLOAT;0;False;4;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3\nNode;AmplifyShaderEditor.DotProductOpNode;46;-224.0256,-66.7878;Inherit;False;2;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.WorldNormalVector;47;-561.067,190.5634;Inherit;False;True;1;0;FLOAT3;0,0,1;False;4;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3\nNode;AmplifyShaderEditor.NormalizeNode;48;-555.2034,402.4863;Inherit;False;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.SimpleAddOpNode;49;-302.2365,670.5883;Inherit;False;2;2;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.DotProductOpNode;31;-115.166,400.1263;Inherit;False;2;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.CustomExpressionNode;32;-713.65,513.8965;Inherit;False;#if + UNITY_SINGLE_PASS_STEREO$float3 cameraPos = float3((unity_StereoWorldSpaceCameraPos[0]+ + unity_StereoWorldSpaceCameraPos[1])*.5)@ $#else$float3 cameraPos = _WorldSpaceCameraPos@$#endif$float3 + worldViewDir = normalize((cameraPos - worldPos))@$return worldViewDir@;3;Create;1;True;worldPos;FLOAT3;0,0,0;In;;Float;False;Stereo + Camera View Direction;True;False;0;;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.NormalizeNode;26;-1752.755,392.6116;Inherit;False;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.NormalizeNode;51;-161.6992,666.2639;Inherit;False;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.FunctionInput;34;-2238.546,194.7088;Inherit;False;View + Dir Offset Yaw;1;6;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionNode;27;-1982.785,409.4107;Inherit;False;FakeLightDir;-1;;638;46d02ae3c8e3e9e4590528574de2dd87;0;2;1;FLOAT;0;False;18;FLOAT;0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.ConditionalIfNode;9;-661.8511,-120.3108;Inherit;False;False;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT3;0,0,0;False;3;FLOAT3;0,0,0;False;4;FLOAT;0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.CustomExpressionNode;30;-2254.546,18.70866;Inherit;False;#if + UNITY_SINGLE_PASS_STEREO$float3 cameraPos = float3((unity_StereoWorldSpaceCameraPos[0]+ + unity_StereoWorldSpaceCameraPos[1])*.5)@ $#else$float3 cameraPos = _WorldSpaceCameraPos@$#endif$return + cameraPos@;3;Create;0;Stereo Camera View Position;True;False;0;;False;0;1;FLOAT3;0\nNode;AmplifyShaderEditor.NormalizeNode;38;-1536.367,127.8187;Inherit;False;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.ConditionalIfNode;8;-1055.361,-136.637;Inherit;False;False;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT3;0,0,0;False;3;FLOAT3;0,0,0;False;4;FLOAT;0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.FunctionInput;28;-2268.384,503.1104;Inherit;False;Fake + Light Dir Y;1;4;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;29;-2263.784,409.4107;Inherit;False;Fake + Light Dir X;1;3;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;16;-1640.696,-54.12757;Inherit;False;Fallback + Light Direction;1;2;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;12;-1458.696,-375.1276;Inherit;False;IsThereWorldLight;1;0;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;33;-2238.546,114.7086;Inherit;False;View + Dir Offset Pitch;1;5;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;42;68.10706,404.9595;Inherit;False;False;-1;NdV;1;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;52;197.2115,623.0217;Inherit;False;False;-1;NdH;2;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;0;55.6214,-67.40279;Inherit;False;True;-1;NdL;0;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionNode;53;-1990.284,21.78066;Inherit;False;View_Direction_Offset;-1;;639;877e13b89b0237646a102a2859889d4f;0;3;295;FLOAT3;0,0,0;False;296;FLOAT;0;False;297;FLOAT;0;False;1;FLOAT3;0\nWireConnection;3;0;16;0\nWireConnection;3;2;38;0\nWireConnection;3;3;26;0\nWireConnection;50;0;47;0\nWireConnection;50;1;51;0\nWireConnection;46;0;9;0\nWireConnection;46;1;47;0\nWireConnection;48;0;9;0\nWireConnection;49;0;48;0\nWireConnection;49;1;32;0\nWireConnection;31;0;47;0\nWireConnection;31;1;32;0\nWireConnection;32;0;40;0\nWireConnection;26;0;27;0\nWireConnection;51;0;49;0\nWireConnection;27;1;29;0\nWireConnection;27;18;28;0\nWireConnection;9;0;17;0\nWireConnection;9;2;3;0\nWireConnection;9;3;8;0\nWireConnection;38;0;53;0\nWireConnection;8;0;12;0\nWireConnection;8;2;36;0\nWireConnection;8;3;3;0\nWireConnection;42;0;31;0\nWireConnection;52;0;50;0\nWireConnection;0;0;46;0\nWireConnection;53;295;30;0\nWireConnection;53;296;33;0\nWireConnection;53;297;34;0\nASEEND*/\n//CHKSM=E3A86004D7C8392171470A7CF0F774F06DB0118C" + m_functionName: + m_description: + m_additionalIncludes: + m_additionalIncludes: [] + m_outsideIncludes: [] + m_additionalPragmas: + m_additionalPragmas: [] + m_outsidePragmas: [] + m_additionalDirectives: + m_validData: 0 + m_isDirty: 0 + m_moduleName: ' Additional Directives' + m_independentModule: 1 + m_customEdited: 0 + m_additionalDirectives: [] + m_shaderFunctionDirectives: [] + m_nativeDirectives: [] + m_nativeDirectivesIndex: -1 + m_nativeDirectivesFoldout: 0 + m_directivesSaveItems: [] + m_nodeCategory: 3 + m_headerStyle: 0 + m_headerColor: {r: 1, g: 0.4, b: 0, a: 1} + m_customNodeCategory: + m_previewPosition: 0 + m_hidden: 0 + m_url: diff --git a/Assets/Resources/NarsShader/Funcs/Dot_Creation.asset.meta b/Assets/Resources/NarsShader/Funcs/Dot_Creation.asset.meta index f4aa979..18a56a5 100644 --- a/Assets/Resources/NarsShader/Funcs/Dot_Creation.asset.meta +++ b/Assets/Resources/NarsShader/Funcs/Dot_Creation.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5dc6ab91272cf5948b2879e6e6e1078b +guid: a6aa1a6bed2a0b144a605337ffede43a NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Resources/NarsShader/Funcs/FakeLightDir.asset b/Assets/Resources/NarsShader/Funcs/FakeLightDir.asset index ed5f8ea..96e0bb4 100644 --- a/Assets/Resources/NarsShader/Funcs/FakeLightDir.asset +++ b/Assets/Resources/NarsShader/Funcs/FakeLightDir.asset @@ -12,3 +12,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 78b2425a2284af743826c689403a4924, type: 3} m_Name: FakeLightDir m_EditorClassIdentifier: + m_functionInfo: "// Made with Amplify Shader Editor\n// Available at the Unity Asset + Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=18719\n2885;182;2195;1072;2621.709;646.2035;1.776079;True;True\nNode;AmplifyShaderEditor.SimpleDivideOpNode;3;-766.0289,101.7025;Inherit;False;2;0;FLOAT;0;False;1;FLOAT;180;False;1;FLOAT;0\nNode;AmplifyShaderEditor.NormalizeNode;2;435.7711,180.5063;Inherit;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.SinOpNode;13;-272,208;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.CosOpNode;7;-272,288;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.CosOpNode;10;-272,368;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.DynamicAppendNode;15;253.745,171.9334;Inherit;False;FLOAT3;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.SinOpNode;9;-272,128;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;1;-961.9783,113.4478;Inherit;False;X;1;0;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SimpleMultiplyOpNode;14;22.42889,307.2759;Inherit;False;3;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;18;-973.363,241.5632;Inherit;False;Y;1;1;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.PiNode;6;-607.1745,228.6206;Inherit;False;1;0;FLOAT;1;False;1;FLOAT;0\nNode;AmplifyShaderEditor.PiNode;5;-619.0288,112.7025;Inherit;False;1;0;FLOAT;1;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SimpleDivideOpNode;4;-745.9622,241.9843;Inherit;False;2;0;FLOAT;0;False;1;FLOAT;180;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SimpleMultiplyOpNode;12;42.15698,95.17993;Inherit;False;3;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.CosOpNode;8;-272,48;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.RangedFloatNode;11;-91.8431,215.1798;Inherit;False;Constant;_Float1;Float + 0;1;0;Create;True;0;0;0;False;0;False;-1;0;0;0;0;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionOutput;0;616,172.5;Inherit;False;True;-1;Output;0;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nWireConnection;3;0;1;0\nWireConnection;2;0;15;0\nWireConnection;13;0;5;0\nWireConnection;7;0;5;0\nWireConnection;10;0;6;0\nWireConnection;15;0;12;0\nWireConnection;15;1;13;0\nWireConnection;15;2;14;0\nWireConnection;9;0;6;0\nWireConnection;14;0;7;0\nWireConnection;14;1;10;0\nWireConnection;14;2;11;0\nWireConnection;6;0;4;0\nWireConnection;5;0;3;0\nWireConnection;4;0;18;0\nWireConnection;12;0;8;0\nWireConnection;12;1;9;0\nWireConnection;12;2;11;0\nWireConnection;8;0;5;0\nWireConnection;0;0;2;0\nASEEND*/\n//CHKSM=FFA46ACB312EDD066434DE1D4C48C14A93BC1A7A" + m_functionName: + m_description: + m_additionalIncludes: + m_additionalIncludes: [] + m_outsideIncludes: [] + m_additionalPragmas: + m_additionalPragmas: [] + m_outsidePragmas: [] + m_additionalDirectives: + m_validData: 0 + m_isDirty: 0 + m_moduleName: ' Additional Directives' + m_independentModule: 1 + m_customEdited: 0 + m_additionalDirectives: [] + m_shaderFunctionDirectives: [] + m_nativeDirectives: [] + m_nativeDirectivesIndex: -1 + m_nativeDirectivesFoldout: 0 + m_directivesSaveItems: [] + m_nodeCategory: 0 + m_customNodeCategory: Arc System Works + m_previewPosition: 0 + m_hidden: 0 diff --git a/Assets/Resources/NarsShader/Funcs/FakeLightDir.asset.meta b/Assets/Resources/NarsShader/Funcs/FakeLightDir.asset.meta index 52c2b89..7697dda 100644 --- a/Assets/Resources/NarsShader/Funcs/FakeLightDir.asset.meta +++ b/Assets/Resources/NarsShader/Funcs/FakeLightDir.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a27e92962c2c2649a3af0cd4f2903b6 +guid: 46d02ae3c8e3e9e4590528574de2dd87 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Resources/NarsShader/Funcs/Is_There_A_Light.asset.meta b/Assets/Resources/NarsShader/Funcs/Is_There_A_Light.asset.meta index 68f598a..f91e95e 100644 --- a/Assets/Resources/NarsShader/Funcs/Is_There_A_Light.asset.meta +++ b/Assets/Resources/NarsShader/Funcs/Is_There_A_Light.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 98bba35e0adeb7a4db4bb32317e70d55 +guid: ed90c6187c10c034caf3e9fb9ab67d31 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Resources/NarsShader/Funcs/View_Direction_Offset.asset b/Assets/Resources/NarsShader/Funcs/View_Direction_Offset.asset index 4d58aa5..b9d1983 100644 --- a/Assets/Resources/NarsShader/Funcs/View_Direction_Offset.asset +++ b/Assets/Resources/NarsShader/Funcs/View_Direction_Offset.asset @@ -12,3 +12,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 78b2425a2284af743826c689403a4924, type: 3} m_Name: View_Direction_Offset m_EditorClassIdentifier: + m_functionInfo: "// Made with Amplify Shader Editor v1.9.2\n// Available at the + Unity Asset Store - http://u3d.as/y3X \n/*ASEBEGIN\nVersion=19200\nNode;AmplifyShaderEditor.SimpleMultiplyOpNode;369;3144.834,4831.834;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;-1;False;1;FLOAT;0\nNode;AmplifyShaderEditor.RadiansOpNode;378;3307.603,4858.271;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.WireNode;381;2628.787,5272.055;Inherit;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.NormalizeNode;384;3767.766,4366.329;Inherit;False;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.WorldPosInputsNode;390;2180.397,4934.364;Inherit;False;0;4;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3\nNode;AmplifyShaderEditor.FunctionInput;297;2966.908,4825.527;Inherit;False;Yaw;1;2;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.FunctionInput;296;3165.27,4437.029;Inherit;False;Pitch;1;1;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SimpleSubtractOpNode;388;4397.638,4943.644;Inherit;False;2;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.RotateAboutAxisNode;387;4038.786,4555.428;Inherit;False;True;4;0;FLOAT3;0,1,0;False;1;FLOAT;0;False;2;FLOAT3;0,0,0;False;3;FLOAT3;0,0,1;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.NormalizeNode;389;4629.431,4933.75;Inherit;False;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.WireNode;386;4311.789,5246.17;Inherit;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.RadiansOpNode;382;3746.993,4507.66;Inherit;False;1;0;FLOAT;0;False;1;FLOAT;0\nNode;AmplifyShaderEditor.SimpleMultiplyOpNode;377;3530.694,4458.626;Inherit;False;2;2;0;FLOAT;0;False;1;FLOAT;1;False;1;FLOAT;0\nNode;AmplifyShaderEditor.NormalizeNode;376;3236.959,4741.025;Inherit;False;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.CustomExpressionNode;375;3596.97,4366.211;Inherit;False;return + UNITY_MATRIX_V[0]@;3;Create;0;View Matrix [0];True;False;0;;False;0;1;FLOAT3;0\nNode;AmplifyShaderEditor.CustomExpressionNode;373;3013.945,4740.818;Inherit;False;return + UNITY_MATRIX_V[1]@;3;Create;0;View Matrix [1];True;False;0;;False;0;1;FLOAT3;0\nNode;AmplifyShaderEditor.WireNode;383;2636.787,4605.055;Inherit;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.FunctionInput;295;2975.552,4976.986;Inherit;False;View + Position;3;0;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.SimpleAddOpNode;380;2447.651,4904.878;Inherit;False;2;2;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.RotateAboutAxisNode;385;3549.403,4859.913;Inherit;False;False;4;0;FLOAT3;0,1,0;False;1;FLOAT;0;False;2;FLOAT3;0,0,0;False;3;FLOAT3;0,0,0;False;1;FLOAT3;0\nNode;AmplifyShaderEditor.FunctionOutput;0;4849.276,4931.584;Inherit;False;True;-1;Adjusted + Position;0;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3;0\nWireConnection;369;0;297;0\nWireConnection;378;0;369;0\nWireConnection;381;0;380;0\nWireConnection;384;0;375;0\nWireConnection;388;0;387;0\nWireConnection;388;1;386;0\nWireConnection;387;0;384;0\nWireConnection;387;1;382;0\nWireConnection;387;2;383;0\nWireConnection;387;3;385;0\nWireConnection;389;0;388;0\nWireConnection;386;0;381;0\nWireConnection;382;0;377;0\nWireConnection;377;0;296;0\nWireConnection;376;0;373;0\nWireConnection;383;0;380;0\nWireConnection;380;1;390;0\nWireConnection;385;0;376;0\nWireConnection;385;1;378;0\nWireConnection;385;2;380;0\nWireConnection;385;3;295;0\nWireConnection;0;0;389;0\nASEEND*/\n//CHKSM=2A6EB84456027344554B4175EC043F7E63172A2A" + m_functionName: + m_description: + m_additionalIncludes: + m_additionalIncludes: [] + m_outsideIncludes: [] + m_additionalPragmas: + m_additionalPragmas: [] + m_outsidePragmas: [] + m_additionalDirectives: + m_validData: 0 + m_isDirty: 0 + m_moduleName: ' Additional Directives' + m_independentModule: 1 + m_customEdited: 0 + m_additionalDirectives: [] + m_shaderFunctionDirectives: [] + m_nativeDirectives: [] + m_nativeDirectivesIndex: -1 + m_nativeDirectivesFoldout: 0 + m_directivesSaveItems: [] + m_nodeCategory: 0 + m_headerStyle: 0 + m_headerColor: {r: 1, g: 0.4, b: 0, a: 1} + m_customNodeCategory: Arc System Works + m_previewPosition: 0 + m_hidden: 0 + m_url: diff --git a/Assets/Resources/NarsShader/Funcs/View_Direction_Offset.asset.meta b/Assets/Resources/NarsShader/Funcs/View_Direction_Offset.asset.meta index fb21422..dd043e5 100644 --- a/Assets/Resources/NarsShader/Funcs/View_Direction_Offset.asset.meta +++ b/Assets/Resources/NarsShader/Funcs/View_Direction_Offset.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0ed390ab7f73e4d45a6b076cf1eb4d6f +guid: 877e13b89b0237646a102a2859889d4f NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Resources/Prefabs/CharaSelect.prefab b/Assets/Resources/Prefabs/CharaSelect.prefab index 16008c8..064541d 100644 --- a/Assets/Resources/Prefabs/CharaSelect.prefab +++ b/Assets/Resources/Prefabs/CharaSelect.prefab @@ -13,7 +13,6 @@ GameObject: - component: {fileID: 1679236400360698640} - component: {fileID: 7159069016347322542} - component: {fileID: 5423960384028092001} - - component: {fileID: 4882398606576421441} m_Layer: 5 m_Name: CharaSelect m_TagString: Untagged @@ -32,8 +31,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8943345654956533132} - - {fileID: 1679236400528196893} + - {fileID: 3950770187706234650} - {fileID: 1679236400529307937} - {fileID: 2014716433788527325} m_Father: {fileID: 0} @@ -42,7 +40,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 250} + m_SizeDelta: {x: 125, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1679236400360698641 CanvasRenderer: @@ -147,22 +145,8 @@ MonoBehaviour: IsMob: 0 CostumeId: CharaImage: {fileID: 1679236400528196890} - BackGroundImage: {fileID: 4359019069968187769} CostumeImage: {fileID: 1679236400529307950} IndexText: {fileID: 2233745518321098558} ---- !u!114 &4882398606576421441 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1679236400360698642} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 --- !u!1 &1679236400528196892 GameObject: m_ObjectHideFlags: 0 @@ -188,17 +172,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1679236400528196892} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1679236400360698643} - m_RootOrder: 1 + m_Father: {fileID: 3950770187706234650} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -55} - m_SizeDelta: {x: 120, y: 120} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 51.7, y: 0} + m_SizeDelta: {x: 160, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1679236400528196891 CanvasRenderer: @@ -215,13 +199,13 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1679236400528196892} - m_Enabled: 1 + m_Enabled: 0 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_Color: {r: 1, g: 1, b: 1, a: 0.5882353} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -268,13 +252,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1679236400360698643} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -180} - m_SizeDelta: {x: 120, y: 120} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -8, y: 2} + m_SizeDelta: {x: 55, y: 55} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &1679236400529307951 CanvasRenderer: m_ObjectHideFlags: 0 @@ -313,7 +297,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4346032192954077524 +--- !u!1 &4987788826952763096 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -321,64 +305,66 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8943345654956533132} - - component: {fileID: 9146919278922802724} - - component: {fileID: 4359019069968187769} + - component: {fileID: 3950770187706234650} + - component: {fileID: 4552747566122390193} + - component: {fileID: 2613657035618519880} + - component: {fileID: 2675877708017493935} m_Layer: 5 - m_Name: BG + m_Name: CharaMask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8943345654956533132 +--- !u!224 &3950770187706234650 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346032192954077524} + m_GameObject: {fileID: 4987788826952763096} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1679236400528196893} m_Father: {fileID: 1679236400360698643} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -115} - m_SizeDelta: {x: 345, y: 345} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.30000305, y: 2.340001} + m_SizeDelta: {x: -3.4599938, y: -7.199998} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9146919278922802724 +--- !u!222 &4552747566122390193 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346032192954077524} + m_GameObject: {fileID: 4987788826952763096} m_CullTransparentMesh: 1 ---- !u!114 &4359019069968187769 +--- !u!114 &2613657035618519880 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346032192954077524} - m_Enabled: 0 + m_GameObject: {fileID: 4987788826952763096} + 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: 0.5019608} - m_RaycastTarget: 0 + m_Color: {r: 1, g: 1, b: 1, a: 0.003921569} + 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: 21300000, guid: f0efb3b3a93d2674e90438758b0fb001, type: 3} + m_Sprite: {fileID: 21300000, guid: 9a444f34ba8719a4083a94891d66b364, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -387,7 +373,20 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.8 +--- !u!114 &2675877708017493935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4987788826952763096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 --- !u!1 &7987743244650596613 GameObject: m_ObjectHideFlags: 0 @@ -418,13 +417,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1679236400360698643} - m_RootOrder: 3 + m_RootOrder: 2 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: -10, y: -10} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -3} + m_SizeDelta: {x: 45, y: 30} + m_Pivot: {x: 0, y: 1} --- !u!222 &3508166106652295565 CanvasRenderer: m_ObjectHideFlags: 0 @@ -455,10 +454,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 036631af73b15ac41a9d10f75f5bbafe, type: 3} - m_FontSize: 25 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 56 m_Alignment: 0 m_AlignByGeometry: 0 diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index a56c0ec..b86a044 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -1190,16 +1190,15 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 887532140} + m_Children: [] m_Father: {fileID: 523631780} - m_RootOrder: 8 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -180, y: 29} - m_SizeDelta: {x: 250, y: 50} - m_Pivot: {x: 0.5, y: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -5, y: 5} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 1, y: 1} --- !u!114 &32867440 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1256,6 +1255,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1564959567} + m_TargetAssemblyTypeName: UmaViewerUI, umamusume + m_MethodName: StopAudio + 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!114 &32867441 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1276,8 +1287,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b4b9eac9ba8f7c54cb12ef5f2f8b9fc8, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: ebdeff1fc4e9ecb498671cfd5fae65e4, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2750,7 +2761,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2.57 --- !u!222 &87919065 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2816,7 +2827,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &92965282 @@ -3426,6 +3437,7 @@ GameObject: - component: {fileID: 115881385} - component: {fileID: 115881384} - component: {fileID: 115881383} + - component: {fileID: 115881387} m_Layer: 0 m_Name: Ground m_TagString: Untagged @@ -3509,6 +3521,25 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &115881387 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 115881382} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 49bffee7ba1a7be428efd20ecf2a02bc, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &116348344 GameObject: m_ObjectHideFlags: 0 @@ -3539,12 +3570,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 523631780} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 159.99998, y: -160} - m_SizeDelta: {x: 430, y: 200} + m_AnchoredPosition: {x: 150, y: -150.83005} + m_SizeDelta: {x: 450, y: 181.66} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &116348346 MonoBehaviour: @@ -7499,7 +7530,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000366} + m_AnchoredPosition: {x: 255, y: -45.000244} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &270183827 @@ -9097,8 +9128,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -10813,8 +10844,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -11502,6 +11533,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 399621053} m_CullTransparentMesh: 1 +--- !u!1 &399811178 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 399811179} + - component: {fileID: 399811181} + - component: {fileID: 399811180} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &399811179 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 399811178} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 666990276} + m_RootOrder: 0 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &399811180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 399811178} + 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: 10901, 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 &399811181 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 399811178} + m_CullTransparentMesh: 1 --- !u!1 &405426473 GameObject: m_ObjectHideFlags: 0 @@ -14199,42 +14305,6 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &469475732 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 469475733} - m_Layer: 5 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &469475733 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 469475732} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1870757781} - m_Father: {fileID: 960399988} - m_RootOrder: 0 - 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: -20} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &473655706 GameObject: m_ObjectHideFlags: 0 @@ -15692,6 +15762,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 504748474} m_CullTransparentMesh: 1 +--- !u!1 &505669194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 505669195} + - component: {fileID: 505669197} + - component: {fileID: 505669196} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &505669195 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505669194} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1977134491} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15, y: -0.5} + m_SizeDelta: {x: -40, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &505669196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505669194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 036631af73b15ac41a9d10f75f5bbafe, type: 3} + m_FontSize: 17 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Load Stage +--- !u!222 &505669197 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505669194} + m_CullTransparentMesh: 1 --- !u!1 &506660741 GameObject: m_ObjectHideFlags: 0 @@ -15703,7 +15852,7 @@ GameObject: - component: {fileID: 506660742} - component: {fileID: 506660743} m_Layer: 5 - m_Name: Toggle + m_Name: VMDToggle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -15723,12 +15872,12 @@ RectTransform: - {fileID: 1556377413} - {fileID: 922614215} m_Father: {fileID: 523631780} - m_RootOrder: 4 + m_RootOrder: 5 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: 261.13794, y: 62.5} - m_SizeDelta: {x: 227.715, y: 35} + m_AnchoredPosition: {x: 160, y: 50} + m_SizeDelta: {x: 150, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &506660743 MonoBehaviour: @@ -16404,13 +16553,13 @@ RectTransform: - {fileID: 1869374223} - {fileID: 1826257963} m_Father: {fileID: 523631780} - m_RootOrder: 3 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 31.678, y: 80} - m_SizeDelta: {x: -626.645, y: 35} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 288.6742, y: 40} + m_SizeDelta: {x: 175, y: 40} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &515484818 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16674,14 +16823,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1805161722} + - {fileID: 32867439} - {fileID: 1406840791} - {fileID: 1781049852} - - {fileID: 515484817} + - {fileID: 1977134491} - {fileID: 506660742} - {fileID: 116348345} - {fileID: 605931264} + - {fileID: 515484817} - {fileID: 1280435371} - - {fileID: 32867439} m_Father: {fileID: 242004464} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19127,14 +19277,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1834195527} - - {fileID: 960399988} m_Father: {fileID: 523631780} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -460} - m_SizeDelta: {x: 750, y: 270} + m_AnchoredPosition: {x: 0, y: -475} + m_SizeDelta: {x: 770, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &605931265 MonoBehaviour: @@ -19149,15 +19298,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Content: {fileID: 1143771492} - m_Horizontal: 1 - m_Vertical: 0 + m_Horizontal: 0 + m_Vertical: 1 m_MovementType: 2 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 m_ScrollSensitivity: -90 m_Viewport: {fileID: 1834195527} - m_HorizontalScrollbar: {fileID: 960399989} + m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 0} m_HorizontalScrollbarVisibility: 2 m_VerticalScrollbarVisibility: 2 @@ -20449,6 +20598,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 665091893} m_CullTransparentMesh: 1 +--- !u!1 &666990275 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 666990276} + - component: {fileID: 666990278} + - component: {fileID: 666990277} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &666990276 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 666990275} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 399811179} + m_Father: {fileID: 1977134491} + m_RootOrder: 1 + 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: 75, y: 0} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &666990277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 666990275} + 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 &666990278 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 666990275} + m_CullTransparentMesh: 1 --- !u!1 &667826759 GameObject: m_ObjectHideFlags: 0 @@ -21407,8 +21632,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 - m_fontSizeBase: 28 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -21446,7 +21671,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 &695163801 @@ -23959,8 +24184,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 - m_fontSizeBase: 28 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -23998,7 +24223,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 &732520870 @@ -26106,9 +26331,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: -152.01} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &800374507 @@ -27755,8 +27980,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -27947,8 +28172,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7.5, y: -0.5} - m_SizeDelta: {x: -35, y: -13} + m_AnchoredPosition: {x: -9.5, y: 0} + m_SizeDelta: {x: -31, y: -8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &839781339 MonoBehaviour: @@ -27971,7 +28196,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 036631af73b15ac41a9d10f75f5bbafe, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 1 @@ -27979,7 +28204,7 @@ MonoBehaviour: m_MaxSize: 70 m_Alignment: 3 m_AlignByGeometry: 0 - m_RichText: 1 + m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 @@ -29425,85 +29650,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 887039469} m_CullTransparentMesh: 1 ---- !u!1 &887532139 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 887532140} - - component: {fileID: 887532142} - - component: {fileID: 887532141} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &887532140 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 887532139} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 32867439} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: 2.5} - m_SizeDelta: {x: 0, y: -5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &887532141 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 887532139} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 036631af73b15ac41a9d10f75f5bbafe, type: 3} - m_FontSize: 25 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 256 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Cancel ---- !u!222 &887532142 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 887532139} - m_CullTransparentMesh: 1 --- !u!1 &887714083 GameObject: m_ObjectHideFlags: 0 @@ -30335,9 +30481,9 @@ RectTransform: m_Father: {fileID: 506660742} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 75, y: 0} m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 1, y: 0.5} --- !u!114 &922614216 @@ -30508,7 +30654,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 380, y: -45.000366} + m_AnchoredPosition: {x: 380, y: -45.000244} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &931406427 @@ -30896,7 +31042,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000366} + m_AnchoredPosition: {x: 255, y: -45.000244} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &952551665 @@ -31101,132 +31247,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952954185} m_CullTransparentMesh: 1 ---- !u!1 &960399987 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 960399988} - - component: {fileID: 960399991} - - component: {fileID: 960399990} - - component: {fileID: 960399989} - m_Layer: 5 - m_Name: Scrollbar Horizontal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &960399988 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960399987} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 469475733} - m_Father: {fileID: 605931264} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} - m_Pivot: {x: 0.5, y: 0} ---- !u!114 &960399989 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960399987} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 1870757782} - m_HandleRect: {fileID: 1870757781} - m_Direction: 0 - m_Value: 0 - m_Size: 1 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &960399990 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960399987} - 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 &960399991 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 960399987} - m_CullTransparentMesh: 1 --- !u!1 &964213175 GameObject: m_ObjectHideFlags: 0 @@ -33428,7 +33448,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1040294592 @@ -36390,7 +36410,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -750, y: 250} + m_SizeDelta: {x: 0, y: 8} m_Pivot: {x: 0, y: 1} --- !u!114 &1143771493 MonoBehaviour: @@ -36404,8 +36424,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 1 - m_VerticalFit: 0 + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!114 &1143771494 MonoBehaviour: m_ObjectHideFlags: 0 @@ -36415,23 +36435,21 @@ MonoBehaviour: m_GameObject: {fileID: 1143771491} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + m_Left: 5 + m_Right: 5 + m_Top: 5 + m_Bottom: 5 + m_ChildAlignment: 1 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 125, y: 70} + m_Spacing: {x: 2, y: 2} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &1145728917 GameObject: m_ObjectHideFlags: 0 @@ -36841,7 +36859,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1652478224} m_HandleRect: {fileID: 1652478223} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -37442,7 +37460,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1882365343} m_HandleRect: {fileID: 1882365342} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -38635,7 +38653,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2 --- !u!222 &1210994113 CanvasRenderer: m_ObjectHideFlags: 0 @@ -40299,13 +40317,13 @@ RectTransform: m_Children: - {fileID: 2061178672} m_Father: {fileID: 523631780} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 180, y: 29} + m_AnchoredPosition: {x: 0, y: 40} m_SizeDelta: {x: 250, y: 50} - m_Pivot: {x: 0.5, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1280435372 MonoBehaviour: m_ObjectHideFlags: 0 @@ -40639,8 +40657,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 18 + m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -44470,7 +44488,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 523631780} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -47051,8 +47069,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -47819,7 +47837,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!224 &1525688469 stripped @@ -48230,8 +48248,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -48269,7 +48287,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 &1542859409 @@ -48482,13 +48500,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Record VMD (Slow) + m_Text: Record VMD --- !u!222 &1556377415 CanvasRenderer: m_ObjectHideFlags: 0 @@ -48534,7 +48552,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1558324558 @@ -48833,6 +48851,7 @@ MonoBehaviour: EnableFaceOverride: 1 LiveTime: 0 isRecordVMD: 0 + isRequireStage: 1 LiveRecoedToggle: {fileID: 0} LiveMode: 1 currentFaceDrivenKeyTarget: {fileID: 0} @@ -50949,7 +50968,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -52101,7 +52120,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1678768231 @@ -52435,7 +52454,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1684693616 @@ -52805,7 +52824,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 380, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1699478760 @@ -54830,8 +54849,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -55124,7 +55143,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 255, y: -45.000366} + m_AnchoredPosition: {x: 255, y: -45.000244} m_SizeDelta: {x: 270, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1765749874 @@ -55559,7 +55578,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 523631780} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -57269,7 +57288,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: -17} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1834195528 MonoBehaviour: @@ -58044,81 +58063,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1869374222} m_CullTransparentMesh: 1 ---- !u!1 &1870757780 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1870757781} - - component: {fileID: 1870757783} - - component: {fileID: 1870757782} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1870757781 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1870757780} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 469475733} - m_RootOrder: 0 - 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: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1870757782 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1870757780} - 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 &1870757783 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1870757780} - m_CullTransparentMesh: 1 --- !u!1 &1871345304 GameObject: m_ObjectHideFlags: 0 @@ -60428,7 +60372,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 400, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1970310175 @@ -61018,6 +60962,104 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &1977134490 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1977134491} + - component: {fileID: 1977134492} + m_Layer: 5 + m_Name: StageToggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1977134491 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977134490} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 505669195} + - {fileID: 666990276} + m_Father: {fileID: 523631780} + m_RootOrder: 4 + 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: 50} + m_SizeDelta: {x: 150, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1977134492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977134490} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 666990277} + toggleTransition: 1 + graphic: {fileID: 399811180} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1564959567} + m_TargetAssemblyTypeName: UmaViewerUI, umamusume + m_MethodName: SetLiveRequireStage + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 1 --- !u!1 &1978429514 GameObject: m_ObjectHideFlags: 0 @@ -65733,7 +65775,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 400, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2129326814 @@ -66955,7 +66997,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -45.000366} + m_AnchoredPosition: {x: 0, y: -45.000244} m_SizeDelta: {x: 255, y: -90} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2146564492 @@ -67242,9 +67284,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 6 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: -304.02} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219665895574065 @@ -67751,9 +67793,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 1 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: -50.67} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666109573094 @@ -70112,9 +70154,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 4 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: -202.68} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219666841734894 @@ -70944,9 +70986,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 2 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: -101.34} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667203546886 @@ -71457,6 +71499,7 @@ MonoBehaviour: CameraModeDropdown: {fileID: 6878219667632297374} CameraTargetHelper: {fileID: 1174230681} TargetCenter: {x: 0, y: 0, z: 0} + eventSystem: {fileID: 859153091} OrbitCamSettingsTab: {fileID: 6878219667498913899} OrbitCamFovSlider: {fileID: 6878219667749320559} OrbitCamZoomSlider: {fileID: 6878219666060843938} @@ -72658,9 +72701,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 116.5, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6878219667749320559 @@ -72879,9 +72922,9 @@ RectTransform: m_Father: {fileID: 6878219667498913896} m_RootOrder: 5 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: -253.34999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 180, y: 20} m_Pivot: {x: 0.5, y: 1} --- !u!1 &6878219667784581358 diff --git a/Assets/Scripts/CameraOrbit.cs b/Assets/Scripts/CameraOrbit.cs index 318ef3b..747d01d 100644 --- a/Assets/Scripts/CameraOrbit.cs +++ b/Assets/Scripts/CameraOrbit.cs @@ -15,7 +15,7 @@ public class CameraOrbit : MonoBehaviour public GameObject CameraTargetHelper; public Vector3 TargetCenter; - EventSystem eventSystem; + public EventSystem eventSystem; bool controlOn; @@ -45,8 +45,6 @@ public class CameraOrbit : MonoBehaviour OrbitCamZoomSlider.minValue = camDistMin; OrbitCamZoomSlider.maxValue = camDistMax; - eventSystem = EventSystem.current; - lookRotation = transform.localRotation; instance = this; } diff --git a/Assets/Scripts/UI/LiveCharacterSelect.cs b/Assets/Scripts/UI/LiveCharacterSelect.cs index de325d2..da4d7a7 100644 --- a/Assets/Scripts/UI/LiveCharacterSelect.cs +++ b/Assets/Scripts/UI/LiveCharacterSelect.cs @@ -6,7 +6,6 @@ public class LiveCharacterSelect : MonoBehaviour public CharaEntry CharaEntry; public string CostumeId; public Image CharaImage; - public Image BackGroundImage; public Image CostumeImage; public Text IndexText; @@ -22,9 +21,8 @@ public class LiveCharacterSelect : MonoBehaviour { CharaEntry = charaentry; CostumeId = costumeId; + CharaImage.enabled = true; CharaImage.sprite = charaentry.Icon; - BackGroundImage.enabled = true; - BackGroundImage.sprite = charaentry.Icon; CostumeImage.sprite = costumeSprite; } } diff --git a/Assets/Scripts/UmaContainerCharacter.cs b/Assets/Scripts/UmaContainerCharacter.cs index df7253a..734f96f 100644 --- a/Assets/Scripts/UmaContainerCharacter.cs +++ b/Assets/Scripts/UmaContainerCharacter.cs @@ -160,9 +160,9 @@ public class UmaContainerCharacter : UmaContainer //Materials foreach (var rend in gameObject.GetComponentsInChildren()) { - for (int i = 0; i < rend.sharedMaterials.Length; i++) + for (int i = 0; i < rend.materials.Length; i++) { - Material mat = rend.sharedMaterials[i]; + Material mat = rend.materials[i]; var matHlp = Materials.FirstOrDefault(m => m.Mat == mat); if (matHlp == null) @@ -572,7 +572,7 @@ public class UmaContainerCharacter : UmaContainer foreach (Renderer r in Body.GetComponentsInChildren()) { - foreach (Material m in r.sharedMaterials) + foreach (Material m in r.materials) { string mainTex = "", toonMap = "", tripleMap = "", optionMap = "", zekkenNumberTex = ""; @@ -615,7 +615,7 @@ public class UmaContainerCharacter : UmaContainer switch (costumeIdShort.Split('_')[0]) //costume ID { case "0001": - switch (r.sharedMaterials.ToList().IndexOf(m)) + switch (r.materials.ToList().IndexOf(m)) { case 0: mainTex = $"tex_bdy{costumeIdShort}_00_waku0_diff"; @@ -646,13 +646,7 @@ public class UmaContainerCharacter : UmaContainer tripleMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_base"; optionMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_ctrl"; break; - case "0006": - mainTex = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_diff"; - toonMap = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_shad_c"; - tripleMap = $"tex_bdy{costumeIdLong}_0_{bust}_00_base"; - optionMap = $"tex_bdy{costumeIdLong}_0_{bust}_00_ctrl"; - break; - case "0009": + case "0006": case "0009": case "0015": mainTex = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_diff"; toonMap = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_shad_c"; tripleMap = $"tex_bdy{costumeIdLong}_0_{bust}_00_base"; @@ -681,7 +675,7 @@ public class UmaContainerCharacter : UmaContainer { foreach (Renderer r in Body.GetComponentsInChildren()) { - foreach (Material m in r.sharedMaterials) + foreach (Material m in r.materials) { //BodyAlapha's shader need to change manually. if (m.name.Contains("bdy") && m.name.Contains("Alpha")) @@ -721,7 +715,7 @@ public class UmaContainerCharacter : UmaContainer foreach (Renderer r in head.GetComponentsInChildren()) { - foreach (Material m in r.sharedMaterials) + foreach (Material m in r.materials) { if (head.name.Contains("mchr")) { @@ -866,7 +860,7 @@ public class UmaContainerCharacter : UmaContainer var textures = MobHeadTextures; foreach (Renderer r in hair.GetComponentsInChildren()) { - foreach (Material m in r.sharedMaterials) + foreach (Material m in r.materials) { //Glasses's shader need to change manually. diff --git a/Assets/Scripts/UmaViewerAudio.cs b/Assets/Scripts/UmaViewerAudio.cs index 08a9fba..d288c01 100644 --- a/Assets/Scripts/UmaViewerAudio.cs +++ b/Assets/Scripts/UmaViewerAudio.cs @@ -9,6 +9,8 @@ public class UmaViewerAudio { static UmaViewerMain Main => UmaViewerMain.Instance; + public static int LastAudioPartIndex = -1; + public struct UmaSoundInfo { public UmaDatabaseEntry awb; @@ -20,7 +22,42 @@ public class UmaViewerAudio public bool enable; public float volume; public float pan; + public int cur_active_source = - 1; + public AudioSource activeSource; public List sourceList; + + public void SwitchActiveSource(int index, bool forceUpdate = false) + { + if (cur_active_source == index && !forceUpdate) return; + cur_active_source = index; + for(int i = 0; i < sourceList.Count; i++) + { + if (i + 1 == index) + { + activeSource = sourceList[i]; + sourceList[i].volume = volume; + sourceList[i].panStereo = pan; + } + else + { + sourceList[i].volume = 0; + } + } + } + + public void SetVolume(float volume) + { + if (volume == this.volume || !activeSource) return; + this.volume = volume; + activeSource.volume = volume; + } + + public void SetPanStereo(float pan) + { + if (pan == this.pan || !activeSource) return; + this.pan = pan; + activeSource.panStereo = pan; + } } static public UmaSoundInfo getSoundPath(string name) @@ -96,21 +133,11 @@ public class UmaViewerAudio right3 = 6, } - public static void ApplyMainVolume(CuteAudioSource sourceList) - { - foreach (var source in sourceList.sourceList) - { - source.volume = (sourceList.enable ? sourceList.volume : 0); - source.panStereo = sourceList.pan; - } - } - - static public void AlterUpdate(float _liveCurrentTime, PartEntry partInfo, List liveVocal) + static public void AlterUpdate(float _liveCurrentTime, PartEntry partInfo, List liveVocal, bool forceUpdate = false) { var timeLineData = partInfo.PartSettings["time"]; - //need to improve var targetIndex = 0; for (int i = timeLineData.Count - 1; i >= 0; i--) { @@ -121,32 +148,96 @@ public class UmaViewerAudio } } - for (int i = 0; i < liveVocal.Count; i++) - { - string partName = liveVocal[i].tag; + if (LastAudioPartIndex == targetIndex) return; + LastAudioPartIndex = targetIndex; - if (partInfo.PartSettings.ContainsKey(partName)){ - liveVocal[i].enable = partInfo.PartSettings[partName][targetIndex] > 0; - - if (partInfo.PartSettings.ContainsKey(partName + "_vol")) - { - var volume = partInfo.PartSettings[partName + "_vol"][targetIndex]; - liveVocal[i].volume = (volume == 999 ? 1 : volume); - } + + float volume_rate = 1; + if (partInfo.PartSettings.ContainsKey("volume_rate")) + { + volume_rate = partInfo.PartSettings["volume_rate"][targetIndex]; + } + + if (volume_rate == 999) //chorus + { + var activeVocal = new List(); + for (int i = 0; i < liveVocal.Count; i++) + { + var vocal = liveVocal[i]; + var partName = vocal.tag; + var active_index = (int)partInfo.PartSettings[partName][targetIndex]; + vocal.SwitchActiveSource(active_index, forceUpdate); if (partInfo.PartSettings.ContainsKey(partName + "_pan")) { - var pan = partInfo.PartSettings[partName + "_pan"][targetIndex]; - liveVocal[i].pan = (pan == 999 ? 0 : pan); + var part = partInfo.PartSettings[partName + "_pan"]; + var pan = part[targetIndex]; + vocal.SetPanStereo(pan == 999 ? 0 : pan); + } + + if (active_index > 0) + { + activeVocal.Add(vocal); + } + } + + switch(activeVocal.Count) + { + case 1: + activeVocal[0].SetVolume(0.9954f); + break; + case 2: + activeVocal[0].SetVolume(0.7031f); + activeVocal[1].SetVolume(0.7031f); + break; + case 3: + activeVocal[0].SetVolume(0.7056f); + activeVocal[1].SetVolume(0.56f); + activeVocal[1].SetVolume(0.56f); + break; + default: + var per_vol = CalculateApproximateDBValues(0.9954f, activeVocal.Count); + activeVocal.ForEach(v => v.SetVolume(per_vol)); + break; + } + } + else + { + for (int i = 0; i < liveVocal.Count; i++) + { + var vocal = liveVocal[i]; + var partName = vocal.tag; + var active_index = (int)partInfo.PartSettings[partName][targetIndex]; + vocal.SwitchActiveSource(active_index, forceUpdate); + + if (partInfo.PartSettings.ContainsKey(partName)) + { + + if (partInfo.PartSettings.ContainsKey(partName + "_vol")) + { + var part = partInfo.PartSettings[partName + "_vol"]; + var volume = part[targetIndex]; + vocal.SetVolume(volume == 999 ? 0 : volume); + } + + if (partInfo.PartSettings.ContainsKey(partName + "_pan")) + { + var part = partInfo.PartSettings[partName + "_pan"]; + var pan = part[targetIndex]; + vocal.SetPanStereo(pan == 999 ? 0 : pan); + } } - } } + } - foreach(var cute in liveVocal) - { - ApplyMainVolume(cute); - } + static public float CalculateApproximateDBValues(float total_volume, int num_sounds) + { + var total_db = 15f; + var P0 = total_volume * (Math.Pow(10, total_db / 10)); + var P_per_sound = P0 / num_sounds; + var per_volume = 10 * Math.Log10(P_per_sound / total_volume); + return (float)(per_volume / total_db); } } diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 9e7e7dd..cf2c7a9 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -76,7 +76,6 @@ public class UmaViewerBuilder : MonoBehaviour public void LoadLiveUma(List characters) { - UmaAssetManager.UnloadAllBundle(); for (int i = 0; i < characters.Count; i++) { if (characters[i].CharaEntry.Name != "") @@ -666,6 +665,7 @@ public class UmaViewerBuilder : MonoBehaviour Gallop.Live.Director mController = MainLive.GetComponentInChildren(); mController.live = live; mController.IsRecordVMD = UI.isRecordVMD; + mController.RequireStage = UI.isRequireStage; List transferObjs = new List() { MainLive, @@ -678,7 +678,7 @@ public class UmaViewerBuilder : MonoBehaviour // Move the GameObject (you attach this in the Inspector) to the newly loaded Scene transferObjs.ForEach(o => SceneManager.MoveGameObjectToScene(o, SceneManager.GetSceneByName("LiveScene"))); mController.Initialize(); - + characters.ForEach(a => { if (a.CharaEntry == null || a.CostumeId == "") @@ -687,8 +687,18 @@ public class UmaViewerBuilder : MonoBehaviour a.CostumeId = "0002_00_00"; } });//fill empty - + var actual_member_count = mController._liveTimelineControl.data.worksheetList[0].charaMotSeqList.Count; + if (actual_member_count > characters.Count) + { + Debug.LogWarning($"actual member count is {actual_member_count} current {characters.Count}"); + var actual_characters = new List(); + for (int i = 0; i < actual_member_count; i++) + { + actual_characters.Add(characters[i % characters.Count]); + } + characters = actual_characters; + } LoadLiveUma(characters); var Lyrics = LoadLiveLyrics(live.MusicId); @@ -735,8 +745,19 @@ public class UmaViewerBuilder : MonoBehaviour } } - public void PlaySound(UmaDatabaseEntry SongAwb, int subindex = -1) + public void loadLivePreviewSound(int songid) { + string nameVar = $"snd_bgm_live_{songid}_preview_02"; + UmaDatabaseEntry previewAwb = Main.AbSounds.FirstOrDefault(a => a.Name.Contains(nameVar) && a.Name.EndsWith("awb")); + if (previewAwb != null) + { + PlaySound(previewAwb, volume : 0.4f, loop : true); + } + } + + public void PlaySound(UmaDatabaseEntry SongAwb, int subindex = -1, float volume = 1, bool loop = false) + { + CurrentLyrics.Clear(); if (CurrentAudioSources.Count > 0) { var tmp = CurrentAudioSources[0]; @@ -748,17 +769,17 @@ public class UmaViewerBuilder : MonoBehaviour { foreach (AudioClip clip in LoadAudio(SongAwb)) { - AddAudioSource(clip); + AddAudioSource(clip, volume, loop); } } else { - AddAudioSource(LoadAudio(SongAwb)[subindex]); + AddAudioSource(LoadAudio(SongAwb)[subindex], volume, loop); } } - private void AddAudioSource(AudioClip clip) + private void AddAudioSource(AudioClip clip, float volume = 1, bool loop = false) { AudioSource source; if (CurrentAudioSources.Count > 0) @@ -771,6 +792,8 @@ public class UmaViewerBuilder : MonoBehaviour } CurrentAudioSources.Add(source); source.clip = clip; + source.volume = volume; + source.loop = loop; source.Play(); } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 2660913..f8b61dc 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -10,6 +10,7 @@ using System.Text; using TMPro; using UnityEngine; using UnityEngine.Events; +using UnityEngine.Networking.Types; using UnityEngine.UI; using static PageManager; using Debug = UnityEngine.Debug; @@ -142,6 +143,7 @@ public class UmaViewerUI : MonoBehaviour [Header("Live")] public bool LiveTime = false; public bool isRecordVMD; + public bool isRequireStage = true; public Dropdown LiveRecoedToggle; public int LiveMode = 1; @@ -152,7 +154,7 @@ public class UmaViewerUI : MonoBehaviour private void Awake() { Instance = this; - AudioPlayButton.onClick.AddListener(AudioPause); + AudioPlayButton.onClick.AddListener(PauseAudio); AudioSlider.onValueChanged.AddListener(AudioProgressChange); AnimationPlayButton.onClick.AddListener(AnimationPause); AnimationSlider.onValueChanged.AddListener(AnimationProgressChange); @@ -243,8 +245,11 @@ public class UmaViewerUI : MonoBehaviour public void LoadedAssetsClear() { LoadedAssetEntries.Clear(); - LoadedAssetPageCtrl.ResetCtrl(); - LoadedAssetPageCtrl.Initialize(LoadedAssetEntries.Values.ToList(), LoadedAssetScrollRect); + if (LoadedAssetPageCtrl) + { + LoadedAssetPageCtrl.ResetCtrl(); + LoadedAssetPageCtrl.Initialize(LoadedAssetEntries.Values.ToList(), LoadedAssetScrollRect); + } } public void CopyAllLoadedAssetsPath() @@ -555,7 +560,7 @@ public class UmaViewerUI : MonoBehaviour foreach (var live in Main.Lives.OrderBy(c => c.MusicId)) { - createContainer(live, UmaContainerLivePrefab, LiveList, () => ShowLiveSelectPannel(live)); + createContainer(live, UmaContainerLivePrefab, LiveList, () => ShowLiveSelectPanel(live)); createContainer(live, UmaContainerLivePrefab, LiveSoundList, () => ListLiveSounds(live.MusicId)); } } @@ -627,9 +632,10 @@ public class UmaViewerUI : MonoBehaviour } } - void ShowLiveSelectPannel(LiveEntry entry) + void ShowLiveSelectPanel(LiveEntry entry) { LiveSelectPannel.SetActive(true); + Builder.loadLivePreviewSound(entry.MusicId); for (int i = LiveSelectList.content.childCount - 1; i >= 0; i--) { Destroy(LiveSelectList.content.GetChild(i).gameObject); @@ -649,7 +655,7 @@ public class UmaViewerUI : MonoBehaviour chara.SelectChara(this); foreach (var t in LiveSelectList.content.GetComponentsInChildren()) { - t.GetComponentInChildren().color = (t == chara ? Color.white : Color.black); + t.GetComponentInChildren().color = (t == chara ? Color.green : Color.black); } }); } @@ -1090,7 +1096,7 @@ public class UmaViewerUI : MonoBehaviour Builder.CurrentUMAContainer?.SetFaceOverrideData(isOn); } - public void AudioPause() + public void PauseAudio() { var sources = Builder.CurrentAudioSources; if (sources.Count > 0) @@ -1115,15 +1121,25 @@ public class UmaViewerUI : MonoBehaviour } } + 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 = source.clip.length * val; + source.time = Mathf.Clamp(time, 0, source.clip.length); } } } @@ -1396,6 +1412,8 @@ public class UmaViewerUI : MonoBehaviour public void SetLiveRecordMode(bool val) { isRecordVMD = val; } + public void SetLiveRequireStage(bool val) { isRequireStage = val; } + public void ShowMessage(string msg, UIMessageType type) { MessageText.text += type switch diff --git a/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs b/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs index b97fbae..d1d1e5a 100644 --- a/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs +++ b/Assets/Scripts/umamusume/Gallop/CySpringDataContainer.cs @@ -87,7 +87,6 @@ namespace Gallop bool isTail = gameObject.name.Contains("tail");//The tail needs less traction var dynamic = bone.gameObject.AddComponent(); dynamic.m_Root = bone; - dynamic.m_UpdateMode = DynamicBone.UpdateMode.Normal; dynamic.m_Gravity = new Vector3(0, Mathf.Clamp01(-30 / spring._gravity), 0); dynamic.m_LimitAngel_Min = spring._limitAngleMin; dynamic.m_LimitAngel_Max = spring._limitAngleMax; diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index d4f3b40..025c024 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -1242,7 +1242,7 @@ namespace Gallop public static float CalcMorphWeight(float time, int speed, int interFrame, InterpolateType interType, LiveTimelineKey curKey, LiveTimelineKey nextKey) { - float keyTime = (float)curKey.frame / 60; + float keyTime = (float)curKey.FrameSecond; switch (speed) { diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs index bd89a59..e95c472 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineMotionSequence.cs @@ -75,6 +75,8 @@ namespace Gallop.Live.Cutt _tempAnim.AddClip(key.clip, key.clip.name); } } + _tempAnim.wrapMode = WrapMode.Clamp; + _tempAnim.enabled = false; } public void AlterUpdate(float currentTime) @@ -108,39 +110,24 @@ namespace Gallop.Live.Cutt LiveTimelineKeyCharaMotionData arg = curKey.key as LiveTimelineKeyCharaMotionData; AnimationClip anim = arg.clip; - if ((curKey != null && _curIndex != -1 && _curIndex != _prevIndex) || Director.instance.sliderControl.is_Touched || Director.instance._syncTime == false || director.IsRecordVMD) + double start; + if (arg.isMotionHeadFrameAll) { - - double start; - if(arg.isMotionHeadFrameAll) - { - start = (double)arg.motionHeadFrame / 60; - } - else - { - start = (double)arg.motionHeadFrameSeparetes[charaIndex] / 60; - } - double interval = currentTime - (double)arg.frame / 60; + start = (double)arg.motionHeadFrame / 60; + } + else + { + start = (double)arg.motionHeadFrameSeparetes[charaIndex] / 60; + } + double interval = (currentTime - arg.FrameSecond) * arg.playSpeed; + float currentAnimationTime = (float)(start + interval); - _tempAnim.wrapMode = (arg.loop ? WrapMode.Loop : WrapMode.Default); - _tempAnim[anim.name].time = (float)(start + interval); - - if (Mathf.Abs(_prevFrameAnimationTime - currentTime) < 0.01f && Director.instance.sliderControl.is_Touched) - { - if (_tempAnim.IsPlaying(anim.name)) - { - _tempAnim.Stop(); - } - } - else - { - _tempAnim.Play(anim.name); - } - } - else if (!_tempAnim.IsPlaying(anim.name)) - { - _tempAnim.Play(anim.name); - } + var state = _tempAnim[anim.name]; + state.enabled = true; + state.weight = 1; + state.time = arg.loop ? Mathf.Repeat(currentAnimationTime, state.length) : currentAnimationTime; + _tempAnim.Sample(); + state.enabled = false; _prevIndex = _curIndex; } diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs index 652d558..79b9a04 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cutt/LiveTimelineWorkSheet.cs @@ -254,7 +254,7 @@ namespace Gallop.Live.Cutt { for (int i = thisList.Count - 1; i >= 0; i--) { - if (currentTime >= (double)thisList[i].frame / 60) + if (currentTime >= thisList[i].FrameSecond) { thisTimeKeyIndex.index = i; thisTimeKeyIndex.key = thisList[i]; @@ -285,7 +285,7 @@ namespace Gallop.Live.Cutt { if (thisTimeKeyIndex.nextKey != null) { - if (currentTime >= (double)thisTimeKeyIndex.nextKey.frame / 60) + if (currentTime >= thisTimeKeyIndex.nextKey.FrameSecond) { thisTimeKeyIndex.index++; thisTimeKeyIndex.key = thisList[thisTimeKeyIndex.index]; @@ -602,6 +602,19 @@ namespace Gallop.Live.Cutt { public int frame; public LiveTimelineKeyAttribute attribute; + + private double _framesecond = -999; + + public double FrameSecond { + get{ + if (_framesecond == -999) + { + _framesecond = (double)frame / 60; + } + return _framesecond; + } + set => _framesecond = value; + } } [System.Serializable] diff --git a/Assets/Scripts/umamusume/Gallop/Live/Cyalume/CyalumeController3D.cs b/Assets/Scripts/umamusume/Gallop/Live/Cyalume/CyalumeController3D.cs index dcaafdc..1b79c4c 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Cyalume/CyalumeController3D.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Cyalume/CyalumeController3D.cs @@ -20,22 +20,21 @@ namespace Gallop.Live.Cyalume } - private void Update() + private void FixedUpdate() { + if (CyalumeMaterial == null) + return; if (passedtime >= intervaltime) { y_offset += (float)0.03125; - if(y_offset >= 1.0f) + if (y_offset >= 1.0f) { y_offset = 0.0f; } CyalumeMaterial.SetTextureOffset("_MainTex", new Vector2(0, y_offset)); passedtime = 0; } - passedtime += Time.deltaTime; - //Debug.Log(CyalumeMaterial); - //Debug.Log(passedtime); - + passedtime += Time.fixedDeltaTime; } public void InitializeCyalume() @@ -47,7 +46,7 @@ namespace Gallop.Live.Cyalume GameObject tempObj = Instantiate((GameObject)obj.Value, transform); if (obj.Value.name.Contains("cyalume")){ CyalumeObj = tempObj; - CyalumeMaterial = gameObject.GetComponentInChildren().sharedMaterial; + CyalumeMaterial = gameObject.GetComponentInChildren().material; } } } diff --git a/Assets/Scripts/umamusume/Gallop/Live/Director.cs b/Assets/Scripts/umamusume/Gallop/Live/Director.cs index 5ec7165..2a725e0 100644 --- a/Assets/Scripts/umamusume/Gallop/Live/Director.cs +++ b/Assets/Scripts/umamusume/Gallop/Live/Director.cs @@ -62,6 +62,8 @@ namespace Gallop.Live public bool IsRecordVMD; + public bool RequireStage = true; + public Transform MainCameraTransform => _mainCameraTransform; private Transform _mainCameraTransform; @@ -97,9 +99,12 @@ namespace Gallop.Live { _instance = this; Debug.Log(string.Format(CUTT_PATH, live.MusicId)); - Debug.Log(live.BackGroundId); Builder.LoadAssetPath(string.Format(CUTT_PATH, live.MusicId), transform); - Builder.LoadAssetPath(string.Format(STAGE_PATH, live.BackGroundId), transform); + if (RequireStage) + { + Debug.Log(live.BackGroundId); + Builder.LoadAssetPath(string.Format(STAGE_PATH, live.BackGroundId), transform); + } //Make CharacterObject @@ -128,6 +133,7 @@ namespace Gallop.Live //Get live parts info UmaDatabaseEntry partAsset = UmaViewerMain.Instance.AbList[string.Format(LIVE_PART_PATH, live.MusicId)]; + UmaViewerAudio.LastAudioPartIndex = -1; Debug.Log(partAsset.Name); @@ -352,7 +358,7 @@ namespace Gallop.Live _liveTimelineControl.AlterUpdate(_liveCurrentTime); if (!_soloMode) { - UmaViewerAudio.AlterUpdate(_liveCurrentTime, partInfo, liveVocal); + UmaViewerAudio.AlterUpdate(_liveCurrentTime, partInfo, liveVocal, sliderControl.is_Outed); } }