优化了对象池返回对象的代码

Author: Wilson520403

Assets/Behavioral Patterns/Command Pattern/Example2.meta

@@ -77,7 +77,7 @@ private PoolObject NewObjectInstance()
         /// <param name="position"></param>
         /// <param name="rotation"></param>
         /// <returns></returns>
-        public GameObject NextAvailableObject(Vector3 position, Quaternion rotation)
+        public PoolObject NextAvailableObject(Vector3 position, Quaternion rotation)
         {
             PoolObject po = null;
             //池中有可用对象，直接从池中取
@@ -111,8 +111,9 @@ public GameObject NextAvailableObject(Vector3 position, Quaternion rotation)
                 result.transform.rotation = rotation;
             }
 
-            return result;
-        }
+            return po;
+
+            }
 
         /// <summary>
         /// 将指定对象返回池中，复杂度o(1)
@@ -247,9 +248,10 @@ private void CreatePools()
         /// <param name="position">位置</param>
         /// <param name="rotation">rotation</param>
         /// <returns></returns>
-        public GameObject GetObjectFromPool(string poolName, Vector3 position, Quaternion rotation)
+        public PoolObject GetObjectFromPool(string poolName, Vector3 position, Quaternion rotation)
         {
-            GameObject result = null;
+            //GameObject result = null;
+            PoolObject result = null;
 
             if (poolMap.ContainsKey(poolName))
             {
@@ -270,12 +272,12 @@ public GameObject GetObjectFromPool(string poolName, Vector3 position, Quaternio
             return result;
         }
 
-        public void ReturnObjectToPool(GameObject go)
+        public void ReturnObjectToPool(PoolObject po)
         {
-            PoolObject po = go.GetComponent<PoolObject>();
+            //PoolObject po = go.GetComponent<PoolObject>();
             if (po == null)
             {
-                Debug.LogWarning("Specified object is not a pooled instance: " + go.name);
+                Debug.LogWarning("Specified object is not a pooled instance: " + po.name);
             }
             else
             {

Assets/Behavioral Patterns/Command Pattern/Example3.meta

@@ -10,7 +10,8 @@ public class ObjectPoolExample : MonoBehaviour
         //池名称
         public string poolName;
         //对象List
-        public List<GameObject> ObjectList = new List<GameObject>();
+        // public List<GameObject> ObjectList = new List<GameObject>();
+        public List<PoolObject> ObjectList = new List<PoolObject>();
 
         public void Start()
         {
@@ -37,10 +38,10 @@ public void GetObjectFromPool()
             pos.y = 0f;
             pos.z = Random.Range(-5, 6);
 
-            GameObject go = PoolManager.Instance.GetObjectFromPool(poolName, pos, Quaternion.identity);
-            if (go)
+            PoolObject po = PoolManager.Instance.GetObjectFromPool(poolName, pos, Quaternion.identity);
+            if (po)
             {
-                ObjectList.Add(go);
+                ObjectList.Add(po);
             }
         }
 
@@ -68,9 +69,9 @@ public void ReturnAllObjectToPool()
                 return;
             }
 
-            foreach (GameObject go in ObjectList)
+            foreach (PoolObject po in ObjectList)
             {
-                PoolManager.Instance.ReturnObjectToPool(go);
+                PoolManager.Instance.ReturnObjectToPool(po);
             }
             ObjectList.Clear();
         }

Assets/Behavioral Patterns/State Pattern/Exmaple3.meta

@@ -0,0 +1,4 @@
+{
+	"dependencies": {
+	}
+}

Assets/Behavioral Patterns/State Pattern/Exmaple4.meta

@@ -1,2 +1 @@
-m_EditorVersion: 5.3.3f1
-m_StandardAssetsVersion: 0
+m_EditorVersion: 2017.1.5f1

Assets/Game Programming Patterns/Object Pool Pattern/Example/Script/Core/PoolManager.cs

@@ -1,20 +1,23 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2015
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity-Design-Pattern", "Unity-Design-Pattern.csproj", "{AA5D6718-EC1F-D1EA-526D-52AF3C037FBB}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity-Design-Pattern", "Assembly-CSharp.csproj", "{8ABF50DE-5C45-E1BE-2FA5-8FD59671116B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AA5D6718-EC1F-D1EA-526D-52AF3C037FBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA5D6718-EC1F-D1EA-526D-52AF3C037FBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA5D6718-EC1F-D1EA-526D-52AF3C037FBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA5D6718-EC1F-D1EA-526D-52AF3C037FBB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8ABF50DE-5C45-E1BE-2FA5-8FD59671116B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8ABF50DE-5C45-E1BE-2FA5-8FD59671116B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8ABF50DE-5C45-E1BE-2FA5-8FD59671116B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8ABF50DE-5C45-E1BE-2FA5-8FD59671116B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Assembly-CSharp.csproj
+	EndGlobalSection
 EndGlobal