From 33506477922eed764c29d8a52d43ad2a7a5547b4 Mon Sep 17 00:00:00 2001 From: katboi01 Date: Mon, 20 Jun 2022 00:11:24 +0200 Subject: [PATCH] Further costume loading improvements. Fixed shaders. --- .gitignore | 1 + Assets/AmplifyShaderEditor.meta | 8 + .../NarsShader/Shaders/UmaMusume Eyes.shader | 138 ++++++++------- .../Shaders/UmaMusume Eyes.shader.meta | 1 + Assets/NarsShader/Shaders/UmaMusume.shader | 2 +- Assets/Scenes/Version2.unity | 12 +- Assets/Scripts/UmaContainer.cs | 3 +- Assets/Scripts/UmaViewerBuilder.cs | 164 +++++++++++------- Assets/Scripts/UmaViewerUI.cs | 9 +- ProjectSettings/GraphicsSettings.asset | 7 +- 10 files changed, 192 insertions(+), 153 deletions(-) create mode 100644 Assets/AmplifyShaderEditor.meta diff --git a/.gitignore b/.gitignore index 9010af3..65da73c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /[Bb]uilds/ /[Ll]ogs/ /[Mm]emoryCaptures/ +/Assets/AmplifyShaderEditor/ /Ignore/ # Asset meta data should only be ignored when the corresponding asset is also ignored diff --git a/Assets/AmplifyShaderEditor.meta b/Assets/AmplifyShaderEditor.meta new file mode 100644 index 0000000..d420c14 --- /dev/null +++ b/Assets/AmplifyShaderEditor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2be36e9c0fdfcca44a4ae5dea045b62c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NarsShader/Shaders/UmaMusume Eyes.shader b/Assets/NarsShader/Shaders/UmaMusume Eyes.shader index 919bda8..ef5cc7e 100644 --- a/Assets/NarsShader/Shaders/UmaMusume Eyes.shader +++ b/Assets/NarsShader/Shaders/UmaMusume Eyes.shader @@ -8,11 +8,11 @@ Shader "Nars/UmaMusume/Eyes" [NoScaleOffset]_MainTex("Base", 2D) = "white" {} [Toggle]_Switch1and2("Switch 1 and 2 ", Float) = 0 _HighLightBrightness("HighLight Brightness", Float) = 1 - [KeywordEnum(Yes,No)] _HasHighlight("Has Highlight", Float) = 1 - [KeywordEnum(One,Two)] _NumberofHighLights("Number of HighLights", Float) = 0 + [KeywordEnum(Yes,No)] _HasHighlight("Has Highlight", Float) = 0 + [KeywordEnum(One,Two)] _NumberofHighLights("Number of HighLights", Float) = 1 [NoScaleOffset]_High0Tex("HighLight One", 2D) = "white" {} [NoScaleOffset]_High1Tex("HighLight Two", 2D) = "white" {} - _FallBackBrightness1("FallBack Brightness", Range( 0 , 1)) = 0.6 + _FallBackBrightness("FallBack Brightness", Range( 0 , 1)) = 0.6 [HideInInspector] _texcoord( "", 2D ) = "white" {} [HideInInspector] __dirty( "", Int ) = 1 } @@ -27,8 +27,8 @@ Shader "Nars/UmaMusume/Eyes" #include "UnityShaderVariables.cginc" #pragma target 3.0 #pragma shader_feature _HASHIGHLIGHT_YES _HASHIGHLIGHT_NO - #pragma shader_feature _STYLES_EYE1 _STYLES_EYE2 _STYLES_EYE3 _STYLES_EYE4 #pragma shader_feature _NUMBEROFHIGHLIGHTS_ONE _NUMBEROFHIGHLIGHTS_TWO + #pragma shader_feature _STYLES_EYE1 _STYLES_EYE2 _STYLES_EYE3 _STYLES_EYE4 #pragma surface surf StandardCustomLighting keepalpha addshadow fullforwardshadows noshadow struct Input { @@ -49,12 +49,12 @@ Shader "Nars/UmaMusume/Eyes" UnityGIInput GIData; }; - uniform float _FallBackBrightness1; - uniform sampler2D _MainTex; - uniform float _Switch1and2; + uniform float _FallBackBrightness; uniform float _HighLightBrightness; + uniform sampler2D _MainTex; uniform sampler2D _High0Tex; uniform sampler2D _High1Tex; + uniform float _Switch1and2; inline half4 LightingStandardCustomLighting( inout SurfaceOutputCustomLightingCustom s, half3 viewDir, UnityGI gi ) { @@ -98,13 +98,14 @@ Shader "Nars/UmaMusume/Eyes" float temp_output_82_0 = break10_g640.r; float Isworldlight90 = temp_output_82_0; float4 temp_output_333_0 = ( ase_lightColor * ase_lightAtten ); - float4 temp_cast_1 = (_FallBackBrightness1).xxxx; + float4 temp_cast_1 = (_FallBackBrightness).xxxx; #ifdef UNITY_PASS_FORWARDADD float4 staticSwitch337 = max( float4( 0,0,0,0 ) , temp_output_333_0 ); #else float4 staticSwitch337 = ( ( 0.0 - 0.0 > 1.0 ? 0.0 : 0.0 - 0.0 <= 1.0 && 0.0 + 0.0 >= 1.0 ? 0.0 : Isworldlight90 ) - 0.0 > 0.0 ? temp_output_333_0 : ( 0.0 - 0.0 > 1.0 ? 0.0 : 0.0 - 0.0 <= 1.0 && 0.0 + 0.0 >= 1.0 ? 0.0 : Isworldlight90 ) - 0.0 <= 0.0 && ( 0.0 - 0.0 > 1.0 ? 0.0 : 0.0 - 0.0 <= 1.0 && 0.0 + 0.0 >= 1.0 ? 0.0 : Isworldlight90 ) + 0.0 >= 0.0 ? temp_cast_1 : 0.0 ) ; #endif float4 Globnallightcolour338 = staticSwitch337; + float4 temp_cast_2 = (_HighLightBrightness).xxxx; float2 uv_TexCoord353 = i.uv_texcoord * float2( 0.25,1 ) + float2( 0,0 ); float2 uv_TexCoord367 = i.uv_texcoord * float2( 0.25,1 ) + float2( 0.25,0 ); float2 uv_TexCoord370 = i.uv_texcoord * float2( 0.25,1 ) + float2( 0.5,0 ); @@ -121,28 +122,27 @@ Shader "Nars/UmaMusume/Eyes" float2 staticSwitch360 = uv_TexCoord353; #endif float4 tex2DNode62 = tex2Dlod( _MainTex, float4( staticSwitch360, 0, 0.0) ); - float4 temp_cast_2 = (_HighLightBrightness).xxxx; float2 uv_TexCoord388 = i.uv_texcoord * float2( 1,2 ); float4 tex2DNode380 = tex2D( _High0Tex, uv_TexCoord388 ); - float4 lerpResult392 = lerp( temp_cast_2 , tex2DNode62 , ( 1.0 - tex2DNode380 )); - float4 temp_cast_3 = (_HighLightBrightness).xxxx; float4 tex2DNode385 = tex2D( _High1Tex, uv_TexCoord388 ); - float4 lerpResult397 = lerp( temp_cast_3 , tex2DNode62 , ( 1.0 - tex2DNode385 )); + float4 lerpResult381 = lerp( temp_cast_2 , tex2DNode62 , ( 1.0 - ( tex2DNode380 + tex2DNode385 ) )); + float4 temp_cast_3 = (_HighLightBrightness).xxxx; + float4 lerpResult392 = lerp( temp_cast_3 , tex2DNode62 , ( 1.0 - tex2DNode380 )); float4 temp_cast_4 = (_HighLightBrightness).xxxx; - float4 lerpResult381 = lerp( temp_cast_4 , tex2DNode62 , ( 1.0 - ( tex2DNode380 + tex2DNode385 ) )); + float4 lerpResult397 = lerp( temp_cast_4 , tex2DNode62 , ( 1.0 - tex2DNode385 )); #if defined(_NUMBEROFHIGHLIGHTS_ONE) float4 staticSwitch391 = (( _Switch1and2 )?( lerpResult397 ):( lerpResult392 )); #elif defined(_NUMBEROFHIGHLIGHTS_TWO) float4 staticSwitch391 = lerpResult381; #else - float4 staticSwitch391 = (( _Switch1and2 )?( lerpResult397 ):( lerpResult392 )); + float4 staticSwitch391 = lerpResult381; #endif #if defined(_HASHIGHLIGHT_YES) float4 staticSwitch390 = staticSwitch391; #elif defined(_HASHIGHLIGHT_NO) float4 staticSwitch390 = tex2DNode62; #else - float4 staticSwitch390 = tex2DNode62; + float4 staticSwitch390 = staticSwitch391; #endif float4 BaseTexture158 = staticSwitch390; float4 temp_output_351_0 = ( BaseTexture158 * BaseTexture158 ); @@ -169,81 +169,82 @@ Shader "Nars/UmaMusume/Eyes" CustomEditor "ASEMaterialInspector" } /*ASEBEGIN -Version=18901 -789;81;1121;389;1227.201;-1315.593;1.082344;True;False +Version=18900 +185;132;1416;839;2777.321;-335.403;1;True;True Node;AmplifyShaderEditor.CommentaryNode;362;-3584.533,-123.3915;Inherit;False;2063.248;1879.443;Comment;29;158;360;62;353;359;358;367;368;369;373;374;375;372;371;377;380;381;383;385;386;387;388;390;391;392;393;395;396;397;;1,1,1,1;0;0 -Node;AmplifyShaderEditor.Vector2Node;368;-3543.7,474.7205;Inherit;False;Constant;_Vector2;Vector 2;4;0;Create;True;0;0;0;False;0;False;0.25,1;0.25,1;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 +Node;AmplifyShaderEditor.Vector2Node;387;-3525.779,-15.3995;Inherit;False;Constant;_Vector8;Vector 8;10;0;Create;True;0;0;0;False;0;False;1,2;0.75,0;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 +Node;AmplifyShaderEditor.Vector2Node;374;-3522.389,1173.064;Inherit;False;Constant;_Vector6;Vector 6;6;0;Create;True;0;0;0;False;0;False;0.25,1;0.25,1;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 Node;AmplifyShaderEditor.Vector2Node;369;-3531.473,663.8401;Inherit;False;Constant;_Vector3;Vector 3;8;0;Create;True;0;0;0;False;0;False;0.25,0;0.25,0;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 Node;AmplifyShaderEditor.Vector2Node;371;-3534.856,848.8988;Inherit;False;Constant;_Vector4;Vector 4;5;0;Create;True;0;0;0;False;0;False;0.25,1;0.25,1;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 -Node;AmplifyShaderEditor.Vector2Node;372;-3518.856,976.8988;Inherit;False;Constant;_Vector5;Vector 5;9;0;Create;True;0;0;0;False;0;False;0.5,0;0.5,0;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 -Node;AmplifyShaderEditor.Vector2Node;374;-3522.389,1173.064;Inherit;False;Constant;_Vector6;Vector 6;6;0;Create;True;0;0;0;False;0;False;0.25,1;0.25,1;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 -Node;AmplifyShaderEditor.Vector2Node;359;-3540,272;Inherit;False;Constant;_Vector1;Vector 1;7;0;Create;True;0;0;0;False;0;False;0,0;0,0;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 -Node;AmplifyShaderEditor.Vector2Node;375;-3527.076,1321.751;Inherit;False;Constant;_Vector7;Vector 7;10;0;Create;True;0;0;0;False;0;False;0.75,0;0.75,0;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 -Node;AmplifyShaderEditor.Vector2Node;387;-3525.779,-15.3995;Inherit;False;Constant;_Vector8;Vector 8;10;0;Create;True;0;0;0;False;0;False;1,2;0.75,0;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 Node;AmplifyShaderEditor.Vector2Node;358;-3536,144;Inherit;False;Constant;_Vector0;Vector 0;3;0;Create;True;0;0;0;False;0;False;0.25,1;0.25,1;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 +Node;AmplifyShaderEditor.Vector2Node;375;-3527.076,1321.751;Inherit;False;Constant;_Vector7;Vector 7;10;0;Create;True;0;0;0;False;0;False;0.75,0;0.75,0;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 +Node;AmplifyShaderEditor.Vector2Node;368;-3543.7,474.7205;Inherit;False;Constant;_Vector2;Vector 2;4;0;Create;True;0;0;0;False;0;False;0.25,1;0.25,1;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 +Node;AmplifyShaderEditor.Vector2Node;359;-3540,272;Inherit;False;Constant;_Vector1;Vector 1;7;0;Create;True;0;0;0;False;0;False;0,0;0,0;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 +Node;AmplifyShaderEditor.Vector2Node;372;-3518.856,976.8988;Inherit;False;Constant;_Vector5;Vector 5;9;0;Create;True;0;0;0;False;0;False;0.5,0;0.5,0;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 +Node;AmplifyShaderEditor.TextureCoordinatesNode;388;-3206.317,99.32188;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.TextureCoordinatesNode;353;-3301.188,254.1345;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.TextureCoordinatesNode;370;-3300.044,959.0333;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.TextureCoordinatesNode;373;-3287.577,1283.199;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.TextureCoordinatesNode;367;-3295.888,607.8551;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.TextureCoordinatesNode;388;-3206.317,99.32188;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.SamplerNode;385;-2895.152,190.8158;Inherit;True;Property;_High1Tex;HighLight Two;7;1;[NoScaleOffset];Create;True;0;0;0;False;0;False;-1;None;c64b3ae05d9fd4c408fbe158a802b8f8;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.SamplerNode;380;-2889.155,-39.23049;Inherit;True;Property;_High0Tex;HighLight One;6;1;[NoScaleOffset];Create;True;0;0;0;False;0;False;-1;None;6eddc1168021e97419045e8c07ddc1b7;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.StaticSwitch;360;-2794.664,771.7491;Inherit;False;Property;_Styles;Styles;0;0;Create;True;0;0;0;False;0;False;0;0;0;True;;KeywordEnum;4;Eye1;Eye2;Eye3;Eye4;Create;False;True;9;1;FLOAT2;0,0;False;0;FLOAT2;0,0;False;2;FLOAT2;0,0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT2;0,0;False;6;FLOAT2;0,0;False;7;FLOAT2;0,0;False;8;FLOAT2;0,0;False;1;FLOAT2;0 +Node;AmplifyShaderEditor.SamplerNode;380;-2889.155,-40.23049;Inherit;True;Property;_High0Tex;HighLight One;6;1;[NoScaleOffset];Create;False;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.SamplerNode;385;-2895.152,190.8158;Inherit;True;Property;_High1Tex;HighLight Two;7;1;[NoScaleOffset];Create;False;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.OneMinusNode;393;-2397.197,94.33471;Inherit;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.SamplerNode;62;-2481.591,651.8398;Inherit;True;Property;_MainTex;Base;1;1;[NoScaleOffset];Create;True;0;0;0;False;0;False;-1;None;dff50b2a8af16ca45a7af6c1217fe162;True;0;False;white;Auto;False;Object;-1;MipLevel;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.SamplerNode;62;-2481.591,651.8398;Inherit;True;Property;_MainTex;Base;1;1;[NoScaleOffset];Create;False;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;MipLevel;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 Node;AmplifyShaderEditor.OneMinusNode;396;-2397.834,257.4658;Inherit;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.RangedFloatNode;377;-2817.374,409.0841;Inherit;False;Property;_HighLightBrightness;HighLight Brightness;3;0;Create;True;0;0;0;False;0;False;1;2;0;0;0;1;FLOAT;0 Node;AmplifyShaderEditor.SimpleAddOpNode;386;-2540.903,149.5288;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.OneMinusNode;383;-2396.313,175.7564;Inherit;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.LerpOp;392;-2138.381,-59.6656;Inherit;True;3;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.RangedFloatNode;377;-2817.374,409.0841;Inherit;False;Property;_HighLightBrightness;HighLight Brightness;3;0;Create;True;0;0;0;False;0;False;1;1;0;0;0;1;FLOAT;0 Node;AmplifyShaderEditor.LerpOp;397;-2124.084,400.1891;Inherit;True;3;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.LerpOp;381;-2133.926,162.9593;Inherit;True;3;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.LerpOp;392;-2138.381,-59.6656;Inherit;True;3;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.OneMinusNode;383;-2396.313,175.7564;Inherit;False;1;0;COLOR;0,0,0,0;False;1;COLOR;0 Node;AmplifyShaderEditor.CommentaryNode;325;-1872,-992;Inherit;False;1347.069;756.9989;Comment;11;85;84;87;88;83;82;86;89;91;247;90;Lights;0.579394,1,0,1;0;0 +Node;AmplifyShaderEditor.LerpOp;381;-2133.926,162.9593;Inherit;True;3;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;1;COLOR;0 Node;AmplifyShaderEditor.ToggleSwitchNode;395;-1809.888,71.73196;Inherit;False;Property;_Switch1and2;Switch 1 and 2 ;2;0;Create;True;0;0;0;False;0;False;0;True;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.FunctionNode;82;-1824,-944;Inherit;False;Is_There_A_Light;-1;;640;692d888142f187d479d5e6f976e674b0;0;0;2;FLOAT;0;FLOAT;15 -Node;AmplifyShaderEditor.StaticSwitch;391;-1812.175,271.3702;Inherit;False;Property;_NumberofHighLights;Number of HighLights;5;0;Create;True;0;0;0;False;0;False;0;0;1;True;;KeywordEnum;2;One;Two;Create;False;True;9;1;COLOR;0,0,0,0;False;0;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;3;COLOR;0,0,0,0;False;4;COLOR;0,0,0,0;False;5;COLOR;0,0,0,0;False;6;COLOR;0,0,0,0;False;7;COLOR;0,0,0,0;False;8;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.FunctionNode;82;-1824,-944;Inherit;False;Is_There_A_Light;-1;;640;98bba35e0adeb7a4db4bb32317e70d55;0;0;2;FLOAT;0;FLOAT;15 +Node;AmplifyShaderEditor.StaticSwitch;391;-1812.175,271.3702;Inherit;False;Property;_NumberofHighLights;Number of HighLights;5;0;Create;True;0;0;0;False;0;False;0;1;1;True;;KeywordEnum;2;One;Two;Create;False;True;9;1;COLOR;0,0,0,0;False;0;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;3;COLOR;0,0,0,0;False;4;COLOR;0,0,0,0;False;5;COLOR;0,0,0,0;False;6;COLOR;0,0,0,0;False;7;COLOR;0,0,0,0;False;8;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.StaticSwitch;390;-1969.297,748.0529;Inherit;False;Property;_HasHighlight;Has Highlight;4;0;Create;True;0;0;0;False;0;False;0;0;0;True;;KeywordEnum;2;Yes;No;Create;False;True;9;1;COLOR;0,0,0,0;False;0;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;3;COLOR;0,0,0,0;False;4;COLOR;0,0,0,0;False;5;COLOR;0,0,0,0;False;6;COLOR;0,0,0,0;False;7;COLOR;0,0,0,0;False;8;COLOR;0,0,0,0;False;1;COLOR;0 Node;AmplifyShaderEditor.CommentaryNode;327;-896,1168;Inherit;False;1617.594;695.9377;Comment;12;338;337;336;335;334;333;332;331;330;329;328;398;Light Autist;0.4860944,1,0,1;0;0 Node;AmplifyShaderEditor.RegisterLocalVarNode;90;-1536,-944;Inherit;False;Isworldlight;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.StaticSwitch;390;-1969.297,748.0529;Inherit;False;Property;_HasHighlight;Has Highlight;4;0;Create;True;0;0;0;False;0;False;0;1;0;True;;KeywordEnum;2;Yes;No;Create;False;True;9;1;COLOR;0,0,0,0;False;0;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;3;COLOR;0,0,0,0;False;4;COLOR;0,0,0,0;False;5;COLOR;0,0,0,0;False;6;COLOR;0,0,0,0;False;7;COLOR;0,0,0,0;False;8;COLOR;0,0,0,0;False;1;COLOR;0 Node;AmplifyShaderEditor.RegisterLocalVarNode;158;-1744.723,799.8381;Inherit;False;BaseTexture;-1;True;1;0;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.CommentaryNode;324;323.5219,-1788.889;Inherit;False;983.0802;394.0726;Comment;6;352;64;78;95;351;271;Shading;1,0,0,1;0;0 +Node;AmplifyShaderEditor.LightColorNode;329;-864,1424;Inherit;False;0;3;COLOR;0;FLOAT3;1;FLOAT;2 Node;AmplifyShaderEditor.LightAttenuation;331;-864,1552;Inherit;False;0;1;FLOAT;0 Node;AmplifyShaderEditor.RangedFloatNode;328;-864,1232;Inherit;False;Constant;_LightColour;Light Colour;6;1;[Enum];Create;True;0;2;Automatic;0;Fake;1;0;False;0;False;0;0;0;0;0;1;FLOAT;0 Node;AmplifyShaderEditor.GetLocalVarNode;330;-864,1328;Inherit;False;90;Isworldlight;1;0;OBJECT;;False;1;FLOAT;0 -Node;AmplifyShaderEditor.CommentaryNode;324;323.5219,-1788.889;Inherit;False;983.0802;394.0726;Comment;6;352;64;78;95;351;271;Shading;1,0,0,1;0;0 -Node;AmplifyShaderEditor.LightColorNode;329;-864,1424;Inherit;False;0;3;COLOR;0;FLOAT3;1;FLOAT;2 Node;AmplifyShaderEditor.TFHCIf;334;-592,1248;Inherit;False;6;0;FLOAT;0;False;1;FLOAT;1;False;2;FLOAT;0;False;3;FLOAT;0;False;4;FLOAT;0;False;5;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.RangedFloatNode;398;-614.5943,1604.579;Inherit;False;Property;_FallBackBrightness1;FallBack Brightness;8;0;Create;True;0;0;0;False;0;False;0.6;0;0;1;0;1;FLOAT;0 -Node;AmplifyShaderEditor.GetLocalVarNode;271;443.1941,-1666.888;Inherit;False;158;BaseTexture;1;0;OBJECT;;False;1;COLOR;0 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;333;-592,1440;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;FLOAT;0;False;1;COLOR;0 +Node;AmplifyShaderEditor.RangedFloatNode;398;-614.5943,1604.579;Inherit;False;Property;_FallBackBrightness;FallBack Brightness;8;0;Create;True;0;0;0;False;0;False;0.6;0.6;0;1;0;1;FLOAT;0 +Node;AmplifyShaderEditor.GetLocalVarNode;271;443.1941,-1666.888;Inherit;False;158;BaseTexture;1;0;OBJECT;;False;1;COLOR;0 Node;AmplifyShaderEditor.RangedFloatNode;95;432.1845,-1570.234;Inherit;False;Constant;_LightSmoothness;Light Smoothness;3;0;Create;True;0;0;0;False;0;False;0.26;0.4;0;0;0;1;FLOAT;0 Node;AmplifyShaderEditor.SimpleMaxOpNode;335;-96,1552;Inherit;False;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.TFHCIf;336;-192,1360;Inherit;False;6;0;FLOAT;0;False;1;FLOAT;0;False;2;COLOR;0,0,0,0;False;3;FLOAT;0;False;4;FLOAT;0;False;5;FLOAT;0;False;1;COLOR;0 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;351;681.7751,-1703.547;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.TFHCIf;336;-192,1360;Inherit;False;6;0;FLOAT;0;False;1;FLOAT;0;False;2;COLOR;0,0,0,0;False;3;FLOAT;0;False;4;FLOAT;0;False;5;FLOAT;0;False;1;COLOR;0 Node;AmplifyShaderEditor.StaticSwitch;337;64,1360;Inherit;False;Property;_Keyword0;Keyword 0;10;0;Create;True;0;0;0;False;0;False;0;0;0;False;UNITY_PASS_FORWARDADD;Toggle;2;Key0;Key1;Fetch;False;True;9;1;COLOR;0,0,0,0;False;0;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;3;COLOR;0,0,0,0;False;4;COLOR;0,0,0,0;False;5;COLOR;0,0,0,0;False;6;COLOR;0,0,0,0;False;7;COLOR;0,0,0,0;False;8;COLOR;0,0,0,0;False;1;COLOR;0 Node;AmplifyShaderEditor.LerpOp;78;859.1939,-1628.888;Inherit;False;3;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;2;FLOAT;0;False;1;COLOR;0 -Node;AmplifyShaderEditor.RegisterLocalVarNode;338;432,1360;Inherit;False;Globnallightcolour;-1;True;1;0;COLOR;0,0,0,0;False;1;COLOR;0 Node;AmplifyShaderEditor.CommentaryNode;326;-482,21.46355;Inherit;False;1237.712;1021.536;Comment;4;0;119;339;340;Outputs;0.981343,1,0,1;0;0 +Node;AmplifyShaderEditor.RegisterLocalVarNode;338;432,1360;Inherit;False;Globnallightcolour;-1;True;1;0;COLOR;0,0,0,0;False;1;COLOR;0 Node;AmplifyShaderEditor.RegisterLocalVarNode;64;1051.194,-1628.888;Inherit;False;Shadow;-1;True;1;0;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.GetLocalVarNode;119;40.02758,390.2436;Inherit;False;64;Shadow;1;0;OBJECT;;False;1;COLOR;0 Node;AmplifyShaderEditor.CommentaryNode;56;-1344,592;Inherit;False;794.4915;416.6398;Light ;4;55;53;52;58;ViewDIr;1,1,1,1;0;0 -Node;AmplifyShaderEditor.GetLocalVarNode;119;80,304;Inherit;False;64;Shadow;1;0;OBJECT;;False;1;COLOR;0 -Node;AmplifyShaderEditor.GetLocalVarNode;339;16,208;Inherit;False;338;Globnallightcolour;1;0;OBJECT;;False;1;COLOR;0 -Node;AmplifyShaderEditor.ViewDirInputsCoordNode;55;-1232,816;Inherit;False;World;False;0;4;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3 -Node;AmplifyShaderEditor.SimpleMultiplyOpNode;340;288,224;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.GetLocalVarNode;339;-23.97242,294.2436;Inherit;False;338;Globnallightcolour;1;0;OBJECT;;False;1;COLOR;0 Node;AmplifyShaderEditor.RangedFloatNode;87;-1824,-352;Inherit;False;Constant;_ViewDirY;ViewDir Y;8;0;Create;True;0;0;0;False;0;False;0;0;-200;200;0;1;FLOAT;0 Node;AmplifyShaderEditor.RegisterLocalVarNode;352;929.0795,-1719.013;Inherit;False;EyeSSS;-1;True;1;0;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.RangedFloatNode;85;-1824,-640;Inherit;False;Constant;_FakeDirX;FakeDir X ;7;0;Create;True;0;0;0;False;0;False;0;0;-200;200;0;1;FLOAT;0 -Node;AmplifyShaderEditor.RangedFloatNode;84;-1824,-816;Inherit;False;Constant;_LightDirection;Light Direction;2;1;[Enum];Create;True;0;2;Normal;0;ViewDirection;1;0;False;0;False;0;0;0;0;0;1;FLOAT;0 -Node;AmplifyShaderEditor.DotProductOpNode;53;-976,720;Inherit;False;2;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.WorldSpaceLightDirHlpNode;52;-1296,640;Inherit;False;True;1;0;FLOAT;0;False;4;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3 -Node;AmplifyShaderEditor.RegisterLocalVarNode;247;-1008,-656;Inherit;False;NDV;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.RegisterLocalVarNode;91;-768,-800;Inherit;False;NDL;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.RangedFloatNode;88;-1824,-464;Inherit;False;Constant;_ViewDirX;ViewDir X;9;0;Create;True;0;0;0;False;0;False;0;0;-200;200;0;1;FLOAT;0 -Node;AmplifyShaderEditor.RangedFloatNode;83;-1824,-736;Inherit;False;Constant;_FallbackLight;Fallback Light ;2;1;[Enum];Create;True;0;2;Automatic;0;Fake;1;0;False;0;False;1;0;0;0;0;1;FLOAT;0 Node;AmplifyShaderEditor.RegisterLocalVarNode;58;-800,736;Inherit;False;Viewdir_light;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 -Node;AmplifyShaderEditor.RangedFloatNode;86;-1824,-560;Inherit;False;Constant;_FakeDirY;FakeDir Y;6;0;Create;True;0;0;0;False;0;False;0;0;-200;200;0;1;FLOAT;0 -Node;AmplifyShaderEditor.FunctionNode;89;-1472,-688;Inherit;False;Dot_Creation;-1;;641;2e5876d4432839c4c9496c6ced2f9534;0;7;12;FLOAT;0;False;17;FLOAT;0;False;16;FLOAT;0;False;29;FLOAT;0;False;28;FLOAT;0;False;33;FLOAT;0;False;34;FLOAT;0;False;3;FLOAT;0;FLOAT;42;FLOAT;52 +Node;AmplifyShaderEditor.SimpleMultiplyOpNode;340;248.0276,310.2436;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.RangedFloatNode;83;-1824,-736;Inherit;False;Constant;_FallbackLight;Fallback Light ;2;1;[Enum];Create;True;0;2;Automatic;0;Fake;1;0;False;0;False;1;0;0;0;0;1;FLOAT;0 +Node;AmplifyShaderEditor.DotProductOpNode;53;-976,720;Inherit;False;2;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.RangedFloatNode;85;-1824,-640;Inherit;False;Constant;_FakeDirX;FakeDir X ;7;0;Create;True;0;0;0;False;0;False;0;0;-200;200;0;1;FLOAT;0 +Node;AmplifyShaderEditor.ViewDirInputsCoordNode;55;-1232,816;Inherit;False;World;False;0;4;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3 +Node;AmplifyShaderEditor.RangedFloatNode;88;-1824,-464;Inherit;False;Constant;_ViewDirX;ViewDir X;9;0;Create;True;0;0;0;False;0;False;0;0;-200;200;0;1;FLOAT;0 +Node;AmplifyShaderEditor.RegisterLocalVarNode;247;-1008,-656;Inherit;False;NDV;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.RangedFloatNode;84;-1824,-816;Inherit;False;Constant;_LightDirection;Light Direction;2;1;[Enum];Create;True;0;2;Normal;0;ViewDirection;1;0;False;0;False;0;0;0;0;0;1;FLOAT;0 +Node;AmplifyShaderEditor.FunctionNode;89;-1472,-688;Inherit;False;Dot_Creation;-1;;641;5dc6ab91272cf5948b2879e6e6e1078b;0;7;12;FLOAT;0;False;17;FLOAT;0;False;16;FLOAT;0;False;29;FLOAT;0;False;28;FLOAT;0;False;33;FLOAT;0;False;34;FLOAT;0;False;3;FLOAT;0;FLOAT;42;FLOAT;52 Node;AmplifyShaderEditor.ColorNode;332;-864,1648;Inherit;False;Constant;_FakeColourtint;Fake Colour tint;5;0;Create;True;0;0;0;False;0;False;1,1,1,0;1,1,1,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 +Node;AmplifyShaderEditor.RegisterLocalVarNode;91;-768,-800;Inherit;False;NDL;-1;True;1;0;FLOAT;0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.WorldSpaceLightDirHlpNode;52;-1296,640;Inherit;False;True;1;0;FLOAT;0;False;4;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3 +Node;AmplifyShaderEditor.RangedFloatNode;86;-1824,-560;Inherit;False;Constant;_FakeDirY;FakeDir Y;6;0;Create;True;0;0;0;False;0;False;0;0;-200;200;0;1;FLOAT;0 Node;AmplifyShaderEditor.StandardSurfaceOutputNode;0;492.7116,71.46355;Float;False;True;-1;2;ASEMaterialInspector;0;0;CustomLighting;Nars/UmaMusume/Eyes;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;Back;0;False;-1;0;False;-1;False;0;False;-1;0;False;-1;False;0;Opaque;0.5;True;True;0;False;Opaque;;Geometry;All;14;all;True;True;True;True;0;False;-1;False;0;False;-1;255;False;-1;255;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;False;2;15;10;25;False;0.5;False;0;0;False;-1;0;False;-1;0;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;0;0,0,0,0;VertexOffset;True;False;Cylindrical;False;Relative;0;;-1;-1;-1;-1;0;False;0;0;False;-1;-1;0;False;-1;0;0;0;False;0.1;False;-1;0;False;-1;False;15;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;2;FLOAT3;0,0,0;False;3;FLOAT3;0,0,0;False;4;FLOAT;0;False;6;FLOAT3;0,0,0;False;7;FLOAT3;0,0,0;False;8;FLOAT;0;False;9;FLOAT;0;False;10;FLOAT;0;False;13;FLOAT3;0,0,0;False;11;FLOAT3;0,0,0;False;12;FLOAT3;0,0,0;False;14;FLOAT4;0,0,0,0;False;15;FLOAT3;0,0,0;False;0 +WireConnection;388;0;387;0 WireConnection;353;0;358;0 WireConnection;353;1;359;0 WireConnection;370;0;371;0 @@ -252,25 +253,24 @@ WireConnection;373;0;374;0 WireConnection;373;1;375;0 WireConnection;367;0;368;0 WireConnection;367;1;369;0 -WireConnection;388;0;387;0 -WireConnection;385;1;388;0 -WireConnection;380;1;388;0 WireConnection;360;1;353;0 WireConnection;360;0;367;0 WireConnection;360;2;370;0 WireConnection;360;3;373;0 +WireConnection;380;1;388;0 +WireConnection;385;1;388;0 WireConnection;393;0;380;0 WireConnection;62;1;360;0 WireConnection;396;0;385;0 WireConnection;386;0;380;0 WireConnection;386;1;385;0 -WireConnection;383;0;386;0 -WireConnection;392;0;377;0 -WireConnection;392;1;62;0 -WireConnection;392;2;393;0 WireConnection;397;0;377;0 WireConnection;397;1;62;0 WireConnection;397;2;396;0 +WireConnection;392;0;377;0 +WireConnection;392;1;62;0 +WireConnection;392;2;393;0 +WireConnection;383;0;386;0 WireConnection;381;0;377;0 WireConnection;381;1;62;0 WireConnection;381;2;383;0 @@ -278,20 +278,20 @@ WireConnection;395;0;392;0 WireConnection;395;1;397;0 WireConnection;391;1;395;0 WireConnection;391;0;381;0 -WireConnection;90;0;82;0 WireConnection;390;1;391;0 WireConnection;390;0;62;0 +WireConnection;90;0;82;0 WireConnection;158;0;390;0 WireConnection;334;0;328;0 WireConnection;334;4;330;0 WireConnection;333;0;329;0 WireConnection;333;1;331;0 WireConnection;335;1;333;0 +WireConnection;351;0;271;0 +WireConnection;351;1;271;0 WireConnection;336;0;334;0 WireConnection;336;2;333;0 WireConnection;336;3;398;0 -WireConnection;351;0;271;0 -WireConnection;351;1;271;0 WireConnection;337;1;336;0 WireConnection;337;0;335;0 WireConnection;78;0;351;0 @@ -299,21 +299,19 @@ WireConnection;78;1;271;0 WireConnection;78;2;95;0 WireConnection;338;0;337;0 WireConnection;64;0;78;0 +WireConnection;352;0;351;0 +WireConnection;58;0;53;0 WireConnection;340;0;339;0 WireConnection;340;1;119;0 -WireConnection;352;0;351;0 WireConnection;53;0;52;0 WireConnection;53;1;55;0 WireConnection;247;0;89;42 -WireConnection;91;0;89;0 -WireConnection;58;0;53;0 WireConnection;89;12;82;0 WireConnection;89;17;84;0 WireConnection;89;16;83;0 WireConnection;89;29;85;0 WireConnection;89;28;86;0 -WireConnection;89;33;88;0 -WireConnection;89;34;87;0 +WireConnection;91;0;89;0 WireConnection;0;13;340;0 ASEEND*/ -//CHKSM=3AB46B0CE8F6F32B264DF2FBCA3719D91A8FB914 \ No newline at end of file +//CHKSM=3963268F096DE90B785301DE9C805620CE6CB8D1 \ No newline at end of file diff --git a/Assets/NarsShader/Shaders/UmaMusume Eyes.shader.meta b/Assets/NarsShader/Shaders/UmaMusume Eyes.shader.meta index c2ec6fa..bdbee2d 100644 --- a/Assets/NarsShader/Shaders/UmaMusume Eyes.shader.meta +++ b/Assets/NarsShader/Shaders/UmaMusume Eyes.shader.meta @@ -4,6 +4,7 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] + preprocessorOverride: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/NarsShader/Shaders/UmaMusume.shader b/Assets/NarsShader/Shaders/UmaMusume.shader index cda2293..e58f09f 100644 --- a/Assets/NarsShader/Shaders/UmaMusume.shader +++ b/Assets/NarsShader/Shaders/UmaMusume.shader @@ -26,7 +26,7 @@ Shader "Nars/UmaMusume/Body" SubShader { Tags{ "RenderType" = "TransparentCutout" "Queue" = "AlphaTest+0"} - Cull Front + Cull Back CGPROGRAM #pragma target 3.0 #pragma surface outlineSurf Outline nofog keepalpha noshadow noambient novertexlights nolightmap nodynlightmap nodirlightmap nometa noforwardadd vertex:outlineVertexDataFunc diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index c841c07..2478763 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -1709,7 +1709,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 255, y: -30} - m_SizeDelta: {x: 75, y: -60} + m_SizeDelta: {x: 130, y: -60} m_Pivot: {x: 0, y: 0.5} --- !u!114 &270183827 MonoBehaviour: @@ -4870,7 +4870,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 255, y: -30} - m_SizeDelta: {x: 75, y: -60} + m_SizeDelta: {x: 120, y: -60} m_Pivot: {x: 0, y: 0.5} --- !u!114 &952551665 MonoBehaviour: @@ -8679,8 +8679,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: 0, y: 0} - m_SizeDelta: {x: -10, y: -10} + m_AnchoredPosition: {x: 4.9999695, y: -5} + m_SizeDelta: {x: -10.000061, y: -10} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2053969671 MonoBehaviour: @@ -8729,8 +8729,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 12 + m_fontSizeBase: 12 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/Scripts/UmaContainer.cs b/Assets/Scripts/UmaContainer.cs index f17d59e..8ed5b8c 100644 --- a/Assets/Scripts/UmaContainer.cs +++ b/Assets/Scripts/UmaContainer.cs @@ -14,8 +14,7 @@ public class UmaContainer : MonoBehaviour [Header("Generic")] public bool IsGeneric = false; - /// 0 - costume ID, 1 - ?, 2 - ?, 3 - skin color, 4 - socks, 5 - bust - public string[] GenericVariables; + public string VarCostumeIdShort, VarCostumeIdLong, VarSkin, VarHeight, VarSocks, VarBust; public List GenericBodyTextures = new List(); [Header("Mini")] diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index be2feec..f47805f 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -57,22 +57,26 @@ public class UmaViewerBuilder : MonoBehaviour private void LoadNormalUma(int id, string costumeId) { JObject charaData = CurrentContainer.CharaData; - bool genericCostume = CurrentContainer.IsGeneric = costumeId.Length == 4; - string[] vars = null; + bool genericCostume = CurrentContainer.IsGeneric = costumeId.Length >= 4; string skin = (string)charaData["skin"], + height = (string)charaData["height"], socks = (string)charaData["socks"], - bust = (string)charaData["bust"]; + bust = (string)charaData["bust"], + costumeIdShort = ""; UmaDatabaseEntry asset = null; if (genericCostume) { - CurrentContainer.GenericVariables = vars = new string[6] { costumeId, "00", "00", skin, socks, bust }; - for (int i = 0; i < 3; i++) - { - string body = UmaDatabaseController.BodyPath + $"bdy{costumeId}_00/pfb_bdy{costumeId}_00_0{i}_{0}_{0}_{bust}"; - asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == body); - if (asset != null) break; - } + costumeIdShort = costumeId.Remove(costumeId.LastIndexOf('_')); + CurrentContainer.VarCostumeIdShort = costumeIdShort; + CurrentContainer.VarCostumeIdLong = costumeId; + CurrentContainer.VarBust = bust; + CurrentContainer.VarSkin = skin; + CurrentContainer.VarSocks = socks; + CurrentContainer.VarHeight = height; + string body = UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/pfb_bdy{costumeId}_{height}_{0}_{bust}"; + Debug.Log("Looking for " + body); + asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == body); } else asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == UmaDatabaseController.BodyPath + $"bdy{id}_{costumeId}/pfb_bdy{id}_{costumeId}"); @@ -84,19 +88,23 @@ public class UmaViewerBuilder : MonoBehaviour else if (genericCostume) { string texPattern1 = "", texPattern2 = ""; - switch (costumeId) + switch (costumeId.Split('_')[0]) { case "0001": - texPattern1 = $"tex_bdy{costumeId}_00_{"00"}_{skin}_{socks}_0{bust}"; - texPattern2 = $"tex_bdy{costumeId}_00_00_0_{socks}_00_"; + texPattern1 = $"tex_bdy{costumeIdShort}_00_{skin}_{socks}_0{bust}"; + texPattern2 = $"tex_bdy{costumeIdShort}_00_0_{socks}_00_"; + break; + case "0003": + texPattern1 = $"tex_bdy{costumeIdShort}_00_{skin}_{bust}"; + texPattern2 = $"tex_bdy{costumeIdShort}_00_0_{bust}"; break; case "0006": //last var is color? - texPattern1 = $"tex_bdy{costumeId}_00_{"00"}_{skin}_{bust}_0{0}"; - texPattern2 = $"tex_bdy{costumeId}_00_00_0_{bust}_00_"; + texPattern1 = $"tex_bdy{costumeId}_{skin}_{bust}_0{0}"; + texPattern2 = $"tex_bdy{costumeId}_0_{bust}_00_"; break; default: - texPattern1 = $"tex_bdy{costumeId}_00_{"00"}_{skin}_{bust}"; - texPattern2 = $"tex_bdy{costumeId}_00_00_0_{bust}"; + texPattern1 = $"tex_bdy{costumeId}_{skin}_{bust}"; + texPattern2 = $"tex_bdy{costumeId}_0_{bust}"; break; } Debug.Log(texPattern1 + " " + texPattern2); @@ -156,24 +164,20 @@ public class UmaViewerBuilder : MonoBehaviour { JObject charaData = CurrentContainer.CharaData; CurrentContainer.IsMini = true; - bool isGeneric = CurrentContainer.IsGeneric = costumeId.Length == 4; - bool customHead = true; - string[] vars = null; + bool isGeneric = CurrentContainer.IsGeneric = costumeId.Length >= 4; string skin = (string)charaData["skin"], + height = (string)charaData["height"], socks = (string)charaData["socks"], bust = (string)charaData["bust"], - cos0003 = costumeId == "0003" ? "1" : "0"; + costumeIdShort = ""; + bool customHead = true; UmaDatabaseEntry asset = null; if (isGeneric) { - CurrentContainer.GenericVariables = vars = new string[6] { costumeId, "00", "00", skin, socks, bust }; - for (int i = 0; i < 3; i++) - { - string body = $"3d/chara/mini/body/mbdy{costumeId}_0{i}/pfb_mbdy{costumeId}_0{i}_0{cos0003}_0"; - asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == body); - if (asset != null) break; - } + costumeIdShort = costumeId.Remove(costumeId.LastIndexOf('_')); + string body = $"3d/chara/mini/body/mbdy{costumeIdShort}/pfb_mbdy{costumeId}_0"; + asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == body); } else asset = UmaViewerMain.Instance.AbList.FirstOrDefault(a => a.Name == $"3d/chara/mini/body/mbdy{id}_{costumeId}/pfb_mbdy{id}_{costumeId}"); if (asset == null) @@ -183,7 +187,16 @@ public class UmaViewerBuilder : MonoBehaviour } else if (isGeneric) { - string texPattern1 = $"tex_mbdy{costumeId}_0{cos0003}_{"00"}_{skin}_{0}"; + string texPattern1 = ""; + switch (costumeId.Split('_')[0]) + { + case "0003": + texPattern1 = $"tex_mbdy{costumeIdShort}_00_{skin}_{0}"; + break; + default: + texPattern1 = $"tex_mbdy{costumeId}_{skin}_{0}"; + break; + } //Load Body Textures foreach (var asset1 in UmaViewerMain.Instance.AbList.Where(a => a.Name.StartsWith("3d/chara/mini/body/") && a.Name.Contains(texPattern1))) { @@ -352,12 +365,12 @@ public class UmaViewerBuilder : MonoBehaviour if (CurrentContainer.IsGeneric) { List textures = CurrentContainer.GenericBodyTextures; - string costumeId = CurrentContainer.GenericVariables[0], - var1 = CurrentContainer.GenericVariables[1], - var2 = CurrentContainer.GenericVariables[2], - skin = CurrentContainer.GenericVariables[3], - socks = CurrentContainer.GenericVariables[4], - bust = CurrentContainer.GenericVariables[5]; + string costumeIdShort = CurrentContainer.VarCostumeIdShort, + costumeIdLong = CurrentContainer.VarCostumeIdLong, + height = CurrentContainer.VarHeight, + skin = CurrentContainer.VarSkin, + socks = CurrentContainer.VarSocks, + bust = CurrentContainer.VarBust; foreach (Renderer r in CurrentContainer.Body.GetComponentsInChildren()) { @@ -371,28 +384,35 @@ public class UmaViewerBuilder : MonoBehaviour else { m.shader = Shader.Find("Nars/UmaMusume/Body"); - switch (costumeId) //costume ID + switch (costumeIdShort.Split('_')[0]) //costume ID { case "0001": - mainTex = $"tex_bdy{costumeId}_{var1}_{var2}_{skin}_{socks}_{bust.PadLeft(2, '0')}_diff"; - toonMap = $"tex_bdy{costumeId}_{var1}_{var2}_{skin}_{socks}_{bust.PadLeft(2, '0')}_shad_c"; - tripleMap = $"tex_bdy{costumeId}_00_00_0_{socks}_00_base"; - optionMap = $"tex_bdy{costumeId}_00_00_0_{socks}_00_ctrl"; + mainTex = $"tex_bdy{costumeIdShort}_00_{skin}_{socks}_{bust.PadLeft(2, '0')}_diff"; + toonMap = $"tex_bdy{costumeIdShort}_00_{skin}_{socks}_{bust.PadLeft(2, '0')}_shad_c"; + tripleMap = $"tex_bdy{costumeIdShort}_00_0_{socks}_00_base"; + optionMap = $"tex_bdy{costumeIdShort}_00_0_{socks}_00_ctrl"; + break; + case "0003": + mainTex = $"tex_bdy{costumeIdShort}_00_{skin}_{bust}_diff"; + toonMap = $"tex_bdy{costumeIdShort}_00_{skin}_{bust}_shad_c"; + tripleMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_base"; + optionMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_ctrl"; break; case "0006": - mainTex = $"tex_bdy{costumeId}_{var1}_{var2}_{skin}_{bust}_{"00"}_diff"; - toonMap = $"tex_bdy{costumeId}_{var1}_{var2}_{skin}_{bust}_{"00"}_shad_c"; - tripleMap = $"tex_bdy{costumeId}_00_00_0_{bust}_00_base"; - optionMap = $"tex_bdy{costumeId}_00_00_0_{bust}_00_ctrl"; + 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; default: - mainTex = $"tex_bdy{costumeId}_{var1}_{var2}_{skin}_{bust}_diff"; - toonMap = $"tex_bdy{costumeId}_{var1}_{var2}_{skin}_{bust}_shad_c"; - tripleMap = $"tex_bdy{costumeId}_00_00_0_{bust}_base"; - optionMap = $"tex_bdy{costumeId}_00_00_0_{bust}_ctrl"; + mainTex = $"tex_bdy{costumeIdLong}_{skin}_{bust}_diff"; + toonMap = $"tex_bdy{costumeIdLong}_{skin}_{bust}_shad_c"; + tripleMap = $"tex_bdy{costumeIdLong}_0_{bust}_base"; + optionMap = $"tex_bdy{costumeIdLong}_0_{bust}_ctrl"; break; } + Debug.Log("Looking for texture " + mainTex); m.SetTexture("_MainTex", textures.FirstOrDefault(t => t.name == mainTex)); m.SetTexture("_ToonMap", textures.FirstOrDefault(t => t.name == toonMap)); m.SetTexture("_TripleMaskMap", textures.FirstOrDefault(t => t.name == tripleMap)); @@ -452,26 +472,36 @@ public class UmaViewerBuilder : MonoBehaviour m.SetTexture("_MainTex", CurrentContainer.MiniHeadTextures.First(t => t.name.Contains("mayu"))); } } - switch (m.shader.name) + else { - case "Gallop/3D/Chara/MultiplyCheek": - m.CopyPropertiesFromMaterial(InvisibleMaterial); - break; - case "Gallop/3D/Chara/ToonEye/T": - case "Nars/UmaMusume/Eyes": - m.shader = Shader.Find("Nars/UmaMusume/Eyes"); - break; - case "Gallop/3D/Chara/ToonFace/TSER": - case "Nars/UmaMusume/Face": - m.shader = Shader.Find("Nars/UmaMusume/Face"); - break; - case "Gallop/3D/Chara/ToonHair/TSER": - m.shader = Shader.Find("Nars/UmaMusume/Body"); - break; - default: - Debug.LogError(m.shader.name); - // m.shader = Shader.Find("Nars/UmaMusume/Body"); - break; + switch (m.shader.name) + { + case "Gallop/3D/Chara/MultiplyCheek": + m.CopyPropertiesFromMaterial(InvisibleMaterial); + break; + case "Gallop/3D/Chara/ToonEye/T": + case "Nars/UmaMusume/Eyes": + m.shader = Shader.Find("Nars/UmaMusume/Eyes"); + foreach(var tex in m.GetTexturePropertyNames()) + { + if(m.GetTexture(tex) != null) + { + m.GetTexture(tex).wrapMode = TextureWrapMode.Repeat; + } + } + break; + case "Gallop/3D/Chara/ToonFace/TSER": + case "Nars/UmaMusume/Face": + m.shader = Shader.Find("Nars/UmaMusume/Face"); + break; + case "Gallop/3D/Chara/ToonHair/TSER": + m.shader = Shader.Find("Nars/UmaMusume/Body"); + break; + default: + Debug.LogError(m.shader.name); + // m.shader = Shader.Find("Nars/UmaMusume/Body"); + break; + } } } } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 02150c8..3c9b34d 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -53,7 +53,7 @@ public class UmaViewerUI : MonoBehaviour if (LoadedAssetCount > 1) LoadedAssetsText.text += "\n"; LoadedAssetsText.text += asset; - LoadedAssetsPanel.sizeDelta = new Vector2(0, LoadedAssetCount * 20); + LoadedAssetsPanel.sizeDelta = new Vector2(0, LoadedAssetCount * LoadedAssetsText.fontSize * 2.4f); } public void LoadedAssetsClear() @@ -145,16 +145,17 @@ public class UmaViewerUI : MonoBehaviour }); } //Common costumes - List costumes = new List(); + List costumes = new List(); nameVar = mini ? "pfb_mbdy0" : $"pfb_bdy0"; foreach (var entry in Main.AbList.Where(a => a.Name.StartsWith("3d/chara/") && a.Name.Contains("/body/") && !a.Name.Contains("/clothes/") && a.Name.Contains(nameVar))) { - int id = int.Parse(Path.GetFileName(entry.Name).Split('_')[1].Substring(mini? 4: 3)); + string id = Path.GetFileName(entry.Name); + id = id.Split('_')[1].Substring(mini ? 4 : 3) + "_" + id.Split('_')[2] + "_" + id.Split('_')[3]; if (!costumes.Contains(id)) { costumes.Add(id); var container = Instantiate(UmaContainerPrefab, costumeList.content).GetComponent(); - string costumeId = container.Name.text = container.name = id.ToString().PadLeft(4,'0'); + string costumeId = container.Name.text = container.name = id; container.Button.onClick.AddListener(() => { HighlightChildImage(costumeList.content, container.GetComponent()); StartCoroutine(Builder.LoadUma(umaId, costumeId, mini)); diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index b4412a5..170fa8a 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -28,6 +28,7 @@ GraphicsSettings: m_LensFlare: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} @@ -39,8 +40,8 @@ GraphicsSettings: - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 4800000, guid: 5ab62aa7fc808ce438fddff06ba6cfcc, type: 3} - - {fileID: 4800000, guid: e3ec72c447c574843985008b8c3a9eb6, type: 3} - - {fileID: 4800000, guid: bafb718b94eb1fd4583c32f845efd992, type: 3} + - {fileID: 4800000, guid: 0f906fb5c12bff84fbbd0e789a01014c, type: 3} + - {fileID: 4800000, guid: 7ec653cb0fc8e8a4fab3acba9f70478c, type: 3} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} @@ -65,5 +66,5 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_AllowEnlightenSupportForUpgradedProject: 0