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

client_Zxw

2018-11-02 b45e9afa8a920ef0db904d832d80512a9bd27253

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

 Core/NetworkPackage/DTCFile/ServerPack/HA7_Arena/DTCA709_tagObjInfoListRefresh.cs

@@ -42,7 +42,6 @@
                        _player.ActorInfo.ResetHp((int)vNetData.Value);
                        break;
                    case PlayerDataRefresh.MaxHP:
                        _player.ActorInfo.SyncServerHpEx = vNetData.Value;
                        _player.ActorInfo.ResetHp(-1, -1, (int)vNetData.Value);
                        break;
                    case PlayerDataRefresh.Family:

 Fight/GameActor/GA_Player.cs

@@ -414,6 +414,7 @@


    public sealed override void RefreshLifeBar(ulong value)

    {

        // Debug.LogFormat("{0} 血量改变: {1}", ServerInstID, value);

        GA_Hero _hero = PlayerDatas.Instance.hero;

        if (_hero != null && _hero.SelectTarget == this)

        {


 Fight/GameActor/GActorInfo.cs

@@ -77,10 +77,10 @@
        set
        {
            _syncHpex = value;
            //if (sid != PlayerDatas.Instance.PlayerId)
            //{
            //    Debug.LogFormat("<color=green>============ 设置 {1} 血量Ex: {0}</color>", _syncHpex, sid);
            //}
            // if (sid != PlayerDatas.Instance.PlayerId)
            // {
            //     Debug.LogFormat("<color=green>============ 设置 {1} 血量Ex: {0}</color>", _syncHpex, sid);
            // }
        }
    }// 服务端血量Ex的校准值

@@ -170,10 +170,10 @@
            MaxHpEx = (ushort)valMaxEx;
        }

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

        if (OnHpChange != null)
        {
@@ -187,7 +187,7 @@

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

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

        // if (sid != PlayerDatas.Instance.PlayerId)
        // {
        //     if (HpEx > 0)
        //     {
        //         Debug.Log("Error");
        //     }
        // }

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

 Fight/GameActor/GActorPlayerBase.cs

@@ -372,7 +372,6 @@
    private GameObject m_ClothesModel;

    private GameObject m_WeaponModel;

    private GameObject m_SecondaryModel;

    private GameObject m_HandModel;

    private GameObject m_WingModel;

    private GameObject m_HorseModel;

    private GA_Guard m_Guard;


 System/Skill/QuickSetting.cs

@@ -42,10 +42,19 @@
            return;
        }
        textBuilder.Length = 0;
        var start = quickRange.index + index * quickRange.single;
        var start = quickRange.index + index * quickRange.single;

        var end = start + value.Length;
        if (quickRange.length == quickRange.single)

        {

            end = start + quickRange.length;

        }
        textBuilder.Append(setting, 0, start);
        textBuilder.Append(value);
        if (quickRange.length == quickRange.single

            && quickRange.length > value.Length)

        {

            textBuilder.Append('*', quickRange.length - value.Length);

        }
        textBuilder.Append(setting, end, setting.Length - end);
        setting = textBuilder.ToString();
        PlayerDatas.Instance.baseData.Setting = setting;