diff --git a/Assets/000_assets/material/M_head_01.mat b/Assets/000_assets/material/M_head_01.mat index 96b034f9..e4b9ebb7 100644 --- a/Assets/000_assets/material/M_head_01.mat +++ b/Assets/000_assets/material/M_head_01.mat @@ -42,6 +42,7 @@ Material: - _VTOAR_ON - _VTOTEXAR_ON - _VTOTEXUVCLIP_ON + - _ZWRITE_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -228,6 +229,7 @@ Material: - _VTORemap: 0 - _VTOTex_Uspeed: 0 - _VTOTex_Vspeed: 0 + - _ZWrite: 1 - _Ztest: 8 - _Zwrite: 0 - __dirty: 1 diff --git a/Assets/000_assets/material/M_head_02.mat b/Assets/000_assets/material/M_head_02.mat index ec082964..aef96ef6 100644 --- a/Assets/000_assets/material/M_head_02.mat +++ b/Assets/000_assets/material/M_head_02.mat @@ -42,6 +42,7 @@ Material: - _VTOAR_ON - _VTOTEXAR_ON - _VTOTEXUVCLIP_ON + - _ZWRITE_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -228,6 +229,7 @@ Material: - _VTORemap: 0 - _VTOTex_Uspeed: 0 - _VTOTex_Vspeed: 0 + - _ZWrite: 1 - _Ztest: 8 - _Zwrite: 0 - __dirty: 1 diff --git a/Assets/Shaders/ShaderExtension.cs b/Assets/Shaders/ShaderExtension.cs new file mode 100644 index 00000000..ce74d872 --- /dev/null +++ b/Assets/Shaders/ShaderExtension.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public static class ShaderExtension +{ + /// + /// 对于从AssetBundle中加载的材质,修改Shader参数可能会出现异常情况。 + /// 此时需要在生成物体的时候,重新初始化Shader。 + /// + public static void InitializeShader(this Renderer renderer) + { + foreach (Material material in renderer.materials) + { + string shaderName = material.shader.name; + Shader shader = Shader.Find(shaderName); + + if (shader != null) + { + material.shader = shader; + } + else + { + Debug.LogWarning($"Shader '{shaderName}' not found for material '{material.name}' on renderer '{renderer.name}'."); + } + } + } +} diff --git a/Assets/Shaders/ShaderExtension.cs.meta b/Assets/Shaders/ShaderExtension.cs.meta new file mode 100644 index 00000000..9458ae4b --- /dev/null +++ b/Assets/Shaders/ShaderExtension.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b74e31a7b06bb9743b629a923718f2c2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/TrackShader.shader b/Assets/Shaders/TrackShader.shader index 567bb57b..be54d17b 100755 --- a/Assets/Shaders/TrackShader.shader +++ b/Assets/Shaders/TrackShader.shader @@ -6,7 +6,7 @@ Shader "Soullies/TrackShader" { [HideInInspector] _AlphaCutoff("Alpha Cutoff ", Range(0, 1)) = 0.5 _MainTexture("MainTexture", 2D) = "white" {} - [HDR]_BaseColor("BaseColor", Color) = (0,0,0,0) + _BaseColor("BaseColor", Color) = (0,0,0,0) [HDR]_EmissionColor("EmissionColor", Color) = (0,0,0,0) [Toggle(_USEREDASALPHA_ON)] _UseRedAsAlpha("UseRedAsAlpha", Float) = 1 [Toggle(_EMISSION_ON)] _Emission("Emission", Float) = 0 @@ -159,11 +159,11 @@ Shader "Soullies/TrackShader" float staticSwitch28 = break10.a; #endif float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28)); - float4 temp_cast_0 = (1.0).xxxx; + float4 color52 = IsGammaSpace() ? float4(1,1,1,1) : float4(1,1,1,1); #ifdef _EMISSION_ON float4 staticSwitch31 = _EmissionColor; #else - float4 staticSwitch31 = temp_cast_0; + float4 staticSwitch31 = color52; #endif float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch31 ); @@ -318,11 +318,11 @@ Shader "Soullies/TrackShader" float staticSwitch28 = break10.a; #endif float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28)); - float4 temp_cast_0 = (1.0).xxxx; + float4 color52 = IsGammaSpace() ? float4(1,1,1,1) : float4(1,1,1,1); #ifdef _EMISSION_ON float4 staticSwitch31 = _EmissionColor; #else - float4 staticSwitch31 = temp_cast_0; + float4 staticSwitch31 = color52; #endif float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch31 ); @@ -461,11 +461,11 @@ Shader "Soullies/TrackShader" float staticSwitch28 = break10.a; #endif float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28)); - float4 temp_cast_0 = (1.0).xxxx; + float4 color52 = IsGammaSpace() ? float4(1,1,1,1) : float4(1,1,1,1); #ifdef _EMISSION_ON float4 staticSwitch31 = _EmissionColor; #else - float4 staticSwitch31 = temp_cast_0; + float4 staticSwitch31 = color52; #endif float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch31 ); @@ -582,11 +582,11 @@ Shader "Soullies/TrackShader" float staticSwitch28 = break10.a; #endif float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28)); - float4 temp_cast_0 = (1.0).xxxx; + float4 color52 = IsGammaSpace() ? float4(1,1,1,1) : float4(1,1,1,1); #ifdef _EMISSION_ON float4 staticSwitch31 = _EmissionColor; #else - float4 staticSwitch31 = temp_cast_0; + float4 staticSwitch31 = color52; #endif float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch31 ); @@ -604,21 +604,21 @@ Shader "Soullies/TrackShader" } /*ASEBEGIN Version=19501 -Node;AmplifyShaderEditor.SamplerNode;6;-992,-272;Inherit;True;Property;_MainTexture;MainTexture;0;0;Create;True;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;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 +Node;AmplifyShaderEditor.SamplerNode;6;-992,-272;Inherit;True;Property;_MainTexture;MainTexture;0;0;Create;True;0;0;0;False;0;False;-1;None;b48cbbfc5b4a8f243b7275d66a4961f7;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;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 Node;AmplifyShaderEditor.BreakToComponentsNode;10;-672,-272;Inherit;False;COLOR;1;0;COLOR;0,0,0,0;False;16;FLOAT;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT;5;FLOAT;6;FLOAT;7;FLOAT;8;FLOAT;9;FLOAT;10;FLOAT;11;FLOAT;12;FLOAT;13;FLOAT;14;FLOAT;15 -Node;AmplifyShaderEditor.StaticSwitch;28;-496,-160;Inherit;False;Property;_UseRedAsAlpha;UseRedAsAlpha;3;0;Create;True;0;0;0;False;0;False;0;1;0;True;;Toggle;2;Key0;Key1;Create;True;True;All;9;1;FLOAT;0;False;0;FLOAT;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;FLOAT;0 -Node;AmplifyShaderEditor.DynamicAppendNode;13;-192,-288;Inherit;False;COLOR;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;COLOR;0 -Node;AmplifyShaderEditor.ColorNode;8;-368,-16;Inherit;False;Property;_BaseColor;BaseColor;1;1;[HDR];Create;True;0;0;0;False;0;False;0,0,0,0;1,1,1,1;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 -Node;AmplifyShaderEditor.ColorNode;20;-96,128;Inherit;False;Property;_EmissionColor;EmissionColor;2;1;[HDR];Create;True;0;0;0;False;0;False;0,0,0,0;1,1,1,1;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 -Node;AmplifyShaderEditor.RangedFloatNode;30;-48,0;Inherit;False;Constant;_Float0;Float 0;6;0;Create;True;0;0;0;False;0;False;1;0;0;0;0;1;FLOAT;0 +Node;AmplifyShaderEditor.StaticSwitch;28;-496,-160;Inherit;False;Property;_UseRedAsAlpha;UseRedAsAlpha;3;0;Create;True;0;0;0;False;0;False;0;1;1;True;;Toggle;2;Key0;Key1;Create;True;True;All;9;1;FLOAT;0;False;0;FLOAT;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;FLOAT;0 +Node;AmplifyShaderEditor.ColorNode;8;-368,-16;Inherit;False;Property;_BaseColor;BaseColor;1;0;Create;True;0;0;0;False;0;False;0,0,0,0;1,1,1,1;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 +Node;AmplifyShaderEditor.DynamicAppendNode;13;-192,-272;Inherit;False;COLOR;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;COLOR;0 +Node;AmplifyShaderEditor.ColorNode;20;-80,208;Inherit;False;Property;_EmissionColor;EmissionColor;2;1;[HDR];Create;True;0;0;0;False;0;False;0,0,0,0;1,1,1,1;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 +Node;AmplifyShaderEditor.ColorNode;52;-80,16;Inherit;False;Constant;_Color0;Color 0;6;0;Create;True;0;0;0;False;0;False;1,1,1,1;0,0,0,0;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;14;-16,-192;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 Node;AmplifyShaderEditor.StaticSwitch;31;192,-16;Inherit;False;Property;_Emission;Emission;4;0;Create;True;0;0;0;False;0;False;0;0;1;True;;Toggle;2;Key0;Key1;Create;True;True;All;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.SimpleMultiplyOpNode;21;416,-144;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.RangedFloatNode;51;-992,-64;Inherit;False;Property;_ZWrite;ZWrite;5;1;[Toggle];Create;True;0;0;0;True;0;False;1;0;0;1;0;1;FLOAT;0 +Node;AmplifyShaderEditor.RangedFloatNode;51;-992,-64;Inherit;False;Property;_ZWrite;ZWrite;5;1;[Toggle];Create;True;0;0;0;True;0;False;1;1;0;1;0;1;FLOAT;0 Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;46;704,-160;Float;False;True;-1;2;ASEMaterialInspector;0;15;Soullies/TrackShader;cf964e524c8e69742b1d21fbe2ebcc4a;True;Sprite Unlit;0;0;Sprite Unlit;4;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;3;True;12;all;0;False;True;2;5;False;;10;False;;3;1;False;;10;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;True;True;True;True;0;False;;False;False;False;False;False;False;False;True;False;0;False;;255;False;;255;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;True;True;1;True;_ZWrite;True;3;False;;True;True;0;False;;0;False;;True;1;LightMode=Universal2D;False;False;0;Hidden/InternalErrorShader;0;0;Standard;3;Vertex Position;1;0;Debug Display;0;0;External Alpha;0;0;0;4;True;True;True;True;False;;False;0 -Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;47;704,-160;Float;False;False;-1;2;ASEMaterialInspector;0;1;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;Sprite Unlit Forward;0;1;Sprite Unlit Forward;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;True;2;5;False;;10;False;;3;1;False;;10;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;True;True;True;True;0;False;;False;False;False;False;False;False;False;True;False;0;False;;255;False;;255;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;False;True;1;True;;True;3;False;;True;True;0;False;;0;False;;True;1;LightMode=UniversalForward;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 -Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;48;704,-160;Float;False;False;-1;2;ASEMaterialInspector;0;1;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;SceneSelectionPass;0;2;SceneSelectionPass;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;1;LightMode=SceneSelectionPass;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 -Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;49;704,-160;Float;False;False;-1;2;ASEMaterialInspector;0;1;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;ScenePickingPass;0;3;ScenePickingPass;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;1;LightMode=Picking;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;47;704,-160;Float;False;False;-1;2;ASEMaterialInspector;0;15;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;Sprite Unlit Forward;0;1;Sprite Unlit Forward;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;True;2;5;False;;10;False;;3;1;False;;10;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;True;True;True;True;0;False;;False;False;False;False;False;False;False;True;False;0;False;;255;False;;255;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;False;True;1;True;;True;3;False;;True;True;0;False;;0;False;;True;1;LightMode=UniversalForward;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;48;704,-160;Float;False;False;-1;2;ASEMaterialInspector;0;15;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;SceneSelectionPass;0;2;SceneSelectionPass;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;1;LightMode=SceneSelectionPass;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;49;704,-160;Float;False;False;-1;2;ASEMaterialInspector;0;15;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;ScenePickingPass;0;3;ScenePickingPass;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;1;LightMode=Picking;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 WireConnection;10;0;6;0 WireConnection;28;1;10;3 WireConnection;28;0;10;0 @@ -628,10 +628,10 @@ WireConnection;13;2;10;2 WireConnection;13;3;28;0 WireConnection;14;0;13;0 WireConnection;14;1;8;0 -WireConnection;31;1;30;0 +WireConnection;31;1;52;0 WireConnection;31;0;20;0 WireConnection;21;0;14;0 WireConnection;21;1;31;0 WireConnection;46;1;21;0 ASEEND*/ -//CHKSM=9B261206D5ECC659CAE607754FAE66AA556FA1C2 \ No newline at end of file +//CHKSM=153CC78E2A8D4184FECF78C9032F5E0DC8E5F8A2 \ No newline at end of file diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 index a46cb88c..244f73f1 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 and b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest index 90367d78..8b0abc3c 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 2566507415 +CRC: 3714027365 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/basic b/Assets/StreamingAssets/ThemeBundles/Windows64/basic index 01ca7868..71675b6f 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/basic and b/Assets/StreamingAssets/ThemeBundles/Windows64/basic differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest index ce8d7807..bdad25dd 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 3789341463 +CRC: 661435127 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 40fae216763050e8a2fa1605583026d4 + Hash: 6a699909a2b8b0cbfa59d426ac5be7f8 TypeTreeHash: serializedVersion: 2 Hash: 56e0d5e6ef758974f5dde53487e37491 IncrementalBuildHash: serializedVersion: 2 - Hash: 40fae216763050e8a2fa1605583026d4 + Hash: 6a699909a2b8b0cbfa59d426ac5be7f8 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse index 1d0b8a89..3260f2d3 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse and b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest index c3125667..d3d449f6 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 1366381981 +CRC: 3671632175 Hashes: AssetFileHash: serializedVersion: 2 - Hash: fb173c362bc2c652f4e01aaee8dd1372 + Hash: a7f1fbf5b07451a4fd9eaf0395081760 TypeTreeHash: serializedVersion: 2 Hash: 5e24545750d5bc6a54ed40af3f398b27 IncrementalBuildHash: serializedVersion: 2 - Hash: fb173c362bc2c652f4e01aaee8dd1372 + Hash: a7f1fbf5b07451a4fd9eaf0395081760 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit b/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit index 1d3f980b..496e7402 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit and b/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest index 53bd0748..129cb030 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 795522552 +CRC: 898680499 Hashes: AssetFileHash: serializedVersion: 2 - Hash: f0d67eef6f0debbc7a9654dd4e0efb19 + Hash: fc0e20eced21837b17a06e3985f2987c TypeTreeHash: serializedVersion: 2 Hash: eb6b412a839e0c091d53441d3abb674f IncrementalBuildHash: serializedVersion: 2 - Hash: f0d67eef6f0debbc7a9654dd4e0efb19 + Hash: fc0e20eced21837b17a06e3985f2987c HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab index 874a9914..cd275b99 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab +++ b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab @@ -4882,12 +4882,19 @@ MonoBehaviour: headPoint: {fileID: 3994922298271009688} headCircle: {fileID: 4454787625577937599} trailBody: {fileID: 8375375593942259461} + isHeadEnabled: 0 renderers: - {fileID: 3450978525971767550} - {fileID: 7892561681603727877} - {fileID: 5282853774221774356} headCircleParticle: {fileID: 284290158934927271} - isHeadEnabled: 0 + visibleTimeLength: + value: 0 + currentAnimationIndex: 0 + animations: [] + isSwitchingReturnType: 0 + lastReturnType: 0 + returnType: 0 enableTimes: value: 0 animations: [] diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/DTMTrail.cs b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/DTMTrail.cs index 8be6745d..b44f9adb 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/DTMTrail.cs +++ b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/DTMTrail.cs @@ -48,7 +48,8 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse dtmTrail.headSize = headSize; dtmTrail.SetUpTweeners(); - + + dtmTrail.renderers.ForEach(rend => rend.InitializeShader()); return dtmTrail; } @@ -84,12 +85,17 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse if (colorSubmodule.emissionEnabled) { rend.material.EnableKeyword("_EMISSION_ON"); + Debug.Log("Enable emission"); } else { rend.material.DisableKeyword("_EMISSION_ON"); } - + + + rend.material.EnableKeyword("_USEREDASALPHA_ON"); + Debug.Log(rend.material.IsKeywordEnabled("_EMISSION_ON") + " " + rend.material.IsKeywordEnabled("_USEREDASALPHA_ON")); + rend.material.SetColor("_BaseColor", colorSubmodule.currentBaseColor); rend.material.SetColor("_EmissionColor", colorSubmodule.GetCurrentEmissionColor()); });