Compare commits

...

3 Commits

Author SHA1 Message Date
shengtao 7597b28ecf tijiao 2023-12-25 16:37:37 +08:00
shengtao b241927d98 tijiao 2023-12-25 16:37:13 +08:00
shengtao 2a2e950a51 tijiao 2023-12-25 16:36:32 +08:00
12 changed files with 5750 additions and 5755 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -46,6 +46,8 @@ Transform:
- {fileID: 4657373496878803144}
- {fileID: 4657373498705921597}
- {fileID: 4657373498407789405}
- {fileID: 5287776230694416841}
- {fileID: 5287776229620031823}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -365,6 +367,81 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 5127605427314593524}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5127605427321199848
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5127605427742172959}
m_Modifications:
- target: {fileID: 361076472953808669, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_Name
value: "\u6536\u8D39\u7AD9"
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalPosition.x
value: 506.29004
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalPosition.y
value: 9.483309
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalPosition.z
value: 177.19698
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_RootOrder
value: 20
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: eda9250adb496d54fabb5e6d91300804, type: 3}
--- !u!4 &5287776229620031823 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
m_PrefabInstance: {fileID: 5127605427321199848}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5127605427358540246
PrefabInstance:
m_ObjectHideFlags: 0
@ -765,6 +842,81 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 5127605428377729708}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5127605428394560622
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5127605427742172959}
m_Modifications:
- target: {fileID: 361076472953808669, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_Name
value: "\u6536\u8D39\u7AD9 (1)"
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalPosition.x
value: 478.44995
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalPosition.y
value: 9.609609
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalPosition.z
value: -252.80302
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_RootOrder
value: 19
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: eda9250adb496d54fabb5e6d91300804, type: 3}
--- !u!4 &5287776230694416841 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1029386489875266983, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
m_PrefabInstance: {fileID: 5127605428394560622}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5127605428616214298
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -567,7 +567,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 33f4fd91a0dab0949a8808f5b1da26fc, type: 2}
- {fileID: 2100000, guid: c5fc97667fe31584a9a616eab4821c37, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -683,7 +683,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 33f4fd91a0dab0949a8808f5b1da26fc, type: 2}
- {fileID: 2100000, guid: c5fc97667fe31584a9a616eab4821c37, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -792,7 +792,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 8d5d327ab3cca784f874ace4eeb1f2c1, type: 2}
- {fileID: 2100000, guid: 034137786182aab4c992cb89e1c19bf4, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1305,7 +1305,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: d148e681a2eb8884bb5e897e6074b259, type: 2}
- {fileID: 2100000, guid: 810dc8dd16f56fb4484344507166973a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1930,7 +1930,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: e0b579ceafe38af4aba46fc0d90c5105, type: 2}
- {fileID: 2100000, guid: 7c8ed7524e95b674f8eeea2154cf3446, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -2714,7 +2714,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 33f4fd91a0dab0949a8808f5b1da26fc, type: 2}
- {fileID: 2100000, guid: c5fc97667fe31584a9a616eab4821c37, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

View File

@ -37472,9 +37472,7 @@ Transform:
- {fileID: 1618723418}
- {fileID: 1714661631}
- {fileID: 721520511}
- {fileID: 2029942617}
- {fileID: 1472842927}
- {fileID: 955557855}
m_Father: {fileID: 0}
m_RootOrder: 29
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -76644,6 +76642,8 @@ Transform:
m_Father: {fileID: 108138218}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
<<<<<<< HEAD
=======
--- !u!1001 &955557854
PrefabInstance:
m_ObjectHideFlags: 0
@ -76759,6 +76759,7 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 955557854}
m_PrefabAsset: {fileID: 0}
>>>>>>> d146636315bf4ab594ab7b9ec560c36a622b4330
--- !u!1 &955848275
GameObject:
m_ObjectHideFlags: 0
@ -171488,6 +171489,8 @@ Transform:
m_Father: {fileID: 847587943}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
<<<<<<< HEAD
=======
--- !u!1001 &2029942616
PrefabInstance:
m_ObjectHideFlags: 0
@ -171603,6 +171606,7 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2029942616}
m_PrefabAsset: {fileID: 0}
>>>>>>> d146636315bf4ab594ab7b9ec560c36a622b4330
--- !u!1 &2030469274
GameObject:
m_ObjectHideFlags: 0
@ -195025,6 +195029,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5127605427742172959, guid: a16844af23c3a354f95dac2298da1d0b,
type: 3}
<<<<<<< HEAD
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5127605427742172959, guid: a16844af23c3a354f95dac2298da1d0b,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5127605427742172959, guid: a16844af23c3a354f95dac2298da1d0b,
type: 3}
=======
>>>>>>> d146636315bf4ab594ab7b9ec560c36a622b4330
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +1,2 @@
m_EditorVersion: 2021.1.24f1
m_EditorVersionWithRevision: 2021.1.24f1 (6667702a1e7c)
m_EditorVersion: 2019.4.0f1
m_EditorVersionWithRevision: 2019.4.0f1 (0af376155913)

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}"
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}") = "Boxophobic.Utils.Editor", "Boxophobic.Utils.Editor.csproj", "{EE237F7D-34D2-D9AE-0263-133C3F95283C}"
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}") = "AmplifyShaderEditor", "AmplifyShaderEditor.csproj", "{19680DCC-6E6D-4577-34A0-666CCEA436DB}"
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}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{50ADFF00-8BA1-5513-3A1B-93449EB2679C}"
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}") = "Boxophobic.AtmosphericHeightFog.Editor", "Boxophobic.AtmosphericHeightFog.Editor.csproj", "{2FB7B5C3-8350-5D1C-9F5A-F691307D3EFB}"
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
{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
{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
{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
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE