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

client_Wu Xijin

2019-03-20 6a7dd7ee0be86d7fc523f3c9e7f3058bdfbec1df

 Fight/GameActor/GActorPlayerBase.cs

@@ -591,9 +591,9 @@
            return;

        }



        int _resID = JobSetup.BaseEquip[1];

        var apperance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance();



        EquipInfo _equipInfo;

        int _resID = JobSetup.BaseEquip[1];



        // 如果是套装位置

        if (index == (int)RoleEquipType.FashionWeapon)

@@ -602,15 +602,15 @@
            if (itemID == 0)

            {

                // 寻找原身上装备, 如果有的话就重置此次要换装的道具id

                if (m_EquipDict.TryGetValue((int)RoleEquipType.Weapon, out _equipInfo))

                if (apperance.weapon != 0)

                {

                    itemID = _equipInfo.itemID;

                    itemID = (uint)apperance.weapon;

                }

            }

        }

        else if (index == (int)RoleEquipType.Weapon)

        {

            if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon))

            if (apperance.fashionWeapon != 0)

            {

                return;

            }

@@ -708,14 +708,15 @@
        {

            return;

        }



        var apperance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance();



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

        int _resID = _baseHandResID;

        if (JobSetup.Job == 2)

        {

            _resID = JobSetup.BaseEquip[2];

        }



        EquipInfo _equipInfo;



        // 如果是套装位置

        if (index == (int)RoleEquipType.FashionWeapon2)

@@ -724,15 +725,15 @@
            if (itemID == 0)

            {

                // 寻找原身上装备, 如果有的话就重置此次要换装的道具id

                if (m_EquipDict.TryGetValue((int)RoleEquipType.Weapon2, out _equipInfo))

                if (apperance.secondary != 0)

                {

                    itemID = _equipInfo.itemID;

                    itemID = (uint)apperance.secondary;

                }

            }

        }

        else if (index == (int)RoleEquipType.Weapon2)

        {

            if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon2))

            if (apperance.fashionSecondary != 0)

            {

                return;

            }

@@ -795,7 +796,7 @@
                }

            }



            if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon2))

            if (apperance.fashionSecondary != 0)

            {

                SwitchHand(true);

            }

@@ -949,7 +950,7 @@
            return;

        }



        EquipInfo _equipInfo;

        var apperance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance();



        // 换装ID

        int _resID = JobSetup.BaseEquip[0];

@@ -961,15 +962,15 @@
            if (itemID == 0)

            {

                // 寻找原身上装备, 如果有的话就重置此次要换装的道具id

                if (m_EquipDict.TryGetValue((int)RoleEquipType.Clothes, out _equipInfo))

                if (apperance.clothes != 0)

                {

                    itemID = _equipInfo.itemID;

                    itemID = (uint)apperance.clothes;

                }

            }

        }

        else if (index == (int)RoleEquipType.Clothes)

        {

            if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionClothes))

            if (apperance.fashionClothes != 0)

            {

                return;

            }

@@ -1134,13 +1135,13 @@
        // 决定副手逻辑

        // 如果当前是时装副手, 则装备时装手臂

        // 如果当前是普通副手, 则卸下手臂

        if (m_EquipDict.ContainsKey((int)RoleEquipType.FashionWeapon2))

        if (apperance.fashionSecondary != 0)

        {

            SwitchHand(true);

        }

        else

        {

            if (!m_EquipDict.ContainsKey((int)RoleEquipType.Weapon2))

            if (apperance.fashionSecondary == 0)

            {

                SwitchHand(true);

            }

@@ -1306,20 +1307,16 @@


        if (onOrOff)

        {

            EquipInfo _equipInfo;

            var apperance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance();



            int _itemID = 7000;



            if (!m_EquipDict.TryGetValue((int)RoleEquipType.FashionClothes, out _equipInfo))

            if (apperance.fashionClothes == 0)

            {

                if (!m_EquipDict.TryGetValue((int)RoleEquipType.Clothes, out _equipInfo))

                if (apperance.clothes == 0)

                {

                    _itemID = 7000;

                }

            }



            if (_equipInfo.itemID != 0)

            {

                _itemID = (int)_equipInfo.itemID;

            }



            int _resID = 7000;