From fc60e426778262c45df5eaf9d22c1a72f3de5e43 Mon Sep 17 00:00:00 2001 From: Victor_Wang Date: Tue, 6 Aug 2024 10:50:14 +0800 Subject: [PATCH 1/2] 1 --- .vsconfig | 6 - Assets/Scripts/Editor/Tools/Tools.cs | 2 +- .../DataClass/ProcessData/D_Process.cs | 2 + .../Scripts/Project/Manager/ProcessManager.cs | 1 + .../UIToolKitFile/Editor/AutoGenerate.cs | 110 ++++++++++-------- 5 files changed, 65 insertions(+), 56 deletions(-) delete mode 100644 .vsconfig diff --git a/.vsconfig b/.vsconfig deleted file mode 100644 index f019fd0..0000000 --- a/.vsconfig +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "1.0", - "components": [ - "Microsoft.VisualStudio.Workload.ManagedGame" - ] -} diff --git a/Assets/Scripts/Editor/Tools/Tools.cs b/Assets/Scripts/Editor/Tools/Tools.cs index 044e747..ef2dc0c 100644 --- a/Assets/Scripts/Editor/Tools/Tools.cs +++ b/Assets/Scripts/Editor/Tools/Tools.cs @@ -205,7 +205,7 @@ public class Tools private static int GetKeyIndex(DataTable dataTable) { DataRow row = dataTable.Rows[2]; - for (int i = startIndex; i < dataTable.Columns.Count; i++) + for (int i = 0; i < dataTable.Columns.Count; i++) { if (row[i].ToString() == "key") { diff --git a/Assets/Scripts/Project/DataClass/ProcessData/D_Process.cs b/Assets/Scripts/Project/DataClass/ProcessData/D_Process.cs index ccd9a02..df7f9a5 100644 --- a/Assets/Scripts/Project/DataClass/ProcessData/D_Process.cs +++ b/Assets/Scripts/Project/DataClass/ProcessData/D_Process.cs @@ -24,6 +24,8 @@ public class D_Process : I_Enter, I_Exit /// public string processName; + + #endregion diff --git a/Assets/Scripts/Project/Manager/ProcessManager.cs b/Assets/Scripts/Project/Manager/ProcessManager.cs index 1618e2f..e85afa9 100644 --- a/Assets/Scripts/Project/Manager/ProcessManager.cs +++ b/Assets/Scripts/Project/Manager/ProcessManager.cs @@ -67,6 +67,7 @@ public class ProcessManager : BaseManager coroutine = GameManager.MonoMgr.StartCoroutine(CountDown(countDown)); d_Scheme = DataManager.Instance.GetSchemeData(id); ReportManager.Instance.creport = DataManager.Instance.GetSchemeReport(id); + d_Scheme.Init(); Debug.Log("流程初始化完成"); } diff --git a/Assets/ThirdPart/UIToolKitFile/Editor/AutoGenerate.cs b/Assets/ThirdPart/UIToolKitFile/Editor/AutoGenerate.cs index 55502cd..676f4b4 100644 --- a/Assets/ThirdPart/UIToolKitFile/Editor/AutoGenerate.cs +++ b/Assets/ThirdPart/UIToolKitFile/Editor/AutoGenerate.cs @@ -19,8 +19,8 @@ public class AutoGenerate : EditorWindow private Label titleText; private Label hintText; - private Toggle testScene; - private Toggle spriteFile; //动态文件夹 + private Toggle testScene; //测试场景是否生成 + private Toggle dynamicSprite; //动态文件夹是否生成 private Button generateBtn; private TextField nameInput; @@ -30,11 +30,13 @@ public class AutoGenerate : EditorWindow #region Path - private string scenePath; + private string testScenePath; private string scriptPath; - private string prefabPath; - private string uiSpritePath; - private string uiSpritePath1; + private string uiPrefabPath; + private string uiStaticSpritePath; + private string uidynamicSpritePath; + + private string uiTemplatePath; #endregion @@ -48,11 +50,14 @@ public class AutoGenerate : EditorWindow public void CreateGUI() { - scenePath = "Assets/SandBox/TestUIPanelScenes"; + testScenePath = "Assets/SandBox/TestUIPanelScenes"; scriptPath = "Assets/Project/UI/UI_Panel"; - prefabPath = "Assets/Resources/UI/UI_Panel"; - uiSpritePath = "Assets/ArtRes/Sprite/UI_Panel"; - uiSpritePath1 = "Assets/Resources/Sprites"; + uiPrefabPath = "Assets/Resources/UI/UI_Panel"; + uiStaticSpritePath = "Assets/ArtRes/Sprite/UI_Panel"; + uidynamicSpritePath = "Assets/Resources/Sprites"; + uiTemplatePath = Path.Combine("Assets", "SandBox", + "TestUIPanelScenes", "OnlyUITemplate", + "CustomPanel.prefab"); // scenePath = "Assets/Test1"; // scriptPath = "Assets/Test2"; // prefabPath = "Assets/Test3"; @@ -65,13 +70,10 @@ public class AutoGenerate : EditorWindow titleText = new Label("自动生成ui预制体,脚本,静态sprite文件夹,动态sprite文件夹(可选),测试场景(可选),"); hintText = new Label(""); - testScene = new Toggle(); - testScene.label = "创建测试场景?"; + testScene = new Toggle("创建测试场景?"); + dynamicSprite = new Toggle("创建动态sprite文件夹?"); - spriteFile = new Toggle(); - spriteFile.label = "创建动态sprite文件夹?"; - - generateBtn = new Button(); + generateBtn = new Button(OnGenerateButtonClick); generateBtn.text = "自动生成按钮"; nameInput = new TextField("预制体名(也是脚本名)"); @@ -79,31 +81,21 @@ public class AutoGenerate : EditorWindow root.Add(titleText); root.Add(hintText); root.Add(testScene); - root.Add(spriteFile); + root.Add(dynamicSprite); root.Add(nameInput); root.Add(generateBtn); - - // rootVisualElement.Add(rootElement); - // generateBtn = rootElement.Q