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

client_linchunjie

2019-07-17 491079f8dc180c91d99626cf603893b5e1c144b9

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

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -534,6 +534,7 @@
                {

                    hero.SwitchSuit();

                    hero.ReqLingGenEffect((int)(baseData.equipShowSwitch / 1000 % 1000));

                    hero.horseAwakeId = (int)(value / 1000000);

                }

                break;

            case PlayerDataType.LuckValue:


 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs

@@ -64,6 +64,14 @@
            else if (_config.EquipPlace == (int)RoleEquipType.Mount)
            {
                _player.ActorInfo.horseItemID = vNetData.EquipID;
                if (vNetData.UserDataLen > 0)
                {
                    var _jsonData = LitJson.JsonMapper.ToObject(vNetData.UserData);
                    if ((_jsonData as IDictionary).Contains("210"))
                    {
                        _player.horseAwakeId = int.Parse(_jsonData["210"].ToString());
                    }
                }
                if (_player.MovingState == E_MovingState.Ride)
                {
                    _player.OnHorse(1);

 Core/NetworkPackage/DTCFile/ServerPack/H07_PlayerItem/DTC0725_tagRolePackRefreshEx.cs

@@ -33,6 +33,15 @@
                    if (_hero != null)
                    {
                        _hero.PutonEquip(_item.ItemID);

                        if (_item.UserDataLen > 0)
                        {
                            var _jsonData = LitJson.JsonMapper.ToObject(_item.UserData);
                            if ((_jsonData as IDictionary).Contains("210"))
                            {
                                _hero.horseAwakeId = int.Parse(_jsonData["210"][0].ToString());
                            }
                        }
                    }
                }
            }

 Core/NetworkPackage/ServerPack/H04_Scene/H0435_tagPetAppear.cs

@@ -1,25 +1,30 @@
using UnityEngine;
using System.Collections;

//04 35 宠物出现#tagPetAppear
//04 35 �������#tagPetAppear

public class H0435_tagPetAppear : GameNetPackBasic {
    public uint PetID;    // 宠物ID
public class H0435_tagPetAppear : GameNetPackBasic
{
    public uint PetID;    // ����ID
    public uint NPCID;    // NPCID
    public uint PlayerID;    // 主人ID
    public uint PosX;    // X坐标
    public uint PosY;    // Y坐标
    public uint PlayerID;    // ����ID
    public uint PosX;    // X����
    public uint PosY;    // Y����
    public byte Rank;

    public H0435_tagPetAppear () {
    public H0435_tagPetAppear()
    {
        _cmd = (ushort)0x0435;
    }

    public override void ReadFromBytes (byte[] vBytes) {
        TransBytes (out PetID, vBytes, NetDataType.DWORD);
        TransBytes (out NPCID, vBytes, NetDataType.DWORD);
        TransBytes (out PlayerID, vBytes, NetDataType.DWORD);
        TransBytes (out PosX, vBytes, NetDataType.DWORD);
        TransBytes (out PosY, vBytes, NetDataType.DWORD);
    public override void ReadFromBytes(byte[] vBytes)
    {
        TransBytes(out PetID, vBytes, NetDataType.DWORD);
        TransBytes(out NPCID, vBytes, NetDataType.DWORD);
        TransBytes(out PlayerID, vBytes, NetDataType.DWORD);
        TransBytes(out PosX, vBytes, NetDataType.DWORD);
        TransBytes(out PosY, vBytes, NetDataType.DWORD);
        TransBytes(out Rank, vBytes, NetDataType.BYTE);
    }

}

 Fight/GameActor/GAMgr.cs

@@ -1450,7 +1450,6 @@
        // 全体模式, 强制模式 需要对玩家进行预先判断

        if ((E_AttackMode)PlayerDatas.Instance.baseData.AttackMode == E_AttackMode.All

         || (E_AttackMode)PlayerDatas.Instance.baseData.AttackMode == E_AttackMode.Family

         || (E_AttackMode)PlayerDatas.Instance.baseData.AttackMode == E_AttackMode.Contest

         || PlayerDatas.Instance.maliciousAtkPlayer.Count > 0

         || ClientCrossServerOneVsOne.isClientCrossServerOneVsOne)

        {


 Fight/GameActor/GA_Pet.cs

@@ -1,5 +1,4 @@


using System.Collections.Generic;

using Snxxz.UI;

using UnityEngine;



@@ -54,7 +53,6 @@
                    }

                    else

                    {



                        var _ctrl = SFXPlayUtility.Instance.PlayBattleEffect(_effectlist[i], m_Model.transform.GetChildTransformDeeply(_boneList[i]));

                        m_EffectList.Add(_ctrl);

                    }

@@ -99,6 +97,23 @@
        {

            ShowEffect();

        }



        if (m_H0435 != null && m_H0435.Rank > 0)

        {

            var _model = ModelCenter.Instance.GetModel<PetModel>();

            int _effectID = _model.GetPetHorseEffect(NpcConfig.NPCID, m_H0435.Rank);

            if (_effectID > 0)

            {

                var _bindNode = Root;

                var _bindNodeName = _model.GetPetHorseEffectNode(NpcConfig.NPCID, m_H0435.Rank);

                if (!string.IsNullOrEmpty(_bindNodeName))

                {

                    _bindNode = Root.GetChildTransformDeeply(_bindNodeName);

                }

                var _ctrl = SFXPlayUtility.Instance.PlayBattleEffect(_effectID, _bindNode);

                m_EffectList.Add(_ctrl);

            }

        }

    }



    public sealed override void ShowOrHideModel(bool showOrHide)


 Fight/GameActor/GActorPlayerBase.cs

@@ -1886,7 +1886,7 @@
            }

        }

    }



    public int horseAwakeId = 0;

    public void ShowHorseEffect()

    {

        HideHorseEffect();

@@ -1927,6 +1927,20 @@
                }

            }

        }



        var _model = ModelCenter.Instance.GetModel<PetModel>();

        int _effectID = _model.GetPetHorseEffect((int)HorseID, horseAwakeId);

        if (_effectID > 0)

        {

            var _bindNode = m_HorseModel.transform;

            var _bindNodeName = _model.GetPetHorseEffectNode((int)HorseID, horseAwakeId);

            if (!string.IsNullOrEmpty(_bindNodeName))

            {

                _bindNode = m_HorseModel.transform.GetChildTransformDeeply(_bindNodeName);

            }

            var _ctrl = SFXPlayUtility.Instance.PlayBattleEffect(_effectID, _bindNode);

            m_HorseEffectList.Add(_ctrl);

        }

    }



    public void PutonEquip(uint itemID)