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

client_Hale

2019-04-15 c79dbe6647429b864d15a21b3baa77ffa8d48768

 System/Strengthening/WingsRedDotModel.cs

@@ -33,7 +33,7 @@
            packModel.itemCntAddEvent += ItemCntAddAct;//物品数量增加
            packModel.itemCntReduceEvent += ItemCntReduceAct;//物品数量减少
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange;
            ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing);
            ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, SpiritWeaponModel.WING_EQUIPINDEX);
            if (IsOnePutOn)
            {
                WingsDot();
@@ -78,7 +78,7 @@
        public void WingsDot()
        {
            redPointStre.state = RedPointState.None;
            ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing);
            ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, SpiritWeaponModel.WING_EQUIPINDEX);

            if (itemModel == null || !FuncOpen.Instance.IsFuncOpen(90))
            {
@@ -174,7 +174,7 @@
            }
            if (arg1 == PackType.Equip)//装备背包物品增加
            {
                ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing);
                ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, SpiritWeaponModel.WING_EQUIPINDEX);
                if (IsOnePutOn)
                {
                    WingsDot();
@@ -225,7 +225,7 @@
            }
            if (arg1 == PackType.Equip)//装备脱下
            {
                ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing);
                ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, SpiritWeaponModel.WING_EQUIPINDEX);
                if (itemModel == null && redPointStre.state == RedPointState.Simple)
                {
                    redPointStre.state = RedPointState.None;