修改增加删除枚举类型是显示错误

a13782425 · Sep 2, 2018 · 0915faa · 0915faa
1 parent 83b7003
commit 0915faa
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/Assets/NewBehaviourScript.cs b/Assets/NewBehaviourScript.cs
@@ -3,6 +3,11 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+public enum MyTestEnum
+{
+    None
+}
+
 public enum TestEnum
 {
     None,

diff --git a/Assets/TSDatabase/Editor/Config/Global/PrimaryKey b/Assets/TSDatabase/Editor/Config/Global/PrimaryKey
diff --git a/Assets/TSDatabase/Editor/Config/Global/TableConfig.asset b/Assets/TSDatabase/Editor/Config/Global/TableConfig.asset
@@ -104,7 +104,7 @@ MonoBehaviour:
       FieldIndex: 15
       GenericType: enum
       GenericIndex: 4
-      EnumIndex: 0
+      EnumIndex: 1
       EnumName: TestEnum
       IsExport: 1
       HasForeignKey: 0

diff --git a/Assets/TSDatabase/Editor/EditorWindows/CreateTableEditor.cs b/Assets/TSDatabase/Editor/EditorWindows/CreateTableEditor.cs
@@ -308,8 +308,38 @@ private void ShowConfigInfo()
                             }
                             else
                             {
+                                #region 当项目增加枚举时候确保枚举是之前设置的值
+                                if (_enumArray.Length > fieldConfig.EnumIndex && fieldConfig.EnumIndex != -1)
+                                {
+                                    if (_enumArray[fieldConfig.EnumIndex] != fieldConfig.EnumName)
+                                    {
+                                        bool isFind = false;
+                                        for (int j = 0; j < _enumArray.Length; j++)
+                                        {
+                                            if (_enumArray[j] == fieldConfig.EnumName)
+                                            {
+                                                isFind = true;
+                                                fieldConfig.EnumIndex = j;
+                                                break;
+                                            }
+                                        }
+                                        if (!isFind)
+                                        {
+                                            fieldConfig.EnumIndex = -1;
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    fieldConfig.EnumIndex = -1;
+                                }
+                                #endregion
+
                                 fieldConfig.EnumIndex = EditorGUILayout.Popup(fieldConfig.EnumIndex, _enumArray, GUILayout.Width(INFO_INPUT_WIDTH));
-                                fieldConfig.EnumName = _enumArray[fieldConfig.EnumIndex];
+                                if (fieldConfig.EnumIndex != -1)
+                                {
+                                    fieldConfig.EnumName = _enumArray[fieldConfig.EnumIndex];
+                                }
                             }
                         }
                         GUILayout.EndHorizontal();