|
@@ -1,13 +1,8 @@
|
|
|
-using System;
|
|
|
-using System.Collections;
|
|
|
-using System.Collections.Generic;
|
|
|
-using System.Data;
|
|
|
+using System.Collections.Generic;
|
|
|
using System.IO;
|
|
|
using System.Text;
|
|
|
using UnityEngine;
|
|
|
using GFGGame;
|
|
|
-using System.Text.RegularExpressions;
|
|
|
-using static Google.Protobuf.Reflection.GeneratedCodeInfo.Types;
|
|
|
using OfficeOpenXml;
|
|
|
|
|
|
namespace GFGEditor
|
|
@@ -168,7 +163,7 @@ namespace GFGEditor
|
|
|
string functionName = string.Format("GetCfgsBy{0}", string.Join("And", groupNames[key]));
|
|
|
string cfgsGroupDicName = string.Format("_cfgsGroupDic{0}", index0);
|
|
|
groupFunction = groupFunction + HandleGroupFunction("groupKey_" + key, groupNames[key], groupTypes[key], functionName, cfgsGroupDicName, configArrayStr, configArrayName);
|
|
|
- strDispose = string.Format("{0}\t\t\t{1}.Clear();", strDispose, cfgsGroupDicName);
|
|
|
+ strDispose = string.Format("{0}\n\t\t\t{1}.Clear();", strDispose, cfgsGroupDicName);
|
|
|
index0++;
|
|
|
}
|
|
|
}
|
|
@@ -205,6 +200,16 @@ namespace GFGEditor
|
|
|
}
|
|
|
string singleStrs = string.Join("\n", singleStrArry);
|
|
|
|
|
|
+ if(string.IsNullOrEmpty(singleStrs))
|
|
|
+ {
|
|
|
+ configArrayStr = configArrayStr.Replace("{SingleHandleBlock}", "");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ //添加
|
|
|
+ configArrayStr = configArrayStr.Replace("{SingleHandleBlock}", singleStrs);
|
|
|
+ }
|
|
|
+
|
|
|
List<string> groupStrArry = new List<string>();
|
|
|
int index1 = 0;
|
|
|
foreach (string key in groupNames.Keys)
|
|
@@ -219,7 +224,7 @@ namespace GFGEditor
|
|
|
}
|
|
|
string groupStrs = string.Join("\n", groupStrArry);
|
|
|
|
|
|
- configArrayStr = configArrayStr.Replace("{FunctionAllBlock}", singleStrs + "\n" + groupStrs);
|
|
|
+ configArrayStr = configArrayStr.Replace("{FunctionAllBlock}", groupStrs);
|
|
|
|
|
|
// foreach()
|
|
|
//名称处理
|