From f086925b1d01eb34440f8900ca753188f75557b1 Mon Sep 17 00:00:00 2001 From: jarjin <2338894521@qq.com> Date: Fri, 18 Dec 2015 22:25:39 +0800 Subject: [PATCH] =?UTF-8?q?iOS=E9=BB=98=E8=AE=A4=E5=8A=A0=E8=BD=BDluaopen?= =?UTF-8?q?=5Fbit=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Lua/Common/functions.lua | 11 +++-------- Assets/Lua/Controller/MessageCtrl.lua | 6 +++--- Assets/Lua/Controller/PromptCtrl.lua | 10 +++++----- Assets/Lua/Logic/CtrlManager.lua | 4 ++-- Assets/Lua/Logic/GameManager.lua | 14 +++++++------- Assets/Lua/Logic/LuaClass.lua | 2 +- Assets/Lua/Logic/Network.lua | 12 ++++++------ Assets/Lua/View/MessagePanel.lua | 4 ++-- Assets/Lua/View/PromptPanel.lua | 4 ++-- Assets/uLua/Core/LuaDLL.cs | 3 +++ Assets/uLua/Source/Base/LuaScriptMgr.cs | 4 ++++ ReadMe.txt | 5 +++-- 12 files changed, 41 insertions(+), 38 deletions(-) diff --git a/Assets/Lua/Common/functions.lua b/Assets/Lua/Common/functions.lua index 32d1f15..52a1677 100644 --- a/Assets/Lua/Common/functions.lua +++ b/Assets/Lua/Common/functions.lua @@ -4,18 +4,13 @@ function log(str) Util.Log(str); end ---打印字符串-- -function print(str) - Util.Log(str); -end - --错误日志-- -function error(str) +function logError(str) Util.LogError(str); end --警告日志-- -function warn(str) +function logWarn(str) Util.LogWarning(str); end @@ -28,7 +23,7 @@ function destroy(obj) GameObject.Destroy(obj); end -function newobject(prefab) +function newObject(prefab) return GameObject.Instantiate(prefab); end diff --git a/Assets/Lua/Controller/MessageCtrl.lua b/Assets/Lua/Controller/MessageCtrl.lua index 1cf5b02..6e913ef 100644 --- a/Assets/Lua/Controller/MessageCtrl.lua +++ b/Assets/Lua/Controller/MessageCtrl.lua @@ -8,12 +8,12 @@ local gameObject; --构建函数-- function MessageCtrl.New() - warn("MessageCtrl.New--->>"); + logWarn("MessageCtrl.New--->>"); return this; end function MessageCtrl.Awake() - warn("MessageCtrl.Awake--->>"); + logWarn("MessageCtrl.Awake--->>"); PanelManager:CreatePanel('Message', this.OnCreate); end @@ -27,7 +27,7 @@ function MessageCtrl.OnCreate(obj) message = gameObject:GetComponent('LuaBehaviour'); message:AddClick(MessagePanel.btnClose, this.OnClick); - warn("Start lua--->>"..gameObject.name); + logWarn("Start lua--->>"..gameObject.name); end --单击事件-- diff --git a/Assets/Lua/Controller/PromptCtrl.lua b/Assets/Lua/Controller/PromptCtrl.lua index 1a7917f..f68a81f 100644 --- a/Assets/Lua/Controller/PromptCtrl.lua +++ b/Assets/Lua/Controller/PromptCtrl.lua @@ -17,12 +17,12 @@ local gameObject; --构建函数-- function PromptCtrl.New() - warn("PromptCtrl.New--->>"); + logWarn("PromptCtrl.New--->>"); return this; end function PromptCtrl.Awake() - warn("PromptCtrl.Awake--->>"); + logWarn("PromptCtrl.Awake--->>"); PanelManager:CreatePanel('Prompt', this.OnCreate); end @@ -33,7 +33,7 @@ function PromptCtrl.OnCreate(obj) panel = transform:GetComponent('UIPanel'); prompt = transform:GetComponent('LuaBehaviour'); - warn("Start lua--->>"..gameObject.name); + logWarn("Start lua--->>"..gameObject.name); this.InitPanel(); --初始化面板-- prompt:AddClick(PromptPanel.btnOpen, this.OnClick); @@ -45,7 +45,7 @@ function PromptCtrl.InitPanel() local parent = PromptPanel.gridParent; local itemPrefab = prompt:GetGameObject('PromptItem'); for i = 1, 100 do - local go = newobject(itemPrefab); + local go = newObject(itemPrefab); go.name = tostring(i); go.transform.parent = parent; go.transform.localScale = Vector3.one; @@ -80,7 +80,7 @@ function PromptCtrl.OnClick(go) if TestProtoType == ProtocalType.SPROTO then this.TestSendSproto(); end - warn("OnClick---->>>"..go.name); + logWarn("OnClick---->>>"..go.name); end --测试发送SPROTO-- diff --git a/Assets/Lua/Logic/CtrlManager.lua b/Assets/Lua/Logic/CtrlManager.lua index ef6c4bb..d27a2df 100644 --- a/Assets/Lua/Logic/CtrlManager.lua +++ b/Assets/Lua/Logic/CtrlManager.lua @@ -7,7 +7,7 @@ local this = CtrlManager; local ctrlList = {}; --控制器列表-- function CtrlManager.Init() - warn("CtrlManager.Init----->>>"); + logWarn("CtrlManager.Init----->>>"); ctrlList[CtrlName.Prompt] = PromptCtrl.New(); ctrlList[CtrlName.Message] = MessageCtrl.New(); return this; @@ -30,5 +30,5 @@ end --关闭控制器-- function CtrlManager.Close() - warn('CtrlManager.Close---->>>'); + logWarn('CtrlManager.Close---->>>'); end \ No newline at end of file diff --git a/Assets/Lua/Logic/GameManager.lua b/Assets/Lua/Logic/GameManager.lua index 19e3531..e4bddd2 100644 --- a/Assets/Lua/Logic/GameManager.lua +++ b/Assets/Lua/Logic/GameManager.lua @@ -57,23 +57,23 @@ function GameManager.OnInitOK() ctrl:Awake(); end - warn('SimpleFramework InitOK--->>>'); + logWarn('SimpleFramework InitOK--->>>'); end --测试协同-- function GameManager.test_coroutine() - warn("1111"); + logWarn("1111"); coroutine.wait(1); - warn("2222"); + logWarn("2222"); local www = WWW("http://bbs.ulua.org/readme.txt"); coroutine.www(www); - warn(www.text); + logWarn(www.text); end --测试sproto-- function GameManager.test_sproto_func() - warn("test_sproto_func-------->>"); + logWarn("test_sproto_func-------->>"); local sp = sproto.parse [[ .Person { name 0 : string @@ -129,7 +129,7 @@ end --测试lpeg-- function GameManager.test_lpeg_func() - warn("test_lpeg_func-------->>"); + logWarn("test_lpeg_func-------->>"); -- matches a word followed by end-of-string local p = lpeg.R"az"^1 * -1 @@ -216,5 +216,5 @@ end --销毁-- function GameManager.OnDestroy() - --warn('OnDestroy--->>>'); + --logWarn('OnDestroy--->>>'); end diff --git a/Assets/Lua/Logic/LuaClass.lua b/Assets/Lua/Logic/LuaClass.lua index ce0b3c6..96b7178 100644 --- a/Assets/Lua/Logic/LuaClass.lua +++ b/Assets/Lua/Logic/LuaClass.lua @@ -18,7 +18,7 @@ end --测试打印方法-- function LuaClass:test() - warn("x:>" .. self.x .. " y:>" .. self.y); + logWarn("x:>" .. self.x .. " y:>" .. self.y); end --endregion diff --git a/Assets/Lua/Logic/Network.lua b/Assets/Lua/Logic/Network.lua index 616350e..b52aad3 100644 --- a/Assets/Lua/Logic/Network.lua +++ b/Assets/Lua/Logic/Network.lua @@ -19,7 +19,7 @@ local gameObject; local islogging = false; function Network.Start() - warn("Network.Start!!"); + logWarn("Network.Start!!"); Event.AddListener(Connect, this.OnConnect); Event.AddListener(Login, this.OnLogin); Event.AddListener(Exception, this.OnException); @@ -33,20 +33,20 @@ end --当连接建立时-- function Network.OnConnect() - warn("Game Server connected!!"); + logWarn("Game Server connected!!"); end --异常断线-- function Network.OnException() islogging = false; NetManager:SendConnect(); - error("OnException------->>>>"); + logError("OnException------->>>>"); end --连接中断，或者被踢掉-- function Network.OnDisconnect() islogging = false; - error("OnDisconnect------->>>>"); + logError("OnDisconnect------->>>>"); end --登录返回-- @@ -69,7 +69,7 @@ function Network.OnLogin(buffer) if ctrl ~= nil then ctrl:Awake(); end - warn('OnLogin----------->>>'); + logWarn('OnLogin----------->>>'); end --二进制登录-- @@ -145,5 +145,5 @@ function Network.Unload() Event.RemoveListener(Login); Event.RemoveListener(Exception); Event.RemoveListener(Disconnect); - warn('Unload Network...'); + logWarn('Unload Network...'); end \ No newline at end of file diff --git a/Assets/Lua/View/MessagePanel.lua b/Assets/Lua/View/MessagePanel.lua index 45e23bd..63ba737 100644 --- a/Assets/Lua/View/MessagePanel.lua +++ b/Assets/Lua/View/MessagePanel.lua @@ -10,7 +10,7 @@ function MessagePanel.Awake(obj) transform = obj.transform; this.InitPanel(); - warn("Awake lua--->>"..gameObject.name); + logWarn("Awake lua--->>"..gameObject.name); end --初始化面板-- @@ -20,6 +20,6 @@ end --单击事件-- function MessagePanel.OnDestroy() - warn("OnDestroy---->>>"); + logWarn("OnDestroy---->>>"); end diff --git a/Assets/Lua/View/PromptPanel.lua b/Assets/Lua/View/PromptPanel.lua index 0683db5..dfadf35 100644 --- a/Assets/Lua/View/PromptPanel.lua +++ b/Assets/Lua/View/PromptPanel.lua @@ -10,7 +10,7 @@ function PromptPanel.Awake(obj) transform = obj.transform; this.InitPanel(); - warn("Awake lua--->>"..gameObject.name); + logWarn("Awake lua--->>"..gameObject.name); end --初始化面板-- @@ -21,5 +21,5 @@ end --单击事件-- function PromptPanel.OnDestroy() - warn("OnDestroy---->>>"); + logWarn("OnDestroy---->>>"); end \ No newline at end of file diff --git a/Assets/uLua/Core/LuaDLL.cs b/Assets/uLua/Core/LuaDLL.cs index 035edec..148f962 100644 --- a/Assets/uLua/Core/LuaDLL.cs +++ b/Assets/uLua/Core/LuaDLL.cs @@ -105,6 +105,9 @@ public class LuaDLL [DllImport(LUADLL, CallingConvention = CallingConvention.Cdecl)] public static extern int luaopen_cjson_safe(IntPtr L); + + [DllImport(LUADLL, CallingConvention = CallingConvention.Cdecl)] + public static extern int luaopen_bit(IntPtr L); #if UNITY_EDITOR [DllImport(LUADLL, CallingConvention = CallingConvention.Cdecl)] public static extern int luaopen_socket_core(IntPtr L); diff --git a/Assets/uLua/Source/Base/LuaScriptMgr.cs b/Assets/uLua/Source/Base/LuaScriptMgr.cs index 781ae13..42f267f 100644 --- a/Assets/uLua/Source/Base/LuaScriptMgr.cs +++ b/Assets/uLua/Source/Base/LuaScriptMgr.cs @@ -205,6 +205,10 @@ public LuaScriptMgr() if (AppConst.UseSproto) { LuaDLL.luaopen_sproto_core(lua.L); } + if (Application.platform == RuntimePlatform.IPhonePlayer || + Application.platform == RuntimePlatform.OSXEditor) { + LuaDLL.luaopen_bit(lua.L); + } #if UNITY_EDITOR LuaDLL.luaopen_socket_core(lua.L); #endif diff --git a/ReadMe.txt b/ReadMe.txt index 9c4ae2d..a52b6df 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -12,8 +12,9 @@ 游戏案例地址 http://www.ulua.org/showcase.html 框架详细介绍 http://doc.ulua.org/default.asp?cateID=4 -//-------------2015-11-28------------- -(1)修复清理纹理引用遗留BUG。 +//-------------2015-12-18------------- +(1)iOS默认加载bit。 +(2)修改functions.lua里面warn、error、newobject函数为logWarn、logError、newObject。 //-------------2015-11-10------------- (1)添加lua中使用self关键字例子A6_LuaCall