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

client_Wu Xijin

2018-09-04 e54f6e22bb26fb06bdd407803f988b86b40df697

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

 Fight/GameActor/GActorInfo.cs

@@ -138,7 +138,7 @@
    {
        get
        {
            return HpEx * FullHp + Hp;
            return (ulong)HpEx * FullHp + Hp;
        }
    }

@@ -146,7 +146,7 @@
    {
        get
        {
            return MaxHpEx * FullHp + MaxHp;
            return (ulong)MaxHpEx * FullHp + MaxHp;
        }
    }

@@ -185,10 +185,10 @@
    {
        ushort _multiple = (ushort)(value / FullHp);

        //if (sid != PlayerDatas.Instance.PlayerId)
        //{
        //    Debug.LogFormat("<color=red>伤血量: {0}, 当前hp: {1}, hpEx: {2}</color>", value, Hp, HpEx);
        //}
        // if (sid != PlayerDatas.Instance.PlayerId)
        // {
        //     Debug.LogFormat("<color=red>伤血量: {0}, 当前hp: {1}, hpEx: {2}</color>", value, Hp, HpEx);
        // }

        if (_multiple > HpEx)
        {
@@ -218,20 +218,20 @@
            Hp -= value;
        }

        //if (sid != PlayerDatas.Instance.PlayerId)
        //{
        //    if (HpEx != SyncServerHpEx)
        //    {
        //        Debug.LogFormat("<color=red>---- 计算后, hp: {0}, hpEx: {1}</color>", Hp, HpEx);
        //    }
        //}

        if (HpEx * FullHp + Hp < SyncServerHpEx * FullHp + SyncServerHp)
        {
            Hp = SyncServerHp;
            HpEx = SyncServerHpEx;
        }

        // if (sid != PlayerDatas.Instance.PlayerId)
        // {
        //     if (HpEx != SyncServerHpEx)
        //     {
        //         Debug.LogFormat("<color=red>---- 计算后, hp: {0}, hpEx: {1}</color>", Hp, HpEx);
        //     }
        // }

        if (OnHpChange != null)
        {
            OnHpChange(Hp);

 System/FairyAu/UnionTaskModel.cs

@@ -3,7 +3,7 @@
using System.Collections.Generic;

using TableConfig;



public class UnionTaskModel : Model

public class UnionTaskModel : Model,IBeforePlayerDataInitialize

{

    private FuncConfigConfig _tagFuncModel;

    public Action RefreshLivenScoreEvent;

@@ -13,6 +13,14 @@
        SetUnionLivenReward();

        SetUnionLivenScore();

    }



    public void OnBeforePlayerDataInitialize()

    {

        taskInfoDict.Clear();

        curLivenScore = 0;



    }



    public override void UnInit()

    {

        


 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -128,6 +128,8 @@
    private float BossDelayTimeint = 0;

    private List<int> FaBaoNPCIdList = new List<int>();//用于获取需要消失的法宝NPCID；

    public Vector3 UIeffectFabaoVec = new Vector3();//法宝NPC消失时获取的坐标





    PlayerPackModel _playerPack;

    PlayerPackModel playerPack

    {

@@ -207,6 +209,10 @@
    {

        try

        {

            if (AutomaticityBool && MissionState!=3)

            {

                TaskupToDate = MissionID;

            }

            var pytaskM = Config.Instance.Get<PyTaskConfig>(MissionID);

            if (pytaskM == null)

            {

@@ -1505,6 +1511,7 @@
        }

    }

    //--------主要用于记录任务列表选中条的智能性 （-_-||）

    public int TaskupToDate = 0;//获取最新任务ID

    public int GetOnTaskId = 0;

    public bool IsGetOnBool = false;

    private  int NeedTime = 10;


 System/MainInterfacePanel/TaskListTip.cs

@@ -200,7 +200,7 @@
        {

            TaskScheduling();    

            TheTaskToGenerate();

            TaskJump(_id);

            TaskJump();

        }



        private void SetLength()

@@ -422,19 +422,12 @@
            return mapConfig != null && mapConfig.MapFBType != 0;

        }



        private void TaskJump(int TaskID=0)

        private void TaskJump()

        {

            int type = 0;

            if (TaskID == 0)

            if (_list.Contains(taskmodel.TaskupToDate))

            {

                type= _list.IndexOf(taskmodel.GetNowTaskID);

            }

            else

            {

                if (_list.Contains(TaskID))

                {

                    type = _list.IndexOf(TaskID);

                }           
                type = _list.IndexOf(taskmodel.TaskupToDate);

            }

            if (_list.Count <= 2 || type <= 0)

            {


 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,