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

client_Wu Xijin

2019-01-16 680fb23e7eaf9c1c15fc0821496d1570f92dbab4

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

 Fight/GameActor/GA_NpcFightSgzcZZ.cs

@@ -232,7 +232,10 @@
    protected override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)
    {
        Renderer _renderer = secondary.GetComponentInChildren<Renderer>();
        _renderer.gameObject.SetLayer(LayerUtility.Player, false);
        if (_renderer)
        {
            _renderer.gameObject.SetLayer(LayerUtility.Player, false);
        }
    }

    protected override void OnPutonWeapon(uint weaponItemID, GameObject weapon)

 Fight/GameActor/GA_NpcFightZZPlayer.cs

@@ -318,12 +318,12 @@
        {
            SwitchGodWeapon(4, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(4));
        }
        

        if (m_ViewPlayerData != null)
        {
            SwitchGodWeapon(1, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(1));
        }
        

        if (m_ViewPlayerData != null)
        {
            SwitchGodWeapon(2, m_ViewPlayerData.rolePlusData.GetGodWeaponLevel(2));
@@ -333,7 +333,10 @@
    protected override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)
    {
        Renderer _renderer = secondary.GetComponentInChildren<Renderer>();
        _renderer.gameObject.SetLayer(LayerUtility.Player, false);
        if (_renderer)
        {
            _renderer.gameObject.SetLayer(LayerUtility.Player, false);
        }
    }

    protected override void OnPutonWeapon(uint weaponItemID, GameObject weapon)

 Fight/GameActor/GA_PlayerClient.cs

@@ -177,7 +177,10 @@
    protected sealed override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)

    {

        Renderer _renderer = secondary.GetComponentInChildren<Renderer>();

        _renderer.gameObject.SetLayer(LayerUtility.Player, false);

        if (_renderer)

        {

            _renderer.gameObject.SetLayer(LayerUtility.Player, false);

        }

    }



    protected sealed override void OnPutonWeapon(uint weaponItemID, GameObject weapon)


 Fight/GameActor/GActorNpcFight.cs

@@ -114,6 +114,8 @@


    private void OnPrefabLoadFinished(bool result, UnityEngine.Object prefab)

    {





        if (!result || prefab == null)

        {

            if (!m_LoadDefaultRes)


 Fight/GameActor/GActorPlayerBase.cs

@@ -650,6 +650,10 @@
        }

        int _baseHandResID = ModelResConfig.GetHandByClothesID((int)ClothesItemID);

        int _resID = _baseHandResID;

        if(JobSetup.Job == 2)

        {

            _resID = JobSetup.BaseEquip[2];

        }



        EquipInfo _equipInfo;



@@ -749,8 +753,26 @@
        }

        else

        {

            SwitchHand(true);

            OnPutonSecondary(SecondaryID, m_HandModel);

            if (JobSetup.Job == 2)

            {

                if (!TryRequest(_resID, ref m_SecondaryModel))

                {

                    return;

                }



                // 替换当前衣服上的武器

                Transform _secondaryNode = m_ClothesModel.transform.GetChildTransformDeeply(GAStaticDefine.SecondaryBindBoneName[JobSetup.Job - 1]);

                m_SecondaryModel.transform.SetParent(_secondaryNode);

                m_SecondaryModel.transform.localPosition = Vector3.zero;

                m_SecondaryModel.transform.localRotation = Quaternion.identity;



                OnPutonSecondary(SecondaryID, m_SecondaryModel);

            }

            else if (JobSetup.Job == 1)

            {

                SwitchHand(true);

                OnPutonSecondary(SecondaryID, m_HandModel);

            }

        }



        ShowSecondaryEffect();