From d36d5af4662c40c081417719f6257b299f0c93f1 Mon Sep 17 00:00:00 2001 From: yzx Date: Fri, 21 Jun 2024 13:56:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../工具/Mat/遮罩材质球/Electroprobe_mat.mat | 5 +- .../现场Scenes/现场_Profiles/现场.asset | 48 ++++++++ .../SXElectricityInformationAcquisition.sln | 109 +++++++----------- 3 files changed, 93 insertions(+), 69 deletions(-) diff --git a/SXElectricityInformationAcquisition/Assets/Model/工具/Mat/遮罩材质球/Electroprobe_mat.mat b/SXElectricityInformationAcquisition/Assets/Model/工具/Mat/遮罩材质球/Electroprobe_mat.mat index 6bc33b06..84f5c734 100644 --- a/SXElectricityInformationAcquisition/Assets/Model/工具/Mat/遮罩材质球/Electroprobe_mat.mat +++ b/SXElectricityInformationAcquisition/Assets/Model/工具/Mat/遮罩材质球/Electroprobe_mat.mat @@ -12,7 +12,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _SWITCHOFEMI_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -109,12 +110,14 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SwitchOfEmi: 1 - _UVSec: 0 - _Whiteint: 0 - _ZWrite: 1 - __dirty: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmiCol: {r: 8, g: 0, b: 0, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _Int_E: {r: 76.15007, g: 76.15007, b: 76.15007, a: 0} - _MainCol: {r: 1, g: 1, b: 1, a: 0} diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset b/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset index a66d9b69..839b4dfe 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset +++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场Scenes/现场_Profiles/现场.asset @@ -67,6 +67,54 @@ MonoBehaviour: settings: - {fileID: -1851505970847268626} - {fileID: 7474006403498107821} + - {fileID: 3579922850427680025} +--- !u!114 &3579922850427680025 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48a79b01ea5641d4aa6daa2e23605641, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + enabled: + overrideState: 1 + value: 1 + intensity: + overrideState: 1 + value: 1 + threshold: + overrideState: 1 + value: 1 + softKnee: + overrideState: 0 + value: 0.5 + clamp: + overrideState: 0 + value: 65472 + diffusion: + overrideState: 0 + value: 7 + anamorphicRatio: + overrideState: 0 + value: 0 + color: + overrideState: 0 + value: {r: 1, g: 1, b: 1, a: 1} + fastMode: + overrideState: 0 + value: 0 + dirtTexture: + overrideState: 0 + value: {fileID: 0} + defaultState: 1 + dirtIntensity: + overrideState: 0 + value: 0 --- !u!114 &7474006403498107821 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln b/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln index 8618ec7c..1b37a01c 100644 --- a/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln +++ b/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln @@ -1,90 +1,63 @@  -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Core", "NaughtyAttributes.Core.csproj", "{70C866B3-6982-AEAE-4186-8220020279AA}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Core", "NaughtyAttributes.Core.csproj", "{b366c870-8269-aeae-4186-8220020279aa}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{328AEAE8-36DB-0919-A8A7-26F06060F4D3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{e8ea8a32-db36-1909-a8a7-26f06060f4d3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{D8880EA9-DBBA-9941-850A-29EEEE6B3832}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{a90e88d8-badb-4199-850a-29eeee6b3832}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{431CD62F-2442-CB9F-8A4A-9397608E2318}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{2fd61c43-4224-9fcb-8a4a-9397608e2318}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{edefe799-dc28-4dd2-3165-1acb9e1a5d82}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Test", "NaughtyAttributes.Test.csproj", "{804E5D77-8A7B-13C1-E64A-F0327B5A51D2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Test", "NaughtyAttributes.Test.csproj", "{775d4e80-7b8a-c113-e64a-f0327b5a51d2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Editor", "NaughtyAttributes.Editor.csproj", "{89912F7C-9D47-5C67-B95E-C95F88C2A560}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaughtyAttributes.Editor", "NaughtyAttributes.Editor.csproj", "{7c2f9189-479d-675c-b95e-c95f88c2a560}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotionFramework", "MotionFramework.csproj", "{8526E427-FBAD-A00A-06E3-F5025D183005}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotionFramework", "MotionFramework.csproj", "{27e42685-adfb-0aa0-06e3-f5025d183005}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{4d0abe3e-2eff-5141-cb61-b756eb38b78b}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{CA93E3BA-F2B3-5C03-979C-FF7E0D806194}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{bae393ca-b3f2-035c-979c-ff7e0d806194}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{2D23DF76-3788-F610-4EB2-65D4B80D2C66}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{76df232d-8837-10f6-4eb2-65d4b80d2c66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{5569EEC5-5613-62FE-795C-07A46B224741}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{c5ee6955-1356-fe62-795c-07a46b224741}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{53349ADB-6DD3-9261-985B-3E8CC856B5BD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{db9a3453-d36d-6192-985b-3e8cc856b5bd}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {70C866B3-6982-AEAE-4186-8220020279AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70C866B3-6982-AEAE-4186-8220020279AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70C866B3-6982-AEAE-4186-8220020279AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70C866B3-6982-AEAE-4186-8220020279AA}.Release|Any CPU.Build.0 = Release|Any CPU - {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {328AEAE8-36DB-0919-A8A7-26F06060F4D3}.Release|Any CPU.Build.0 = Release|Any CPU - {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8880EA9-DBBA-9941-850A-29EEEE6B3832}.Release|Any CPU.Build.0 = Release|Any CPU - {431CD62F-2442-CB9F-8A4A-9397608E2318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {431CD62F-2442-CB9F-8A4A-9397608E2318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {431CD62F-2442-CB9F-8A4A-9397608E2318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {431CD62F-2442-CB9F-8A4A-9397608E2318}.Release|Any CPU.Build.0 = Release|Any CPU - {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99E7EFED-28DC-D24D-3165-1ACB9E1A5D82}.Release|Any CPU.Build.0 = Release|Any CPU - {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {804E5D77-8A7B-13C1-E64A-F0327B5A51D2}.Release|Any CPU.Build.0 = Release|Any CPU - {89912F7C-9D47-5C67-B95E-C95F88C2A560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89912F7C-9D47-5C67-B95E-C95F88C2A560}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89912F7C-9D47-5C67-B95E-C95F88C2A560}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89912F7C-9D47-5C67-B95E-C95F88C2A560}.Release|Any CPU.Build.0 = Release|Any CPU - {8526E427-FBAD-A00A-06E3-F5025D183005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8526E427-FBAD-A00A-06E3-F5025D183005}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8526E427-FBAD-A00A-06E3-F5025D183005}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8526E427-FBAD-A00A-06E3-F5025D183005}.Release|Any CPU.Build.0 = Release|Any CPU - {3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3EBE0A4D-FF2E-4151-CB61-B756EB38B78B}.Release|Any CPU.Build.0 = Release|Any CPU - {CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA93E3BA-F2B3-5C03-979C-FF7E0D806194}.Release|Any CPU.Build.0 = Release|Any CPU - {2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D23DF76-3788-F610-4EB2-65D4B80D2C66}.Release|Any CPU.Build.0 = Release|Any CPU - {5569EEC5-5613-62FE-795C-07A46B224741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5569EEC5-5613-62FE-795C-07A46B224741}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5569EEC5-5613-62FE-795C-07A46B224741}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5569EEC5-5613-62FE-795C-07A46B224741}.Release|Any CPU.Build.0 = Release|Any CPU - {53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53349ADB-6DD3-9261-985B-3E8CC856B5BD}.Release|Any CPU.Build.0 = Release|Any CPU + {b366c870-8269-aeae-4186-8220020279aa}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {b366c870-8269-aeae-4186-8220020279aa}.Debug|Any CPU.Build.0 = Debug|Any CPU + {e8ea8a32-db36-1909-a8a7-26f06060f4d3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {e8ea8a32-db36-1909-a8a7-26f06060f4d3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {a90e88d8-badb-4199-850a-29eeee6b3832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {a90e88d8-badb-4199-850a-29eeee6b3832}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2fd61c43-4224-9fcb-8a4a-9397608e2318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2fd61c43-4224-9fcb-8a4a-9397608e2318}.Debug|Any CPU.Build.0 = Debug|Any CPU + {edefe799-dc28-4dd2-3165-1acb9e1a5d82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {edefe799-dc28-4dd2-3165-1acb9e1a5d82}.Debug|Any CPU.Build.0 = Debug|Any CPU + {775d4e80-7b8a-c113-e64a-f0327b5a51d2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {775d4e80-7b8a-c113-e64a-f0327b5a51d2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7c2f9189-479d-675c-b95e-c95f88c2a560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7c2f9189-479d-675c-b95e-c95f88c2a560}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27e42685-adfb-0aa0-06e3-f5025d183005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27e42685-adfb-0aa0-06e3-f5025d183005}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.Build.0 = Debug|Any CPU + {bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.Build.0 = Debug|Any CPU + {76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.Build.0 = Debug|Any CPU + {db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE