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

client_Zxw

2018-09-04 7c5418de3d337a1b77fd565bceafa3c5bc865fa7

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

 System/TreasureFindHost/TreasureFindHostModel.cs

@@ -15,6 +15,7 @@
 

        public List<int> treasureIdlist { get; set; }

        public event Action TreasureFindHostCompleteAct;

        public int[] specEquipIds { get; private set;}



        public override void Init()

        {

@@ -43,6 +44,8 @@
            playerPack.RefreshItemCountAct += RefreshEquipInfo;

            playerSuit.RefreshSuitModelAct += RefreshSuitInfo;

            treasureModel.treasureStateChangeEvent += RefreshTreasureState;

            FuncConfigConfig SamboSpecialUnlock = Config.Instance.Get<FuncConfigConfig>("SamboSpecialUnlock");

            specEquipIds = ConfigParse.GetMultipleStr<int>(SamboSpecialUnlock.Numerical1);

        }



        public void OnBeforePlayerDataInitialize()

@@ -135,12 +138,18 @@
            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptEquip);

            if (singlePack == null) return false;





            foreach (var condi in treasureInfo.needConditionsDict.Values)

            {

                progress = 0;

                ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptEquip,condi[3]);

                if(itemModel != null)

                {

                    if(specEquipIds != null && specEquipIds.Contains(condi[3]))

                    {

                        progress += 1;

                        return true;

                    }

                    if(itemModel.chinItemModel.LV >= condi[0]

                        && itemModel.chinItemModel.ItemColor >= condi[1]

                        && itemModel.chinItemModel.StarLevel >= condi[2])


 Utility/LanguageVerify.cs

@@ -20,7 +20,7 @@

    static StringBuilder s_StringBuilder = new StringBuilder();

    const string VerifyPlayerNameUrl = "https://api.maoergame.com/game/role/response?";
    const string VerifyPlayerNameUrl = "https://api.maoergame.com/game/role/response";
    /// <summary>

    /// 校验玩家名

    /// </summary>

@@ -52,7 +52,8 @@
        tables["sender_name"] = playerName;

        tables["sender_level"] = level.ToString();

        tables["sender_vip_level"] = vipLv.ToString();

        tables["timestamp"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

        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"]));

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

            (bool ok, string result) =>

@@ -78,7 +79,7 @@
               });

    }

    const string VerifyFairyUrl = "https://api.maoergame.com/game/sociaty/response?";
    const string VerifyFairyUrl = "https://api.maoergame.com/game/sociaty/response";
    public void VerifyFairy(string verifyContent, int op_type, string fairyName, int title, Action<bool, string> callback)

    {

        if (!requireVerify)

@@ -115,7 +116,8 @@
        tables["edit_name"] = playerName;



        tables["notice"] = op_type == 2 ? string.Empty : verifyContent;

        tables["timestamp"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

        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"]));



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

@@ -144,7 +146,7 @@
    public static uint toPlayer = 0;
    public static string toPlayerName = string.Empty;
    public static int toPlayerLevel = 0;
    const string VerifyChatUrl = "https://api.maoergame.com/game/chat/response?";
    const string VerifyChatUrl = "https://api.maoergame.com/game/chat/response";
    public void VerifyChat(string content, ChatInfoType channelType, Action<bool, string> callback)

    {

        int channel = 0;

@@ -181,7 +183,8 @@
        tables["receiver_level"] = channel == 3 ? (toPlayerLevel == 0 ? string.Empty : toPlayerLevel.ToString()) : string.Empty;

        tables["receiver_vip_level"] = string.Empty;



        tables["timestamp"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");

        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"]));



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