huangjiayu
/
H_SafeExperienceDrivingSystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://172.16.1.12/huangjiayu/H_SafeExperienceDrivingSystem 

# Conflicts:
#	U3D_DrivingSystem/Logs/shadercompiler-AssetImportWorker0.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe0.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe1.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe10.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe11.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe12.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe13.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe14.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe15.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe2.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe3.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe4.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe5.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe6.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe7.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe8.log
#	U3D_DrivingSystem/Logs/shadercompiler-UnityShaderCompiler.exe9.log
This commit is contained in:
yzx 2024-01-03 17:36:16 +08:00
parent b0436f2f3a eaa8abd788
commit 9452b66dea
7 changed files with 5025 additions and 4901 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2701
U3D_DrivingSystem/AmplifyShaderEditor.csproj
View File

File diff suppressed because it is too large Load Diff

1584
U3D_DrivingSystem/Assembly-CSharp-Editor.csproj
View File

File diff suppressed because it is too large Load Diff

1389
U3D_DrivingSystem/Boxophobic.AtmosphericHeightFog.Editor.csproj
View File

File diff suppressed because it is too large Load Diff

1355
U3D_DrivingSystem/Boxophobic.AtmosphericHeightFog.Runtime.csproj
View File

File diff suppressed because it is too large Load Diff

1455
U3D_DrivingSystem/Boxophobic.Utils.Editor.csproj
View File

File diff suppressed because it is too large Load Diff

1381
U3D_DrivingSystem/Boxophobic.Utils.Scripts.csproj
View File

File diff suppressed because it is too large Load Diff

61
U3D_DrivingSystem/U3D_DrivingSystem.sln
View File

@ -1,39 +1,54 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{34b3d790-0799-11d2-326f-33d0ff6f6206}"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{90D7B334-9907-D211-326F-33D0FF6F6206}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Boxophobic.Utils.Scripts", "Boxophobic.Utils.Scripts.csproj", "{e23bffcd-3f7f-6434-c8d9-78b1ae3bc3c2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Boxophobic.Utils.Scripts", "Boxophobic.Utils.Scripts.csproj", "{CDFF3BE2-7F3F-3464-C8D9-78B1AE3BC3C2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Boxophobic.AtmosphericHeightFog.Runtime", "Boxophobic.AtmosphericHeightFog.Runtime.csproj", "{12bd964c-ebf6-4008-dc94-863a1f7d1d40}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Boxophobic.AtmosphericHeightFog.Runtime", "Boxophobic.AtmosphericHeightFog.Runtime.csproj", "{4C96BD12-F6EB-0840-DC94-863A1F7D1D40}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmplifyShaderEditor", "AmplifyShaderEditor.csproj", "{cc0d6819-6d6e-7745-34a0-666ccea436db}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmplifyShaderEditor", "AmplifyShaderEditor.csproj", "{19680DCC-6E6D-4577-34A0-666CCEA436DB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Boxophobic.AtmosphericHeightFog.Editor", "Boxophobic.AtmosphericHeightFog.Editor.csproj", "{c3b5b72f-5083-1c5d-9f5a-f691307d3efb}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Boxophobic.AtmosphericHeightFog.Editor", "Boxophobic.AtmosphericHeightFog.Editor.csproj", "{2FB7B5C3-8350-5D1C-9F5A-F691307D3EFB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Boxophobic.Utils.Editor", "Boxophobic.Utils.Editor.csproj", "{7d7f23ee-d234-aed9-0263-133c3f95283c}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Boxophobic.Utils.Editor", "Boxophobic.Utils.Editor.csproj", "{EE237F7D-34D2-D9AE-0263-133C3F95283C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{00ffad50-a18b-1355-3a1b-93449eb2679c}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{50ADFF00-8BA1-5513-3A1B-93449EB2679C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{34b3d790-0799-11d2-326f-33d0ff6f6206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{34b3d790-0799-11d2-326f-33d0ff6f6206}.Debug|Any CPU.Build.0 = Debug|Any CPU
{e23bffcd-3f7f-6434-c8d9-78b1ae3bc3c2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{e23bffcd-3f7f-6434-c8d9-78b1ae3bc3c2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12bd964c-ebf6-4008-dc94-863a1f7d1d40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12bd964c-ebf6-4008-dc94-863a1f7d1d40}.Debug|Any CPU.Build.0 = Debug|Any CPU
{cc0d6819-6d6e-7745-34a0-666ccea436db}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{cc0d6819-6d6e-7745-34a0-666ccea436db}.Debug|Any CPU.Build.0 = Debug|Any CPU
{c3b5b72f-5083-1c5d-9f5a-f691307d3efb}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{c3b5b72f-5083-1c5d-9f5a-f691307d3efb}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7d7f23ee-d234-aed9-0263-133c3f95283c}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7d7f23ee-d234-aed9-0263-133c3f95283c}.Debug|Any CPU.Build.0 = Debug|Any CPU
{00ffad50-a18b-1355-3a1b-93449eb2679c}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{00ffad50-a18b-1355-3a1b-93449eb2679c}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90D7B334-9907-D211-326F-33D0FF6F6206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{90D7B334-9907-D211-326F-33D0FF6F6206}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90D7B334-9907-D211-326F-33D0FF6F6206}.Release|Any CPU.ActiveCfg = Release|Any CPU
{90D7B334-9907-D211-326F-33D0FF6F6206}.Release|Any CPU.Build.0 = Release|Any CPU
{CDFF3BE2-7F3F-3464-C8D9-78B1AE3BC3C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CDFF3BE2-7F3F-3464-C8D9-78B1AE3BC3C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CDFF3BE2-7F3F-3464-C8D9-78B1AE3BC3C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CDFF3BE2-7F3F-3464-C8D9-78B1AE3BC3C2}.Release|Any CPU.Build.0 = Release|Any CPU
{4C96BD12-F6EB-0840-DC94-863A1F7D1D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4C96BD12-F6EB-0840-DC94-863A1F7D1D40}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4C96BD12-F6EB-0840-DC94-863A1F7D1D40}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4C96BD12-F6EB-0840-DC94-863A1F7D1D40}.Release|Any CPU.Build.0 = Release|Any CPU
{19680DCC-6E6D-4577-34A0-666CCEA436DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{19680DCC-6E6D-4577-34A0-666CCEA436DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{19680DCC-6E6D-4577-34A0-666CCEA436DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{19680DCC-6E6D-4577-34A0-666CCEA436DB}.Release|Any CPU.Build.0 = Release|Any CPU
{2FB7B5C3-8350-5D1C-9F5A-F691307D3EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FB7B5C3-8350-5D1C-9F5A-F691307D3EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FB7B5C3-8350-5D1C-9F5A-F691307D3EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FB7B5C3-8350-5D1C-9F5A-F691307D3EFB}.Release|Any CPU.Build.0 = Release|Any CPU
{EE237F7D-34D2-D9AE-0263-133C3F95283C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EE237F7D-34D2-D9AE-0263-133C3F95283C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE237F7D-34D2-D9AE-0263-133C3F95283C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE237F7D-34D2-D9AE-0263-133C3F95283C}.Release|Any CPU.Build.0 = Release|Any CPU
{50ADFF00-8BA1-5513-3A1B-93449EB2679C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{50ADFF00-8BA1-5513-3A1B-93449EB2679C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{50ADFF00-8BA1-5513-3A1B-93449EB2679C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{50ADFF00-8BA1-5513-3A1B-93449EB2679C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE