From 832622b84cdcd39b764aac99f9a4c1189fda3376 Mon Sep 17 00:00:00 2001 From: ninemine <1371605831@qq.com> Date: Tue, 11 Nov 2025 14:30:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=8A=9F=E4=BD=BF=E7=94=A8RScript?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E8=84=9A=E6=9C=AC=E5=88=9D=E6=AD=A5=E8=BF=90?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Plugins/Flee | 2 +- Assets/Scenes/Game/EditorWord.prefab | 1 - .../EditiorContent/EditorController.cs | 1 + Assets/Scripts/Framework/ScriptableObject.cs | 36 +++++++++++++++++++ ProjectSettings/EditorSettings.asset | 4 +-- 5 files changed, 40 insertions(+), 4 deletions(-) diff --git a/Assets/Plugins/Flee b/Assets/Plugins/Flee index 47b12f4..5c561fc 160000 --- a/Assets/Plugins/Flee +++ b/Assets/Plugins/Flee @@ -1 +1 @@ -Subproject commit 47b12f4bc0b0ff9ad9be0ba07268e7a497f4c330 +Subproject commit 5c561fc69c7bba8c5fead507a1244e1abca4943a diff --git a/Assets/Scenes/Game/EditorWord.prefab b/Assets/Scenes/Game/EditorWord.prefab index ab0ddae..d7f76fd 100644 --- a/Assets/Scenes/Game/EditorWord.prefab +++ b/Assets/Scenes/Game/EditorWord.prefab @@ -183,7 +183,6 @@ MonoBehaviour: TotalTimelineBar: {fileID: 8439816364275150554} CurrentTimeText: {fileID: 2053773207632650149} CurrentFPS: {fileID: 3211738389701231255} - CurrentProjectDefaultFileStyle: 0 IsLowPerformance: 0 LastLoadProjectName: MainGameController: {fileID: 0} diff --git a/Assets/Scripts/Framework/EditiorContent/EditorController.cs b/Assets/Scripts/Framework/EditiorContent/EditorController.cs index 4a27790..67e6a95 100644 --- a/Assets/Scripts/Framework/EditiorContent/EditorController.cs +++ b/Assets/Scripts/Framework/EditiorContent/EditorController.cs @@ -376,6 +376,7 @@ namespace Demo.Editor private void Start() { + GlobalConfig.ConstConfigFile = "config.easysave"; // Generate Framework var generaters = DefaultInstantiate.GetScriptableObjectInstantiate(); foreach (var asm in AppDomain.CurrentDomain.GetAssemblies()) diff --git a/Assets/Scripts/Framework/ScriptableObject.cs b/Assets/Scripts/Framework/ScriptableObject.cs index a5f2303..0cafcee 100644 --- a/Assets/Scripts/Framework/ScriptableObject.cs +++ b/Assets/Scripts/Framework/ScriptableObject.cs @@ -441,6 +441,42 @@ namespace Demo callback?.Invoke(child); } + public IEnumerator DoGenerateSubScriptAsync([In] string type, string name, [Opt] Action callback) + { + // 判断类型是否合法 + if (DefaultInstantiate.GetScriptableObjectInstantiate().TryGetValue(type, out var creater) == false) + { + Debug.LogError($"{type} is not exist or {type}'s Instantiater is not valid", this); + callback?.Invoke(null); + yield break; + } + // 生成对象 + var child = creater(); + child.ScriptName = name; + child.transform.SetParent(this.transform); + child.transform.SetLocalPositionAndRotation(Vector3.zero, Quaternion.identity); + child.transform.localScale = Vector3.one; + child.EnableScript("", "", type, this); + + // Add Child + Childs.Add(child); + + // Load Child Script + yield return child.LoadScript(""); + + LastLoadedScriptableObject = child; + callback?.Invoke(child); + } + + /// + /// 创建子脚本 + /// + /// 指定类型 + public IEnumerator NewSubScript([In] string type) + { + return DoGenerateSubScriptAsync(type, $"New {type}", null); + } + /// /// 加载子脚本 /// diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 9162d31..e15cca8 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -24,8 +24,8 @@ EditorSettings: m_EnableEditorAsyncCPUTextureLoading: 0 m_AsyncShaderCompilation: 1 m_PrefabModeAllowAutoSave: 1 - m_EnterPlayModeOptionsEnabled: 1 - m_EnterPlayModeOptions: 2 + m_EnterPlayModeOptionsEnabled: 0 + m_EnterPlayModeOptions: 0 m_GameObjectNamingDigits: 1 m_GameObjectNamingScheme: 0 m_AssetNamingUsesSpace: 1