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>
This commit is contained in:
katboi01
2024-09-09 10:27:37 +02:00
committed by GitHub
parent 4292484f25
commit 3b2bae40cd
23 changed files with 916 additions and 617 deletions
@@ -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
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b57a5970c828c684cbfd13cde8f02ce5
guid: 6b8f6fee737fb044f9a10ca148030da2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
@@ -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:
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5dc6ab91272cf5948b2879e6e6e1078b
guid: a6aa1a6bed2a0b144a605337ffede43a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
@@ -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
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4a27e92962c2c2649a3af0cd4f2903b6
guid: 46d02ae3c8e3e9e4590528574de2dd87
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 98bba35e0adeb7a4db4bb32317e70d55
guid: ed90c6187c10c034caf3e9fb9ab67d31
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
@@ -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:
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0ed390ab7f73e4d45a6b076cf1eb4d6f
guid: 877e13b89b0237646a102a2859889d4f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
+61 -62
View File
@@ -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
File diff suppressed because it is too large Load Diff
+1 -3
View File
@@ -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;
}
+1 -3
View File
@@ -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;
}
}
+8 -14
View File
@@ -160,9 +160,9 @@ public class UmaContainerCharacter : UmaContainer
//Materials
foreach (var rend in gameObject.GetComponentsInChildren<Renderer>())
{
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<Renderer>())
{
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<Renderer>())
{
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<Renderer>())
{
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<Renderer>())
{
foreach (Material m in r.sharedMaterials)
foreach (Material m in r.materials)
{
//Glasses's shader need to change manually.
+120 -29
View File
@@ -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<AudioSource> 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<CuteAudioSource> liveVocal)
static public void AlterUpdate(float _liveCurrentTime, PartEntry partInfo, List<CuteAudioSource> 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<CuteAudioSource>();
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);
}
}
+30 -7
View File
@@ -76,7 +76,6 @@ public class UmaViewerBuilder : MonoBehaviour
public void LoadLiveUma(List<LiveCharacterSelect> 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<Gallop.Live.Director>();
mController.live = live;
mController.IsRecordVMD = UI.isRecordVMD;
mController.RequireStage = UI.isRequireStage;
List<GameObject> transferObjs = new List<GameObject>() {
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<LiveCharacterSelect>();
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();
}
+26 -8
View File
@@ -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<LiveCharacterSelect>())
{
t.GetComponentInChildren<Text>().color = (t == chara ? Color.white : Color.black);
t.GetComponentInChildren<Text>().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
@@ -87,7 +87,6 @@ namespace Gallop
bool isTail = gameObject.name.Contains("tail");//The tail needs less traction
var dynamic = bone.gameObject.AddComponent<DynamicBone>();
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;
@@ -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)
{
@@ -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;
}
@@ -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]
@@ -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<MeshRenderer>().sharedMaterial;
CyalumeMaterial = gameObject.GetComponentInChildren<MeshRenderer>().material;
}
}
}
@@ -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);
}
}