Skip to content

Commit

Permalink
更新GF
Browse files Browse the repository at this point in the history
  • Loading branch information
Jiang Yin committed Jun 16, 2021
1 parent 5fa1b89 commit aa6a5de
Show file tree
Hide file tree
Showing 19 changed files with 59 additions and 59 deletions.
2 changes: 1 addition & 1 deletion Assets/GameFramework
Submodule GameFramework updated 58 files
+1 −0 GameFramework.prefab
+ − Libraries/GameFramework.dll
+3,228 −101 Libraries/GameFramework.xml
+29 −0 Scripts/Editor/Inspector/BaseComponentInspector.cs
+1 −1 Scripts/Editor/Inspector/DataTableComponentInspector.cs
+3 −3 Scripts/Editor/Inspector/DownloadComponentInspector.cs
+1 −1 Scripts/Editor/Inspector/FileSystemComponentInspector.cs
+1 −1 Scripts/Editor/Inspector/FsmComponentInspector.cs
+3 −3 Scripts/Editor/Inspector/NetworkComponentInspector.cs
+3 −3 Scripts/Editor/Inspector/ObjectPoolComponentInspector.cs
+3 −3 Scripts/Editor/Inspector/ReferencePoolComponentInspector.cs
+4 −4 Scripts/Editor/Inspector/ResourceComponentInspector.cs
+3 −3 Scripts/Editor/Inspector/WebRequestComponentInspector.cs
+1 −1 Scripts/Editor/Misc/OpenFolder.cs
+14 −14 Scripts/Editor/ResourceAnalyzer/ResourceAnalyzer.cs
+5 −5 Scripts/Editor/ResourceBuilder/ResourceBuilder.cs
+1 −5 Scripts/Editor/ResourceBuilder/ResourceBuilderController.BuildReport.cs
+6 −6 Scripts/Editor/ResourceBuilder/ResourceBuilderController.cs
+11 −11 Scripts/Editor/ResourceEditor/ResourceEditor.cs
+5 −5 Scripts/Editor/ResourcePackBuilder/ResourcePackBuilder.cs
+2 −2 Scripts/Editor/ResourcePackBuilder/ResourcePackBuilderController.cs
+3 −3 Scripts/Editor/ResourceSyncTools/ResourceSyncTools.cs
+29 −1 Scripts/Runtime/Base/BaseComponent.cs
+1 −1 Scripts/Runtime/Base/GameEntry.cs
+2 −2 Scripts/Runtime/Config/DefaultConfigHelper.cs
+2 −2 Scripts/Runtime/DataTable/DefaultDataTableHelper.cs
+6 −8 Scripts/Runtime/Debugger/DebuggerComponent.ConsoleWindow.cs
+2 −2 Scripts/Runtime/Debugger/DebuggerComponent.EnvironmentInformationWindow.cs
+2 −2 Scripts/Runtime/Debugger/DebuggerComponent.GraphicsInformationWindow.cs
+1 −1 Scripts/Runtime/Debugger/DebuggerComponent.InputAccelerationInformationWindow.cs
+1 −1 Scripts/Runtime/Debugger/DebuggerComponent.InputTouchInformationWindow.cs
+3 −3 Scripts/Runtime/Debugger/DebuggerComponent.NetworkInformationWindow.cs
+2 −2 Scripts/Runtime/Debugger/DebuggerComponent.QualityInformationWindow.cs
+2 −2 Scripts/Runtime/Debugger/DebuggerComponent.RuntimeMemoryInformationWindow.cs
+1 −1 Scripts/Runtime/Debugger/DebuggerComponent.RuntimeMemorySummaryWindow.cs
+3 −3 Scripts/Runtime/Debugger/DebuggerComponent.ScreenInformationWindow.cs
+7 −7 Scripts/Runtime/Debugger/DebuggerComponent.ScrollableDebuggerWindowBase.cs
+2 −2 Scripts/Runtime/Debugger/DebuggerComponent.SystemInformationWindow.cs
+1 −1 Scripts/Runtime/Debugger/DebuggerComponent.TimeInformationWindow.cs
+1 −1 Scripts/Runtime/Debugger/DebuggerComponent.cs
+2 −2 Scripts/Runtime/Download/DownloadComponent.cs
+2 −2 Scripts/Runtime/Download/UnityWebRequestDownloadAgentHelper.cs
+2 −2 Scripts/Runtime/Download/WWWDownloadAgentHelper.cs
+9 −9 Scripts/Runtime/Entity/Entity.cs
+1 −1 Scripts/Runtime/Entity/EntityComponent.cs
+1 −1 Scripts/Runtime/FileSystem/AndroidFileSystemStream.cs
+2 −2 Scripts/Runtime/Localization/DefaultLocalizationHelper.cs
+397 −12 Scripts/Runtime/Localization/LocalizationComponent.cs
+1 −1 Scripts/Runtime/Resource/ResourceComponent.cs
+2 −2 Scripts/Runtime/Setting/DefaultSettingHelper.cs
+3 −3 Scripts/Runtime/Sound/SoundComponent.cs
+1 −1 Scripts/Runtime/UI/UIComponent.cs
+11 −11 Scripts/Runtime/UI/UIForm.cs
+1 −1 Scripts/Runtime/Utility/DefaultLogHelper.cs
+592 −0 Scripts/Runtime/Utility/DefaultTextHelper.cs
+11 −0 Scripts/Runtime/Utility/DefaultTextHelper.cs.meta
+2,374 −149 Scripts/Runtime/Utility/Log.cs
+2 −2 Scripts/Runtime/WebRequest/WebRequestComponent.cs
10 changes: 5 additions & 5 deletions Assets/GameMain/Scripts/DataTable/DRAircraft.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Feedback: mailto:[email protected]
//------------------------------------------------------------
// 此文件由工具自动生成，请勿直接修改。
// 生成时间：2020-07-13 00:03:21.658
// 生成时间：2021-06-16 21:54:35.517
//------------------------------------------------------------

using GameFramework;
Expand Down Expand Up @@ -186,14 +186,14 @@ public int GetWeaponId(int id)
}
}

throw new GameFrameworkException(Utility.Text.Format("GetWeaponId with invalid id '{0}'.", id.ToString()));
throw new GameFrameworkException(Utility.Text.Format("GetWeaponId with invalid id '{0}'.", id));
}

public int GetWeaponIdAt(int index)
{
if (index < 0 || index >= m_WeaponId.Length)
{
throw new GameFrameworkException(Utility.Text.Format("GetWeaponIdAt with invalid index '{0}'.", index.ToString()));
throw new GameFrameworkException(Utility.Text.Format("GetWeaponIdAt with invalid index '{0}'.", index));
}

return m_WeaponId[index].Value;
Expand All @@ -219,14 +219,14 @@ public int GetArmorId(int id)
}
}

throw new GameFrameworkException(Utility.Text.Format("GetArmorId with invalid id '{0}'.", id.ToString()));
throw new GameFrameworkException(Utility.Text.Format("GetArmorId with invalid id '{0}'.", id));
}

public int GetArmorIdAt(int index)
{
if (index < 0 || index >= m_ArmorId.Length)
{
throw new GameFrameworkException(Utility.Text.Format("GetArmorIdAt with invalid index '{0}'.", index.ToString()));
throw new GameFrameworkException(Utility.Text.Format("GetArmorIdAt with invalid index '{0}'.", index));
}

return m_ArmorId[index].Value;
Expand Down
2 changes: 1 addition & 1 deletion Assets/GameMain/Scripts/DataTable/DRArmor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Feedback: mailto:[email protected]
//------------------------------------------------------------
// 此文件由工具自动生成，请勿直接修改。
// 生成时间：2020-07-13 00:03:21.672
// 生成时间：2021-06-16 21:54:35.539
//------------------------------------------------------------

using GameFramework;
Expand Down
2 changes: 1 addition & 1 deletion Assets/GameMain/Scripts/DataTable/DRAsteroid.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Feedback: mailto:[email protected]
//------------------------------------------------------------
// 此文件由工具自动生成，请勿直接修改。
// 生成时间：2020-07-13 00:03:21.678
// 生成时间：2021-06-16 21:54:35.557
//------------------------------------------------------------

using GameFramework;
Expand Down
2 changes: 1 addition & 1 deletion Assets/GameMain/Scripts/DataTable/DREntity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Feedback: mailto:[email protected]
//------------------------------------------------------------
// 此文件由工具自动生成，请勿直接修改。
// 生成时间：2020-07-13 00:03:21.678
// 生成时间：2021-06-16 21:54:35.576
//------------------------------------------------------------

using GameFramework;
Expand Down
2 changes: 1 addition & 1 deletion Assets/GameMain/Scripts/DataTable/DRMusic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Feedback: mailto:[email protected]
//------------------------------------------------------------
// 此文件由工具自动生成，请勿直接修改。
// 生成时间：2020-07-13 00:03:21.688
// 生成时间：2021-06-16 21:54:35.591
//------------------------------------------------------------

using GameFramework;
Expand Down
2 changes: 1 addition & 1 deletion Assets/GameMain/Scripts/DataTable/DRScene.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Feedback: mailto:[email protected]
//------------------------------------------------------------
// 此文件由工具自动生成，请勿直接修改。
// 生成时间：2020-07-13 00:03:21.693
// 生成时间：2021-06-16 21:54:35.610
//------------------------------------------------------------

using GameFramework;
Expand Down
2 changes: 1 addition & 1 deletion Assets/GameMain/Scripts/DataTable/DRSound.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Feedback: mailto:[email protected]
//------------------------------------------------------------
// 此文件由工具自动生成，请勿直接修改。
// 生成时间：2020-07-13 00:03:21.693
// 生成时间：2021-06-16 21:54:35.625
//------------------------------------------------------------

using GameFramework;
Expand Down
2 changes: 1 addition & 1 deletion Assets/GameMain/Scripts/DataTable/DRThruster.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Feedback: mailto:[email protected]
//------------------------------------------------------------
// 此文件由工具自动生成，请勿直接修改。
// 生成时间：2020-07-13 00:03:21.698
// 生成时间：2021-06-16 21:54:35.638
//------------------------------------------------------------

using GameFramework;
Expand Down
2 changes: 1 addition & 1 deletion Assets/GameMain/Scripts/DataTable/DRUIForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Feedback: mailto:[email protected]
//------------------------------------------------------------
// 此文件由工具自动生成，请勿直接修改。
// 生成时间：2020-07-13 00:03:21.703
// 生成时间：2021-06-16 21:54:35.652
//------------------------------------------------------------

using GameFramework;
Expand Down
2 changes: 1 addition & 1 deletion Assets/GameMain/Scripts/DataTable/DRUISound.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Feedback: mailto:[email protected]
//------------------------------------------------------------
// 此文件由工具自动生成，请勿直接修改。
// 生成时间：2020-07-13 00:03:21.708
// 生成时间：2021-06-16 21:54:35.666
//------------------------------------------------------------

using GameFramework;
Expand Down
2 changes: 1 addition & 1 deletion Assets/GameMain/Scripts/DataTable/DRWeapon.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Feedback: mailto:[email protected]
//------------------------------------------------------------
// 此文件由工具自动生成，请勿直接修改。
// 生成时间：2020-07-13 00:03:21.718
// 生成时间：2021-06-16 21:54:35.680
//------------------------------------------------------------

using GameFramework;
Expand Down
6 changes: 3 additions & 3 deletions Assets/GameMain/Scripts/Editor/DataTableGenerator/DataTableGenerator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,14 @@ private static string GenerateDataTablePropertyArray(DataTableProcessor dataTabl
.AppendLine(" }")
.AppendLine(" }")
.AppendLine()
.AppendFormat(" throw new GameFrameworkException(Utility.Text.Format(\"Get{0} with invalid id '{{0}}'.\", id.ToString()));", propertyCollection.Name).AppendLine()
.AppendFormat(" throw new GameFrameworkException(Utility.Text.Format(\"Get{0} with invalid id '{{0}}'.\", id));", propertyCollection.Name).AppendLine()
.AppendLine(" }")
.AppendLine()
.AppendFormat(" public {1} Get{0}At(int index)", propertyCollection.Name, propertyCollection.LanguageKeyword).AppendLine()
.AppendLine(" {")
.AppendFormat(" if (index < 0 || index >= m_{0}.Length)", propertyCollection.Name).AppendLine()
.AppendLine(" {")
.AppendFormat(" throw new GameFrameworkException(Utility.Text.Format(\"Get{0}At with invalid index '{{0}}'.\", index.ToString()));", propertyCollection.Name).AppendLine()
.AppendFormat(" throw new GameFrameworkException(Utility.Text.Format(\"Get{0}At with invalid index '{{0}}'.\", index));", propertyCollection.Name).AppendLine()
.AppendLine(" }")
.AppendLine()
.AppendFormat(" return m_{0}[index].Value;", propertyCollection.Name).AppendLine()
Expand Down Expand Up @@ -397,7 +397,7 @@ public KeyValuePair<int, string> GetItem(int index)
{
if (index < 0 || index >= m_Items.Count)
{
throw new GameFrameworkException(Utility.Text.Format("GetItem with invalid index '{0}'.", index.ToString()));
throw new GameFrameworkException(Utility.Text.Format("GetItem with invalid index '{0}'.", index));
}

return m_Items[index];
Expand Down
Loading

0 comments on commit aa6a5de

Please sign in to comment.