简化框架加载流程。

jarjin · jarjin · commit afb845143edc · 2016-01-31T09:48:06.000+08:00
diff --git a/Assets/LuaFramework/Lua/Logic/Game.lua b/Assets/LuaFramework/Lua/Logic/Game.lua
@@ -19,24 +19,29 @@ require "Logic/CtrlManager"
 require "Controller/PromptCtrl"
 
 --管理器--
-GameManager = {};
-local this = GameManager;
+Game = {};
+local this = Game;
 
 local game; 
 local transform;
 local gameObject;
 local WWW = UnityEngine.WWW;
 
-function GameManager.LuaPanels()
-	return unpack(PanelNames);
+function Game.InitViewPanels()
+	for i = 1, #PanelNames do
+		require ("View/"..tostring(PanelNames[i]))
+	end
 end
 
 --初始化完成，发送链接服务器信息--
-function GameManager.OnInitOK()
+function Game.OnInitOK()
     AppConst.SocketPort = 2012;
     AppConst.SocketAddress = "127.0.0.1";
     networkMgr:SendConnect();
 
+    --注册LuaView--
+    this.InitViewPanels();
+
     --this.test_class_func();
     --this.test_pblua_func();
     --this.test_cjson_func();
@@ -50,11 +55,11 @@ function GameManager.OnInitOK()
     if ctrl ~= nil and AppConst.ExampleMode then
         ctrl:Awake();
     end
-    logWarn('SimpleFramework InitOK--->>>');
+    logWarn('LuaFramework InitOK--->>>');
 end
 
 --测试协同--
-function GameManager.test_coroutine()    
+function Game.test_coroutine()    
     logWarn("1111");
     coroutine.wait(1);	
     logWarn("2222");
@@ -65,7 +70,7 @@ function GameManager.test_coroutine()
 end
 
 --测试sproto--
-function GameManager.test_sproto_func()
+function Game.test_sproto_func()
     logWarn("test_sproto_func-------->>");
     local sp = sproto.parse [[
     .Person {
@@ -121,7 +126,7 @@ function GameManager.test_sproto_func()
 end
 
 --测试lpeg--
-function GameManager.test_lpeg_func()
+function Game.test_lpeg_func()
 	logWarn("test_lpeg_func-------->>");
 	-- matches a word followed by end-of-string
 	local p = lpeg.R"az"^1 * -1
@@ -132,12 +137,12 @@ function GameManager.test_lpeg_func()
 end
 
 --测试lua类--
-function GameManager.test_class_func()
+function Game.test_class_func()
     LuaClass:New(10, 20):test();
 end
 
 --测试pblua--
-function GameManager.test_pblua_func()
+function Game.test_pblua_func()
     local login = login_pb.LoginRequest();
     login.id = 2000;
     login.name = 'game';
@@ -148,15 +153,15 @@ function GameManager.test_pblua_func()
 end
 
 --pblua callback--
-function GameManager.OnPbluaCall(data)
+function Game.OnPbluaCall(data)
     local msg = login_pb.LoginRequest();
     msg:ParseFromString(data);
     print(msg);
     print(msg.id..' '..msg.name);
 end
 
 --测试pbc--
-function GameManager.test_pbc_func()
+function Game.test_pbc_func()
     local path = Util.DataPath.."lua/3rd/pbc/addressbook.pb";
     log('io.open--->>>'..path);
 
@@ -178,7 +183,7 @@ function GameManager.test_pbc_func()
 end
 
 --pbc callback--
-function GameManager.OnPbcCall(data)
+function Game.OnPbcCall(data)
     local path = Util.DataPath.."lua/3rd/pbc/addressbook.pb";
 
     local addr = io.open(path, "rb")
@@ -195,19 +200,19 @@ function GameManager.OnPbcCall(data)
 end
 
 --测试cjson--
-function GameManager.test_cjson_func()
+function Game.test_cjson_func()
     local path = Util.DataPath.."lua/3rd/cjson/example2.json";
     local text = util.file_load(path);
     LuaHelper.OnJsonCallFunc(text, this.OnJsonCall);
 end
 
 --cjson callback--
-function GameManager.OnJsonCall(data)
+function Game.OnJsonCall(data)
     local obj = json.decode(data);
     print(obj['menu']['id']);
 end
 
 --销毁--
-function GameManager.OnDestroy()
+function Game.OnDestroy()
 	--logWarn('OnDestroy--->>>');
 end
diff --git a/Assets/LuaFramework/Lua/Logic/Game.lua.meta b/Assets/LuaFramework/Lua/Logic/Game.lua.meta
diff --git a/Assets/LuaFramework/Scripts/Common/LuaBehaviour.cs b/Assets/LuaFramework/Scripts/Common/LuaBehaviour.cs
@@ -6,26 +6,24 @@
 
 namespace LuaFramework {
     public class LuaBehaviour : Base {
-        protected static bool initialize = false;
-
         private string data = null;
         private AssetBundle bundle = null;
         private Dictionary<string, LuaFunction> buttons = new Dictionary<string, LuaFunction>();
 
         protected void Awake() {
-            CallMethod("Awake", gameObject);
+            Util.CallMethod(name, "Awake", gameObject);
         }
 
         protected void Start() {
-            CallMethod("Start");
+            Util.CallMethod(name, "Start");
         }
 
         protected void OnClick() {
-            CallMethod("OnClick");
+            Util.CallMethod(name, "OnClick");
         }
 
         protected void OnClickEvent(GameObject go) {
-            CallMethod("OnClick", go);
+            Util.CallMethod(name, "OnClick", go);
         }
 
         /// <summary>
@@ -83,14 +81,6 @@ public void ClearClick() {
             buttons.Clear();
         }
         
-        /// <summary>
-        /// 执行Lua方法
-        /// </summary>
-        protected object[] CallMethod(string func, params object[] args) {
-            if (!initialize) return null;
-            return Util.CallMethod(name, func, args);
-        }
-
         //-----------------------------------------------------------------
         protected void OnDestroy() {
             if (bundle) {
diff --git a/Assets/LuaFramework/Scripts/ConstDefine/AppConst.cs b/Assets/LuaFramework/Scripts/ConstDefine/AppConst.cs
@@ -5,7 +5,7 @@
 
 namespace LuaFramework {
     public class AppConst {
-        public const bool DebugMode = false;                        //调试模式-用于内部测试
+        public const bool DebugMode = true;                        //调试模式-用于内部测试
 
         /// <summary>
         /// 如果想删掉框架自带的例子，那这个例子模式必须要
@@ -20,7 +20,7 @@ public class AppConst {
         /// </summary>
         public const bool UpdateMode = false;                      //更新模式-默认关闭 
         public const bool LuaByteMode = false;                     //Lua字节码模式-默认关闭 
-        public const bool LuaBundleMode = true;                   //Lua代码AssetBundle模式-默认关闭 
+        public const bool LuaBundleMode = false;                   //Lua代码AssetBundle模式-默认关闭 
 
         public const bool UsePbc = true;                           //PBC
         public const bool UseLpeg = true;                          //lpeg
diff --git a/Assets/LuaFramework/Scripts/Controller/Command/StartUpCommand.cs b/Assets/LuaFramework/Scripts/Controller/Command/StartUpCommand.cs
@@ -24,7 +24,5 @@ public override void Execute(IMessage message) {
         AppFacade.Instance.AddManager<ResourceManager>(ManagerName.Resource);
         AppFacade.Instance.AddManager<ThreadManager>(ManagerName.Thread);
         AppFacade.Instance.AddManager<GameManager>(ManagerName.Game);
-
-        Debug.Log("LuaFramework StartUp-------->>>>>");
     }
 }
diff --git a/Assets/LuaFramework/Scripts/Manager/GameManager.cs b/Assets/LuaFramework/Scripts/Manager/GameManager.cs
@@ -6,12 +6,9 @@
 using System.Reflection;
 using System.IO;
 
-#if UNITY_EDITOR
-using UnityEditor;
-#endif
-
 namespace LuaFramework {
-    public class GameManager : LuaBehaviour {
+    public class GameManager : Manager {
+        protected static bool initialize = false;
         private List<string> downloadFiles = new List<string>();
 
         /// <summary>
@@ -232,51 +229,22 @@ void OnThreadCompleted(NotiData data) {
             }
         }
 
-        /// <summary>
-        /// 资源初始化结束
-        /// </summary>
-        public void OnResourceInited() {
-            LuaManager.InitStart();
-            LuaManager.DoFile("Logic/Network");       //加载网络
-            LuaManager.DoFile("Logic/GameManager");    //加载游戏
-            initialize = true;                     //初始化完 
-
-            NetManager.OnInit();    //初始化网络
-
-            object[] panels = CallMethod("LuaPanels");  
-            //---------------------Lua面板---------------------------
-            foreach (object o in panels) {
-                string name = o.ToString().Trim();
-                if (string.IsNullOrEmpty(name)) continue;
-
-                LuaManager.DoFile("View/" + name);
-                Debug.LogWarning("LoadLua---->>>>" + name + ".lua");
-            }
-            //------------------------------------------------------------
-            CallMethod("OnInitOK");   //初始化完成
-        }
-
         void OnUpdateFailed(string file) {
             string message = "更新失败!>" + file;
             facade.SendMessageCommand(NotiConst.UPDATE_MESSAGE, message);
         }
 
-        void Update() {
-            if (LuaManager != null && initialize) {
-                //LuaManager.Update();
-            }
-        }
-
-        void LateUpdate() {
-            if (LuaManager != null && initialize) {
-                //LuaManager.LateUpate();
-            }
-        }
+        /// <summary>
+        /// 资源初始化结束
+        /// </summary>
+        public void OnResourceInited() {
+            LuaManager.InitStart();
+            LuaManager.DoFile("Logic/Game");            //加载游戏
+            LuaManager.DoFile("Logic/Network");         //加载网络
+            NetManager.OnInit();                        //初始化网络
 
-        void FixedUpdate() {
-            if (LuaManager != null && initialize) {
-                //LuaManager.FixedUpdate();
-            }
+            Util.CallMethod(name, "OnInitOK");          //初始化完成
+            initialize = true;                          //初始化完 
         }
 
         /// <summary>
diff --git a/ReadMe.txt b/ReadMe.txt
@@ -14,6 +14,9 @@
 tolua#地址： https://github.com/topameng/tolua
 tolua#底层库 https://github.com/topameng/tolua_runtime
 
+//-------------2016-01-31-------------
+(1)简化框架加载流程。
+
 //-------------2016-01-30-------------
 (1)添加luajit2.1版本在ios下的32、64位编码器。
 (2)修复加载Lua文件BUG。

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,5 @@ public override void Execute(IMessage message) {`
`24`	`24`	`AppFacade.Instance.AddManager<ResourceManager>(ManagerName.Resource);`
`25`	`25`	`AppFacade.Instance.AddManager<ThreadManager>(ManagerName.Thread);`
`26`	`26`	`AppFacade.Instance.AddManager<GameManager>(ManagerName.Game);`
`27`		`-`
`28`		`- Debug.Log("LuaFramework StartUp-------->>>>>");`
`29`	`27`	`}`
`30`	`28`	`}`