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

client_Hale

2019-01-25 1586ec26e8d2e19fb58400261fbaf8e1f624c0c2

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

 System/Dungeon/TargetBriefInfoWin.cs

@@ -135,6 +135,11 @@
            return;

        }



        if (WindowCenter.Instance.IsOpen("DemonJarBossLifeBarWin"))

        {

            WindowCenter.Instance.Close<DemonJarBossLifeBarWin>();

        }



        TargetBriefInfoWin win;

        if (!WindowCenter.Instance.IsOpen<TargetBriefInfoWin>())

        {


 System/JadeDynastyKnapSack/JadeDynastyDecomposeWin.cs

@@ -117,6 +117,11 @@


        private void ClickDecompose()

        {

            if(decomposeModel.selectGuids.Count < 1)

            {

                SysNotifyMgr.Instance.ShowTip("JadeDynastyDecompose");

                return;

            }

            decomposeModel.SendJadeDynastyDecompose(0);

        }




 System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs

@@ -313,14 +313,24 @@
            return false;

        }



        public bool TryGetMaxSuitLV(int equipPlace,out int maxSuitLv)

        public bool TryGetMaxSuitLV(int itemId,int equipPlace,out int maxSuitLv)

        {

            maxSuitLv = 0;

            var config = Config.Instance.Get<ItemConfig>(itemId);

            if (config == null) return false;

         
            var suitLvs = GetSuitLvList(equipPlace);

            if(suitLvs != null && suitLvs.Count > 0)

            {

                maxSuitLv = suitLvs[suitLvs.Count - 1];

                return true;

                for(int i = suitLvs.Count - 1; i > -1; i--)

                {

                    var suitLv = suitLvs[i];

                    if(suitLv <= config.LV)

                    {

                        maxSuitLv = suitLv;

                        return true;

                    }

                }

            }

            return false;

        }

@@ -373,19 +383,22 @@
            return isActive;

        }



        public bool TryGetSuitLV(int equipPlace,PackType type,out int curSuitLv,out int nextSuitLV)

        public bool TryGetSuitLV(int equipPlace,PackType type,out int curSuitLv,out int nextSuitLV,int itemId = 0)

        {

            curSuitLv = 0;

            nextSuitLV = 0;

            int maxSuitLv = 0;

            bool isMax = TryGetMaxSuitLV(equipPlace,out maxSuitLv);

            switch(type)

            {

                case PackType.rptJadeDynastyItem:

                    if(isMax)

                    if(itemId != 0)

                    {

                        nextSuitLV = maxSuitLv;

                        return true;

                        int maxSuitLv = 0;

                        bool isMax = TryGetMaxSuitLV(itemId,equipPlace, out maxSuitLv);

                        if(isMax)

                        {

                            nextSuitLV = maxSuitLv;

                            return true;

                        }

                    }

                    break;

                case PackType.rptJadeDynastyEquip:

@@ -448,7 +461,7 @@
           

        }



        public bool TryGetSumSuitAttr(int suitType,PackType type,out JadeDynastySuitAttrData activeSuit,out JadeDynastySuitAttrData nextSuit)

        public bool TryGetSumSuitAttr(int suitType,PackType type,out JadeDynastySuitAttrData activeSuit,out JadeDynastySuitAttrData nextSuit,int itemId = 0)

        {

            activeSuit = null;

            nextSuit = null;

@@ -457,7 +470,7 @@
            int equipPlace = suitTypeDict[suitType][0];

            int curSuitLv = 0;

            int nextSuitLv = 0;

            bool isSuitLv = TryGetSuitLV(equipPlace,type,out curSuitLv,out nextSuitLv);

            bool isSuitLv = TryGetSuitLV(equipPlace,type,out curSuitLv,out nextSuitLv,itemId);



            TryGetSuitAttrData(equipPlace,curSuitLv,out activeSuit);

            TryGetSuitAttrData(equipPlace,nextSuitLv,out nextSuit);


 System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs

@@ -137,6 +137,8 @@
                    equipModel.ClearLookItemModel();

                    break;

                case PackType.rptJadeDynastyEquip:

                    UpdateItemLine();

                    equipModel.ClearLookItemModel();

                    UpdatePlayerUI3DModel();

                    UpdateFightPower();

                    break;


 System/JadeDynastyKnapSack/JadeDynastyItemBeh.cs

@@ -73,6 +73,13 @@
                        effect.Play();

                    }

                }

                else

                {

                    if (effect.IsPlaying)

                    {

                        effect.Stop();

                    }

                }

            }

        }

    }


 System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs

@@ -14,9 +14,10 @@
        [SerializeField] GameObject noneActive;



        JadeDynastyEquipModel equipModel { get { return ModelCenter.Instance.GetModel<JadeDynastyEquipModel>(); } }



        public void SetDisplay(PackType type,bool isNext = false,int equipPlace = 0)

        int itemId = 0;

        public void SetDisplay(PackType type,bool isNext = false,int equipPlace = 0,int _itemId = 0)

        {

            this.itemId = _itemId;

           if(equipPlace == 0)

            {

                UpdateSumSuitAttr(type, isNext);

@@ -45,7 +46,7 @@
                    suitAttr.attrTypeObj.SetActive(true);

                    JadeDynastyEquipModel.JadeDynastySuitAttrData curAttrData = null;

                    JadeDynastyEquipModel.JadeDynastySuitAttrData nextAttrData = null;

                    equipModel.TryGetSumSuitAttr(suitType, type, out curAttrData, out nextAttrData);

                    equipModel.TryGetSumSuitAttr(suitType, type, out curAttrData, out nextAttrData,itemId);

                    if (isNext)

                    {

                        if (nextAttrData != null)

@@ -60,7 +61,7 @@
                            isNoneActive = false;

                        }

                    }

                    suitAttr.SetDisplay(suitType, type, isNext);

                    suitAttr.SetDisplay(suitType, type, isNext,itemId);

                }

            }



@@ -104,7 +105,7 @@
                    int suitType = suitTypes[i];

                    JadeDynastyEquipModel.JadeDynastySuitAttrData curAttrData = null;

                    JadeDynastyEquipModel.JadeDynastySuitAttrData nextAttrData = null;

                    equipModel.TryGetSumSuitAttr(suitType, type, out curAttrData, out nextAttrData);

                    equipModel.TryGetSumSuitAttr(suitType, type, out curAttrData, out nextAttrData,this.itemId);

                    if (isNext)

                    {

                        if (nextAttrData != null)

@@ -119,7 +120,7 @@
                            isNoneActive = false;

                        }

                    }

                    suitAttr.SetDisplay(suitType, type, isNext);

                    suitAttr.SetDisplay(suitType, type, isNext,itemId);

                }

                else

                {

@@ -157,12 +158,12 @@
            ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

            JadeDynastyEquipModel equipModel { get { return ModelCenter.Instance.GetModel<JadeDynastyEquipModel>(); } }



            public void SetDisplay(int suitType,PackType type,bool isNext)

            public void SetDisplay(int suitType,PackType type,bool isNext,int itemId)

            {

                JadeDynastyEquipModel.JadeDynastySuitAttrData curAttrData = null;

                JadeDynastyEquipModel.JadeDynastySuitAttrData nextAttrData = null;

                JadeDynastyEquipModel.JadeDynastySuitAttrData suitAttrData = null;

                equipModel.TryGetSumSuitAttr(suitType,type,out curAttrData,out nextAttrData);

                equipModel.TryGetSumSuitAttr(suitType,type,out curAttrData,out nextAttrData,itemId);

                suitAttrData = isNext ? nextAttrData : curAttrData;

                if(suitAttrData == null)

                {


 System/KnapSack/BetterItemGetBehaviour.cs

@@ -157,7 +157,8 @@
            if (model.TryGetBetterEquip(model.currentEquipGuid, out betterEquip))

            {

                var itemConfig = Config.Instance.Get<ItemConfig>(betterEquip.itemInfo.ItemID);

                itemTipsModel.SetItemTipsModel(PackType.rptItem, betterEquip.itemInfo.ItemGUID);

                var packType = GeneralDefine.GetPackTypeByItemType(itemConfig.Type);

                itemTipsModel.SetItemTipsModel(packType, betterEquip.itemInfo.ItemGUID);

            }

        }




 System/KnapSack/Logic/EquipTip.cs

@@ -878,8 +878,8 @@


            PackType packType = itemAttrData.packType == PackType.rptDeleted ? PackType.rptJadeDynastyItem : itemAttrData.packType;



            curJadeDynastySuitAttr.SetDisplay(packType,false,itemAttrData.itemConfig.EquipPlace);

            nextJadeDynastySuitAttr.SetDisplay(packType, true, itemAttrData.itemConfig.EquipPlace);

            curJadeDynastySuitAttr.SetDisplay(packType,false,itemAttrData.itemConfig.EquipPlace,itemAttrData.itemId);

            nextJadeDynastySuitAttr.SetDisplay(packType, true, itemAttrData.itemConfig.EquipPlace,itemAttrData.itemId);

        }



        private void SetMidUIHeight(float midHeight)


 System/KnapSack/Logic/PackModelInterface.cs

@@ -1681,15 +1681,27 @@
                        putOnModel2 = playerPack.GetItemModelByIndex(PackType.rptJadeDynastyEquip, (int)RoleEquipType.JadeDynasty_Ring2);

                        break;

                }

                if (putOnModel2 != null)



                switch ((RoleEquipType)chinItemModel.EquipPlace)

                {

                    if (putOnModel != null)

                    {

                        if (putOnModel2.equipScore < putOnModel.equipScore)

                    case RoleEquipType.retFairyCan:

                    case RoleEquipType.JadeDynasty_Glove1:

                    case RoleEquipType.JadeDynasty_Ring1:

                        if (putOnModel2 != null)

                        {

                            if (putOnModel != null)

                            {

                                if (putOnModel2.equipScore < putOnModel.equipScore)

                                {

                                    putOnModel = putOnModel2;

                                }

                            }

                        }

                        else

                        {

                            putOnModel = putOnModel2;

                        }

                    }

                        break;

                }



                int equipScore1 = 0;


 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -558,15 +558,15 @@


            if(sendItemModel.packType == PackType.rptJadeDynastyItem)

            {

                if (sendItemModel.chinItemModel.EquipPlace >= (int)RoleEquipType.JadeDynasty_Cloak

                     && sendItemModel.chinItemModel.EquipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)

                if (equipPlace >= (int)RoleEquipType.JadeDynasty_Cloak

                     && equipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)

                {

                    var jadeDynastyModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();

                    bool islock = jadeDynastyModel.IsLockEquipPlace(sendItemModel.chinItemModel.EquipPlace);

                    bool islock = jadeDynastyModel.IsLockEquipPlace(equipPlace);

                    if (islock)

                    {

                        int towerlayer = 0;

                        jadeDynastyModel.TryGetLockTowerLayer(sendItemModel.chinItemModel.EquipPlace, out towerlayer);

                        jadeDynastyModel.TryGetLockTowerLayer(equipPlace, out towerlayer);

                        SysNotifyMgr.Instance.ShowTip("JadeDynastyEquip", towerlayer);

                        return;

                    }