Merge branch 'master' into ILRuntime

Author: coding2233

Assets/Game/Scripts/Base/GameMode.cs

@@ -87,5 +87,21 @@ IEnumerator Start()
             #endregion
         }
 
-    }
+
+		private void Update()
+		{
+			GameFrameworkMode.Update();
+		}
+
+		private void FixedUpdate()
+		{
+			GameFrameworkMode.FixedUpdate();
+		}
+
+		private void OnDestroy()
+		{
+			GameFrameworkMode.ShutDown();
+		}
+
+	}
 }

Assets/Game/Scripts/Editor/GameModeEditor.cs

@@ -211,6 +211,9 @@ public override void OnInspectorGUI()
             #endregion
 
             GUILayout.EndVertical();
+
+			//保存设置
+	        EditorUtility.SetDirty(_gameMode);
         }