Merge remote-tracking branch 'remotes/origin/develop'.

Author: Mogoson

Assets/MGS-CommonCode.meta

@@ -76,14 +76,14 @@ public ObjectPool(Func<T> create, Action<T> reset, Action<T> dispose, int maxCou
         public virtual T TakeNew()
         {
             if (objectStack.Count > 0)
+            {
                 return objectStack.Pop();
-            else
+            }
+            if (createFunc == null)
             {
-                if (createFunc == null)
-                    return default(T);
-                else
-                    return createFunc.Invoke();
+                return default(T);
             }
+            return createFunc.Invoke();
         }
 
         /// <summary>
@@ -94,23 +94,30 @@ public virtual void Recycle(T obj)
         {
             //Null object is not allowed to recycle.
             if (obj == null)
+            {
                 return;
+            }
 
             //Avoid repeated recycle. 
             if (objectStack.Contains(obj))
+            {
                 return;
+            }
 
             if (objectStack.Count < MaxCount)
             {
                 if (resetAction != null)
+                {
                     resetAction.Invoke(obj);
-
+                }
                 objectStack.Push(obj);
             }
             else
             {
                 if (disposeAction != null)
+                {
                     disposeAction.Invoke(obj);
+                }
             }
         }
 

Assets/MGS-CommonCode/DesignPattern.meta

@@ -63,9 +63,10 @@ protected void Awake()
             if (instance == null)
             {
                 instance = this as T;
-
                 if (dontDestroyOnLoad)
+                {
                     DontDestroyOnLoad(gameObject);
+                }
             }
             else
             {