diff --git a/Assets/Scripts/Component/Touch/UITouchEvent.cs b/Assets/Scripts/Component/Touch/UITouchEvent.cs index c66e29a50..3ca64867d 100644 --- a/Assets/Scripts/Component/Touch/UITouchEvent.cs +++ b/Assets/Scripts/Component/Touch/UITouchEvent.cs @@ -73,6 +73,18 @@ namespace BF } } + public void StopTouchAnimation() + { + if (sequence != null && sequence.IsPlaying()) + { + sequence.Pause(); + if (!ReferenceEquals(originScale, null)) + { + this.transform.localScale = originScale; + } + } + } + public void OnPointerDown(PointerEventData eventData) { if (!enable) @@ -83,7 +95,6 @@ namespace BF { return; } - #if UNITY_EDITOR touchEvent = UITouchEventType.Down; #endif @@ -95,8 +106,6 @@ namespace BF { luaFunc((int)UITouchEventType.Down, eventData.position.x, eventData.position.y); } - - } public void OnPointerUp(PointerEventData eventData) diff --git a/Assets/XLua/Gen/BF_UITouchEventWrap.cs b/Assets/XLua/Gen/BF_UITouchEventWrap.cs index c0540f600..63fd73db7 100644 --- a/Assets/XLua/Gen/BF_UITouchEventWrap.cs +++ b/Assets/XLua/Gen/BF_UITouchEventWrap.cs @@ -21,13 +21,14 @@ namespace XLua.CSObjectWrap { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(BF.UITouchEvent); - Utils.BeginObjectRegister(type, L, translator, 0, 10, 1, 1); + Utils.BeginObjectRegister(type, L, translator, 0, 11, 1, 1); Utils.RegisterFunc(L, Utils.METHOD_IDX, "AddTouchEventListener", _m_AddTouchEventListener); Utils.RegisterFunc(L, Utils.METHOD_IDX, "RemoveEventListener", _m_RemoveEventListener); Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetShowClickAnimation", _m_SetShowClickAnimation); Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetShowClickAnimation", _m_GetShowClickAnimation); Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetTouchEnable", _m_SetTouchEnable); + Utils.RegisterFunc(L, Utils.METHOD_IDX, "StopTouchAnimation", _m_StopTouchAnimation); Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPointerDown", _m_OnPointerDown); Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPointerUp", _m_OnPointerUp); Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnPointerEnter", _m_OnPointerEnter); @@ -215,6 +216,33 @@ namespace XLua.CSObjectWrap + return 0; + } + + } catch(System.Exception gen_e) { + return LuaAPI.luaL_error(L, "c# exception:" + gen_e); + } + + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int _m_StopTouchAnimation(RealStatePtr L) + { + try { + + ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); + + + BF.UITouchEvent gen_to_be_invoked = (BF.UITouchEvent)translator.FastGetCSObj(L, 1); + + + + { + + gen_to_be_invoked.StopTouchAnimation( ); + + + return 0; } diff --git a/Assets/lua/app/bf/unity/uiprefab_object.lua.bytes b/Assets/lua/app/bf/unity/uiprefab_object.lua.bytes index 0b6153101..0a8450f8b 100644 Binary files a/Assets/lua/app/bf/unity/uiprefab_object.lua.bytes and b/Assets/lua/app/bf/unity/uiprefab_object.lua.bytes differ diff --git a/Assets/lua/app/module/maincity/maincity_const.lua.bytes b/Assets/lua/app/module/maincity/maincity_const.lua.bytes index 43f003ca8..e60d993db 100644 Binary files a/Assets/lua/app/module/maincity/maincity_const.lua.bytes and b/Assets/lua/app/module/maincity/maincity_const.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index d162e9d5d..a31314e88 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ