Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2019-04-16 bb2d2bae05da9eed93e13071b0f3bb9f5e058aa8

 UI/Common/FunctionButton.cs

@@ -7,12 +7,13 @@
using UnityEngine.UI;
using UnityEngine.Events;
using UnityEngine.EventSystems;
using TableConfig;

using System;

namespace Snxxz.UI
{

    [XLua.LuaCallCSharp]
    public class FunctionButton : Button
    {
        [SerializeField] int m_Order = 0;
@@ -104,6 +105,7 @@
        }

        public event Action<string> OnPointClickLockFunc;
        public event Action repeatClickFunc;

        protected override void Awake()
        {
@@ -170,6 +172,10 @@

            if (!invokeForce && state == TitleBtnState.Click)
            {
                if (repeatClickFunc != null)

                {

                    repeatClickFunc();

                }
                return;
            }