diff --git a/Assets/Art_SubModule b/Assets/Art_SubModule index e78462c..ea8f052 160000 --- a/Assets/Art_SubModule +++ b/Assets/Art_SubModule @@ -1 +1 @@ -Subproject commit e78462ce1c95bb74a5ee52ea505cd57a73138369 +Subproject commit ea8f052587557afd8afd3760e73a6d33d2818f03 diff --git a/Assets/Design_SubModule b/Assets/Design_SubModule index 10f0ce5..59298e4 160000 --- a/Assets/Design_SubModule +++ b/Assets/Design_SubModule @@ -1 +1 @@ -Subproject commit 10f0ce58ada99859a0d127844bdb41447c59e206 +Subproject commit 59298e4d8f9f439e9caa9ea1f3711b7547e2fb87 diff --git a/Assets/Editor/Design_Tools/ItemConfigEditor.cs b/Assets/Editor/Design_Tools/ItemConfigEditor.cs index e695ad5..41bdd8a 100644 --- a/Assets/Editor/Design_Tools/ItemConfigEditor.cs +++ b/Assets/Editor/Design_Tools/ItemConfigEditor.cs @@ -1075,12 +1075,22 @@ namespace DesignTools } /// - /// 绘制Effect字段 + /// 绘制Effect字段(统一文本编辑) /// private void DrawEffectField(ItemData data) { EditorGUILayout.BeginVertical(GUILayout.Width(200)); + // 当前使用统一的文本编辑框处理所有类型 + EditorGUI.BeginChangeCheck(); + string newEffect = EditorGUILayout.TextField(data.Effect ?? "", GUILayout.Width(200)); + if (EditorGUI.EndChangeCheck()) + { + data.Effect = newEffect; + } + + /* + // 以下是之前按类型特殊处理的代码,已注释保留,方便之后还原特殊处理 switch (data.IType) { case 100: // 棋子 - 不显示 @@ -1117,6 +1127,7 @@ namespace DesignTools data.Effect = EditorGUILayout.TextField(data.Effect, GUILayout.Width(200)); break; } + */ EditorGUILayout.EndVertical(); } @@ -1352,10 +1363,11 @@ namespace DesignTools currentFolder = folderOptions[newFolderIndex]; // 保存到缓存 resSelectedFolderCache[data.Id] = currentFolder; - // 组改变时,清空表和Item选择 + // 组改变时,清空表和Item选择,并清空Res数据 currentTable = null; tableId = -1; itemId = -1; + data.Res = ""; // 清空Res,避免旧数据干扰 } else if (newFolderIndex == 0) { diff --git a/Git工具/Unity Git管理工具.exe b/Git工具/Unity Git管理工具.exe index b4275ef..7970604 100644 Binary files a/Git工具/Unity Git管理工具.exe and b/Git工具/Unity Git管理工具.exe differ