From 0b562b7f659d70304e88f6a90771095ee12bd526 Mon Sep 17 00:00:00 2001 From: ninemine <1371605831@qq.com> Date: Sat, 29 Nov 2025 00:42:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=8F=E7=9A=846000?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/ES3/ES3Defaults.asset | 1 - Convention/[Runtime]/Config.cs | 40 +++++++- Convention/[Visual]/[Prefabs]/Root.prefab | 96 ++++++++++++------- 3 files changed, 99 insertions(+), 38 deletions(-) diff --git a/Convention/[ES3]/Easy Save 3/Resources/ES3/ES3Defaults.asset b/Convention/[ES3]/Easy Save 3/Resources/ES3/ES3Defaults.asset index 8174533..3a5b58a 100644 --- a/Convention/[ES3]/Easy Save 3/Resources/ES3/ES3Defaults.asset +++ b/Convention/[ES3]/Easy Save 3/Resources/ES3/ES3Defaults.asset @@ -32,7 +32,6 @@ MonoBehaviour: assemblyNames: - Assembly-CSharp - Assembly-CSharp-firstpass - - Cinemachine - Dreamteck.Splines - Dreamteck.Utilities - EasySave3 diff --git a/Convention/[Runtime]/Config.cs b/Convention/[Runtime]/Config.cs index e034b08..90d8051 100644 --- a/Convention/[Runtime]/Config.cs +++ b/Convention/[Runtime]/Config.cs @@ -1,5 +1,4 @@ -using Convention.WindowsUI; -using System; +using System; using System.Collections; using System.Collections.Generic; using System.IO; @@ -8,7 +7,9 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Text; using System.Threading; +using Convention.WindowsUI; using UnityEditor; +using UnityEditor.Build; using UnityEngine; using UnityEngine.Events; using UnityEngine.SceneManagement; @@ -2199,6 +2200,39 @@ namespace Convention public static class ScriptingDefineUtility { #if UNITY_EDITOR + +#if UNITY_6000_0_OR_NEWER + public static void Add(string define, NamedBuildTarget target, bool log = false) + { + string definesString = PlayerSettings.GetScriptingDefineSymbols(target); + if (definesString.Contains(define)) return; + string[] allDefines = definesString.Split(';'); + ArrayUtility.Add(ref allDefines, define); + definesString = string.Join(";", allDefines); + PlayerSettings.SetScriptingDefineSymbols(target, definesString); + Debug.Log("Added \"" + define + "\" from " + EditorUserBuildSettings.selectedBuildTargetGroup + " Scripting define in Player Settings"); + } + + public static void Remove(string define, NamedBuildTarget target, bool log = false) + { + string definesString = PlayerSettings.GetScriptingDefineSymbols(target); + if (!definesString.Contains(define)) return; + string[] allDefines = definesString.Split(';'); + ArrayUtility.Remove(ref allDefines, define); + definesString = string.Join(";", allDefines); + PlayerSettings.SetScriptingDefineSymbols(target, definesString); + Debug.Log("Removed \"" + define + "\" from " + EditorUserBuildSettings.selectedBuildTargetGroup + " Scripting define in Player Settings"); + } + public static void Add(string define, BuildTargetGroup target, bool log = false) + { + Add(define, NamedBuildTarget.FromBuildTargetGroup(target), log); + } + + public static void Remove(string define, BuildTargetGroup target, bool log = false) + { + Remove(define, NamedBuildTarget.FromBuildTargetGroup(target), log); + } +#else public static void Add(string define, BuildTargetGroup target, bool log = false) { string definesString = PlayerSettings.GetScriptingDefineSymbolsForGroup(target); @@ -2220,6 +2254,8 @@ namespace Convention PlayerSettings.SetScriptingDefineSymbolsForGroup(target, definesString); Debug.Log("Removed \"" + define + "\" from " + EditorUserBuildSettings.selectedBuildTargetGroup + " Scripting define in Player Settings"); } +#endif + #endif } } diff --git a/Convention/[Visual]/[Prefabs]/Root.prefab b/Convention/[Visual]/[Prefabs]/Root.prefab index f041d6d..5e502b6 100644 --- a/Convention/[Visual]/[Prefabs]/Root.prefab +++ b/Convention/[Visual]/[Prefabs]/Root.prefab @@ -844,28 +844,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowDebugText: 0 - m_ShowCameraFrustum: 1 - m_IgnoreTimeScale: 0 - m_WorldUpOverride: {fileID: 0} - m_UpdateMethod: 2 - m_BlendUpdateMethod: 1 - m_DefaultBlend: - m_Style: 1 - m_Time: 0.5 - m_CustomCurve: + ShowDebugText: 0 + ShowCameraFrustum: 1 + IgnoreTimeScale: 0 + WorldUpOverride: {fileID: 0} + ChannelMask: -1 + UpdateMethod: 2 + BlendUpdateMethod: 1 + LensModeOverride: + Enabled: 0 + DefaultMode: 2 + DefaultBlend: + Style: 1 + Time: 0.5 + CustomCurve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - m_CustomBlends: {fileID: 0} - m_CameraCutEvent: - m_PersistentCalls: - m_Calls: [] - m_CameraActivatedEvent: - m_PersistentCalls: - m_Calls: [] + CustomBlends: {fileID: 0} --- !u!114 &1937889226080204937 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1060,12 +1058,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} m_Name: m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: + Priority: + Enabled: 0 + m_Value: 0 + OutputChannel: 1 + StandbyUpdate: 2 m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 + m_LegacyPriority: 10 m_LookAt: {fileID: 0} m_Follow: {fileID: 0} m_Lens: @@ -1075,17 +1074,30 @@ MonoBehaviour: FarClipPlane: 5000 Dutch: 0 ModeOverride: 0 - LensShift: {x: 0, y: 0} GateFit: 2 - FocusDistance: 10 m_SensorSize: {x: 1, y: 1} - m_Transitions: + LensShift: {x: 0, y: 0} + FocusDistance: 10 + Iso: 200 + ShutterSpeed: 0.005 + Aperture: 16 + BladeCount: 5 + Curvature: {x: 2, y: 11} + BarrelClipping: 0.25 + Anamorphism: 0 + BlendHint: 0 + m_OnCameraLiveEvent: + m_PersistentCalls: + m_Calls: [] + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_LegacyTransitions: m_BlendHint: 0 m_InheritPosition: 0 m_OnCameraLive: m_PersistentCalls: m_Calls: [] - m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 11535700043902880} --- !u!20 &2319537278398014183 Camera: @@ -1439,12 +1451,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} m_Name: m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: + Priority: + Enabled: 0 + m_Value: 0 + OutputChannel: 1 + StandbyUpdate: 2 m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 + m_LegacyPriority: 10 m_LookAt: {fileID: 0} m_Follow: {fileID: 0} m_Lens: @@ -1454,17 +1467,30 @@ MonoBehaviour: FarClipPlane: 5000 Dutch: 0 ModeOverride: 0 - LensShift: {x: 0, y: 0} GateFit: 2 - FocusDistance: 10 m_SensorSize: {x: 1, y: 1} - m_Transitions: + LensShift: {x: 0, y: 0} + FocusDistance: 10 + Iso: 200 + ShutterSpeed: 0.005 + Aperture: 16 + BladeCount: 5 + Curvature: {x: 2, y: 11} + BarrelClipping: 0.25 + Anamorphism: 0 + BlendHint: 0 + m_OnCameraLiveEvent: + m_PersistentCalls: + m_Calls: [] + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_LegacyTransitions: m_BlendHint: 0 m_InheritPosition: 0 m_OnCameraLive: m_PersistentCalls: m_Calls: [] - m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 3000479872335485243} --- !u!20 &7206794941111705965 Camera: