Skip to content

Commit b3f3d9e

Browse files
author
Jiang Yin
committed
优化字符串的拼接逻辑
1 parent 2f08fc0 commit b3f3d9e

File tree

57 files changed

+6723
-437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+6723
-437
lines changed

‎Libraries/GameFramework.dll‎

27.5 KB
Binary file not shown.

‎Libraries/GameFramework.xml‎

Lines changed: 3204 additions & 107 deletions
Large diffs are not rendered by default.

‎Scripts/Editor/Inspector/BaseComponentInspector.cs‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ internal sealed class BaseComponentInspector : GameFrameworkInspector
2222

2323
private SerializedProperty m_EditorResourceMode = null;
2424
private SerializedProperty m_EditorLanguage = null;
25+
private SerializedProperty m_TextHelperTypeName = null;
2526
private SerializedProperty m_VersionHelperTypeName = null;
2627
private SerializedProperty m_LogHelperTypeName = null;
2728
private SerializedProperty m_CompressionHelperTypeName = null;
@@ -31,6 +32,8 @@ internal sealed class BaseComponentInspector : GameFrameworkInspector
3132
private SerializedProperty m_RunInBackground = null;
3233
private SerializedProperty m_NeverSleep = null;
3334

35+
private string[] m_TextHelperTypeNames = null;
36+
private int m_TextHelperTypeNameIndex = 0;
3437
private string[] m_VersionHelperTypeNames = null;
3538
private int m_VersionHelperTypeNameIndex = 0;
3639
private string[] m_LogHelperTypeNames = null;
@@ -62,6 +65,13 @@ public override void OnInspectorGUI()
6265
{
6366
EditorGUILayout.LabelField("Global Helpers", EditorStyles.boldLabel);
6467

68+
int textHelperSelectedIndex = EditorGUILayout.Popup("Text Helper", m_TextHelperTypeNameIndex, m_TextHelperTypeNames);
69+
if (textHelperSelectedIndex != m_TextHelperTypeNameIndex)
70+
{
71+
m_TextHelperTypeNameIndex = textHelperSelectedIndex;
72+
m_TextHelperTypeName.stringValue = textHelperSelectedIndex <= 0 ? null : m_TextHelperTypeNames[textHelperSelectedIndex];
73+
}
74+
6575
int versionHelperSelectedIndex = EditorGUILayout.Popup("Version Helper", m_VersionHelperTypeNameIndex, m_VersionHelperTypeNames);
6676
if (versionHelperSelectedIndex != m_VersionHelperTypeNameIndex)
6777
{
@@ -170,6 +180,7 @@ private void OnEnable()
170180
{
171181
m_EditorResourceMode = serializedObject.FindProperty("m_EditorResourceMode");
172182
m_EditorLanguage = serializedObject.FindProperty("m_EditorLanguage");
183+
m_TextHelperTypeName = serializedObject.FindProperty("m_TextHelperTypeName");
173184
m_VersionHelperTypeName = serializedObject.FindProperty("m_VersionHelperTypeName");
174185
m_LogHelperTypeName = serializedObject.FindProperty("m_LogHelperTypeName");
175186
m_CompressionHelperTypeName = serializedObject.FindProperty("m_CompressionHelperTypeName");
@@ -184,6 +195,24 @@ private void OnEnable()
184195

185196
private void RefreshTypeNames()
186197
{
198+
List<string> textHelperTypeNames = new List<string>
199+
{
200+
NoneOptionName
201+
};
202+
203+
textHelperTypeNames.AddRange(Type.GetRuntimeTypeNames(typeof(Utility.Text.ITextHelper)));
204+
m_TextHelperTypeNames = textHelperTypeNames.ToArray();
205+
m_TextHelperTypeNameIndex = 0;
206+
if (!string.IsNullOrEmpty(m_TextHelperTypeName.stringValue))
207+
{
208+
m_TextHelperTypeNameIndex = textHelperTypeNames.IndexOf(m_TextHelperTypeName.stringValue);
209+
if (m_TextHelperTypeNameIndex <= 0)
210+
{
211+
m_TextHelperTypeNameIndex = 0;
212+
m_TextHelperTypeName.stringValue = null;
213+
}
214+
}
215+
187216
List<string> versionHelperTypeNames = new List<string>
188217
{
189218
NoneOptionName

‎Scripts/Editor/Inspector/DataTableComponentInspector.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private void OnEnable()
7575

7676
private void DrawDataTable(DataTableBase dataTable)
7777
{
78-
EditorGUILayout.LabelField(dataTable.FullName, Utility.Text.Format("{0} Rows", dataTable.Count.ToString()));
78+
EditorGUILayout.LabelField(dataTable.FullName, Utility.Text.Format("{0} Rows", dataTable.Count));
7979
}
8080

8181
private void RefreshTypeNames()

‎Scripts/Editor/Inspector/DownloadComponentInspector.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ public override void OnInspectorGUI()
9797
data[index++] = "Download Path,Serial Id,Tag,Priority,Status";
9898
foreach (TaskInfo downloadInfo in downloadInfos)
9999
{
100-
data[index++] = Utility.Text.Format("{0},{1},{2},{3},{4}", downloadInfo.Description, downloadInfo.SerialId.ToString(), downloadInfo.Tag ?? string.Empty, downloadInfo.Priority.ToString(), downloadInfo.Status.ToString());
100+
data[index++] = Utility.Text.Format("{0},{1},{2},{3},{4}", downloadInfo.Description, downloadInfo.SerialId, downloadInfo.Tag ?? string.Empty, downloadInfo.Priority, downloadInfo.Status);
101101
}
102102

103103
File.WriteAllLines(exportFileName, data, Encoding.UTF8);
104104
Debug.Log(Utility.Text.Format("Export download task CSV data to '{0}' success.", exportFileName));
105105
}
106106
catch (Exception exception)
107107
{
108-
Debug.LogError(Utility.Text.Format("Export download task CSV data to '{0}' failure, exception is '{1}'.", exportFileName, exception.ToString()));
108+
Debug.LogError(Utility.Text.Format("Export download task CSV data to '{0}' failure, exception is '{1}'.", exportFileName, exception));
109109
}
110110
}
111111
}
@@ -144,7 +144,7 @@ private void OnEnable()
144144

145145
private void DrawDownloadInfo(TaskInfo downloadInfo)
146146
{
147-
EditorGUILayout.LabelField(downloadInfo.Description, Utility.Text.Format("[SerialId]{0} [Tag]{1} [Priority]{2} [Status]{3}", downloadInfo.SerialId.ToString(), downloadInfo.Tag ?? "<None>", downloadInfo.Priority.ToString(), downloadInfo.Status.ToString()));
147+
EditorGUILayout.LabelField(downloadInfo.Description, Utility.Text.Format("[SerialId]{0} [Tag]{1} [Priority]{2} [Status]{3}", downloadInfo.SerialId, downloadInfo.Tag ?? "<None>", downloadInfo.Priority, downloadInfo.Status));
148148
}
149149

150150
private void RefreshTypeNames()

‎Scripts/Editor/Inspector/FileSystemComponentInspector.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private void RefreshTypeNames()
6767

6868
private void DrawFileSystem(IFileSystem fileSystem)
6969
{
70-
EditorGUILayout.LabelField(fileSystem.FullPath, Utility.Text.Format("{0}, {1} / {2} Files", fileSystem.Access.ToString(), fileSystem.FileCount.ToString(), fileSystem.MaxFileCount.ToString()));
70+
EditorGUILayout.LabelField(fileSystem.FullPath, Utility.Text.Format("{0}, {1} / {2} Files", fileSystem.Access, fileSystem.FileCount, fileSystem.MaxFileCount));
7171
}
7272
}
7373
}

‎Scripts/Editor/Inspector/FsmComponentInspector.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private void OnEnable()
4747

4848
private void DrawFsm(FsmBase fsm)
4949
{
50-
EditorGUILayout.LabelField(fsm.FullName, fsm.IsRunning ? Utility.Text.Format("{0}, {1} s", fsm.CurrentStateName, fsm.CurrentStateTime.ToString("F1")) : (fsm.IsDestroyed ? "Destroyed" : "Not Running"));
50+
EditorGUILayout.LabelField(fsm.FullName, fsm.IsRunning ? Utility.Text.Format("{0}, {1:F1} s", fsm.CurrentStateName, fsm.CurrentStateTime) : (fsm.IsDestroyed ? "Destroyed" : "Not Running"));
5151
}
5252
}
5353
}

‎Scripts/Editor/Inspector/NetworkComponentInspector.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ private void DrawNetworkChannel(INetworkChannel networkChannel)
5555
EditorGUILayout.LabelField("Address Family", networkChannel.AddressFamily.ToString());
5656
EditorGUILayout.LabelField("Local Address", networkChannel.Connected ? networkChannel.Socket.LocalEndPoint.ToString() : "Unavailable");
5757
EditorGUILayout.LabelField("Remote Address", networkChannel.Connected ? networkChannel.Socket.RemoteEndPoint.ToString() : "Unavailable");
58-
EditorGUILayout.LabelField("Send Packet", Utility.Text.Format("{0} / {1}", networkChannel.SendPacketCount.ToString(), networkChannel.SentPacketCount.ToString()));
59-
EditorGUILayout.LabelField("Receive Packet", Utility.Text.Format("{0} / {1}", networkChannel.ReceivePacketCount.ToString(), networkChannel.ReceivedPacketCount.ToString()));
58+
EditorGUILayout.LabelField("Send Packet", Utility.Text.Format("{0} / {1}", networkChannel.SendPacketCount, networkChannel.SentPacketCount));
59+
EditorGUILayout.LabelField("Receive Packet", Utility.Text.Format("{0} / {1}", networkChannel.ReceivePacketCount, networkChannel.ReceivedPacketCount));
6060
EditorGUILayout.LabelField("Miss Heart Beat Count", networkChannel.MissHeartBeatCount.ToString());
61-
EditorGUILayout.LabelField("Heart Beat", Utility.Text.Format("{0} / {1}", networkChannel.HeartBeatElapseSeconds.ToString("F2"), networkChannel.HeartBeatInterval.ToString("F2")));
61+
EditorGUILayout.LabelField("Heart Beat", Utility.Text.Format("{0:F2} / {1:F2}", networkChannel.HeartBeatElapseSeconds, networkChannel.HeartBeatInterval));
6262
EditorGUI.BeginDisabledGroup(!networkChannel.Connected);
6363
{
6464
if (GUILayout.Button("Disconnect"))

‎Scripts/Editor/Inspector/ObjectPoolComponentInspector.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private void DrawObjectPool(ObjectPoolBase objectPool)
8686
EditorGUILayout.LabelField("Name", objectPool.AllowMultiSpawn ? "Locked\tCount\tFlag\tPriority\tLast Use Time" : "Locked\tIn Use\tFlag\tPriority\tLast Use Time");
8787
foreach (ObjectInfo objectInfo in objectInfos)
8888
{
89-
EditorGUILayout.LabelField(string.IsNullOrEmpty(objectInfo.Name) ? "<None>" : objectInfo.Name, Utility.Text.Format("{0}\t{1}\t{2}\t{3}\t{4}", objectInfo.Locked.ToString(), objectPool.AllowMultiSpawn ? objectInfo.SpawnCount.ToString() : objectInfo.IsInUse.ToString(), objectInfo.CustomCanReleaseFlag.ToString(), objectInfo.Priority.ToString(), objectInfo.LastUseTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")));
89+
EditorGUILayout.LabelField(string.IsNullOrEmpty(objectInfo.Name) ? "<None>" : objectInfo.Name, objectPool.AllowMultiSpawn ? Utility.Text.Format("{0}\t{1}\t{2}\t{3}\t{4:yyyy-MM-dd HH:mm:ss}", objectInfo.Locked, objectInfo.SpawnCount, objectInfo.CustomCanReleaseFlag, objectInfo.Priority, objectInfo.LastUseTime.ToLocalTime()) : Utility.Text.Format("{0}\t{1}\t{2}\t{3}\t{4:yyyy-MM-dd HH:mm:ss}", objectInfo.Locked, objectInfo.IsInUse, objectInfo.CustomCanReleaseFlag, objectInfo.Priority, objectInfo.LastUseTime.ToLocalTime()));
9090
}
9191

9292
if (GUILayout.Button("Release"))
@@ -111,15 +111,15 @@ private void DrawObjectPool(ObjectPoolBase objectPool)
111111
data[index++] = Utility.Text.Format("Name,Locked,{0},Custom Can Release Flag,Priority,Last Use Time", objectPool.AllowMultiSpawn ? "Count" : "In Use");
112112
foreach (ObjectInfo objectInfo in objectInfos)
113113
{
114-
data[index++] = Utility.Text.Format("{0},{1},{2},{3},{4},{5}", objectInfo.Name, objectInfo.Locked.ToString(), objectPool.AllowMultiSpawn ? objectInfo.SpawnCount.ToString() : objectInfo.IsInUse.ToString(), objectInfo.CustomCanReleaseFlag.ToString(), objectInfo.Priority.ToString(), objectInfo.LastUseTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss"));
114+
data[index++] = objectPool.AllowMultiSpawn ? Utility.Text.Format("{0},{1},{2},{3},{4},{5:yyyy-MM-dd HH:mm:ss}", objectInfo.Name, objectInfo.Locked, objectInfo.SpawnCount, objectInfo.CustomCanReleaseFlag, objectInfo.Priority, objectInfo.LastUseTime.ToLocalTime()) : Utility.Text.Format("{0},{1},{2},{3},{4},{5:yyyy-MM-dd HH:mm:ss}", objectInfo.Name, objectInfo.Locked, objectInfo.IsInUse, objectInfo.CustomCanReleaseFlag, objectInfo.Priority, objectInfo.LastUseTime.ToLocalTime());
115115
}
116116

117117
File.WriteAllLines(exportFileName, data, Encoding.UTF8);
118118
Debug.Log(Utility.Text.Format("Export object pool CSV data to '{0}' success.", exportFileName));
119119
}
120120
catch (Exception exception)
121121
{
122-
Debug.LogError(Utility.Text.Format("Export object pool CSV data to '{0}' failure, exception is '{1}'.", exportFileName, exception.ToString()));
122+
Debug.LogError(Utility.Text.Format("Export object pool CSV data to '{0}' failure, exception is '{1}'.", exportFileName, exception));
123123
}
124124
}
125125
}

‎Scripts/Editor/Inspector/ReferencePoolComponentInspector.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ public override void OnInspectorGUI()
9898
data[index++] = "Class Name,Full Class Name,Unused,Using,Acquire,Release,Add,Remove";
9999
foreach (ReferencePoolInfo referencePoolInfo in assemblyReferencePoolInfo.Value)
100100
{
101-
data[index++] = Utility.Text.Format("{0},{1},{2},{3},{4},{5},{6},{7}", referencePoolInfo.Type.Name, referencePoolInfo.Type.FullName, referencePoolInfo.UnusedReferenceCount.ToString(), referencePoolInfo.UsingReferenceCount.ToString(), referencePoolInfo.AcquireReferenceCount.ToString(), referencePoolInfo.ReleaseReferenceCount.ToString(), referencePoolInfo.AddReferenceCount.ToString(), referencePoolInfo.RemoveReferenceCount.ToString());
101+
data[index++] = Utility.Text.Format("{0},{1},{2},{3},{4},{5},{6},{7}", referencePoolInfo.Type.Name, referencePoolInfo.Type.FullName, referencePoolInfo.UnusedReferenceCount, referencePoolInfo.UsingReferenceCount, referencePoolInfo.AcquireReferenceCount, referencePoolInfo.ReleaseReferenceCount, referencePoolInfo.AddReferenceCount, referencePoolInfo.RemoveReferenceCount);
102102
}
103103

104104
File.WriteAllLines(exportFileName, data, Encoding.UTF8);
105105
Debug.Log(Utility.Text.Format("Export reference pool CSV data to '{0}' success.", exportFileName));
106106
}
107107
catch (Exception exception)
108108
{
109-
Debug.LogError(Utility.Text.Format("Export reference pool CSV data to '{0}' failure, exception is '{1}'.", exportFileName, exception.ToString()));
109+
Debug.LogError(Utility.Text.Format("Export reference pool CSV data to '{0}' failure, exception is '{1}'.", exportFileName, exception));
110110
}
111111
}
112112
}
@@ -134,7 +134,7 @@ private void OnEnable()
134134

135135
private void DrawReferencePoolInfo(ReferencePoolInfo referencePoolInfo)
136136
{
137-
EditorGUILayout.LabelField(m_ShowFullClassName ? referencePoolInfo.Type.FullName : referencePoolInfo.Type.Name, Utility.Text.Format("{0}\t{1}\t{2}\t{3}\t{4}\t{5}", referencePoolInfo.UnusedReferenceCount.ToString(), referencePoolInfo.UsingReferenceCount.ToString(), referencePoolInfo.AcquireReferenceCount.ToString(), referencePoolInfo.ReleaseReferenceCount.ToString(), referencePoolInfo.AddReferenceCount.ToString(), referencePoolInfo.RemoveReferenceCount.ToString()));
137+
EditorGUILayout.LabelField(m_ShowFullClassName ? referencePoolInfo.Type.FullName : referencePoolInfo.Type.Name, Utility.Text.Format("{0}\t{1}\t{2}\t{3}\t{4}\t{5}", referencePoolInfo.UnusedReferenceCount, referencePoolInfo.UsingReferenceCount, referencePoolInfo.AcquireReferenceCount, referencePoolInfo.ReleaseReferenceCount, referencePoolInfo.AddReferenceCount, referencePoolInfo.RemoveReferenceCount));
138138
}
139139

140140
private int Comparison(ReferencePoolInfo a, ReferencePoolInfo b)

0 commit comments

Comments
 (0)