diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index 2fd83e44709007a993299b4f7627f5c903267c14..afd7351b3083d47abcf0c08629d5830b19f67b70 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -296,6 +296,9 @@
+
+
+
diff --git a/Assets/LuaFramework/Editor/CustomSettings.cs b/Assets/LuaFramework/Editor/CustomSettings.cs
index 2fe3f75347dae2cfce2be5f95b410a13ad5257fa..a7b026d59d6b56ab0722b86a1cc37edfcef9444e 100644
--- a/Assets/LuaFramework/Editor/CustomSettings.cs
+++ b/Assets/LuaFramework/Editor/CustomSettings.cs
@@ -165,6 +165,7 @@ namespace LuaFramework
_GT(typeof(Toggle)),
_GT(typeof(Slider)),
_GT(typeof(InputField)),
+ _GT(typeof(InputField.OnChangeEvent)),
_GT(typeof(Dropdown)),
// TODO: 添加自定义的类
diff --git a/Assets/LuaFramework/Lua/Logic/Login/LoginLogic.lua b/Assets/LuaFramework/Lua/Logic/Login/LoginLogic.lua
index aee216c8e10b0ff32a03920bc4c7d636b0acee4c..9d16c2af27fad492cb0e24a206ae444d78b5b9b5 100644
--- a/Assets/LuaFramework/Lua/Logic/Login/LoginLogic.lua
+++ b/Assets/LuaFramework/Lua/Logic/Login/LoginLogic.lua
@@ -8,9 +8,7 @@ function LoginLogic.DoLogin(account, pwdMd5, cb)
if not this.CheckAccount(account) then
return
end
- if not this.CheckPwd(pwdMd5) then
- return
- end
+
-- TODO 调用SDK或与游戏服务端通信，执行登录流程
log("DoLogin, account: " .. account .. ", pwdMd5: " .. pwdMd5)
-- 缓存账号密码
diff --git a/Assets/LuaFramework/Lua/View/Login/LoginPanel.lua b/Assets/LuaFramework/Lua/View/Login/LoginPanel.lua
index bf574f6619d4125d7d26c1fb005e8d4c0c56b154..9e13f96fe68d306757eda0b57fdf77485f2f2b5f 100644
--- a/Assets/LuaFramework/Lua/View/Login/LoginPanel.lua
+++ b/Assets/LuaFramework/Lua/View/Login/LoginPanel.lua
@@ -26,26 +26,46 @@ function LoginPanel:SetUi(binder)
local accountInput = binder:GetObj("accountInput")
accountInput.text = Cache.Get("ACCOUNT", "")
-- 密码输入框
- local pwdMd5 = Cache.Get("PASSWORD", "")
+ local cachePwdMd5 = Cache.Get("PASSWORD", "")
+ local finalPwdMd5 = cachePwdMd5
+
local pwdInput = UGUITool.SetInputField(binder, "pwdInput", function (v)
+ -- 输入框编辑完毕后会进入这个回调
if "********" == v then
return
end
local newPwdMd5 = Util.md5(v)
- if newPwdMd5 ~= pwdMd5 then
- pwdMd5 = newPwdMd5
+ if newPwdMd5 ~= cachePwdMd5 then
+ finalPwdMd5 = newPwdMd5
end
end)
-
- if not LuaUtil.IsStrNullOrEmpty(pwdMd5) then
+
+ -- 当缓存了密码，修改任何字符都会清掉密码
+ pwdInput.onValueChanged:AddListener(function (v)
+ if "********" == v then
+ return
+ end
+ if not LuaUtil.IsStrNullOrEmpty(cachePwdMd5) then
+ cachePwdMd5 = ""
+ pwdInput.text = ""
+ end
+ end)
+
+ -- 如果缓存了密码，则密码框显示为********
+ if not LuaUtil.IsStrNullOrEmpty(cachePwdMd5) then
pwdInput.text = "********"
end
-- 登录按钮
UGUITool.SetButton(binder, "loginBtn", function (btn)
+ if not LoginLogic.CheckPwd(pwdInput.text) then
+ return
+ end
+
-- 执行登录
local account = accountInput.text
- LoginLogic.DoLogin(account, pwdMd5, function (ok)
+ -- logGreen("pwd :" .. pwdInput.text .. ", md5: " .. Util.md5(pwdInput.text))
+ LoginLogic.DoLogin(account, finalPwdMd5, function (ok)
if not ok then return end
-- 登录成功，关闭登录界面
self.Hide()
diff --git a/Assets/LuaFramework/ToLua/Source/Generate/DelegateFactory.cs b/Assets/LuaFramework/ToLua/Source/Generate/DelegateFactory.cs
index 380af6a34817beaf67454744feed42828720a281..f44866a33dc57621eab6c561fd183231a193a868 100644
--- a/Assets/LuaFramework/ToLua/Source/Generate/DelegateFactory.cs
+++ b/Assets/LuaFramework/ToLua/Source/Generate/DelegateFactory.cs
@@ -38,6 +38,7 @@ public static class DelegateFactory
dict.Add(typeof(System.Action), System_Action_float);
dict.Add(typeof(UnityEngine.RectTransform.ReapplyDrivenProperties), UnityEngine_RectTransform_ReapplyDrivenProperties);
dict.Add(typeof(UnityEngine.UI.InputField.OnValidateInput), UnityEngine_UI_InputField_OnValidateInput);
+ dict.Add(typeof(UnityEngine.Events.UnityAction), UnityEngine_Events_UnityAction_string);
dict.Add(typeof(MyEventHandler), MyEventHandler);
}
@@ -1153,6 +1154,53 @@ public static class DelegateFactory
}
}
+ class UnityEngine_Events_UnityAction_string_Event : LuaDelegate
+ {
+ public UnityEngine_Events_UnityAction_string_Event(LuaFunction func) : base(func) { }
+ public UnityEngine_Events_UnityAction_string_Event(LuaFunction func, LuaTable self) : base(func, self) { }
+
+ public void Call(string param0)
+ {
+ func.BeginPCall();
+ func.Push(param0);
+ func.PCall();
+ func.EndPCall();
+ }
+
+ public void CallWithSelf(string param0)
+ {
+ func.BeginPCall();
+ func.Push(self);
+ func.Push(param0);
+ func.PCall();
+ func.EndPCall();
+ }
+ }
+
+ public static Delegate UnityEngine_Events_UnityAction_string(LuaFunction func, LuaTable self, bool flag)
+ {
+ if (func == null)
+ {
+ UnityEngine.Events.UnityAction fn = delegate(string param0) { };
+ return fn;
+ }
+
+ if(!flag)
+ {
+ UnityEngine_Events_UnityAction_string_Event target = new UnityEngine_Events_UnityAction_string_Event(func);
+ UnityEngine.Events.UnityAction d = target.Call;
+ target.method = d.Method;
+ return d;
+ }
+ else
+ {
+ UnityEngine_Events_UnityAction_string_Event target = new UnityEngine_Events_UnityAction_string_Event(func, self);
+ UnityEngine.Events.UnityAction d = target.CallWithSelf;
+ target.method = d.Method;
+ return d;
+ }
+ }
+
class MyEventHandler_Event : LuaDelegate
{
public MyEventHandler_Event(LuaFunction func) : base(func) { }
diff --git a/Assets/LuaFramework/ToLua/Source/Generate/LuaBinder.cs b/Assets/LuaFramework/ToLua/Source/Generate/LuaBinder.cs
index 36e014ff4511a5a448452fcadbe88dfa2e2cfcdd..87e531c6b00514cf3fb03b38c4696d0da3ba72ec 100644
--- a/Assets/LuaFramework/ToLua/Source/Generate/LuaBinder.cs
+++ b/Assets/LuaFramework/ToLua/Source/Generate/LuaBinder.cs
@@ -79,6 +79,7 @@ public static class LuaBinder
UnityEngine_UI_MaskableGraphicWrap.Register(L);
UnityEngine_UI_GraphicWrap.Register(L);
L.BeginModule("InputField");
+ UnityEngine_UI_InputField_OnChangeEventWrap.Register(L);
L.RegFunction("OnValidateInput", UnityEngine_UI_InputField_OnValidateInput);
L.EndModule();
L.EndModule();
@@ -86,7 +87,10 @@ public static class LuaBinder
UnityEngine_EventSystems_UIBehaviourWrap.Register(L);
L.EndModule();
L.BeginModule("Events");
+ UnityEngine_Events_UnityEvent_stringWrap.Register(L);
+ UnityEngine_Events_UnityEventBaseWrap.Register(L);
L.RegFunction("UnityAction", UnityEngine_Events_UnityAction);
+ L.RegFunction("UnityAction_string", UnityEngine_Events_UnityAction_string);
L.EndModule();
L.BeginModule("Camera");
L.RegFunction("CameraCallback", UnityEngine_Camera_CameraCallback);
@@ -243,6 +247,33 @@ public static class LuaBinder
}
}
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int UnityEngine_Events_UnityAction_string(IntPtr L)
+ {
+ try
+ {
+ int count = LuaDLL.lua_gettop(L);
+ LuaFunction func = ToLua.CheckLuaFunction(L, 1);
+
+ if (count == 1)
+ {
+ Delegate arg1 = DelegateFactory.CreateDelegate(typeof(UnityEngine.Events.UnityAction), func);
+ ToLua.Push(L, arg1);
+ }
+ else
+ {
+ LuaTable self = ToLua.CheckLuaTable(L, 2);
+ Delegate arg1 = DelegateFactory.CreateDelegate(typeof(UnityEngine.Events.UnityAction), func, self);
+ ToLua.Push(L, arg1);
+ }
+ return 1;
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int UnityEngine_Camera_CameraCallback(IntPtr L)
{
diff --git a/Assets/LuaFramework/ToLua/Source/Generate/LuaFramework_AppConstWrap.cs b/Assets/LuaFramework/ToLua/Source/Generate/LuaFramework_AppConstWrap.cs
index 255e03a5a0790d9f995c7cff948f2da1fec3f38d..86e5983b285f49feec0f9759c6708d295a53fe36 100644
--- a/Assets/LuaFramework/ToLua/Source/Generate/LuaFramework_AppConstWrap.cs
+++ b/Assets/LuaFramework/ToLua/Source/Generate/LuaFramework_AppConstWrap.cs
@@ -12,6 +12,7 @@ public class LuaFramework_AppConstWrap
L.RegConstant("DebugMode", 0);
L.RegConstant("ExampleMode", 0);
L.RegConstant("TimerInterval", 1);
+ L.RegConstant("GameFrameRate", 30);
L.RegVar("AppName", get_AppName, null);
L.RegVar("LuaTempDir", get_LuaTempDir, null);
L.RegVar("ExtName", get_ExtName, null);
diff --git a/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEventBaseWrap.cs b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEventBaseWrap.cs
new file mode 100644
index 0000000000000000000000000000000000000000..80a2f252d6c725c56bd2e87ba3c24e073ec1171f
--- /dev/null
+++ b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEventBaseWrap.cs
@@ -0,0 +1,161 @@
+//this source code was auto-generated by tolua#, do not modify it
+using System;
+using LuaInterface;
+
+public class UnityEngine_Events_UnityEventBaseWrap
+{
+ public static void Register(LuaState L)
+ {
+ L.BeginClass(typeof(UnityEngine.Events.UnityEventBase), typeof(System.Object));
+ L.RegFunction("GetPersistentEventCount", GetPersistentEventCount);
+ L.RegFunction("GetPersistentTarget", GetPersistentTarget);
+ L.RegFunction("GetPersistentMethodName", GetPersistentMethodName);
+ L.RegFunction("SetPersistentListenerState", SetPersistentListenerState);
+ L.RegFunction("RemoveAllListeners", RemoveAllListeners);
+ L.RegFunction("ToString", ToString);
+ L.RegFunction("GetValidMethodInfo", GetValidMethodInfo);
+ L.RegFunction("__tostring", ToLua.op_ToString);
+ L.EndClass();
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int GetPersistentEventCount(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 1);
+ UnityEngine.Events.UnityEventBase obj = (UnityEngine.Events.UnityEventBase)ToLua.CheckObject(L, 1, typeof(UnityEngine.Events.UnityEventBase));
+ int o = obj.GetPersistentEventCount();
+ LuaDLL.lua_pushinteger(L, o);
+ return 1;
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int GetPersistentTarget(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 2);
+ UnityEngine.Events.UnityEventBase obj = (UnityEngine.Events.UnityEventBase)ToLua.CheckObject(L, 1, typeof(UnityEngine.Events.UnityEventBase));
+ int arg0 = (int)LuaDLL.luaL_checknumber(L, 2);
+ UnityEngine.Object o = obj.GetPersistentTarget(arg0);
+ ToLua.Push(L, o);
+ return 1;
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int GetPersistentMethodName(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 2);
+ UnityEngine.Events.UnityEventBase obj = (UnityEngine.Events.UnityEventBase)ToLua.CheckObject(L, 1, typeof(UnityEngine.Events.UnityEventBase));
+ int arg0 = (int)LuaDLL.luaL_checknumber(L, 2);
+ string o = obj.GetPersistentMethodName(arg0);
+ LuaDLL.lua_pushstring(L, o);
+ return 1;
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int SetPersistentListenerState(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 3);
+ UnityEngine.Events.UnityEventBase obj = (UnityEngine.Events.UnityEventBase)ToLua.CheckObject(L, 1, typeof(UnityEngine.Events.UnityEventBase));
+ int arg0 = (int)LuaDLL.luaL_checknumber(L, 2);
+ UnityEngine.Events.UnityEventCallState arg1 = (UnityEngine.Events.UnityEventCallState)ToLua.CheckObject(L, 3, typeof(UnityEngine.Events.UnityEventCallState));
+ obj.SetPersistentListenerState(arg0, arg1);
+ return 0;
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int RemoveAllListeners(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 1);
+ UnityEngine.Events.UnityEventBase obj = (UnityEngine.Events.UnityEventBase)ToLua.CheckObject(L, 1, typeof(UnityEngine.Events.UnityEventBase));
+ obj.RemoveAllListeners();
+ return 0;
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int ToString(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 1);
+ UnityEngine.Events.UnityEventBase obj = (UnityEngine.Events.UnityEventBase)ToLua.CheckObject(L, 1, typeof(UnityEngine.Events.UnityEventBase));
+ string o = obj.ToString();
+ LuaDLL.lua_pushstring(L, o);
+ return 1;
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int GetValidMethodInfo(IntPtr L)
+ {
+ try
+ {
+ int count = LuaDLL.lua_gettop(L);
+
+ if (count == 3 && TypeChecker.CheckTypes(L, 1, typeof(System.Type), typeof(string), typeof(System.Type[])))
+ {
+ System.Type arg0 = (System.Type)ToLua.ToObject(L, 1);
+ string arg1 = ToLua.ToString(L, 2);
+ System.Type[] arg2 = ToLua.CheckObjectArray(L, 3);
+ System.Reflection.MethodInfo o = UnityEngine.Events.UnityEventBase.GetValidMethodInfo(arg0, arg1, arg2);
+ ToLua.PushObject(L, o);
+ return 1;
+ }
+ else if (count == 3 && TypeChecker.CheckTypes(L, 1, typeof(object), typeof(string), typeof(System.Type[])))
+ {
+ object arg0 = ToLua.ToVarObject(L, 1);
+ string arg1 = ToLua.ToString(L, 2);
+ System.Type[] arg2 = ToLua.CheckObjectArray(L, 3);
+ System.Reflection.MethodInfo o = UnityEngine.Events.UnityEventBase.GetValidMethodInfo(arg0, arg1, arg2);
+ ToLua.PushObject(L, o);
+ return 1;
+ }
+ else
+ {
+ return LuaDLL.luaL_throw(L, "invalid arguments to method: UnityEngine.Events.UnityEventBase.GetValidMethodInfo");
+ }
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+}
+
diff --git a/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEventBaseWrap.cs.meta b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEventBaseWrap.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..94ac12eb4c7fc3734f1f98e358bd498df968f7e4
--- /dev/null
+++ b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEventBaseWrap.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0244c2247600ae84589016c41d81b434
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEvent_stringWrap.cs b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEvent_stringWrap.cs
new file mode 100644
index 0000000000000000000000000000000000000000..3adec0131d7b7eab81b65a7aa9fd4c9b75269a0f
--- /dev/null
+++ b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEvent_stringWrap.cs
@@ -0,0 +1,117 @@
+//this source code was auto-generated by tolua#, do not modify it
+using System;
+using LuaInterface;
+
+public class UnityEngine_Events_UnityEvent_stringWrap
+{
+ public static void Register(LuaState L)
+ {
+ L.BeginClass(typeof(UnityEngine.Events.UnityEvent), typeof(UnityEngine.Events.UnityEventBase), "UnityEvent_string");
+ L.RegFunction("AddListener", AddListener);
+ L.RegFunction("RemoveListener", RemoveListener);
+ L.RegFunction("Invoke", Invoke);
+ L.RegFunction("New", _CreateUnityEngine_Events_UnityEvent_string);
+ L.RegFunction("__tostring", ToLua.op_ToString);
+ L.EndClass();
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _CreateUnityEngine_Events_UnityEvent_string(IntPtr L)
+ {
+ try
+ {
+ int count = LuaDLL.lua_gettop(L);
+
+ if (count == 0)
+ {
+ UnityEngine.Events.UnityEvent obj = new UnityEngine.Events.UnityEvent();
+ ToLua.PushObject(L, obj);
+ return 1;
+ }
+ else
+ {
+ return LuaDLL.luaL_throw(L, "invalid arguments to ctor method: UnityEngine.Events.UnityEvent.New");
+ }
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int AddListener(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 2);
+ UnityEngine.Events.UnityEvent obj = (UnityEngine.Events.UnityEvent)ToLua.CheckObject(L, 1, typeof(UnityEngine.Events.UnityEvent));
+ UnityEngine.Events.UnityAction arg0 = null;
+ LuaTypes funcType2 = LuaDLL.lua_type(L, 2);
+
+ if (funcType2 != LuaTypes.LUA_TFUNCTION)
+ {
+ arg0 = (UnityEngine.Events.UnityAction)ToLua.CheckObject(L, 2, typeof(UnityEngine.Events.UnityAction));
+ }
+ else
+ {
+ LuaFunction func = ToLua.ToLuaFunction(L, 2);
+ arg0 = DelegateFactory.CreateDelegate(typeof(UnityEngine.Events.UnityAction), func) as UnityEngine.Events.UnityAction;
+ }
+
+ obj.AddListener(arg0);
+ return 0;
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int RemoveListener(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 2);
+ UnityEngine.Events.UnityEvent obj = (UnityEngine.Events.UnityEvent)ToLua.CheckObject(L, 1, typeof(UnityEngine.Events.UnityEvent));
+ UnityEngine.Events.UnityAction arg0 = null;
+ LuaTypes funcType2 = LuaDLL.lua_type(L, 2);
+
+ if (funcType2 != LuaTypes.LUA_TFUNCTION)
+ {
+ arg0 = (UnityEngine.Events.UnityAction)ToLua.CheckObject(L, 2, typeof(UnityEngine.Events.UnityAction));
+ }
+ else
+ {
+ LuaFunction func = ToLua.ToLuaFunction(L, 2);
+ arg0 = DelegateFactory.CreateDelegate(typeof(UnityEngine.Events.UnityAction), func) as UnityEngine.Events.UnityAction;
+ }
+
+ obj.RemoveListener(arg0);
+ return 0;
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int Invoke(IntPtr L)
+ {
+ try
+ {
+ ToLua.CheckArgsCount(L, 2);
+ UnityEngine.Events.UnityEvent obj = (UnityEngine.Events.UnityEvent)ToLua.CheckObject(L, 1, typeof(UnityEngine.Events.UnityEvent));
+ string arg0 = ToLua.CheckString(L, 2);
+ obj.Invoke(arg0);
+ return 0;
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+}
+
diff --git a/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEvent_stringWrap.cs.meta b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEvent_stringWrap.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..87a5f54902724d2ef5d14de41dd4bd7dd7ff5e2d
--- /dev/null
+++ b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_Events_UnityEvent_stringWrap.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6724732865ef87e44a16b2c77335abed
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_UI_InputField_OnChangeEventWrap.cs b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_UI_InputField_OnChangeEventWrap.cs
new file mode 100644
index 0000000000000000000000000000000000000000..e42b3e435805e2304e1818f34f3bdee154c9a481
--- /dev/null
+++ b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_UI_InputField_OnChangeEventWrap.cs
@@ -0,0 +1,39 @@
+//this source code was auto-generated by tolua#, do not modify it
+using System;
+using LuaInterface;
+
+public class UnityEngine_UI_InputField_OnChangeEventWrap
+{
+ public static void Register(LuaState L)
+ {
+ L.BeginClass(typeof(UnityEngine.UI.InputField.OnChangeEvent), typeof(UnityEngine.Events.UnityEvent));
+ L.RegFunction("New", _CreateUnityEngine_UI_InputField_OnChangeEvent);
+ L.RegFunction("__tostring", ToLua.op_ToString);
+ L.EndClass();
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _CreateUnityEngine_UI_InputField_OnChangeEvent(IntPtr L)
+ {
+ try
+ {
+ int count = LuaDLL.lua_gettop(L);
+
+ if (count == 0)
+ {
+ UnityEngine.UI.InputField.OnChangeEvent obj = new UnityEngine.UI.InputField.OnChangeEvent();
+ ToLua.PushObject(L, obj);
+ return 1;
+ }
+ else
+ {
+ return LuaDLL.luaL_throw(L, "invalid arguments to ctor method: UnityEngine.UI.InputField.OnChangeEvent.New");
+ }
+ }
+ catch(Exception e)
+ {
+ return LuaDLL.toluaL_exception(L, e);
+ }
+ }
+}
+
diff --git a/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_UI_InputField_OnChangeEventWrap.cs.meta b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_UI_InputField_OnChangeEventWrap.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..32860961521df9e6c0b507445cd8d972fae93a07
--- /dev/null
+++ b/Assets/LuaFramework/ToLua/Source/Generate/UnityEngine_UI_InputField_OnChangeEventWrap.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b243297d3317a504ca5715b4185d7774
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Framework/UGUIExpand/UGUITool.cs b/Assets/Scripts/Framework/UGUIExpand/UGUITool.cs
index f93439bb7396e4043b7175c2c89073148ffd051a..3cf982a1a74e031de1bb4c4938db9c2944cba605 100644
--- a/Assets/Scripts/Framework/UGUIExpand/UGUITool.cs
+++ b/Assets/Scripts/Framework/UGUIExpand/UGUITool.cs
@@ -35,8 +35,6 @@ public class UGUITool
GameLogger.LogError("SetButton Error, obj is null: " + name);
return null;
}
-
- btn.onClick.RemoveAllListeners();
btn.onClick.AddListener(() =>
{
if (null != onClick)
@@ -58,16 +56,14 @@ public class UGUITool
GameLogger.LogError("SetInputField Error, obj is null: " + name);
return null;
}
- input.onEndEdit.RemoveAllListeners();
input.onEndEdit.AddListener((v) =>
{
if (null != onEndEdit)
onEndEdit(v);
});
-
return input;
}
-
+
///
/// 设置下拉框选择回调
///
@@ -87,7 +83,7 @@ public class UGUITool
if (null != onValueChanged)
onValueChanged(v);
});
-
+
return dropdown;
}
@@ -139,5 +135,5 @@ public class UGUITool
return slider;
}
-
+
}
diff --git a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache
index 1d4d3ac498042a86c6dc9d4c8b4a35260220fe91..204fdef644eaa2e6de09b015f5f4588ab58aa14d 100644
Binary files a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache differ