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

client_Wu Xijin

2018-09-04 65ee0906040485c15696b10e13196e8139bd1a4d

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

 System/Chat/ChatCtrl.cs

@@ -249,6 +249,12 @@
    {

        bool _dirty = false;



        if (CheckEmptyChat(msg))

        {

            SysNotifyMgr.Instance.ShowTip("CanootTalk14");

            return;

        }



        ChatReport(type, msg, PteChatName);



        if (!ChatCenter.s_VoiceRegex.IsMatch(msg))

@@ -347,6 +353,15 @@
             }

         });

    }



    bool CheckEmptyChat(string msg)

    {

        if (string.IsNullOrEmpty(msg.Replace(" ", string.Empty)))

        {

            return true;

        }

        return false;

    }

    /// <summary>

    /// 世界频道

    /// </summary>


 System/FairyAu/GiveRedBagTipsWin.cs

@@ -137,7 +137,7 @@


        private void NumKeyboardMoneyChange()

        {

            if (int.Parse(m_NumKeyboardMoney.Value) <= 999)

            if (int.Parse(m_NumKeyboardMoney.Value) <= _RedLines)

            {

                if (int.Parse(m_NumKeyboardMoney.Value) <= 0)

                {

@@ -149,7 +149,7 @@
            }

            else

            {

                m_NumKeyboardMoney.Value = 999.ToString();

                m_NumKeyboardMoney.Value = _RedLines.ToString();

                ScrollTip.ShowTip(Language.Get("RedEnvelopeReleaseLimit_Z"));



            }  


 System/Role/MagicianWin.cs

@@ -57,6 +57,28 @@
            {

                UpdateUseItem(model.selectType);

                UpdateItems(model.selectItemIndex);

                try

                {

                    bool allNone = true;

                    int[] items = model.GetLvUpItemByType(model.selectType);

                    for (int i = 0; i < items.Length; i++)

                    {

                        var _count = playerPack.GetItemCountByID(PackType.rptItem, items[i]);

                        if (_count > 0)

                        {

                            allNone = false;

                        }

                    }

                    var count = playerPack.GetItemCountByID(PackType.rptItem, items[model.selectItemIndex]);

                    if (count == 0 && !allNone)

                    {

                        UpdateItems(GetItemIndex(model.selectType, model.selectItemIndex));

                    }

                }

                catch (Exception e)

                {

                    DebugEx.Log(e.Message);

                }

            }

        }

        void OnRefresh()


 Utility/FileExtersion.cs

@@ -155,4 +155,24 @@
            throw new Exception("GetMD5HashFromFile() fail,error:" + ex.Message);

        }

    }



    public static string GetStringMD5Hash(string str)

    {

        try

        {

            var bytes = Encoding.UTF8.GetBytes(str);

            var md5 = new MD5CryptoServiceProvider();

            var retVal = md5.ComputeHash(bytes);

            var sb = new StringBuilder();

            for (int i = 0; i < retVal.Length; i++)

            {

                sb.Append(retVal[i].ToString("x2"));

            }

            return sb.ToString();

        }

        catch (Exception ex)

        {

            throw new Exception("GetMD5HashFromFile() fail,error:" + ex.Message);

        }

    }

}

 Utility/LanguageVerify.cs

@@ -54,7 +54,7 @@
        tables["sender_vip_level"] = vipLv.ToString();

        var ts = System.DateTime.UtcNow - new System.DateTime(1970, 1, 1, 0, 0, 0, 0);

        tables["timestamp"] = ((long)System.Convert.ToInt64(ts.TotalSeconds)).ToString();

        tables["key"] = ToMD5(StringUtility.Contact(Sercret, tables["timestamp"]));

        tables["key"] = FileExtersion.GetStringMD5Hash(StringUtility.Contact(Sercret, tables["timestamp"]));

        HttpRequest.Instance.RequestHttpPost(VerifyPlayerNameUrl, tables, HttpRequest.defaultHttpContentType, 3,

            (bool ok, string result) =>

               {

@@ -118,7 +118,7 @@
        tables["notice"] = op_type == 2 ? string.Empty : verifyContent;

        var ts = System.DateTime.UtcNow - new System.DateTime(1970, 1, 1, 0, 0, 0, 0);

        tables["timestamp"] = ((long)System.Convert.ToInt64(ts.TotalSeconds)).ToString();

        tables["key"] = ToMD5(StringUtility.Contact(Sercret, tables["timestamp"]));

        tables["key"] = FileExtersion.GetStringMD5Hash(StringUtility.Contact(Sercret, tables["timestamp"]));



        HttpRequest.Instance.RequestHttpPost(VerifyFairyUrl, tables, HttpRequest.defaultHttpContentType, 3,

            (bool ok, string result) =>

@@ -185,7 +185,7 @@


        var ts = System.DateTime.UtcNow - new System.DateTime(1970, 1, 1, 0, 0, 0, 0);

        tables["timestamp"] = ((long)System.Convert.ToInt64(ts.TotalSeconds)).ToString();

        tables["key"] = ToMD5(StringUtility.Contact(Sercret, tables["timestamp"]));

        tables["key"] = FileExtersion.GetStringMD5Hash(StringUtility.Contact(Sercret, tables["timestamp"]));



        HttpRequest.Instance.RequestHttpPost(VerifyChatUrl, tables, HttpRequest.defaultHttpContentType, 3,

            (bool ok, string result) =>

@@ -250,19 +250,6 @@
        }

        return true;

    }

    static string ToMD5(string content)

    {

        byte[] bytes = Encoding.UTF8.GetBytes(content);

        MD5 md5 = new MD5CryptoServiceProvider();

        byte[] hash = md5.ComputeHash(bytes);

        s_StringBuilder.Length = 0;

        for (int i = 0; i < hash.Length; i++)

        {

            s_StringBuilder.Append(hash[i].ToString("X2"));

        }

        return s_StringBuilder.ToString();

    }



    public class VerifyResponse

    {