Merge pull request #64 from MeniscusLight/master

新toluaRuntime地址添加
jarjin · Jun 4, 2019 · f433075 · f433075
2 parents d5a632f + 49958ef
commit f433075
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/Assets/LuaFramework/Scripts/Manager/GameManager.cs b/Assets/LuaFramework/Scripts/Manager/GameManager.cs
@@ -262,7 +262,10 @@ void OnInitialize() {
 
             ObjPoolManager.Release("TestGameObject", gameObj);
             var backObj = ObjPoolManager.Get("TestGameObject");
-            backObj.transform.SetParent(null);
+            if (backObj != null)
+            {
+                backObj.transform.SetParent(null);
+            }
 
             Debug.Log("TestGameObject--->>>" + backObj);
         }

diff --git a/Assets/LuaFramework/Scripts/ObjectPool/GameObjectPool.cs b/Assets/LuaFramework/Scripts/ObjectPool/GameObjectPool.cs
@@ -36,6 +36,10 @@ public GameObjectPool(string poolName, GameObject poolObjectPrefab, int initCoun
 
 		//o(1)
         private void AddObjectToPool(GameObject go) {
+            if (go == null)
+            {
+                return;
+            }
 			//add to pool
             go.SetActive(false);
             availableObjStack.Push(go);
@@ -53,7 +57,10 @@ public GameObject NextAvailableObject() {
 			} else {
 				Debug.LogWarning("No object available & cannot grow pool: " + poolName);
 			}
-            go.SetActive(true);
+            if (go != null)
+            {
+                go.SetActive(true);
+            }
             return go;
 		} 
 

diff --git a/ReadMe.txt b/ReadMe.txt
@@ -17,6 +17,11 @@ XlsxToLua:   https://github.com/zhangqi-ulua/XlsxToLua
 UnityHello:  https://github.com/woshihuo12/UnityHello
 Excel配置：https://github.com/sy-yanghuan/proton
 
+【最新版地址，已支持Android arm64】
+最新版LuaFrameWork地址 : https://github.com/jarjin/LuaFramework_UGUI_V2
+最新版tolua_runtime地址 : https://github.com/jarjin/tolua_runtime_V2
+目前由MeniscusLight维护和更新 : https://github.com/MeniscusLight
+
 //-------------2018-05-26-------------
 (1)更新tolua#到May 21, 2018版