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

client_Wu Xijin

2018-09-26 7fa40925ba36d19a355763122836e10089ab5fca

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

 System/KnapSack/Logic/PackModelInterface.cs

@@ -40,6 +40,7 @@
        PlayerStrengthengDatas strengthDatas { get { return ModelCenter.Instance.GetModel<PlayerStrengthengDatas>(); } }

        MagicianModel magicianModel { get { return ModelCenter.Instance.GetModel<MagicianModel>(); } }

        TrialDungeonModel trialModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }

        ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } }



        private int[] pushItemIds;

        public int[] pushBuffTypeIds;

@@ -564,6 +565,11 @@
                    }

                    break;

                case 39:

                    if(!CheckIsBetterWings(itemModel))

                    {

                        isReach = false;

                        return isReach;

                    }

                    break;

                case 52:

                    if (!strengthDatas.IsHint(itemModel.itemId))

@@ -599,6 +605,59 @@
            return isReach;

        }



        private bool CheckIsBetterWings(ItemModel itemModel)

        {

            if (itemModel == null) return false;



            bool isBetter = true;

            ItemModel putModel = playerPack.GetItemModelByIndex(PackType.rptEquip,(int)RoleEquipType.retWing);

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);

            List<ItemModel> itemModels = null;

            if(singlePack != null)

            {

                singlePack.GetItemCountByType((int)ItemType.Wings, out itemModels);

            }

            int[] composeTypes = itemModel.chinItemModel.JumpComposeCondi;

            bool isOpenCompose = false;

            if(composeTypes != null && composeTypes.Length >= 3)

            {

                ItemCompoundConfig itemCompound = ItemCompoundConfig.GetItemCompoundByType(composeTypes[0], composeTypes[1], composeTypes[2]);

                if (itemCompound != null)

                {

                    if (itemCompound.levelNeed <= PlayerDatas.Instance.baseData.LV)

                    {

                        isOpenCompose = true;

                    }

                }

            }



            if(!isOpenCompose)

            {

                return false;

            }



            if (putModel != null && putModel.chinItemModel.LV >= itemModel.chinItemModel.LV)

            {

                return false;

            }



            if (itemModels != null)

            {

                for(int i = 0; i < itemModels.Count; i++)

                {

                    if(itemModels[i].chinItemModel.JobLimit/100 == PlayerDatas.Instance.baseData.Job)

                    {

                        if(itemModels[i].chinItemModel.LV >= itemModel.chinItemModel.LV)

                        {

                            return false;

                        }

                    }

                }

            }



            return true;

        }



        private bool CheckIsExtendGrid(int itemId)

        {

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);


 System/KnapSack/PreciousItemGetBehaviour.cs

@@ -87,7 +87,20 @@
                model.ReportConfirmPreciousItem(model.currentShowItem);

                if (itemModel != null && itemModel.packType == PackType.rptItem)

                {

                    PackSendQuestMgr.Instance.SendUseItemQuest(ItemWinBtnType.makeUse, itemModel.itemInfo.ItemPlace);

                    switch((ItemType)itemModel.chinItemModel.Type)

                    {

                        case ItemType.WingsMat:

                            int jumpId = 0;

                            bool isUnlock = ModelCenter.Instance.GetModel<ComposeWinModel>().CheckComposeItemById(itemModel.itemId, out jumpId);

                            if (isUnlock)

                            {

                                PackSendQuestMgr.Instance.ClickComposeBtn(ItemWinBtnType.compose, jumpId);

                            }

                            break;

                        default:

                            PackSendQuestMgr.Instance.SendUseItemQuest(ItemWinBtnType.makeUse, itemModel.itemInfo.ItemPlace);

                            break;

                    }

                }

            }

        }


 System/MainInterfacePanel/InGamePushContainer.cs

@@ -343,6 +343,15 @@
            }

            else

            {

                SnxxzGame.Instance.StartCoroutine(Co_DeActiveFairyGrabBoss());

            }

        }



        IEnumerator Co_DeActiveFairyGrabBoss()

        {

            yield return null;

            if (fairyGrabBossModel.fairyGrabBossHelps.Count == 0)

            {

                m_FairyGrabBossHelpBehaviour.gameObject.SetActive(false);

            }

        }


 System/Treasure/TreasurePotentialPanel.cs

@@ -279,7 +279,7 @@
        {

            var potential = m_Treasure.potentials[_index];

            potentialBriefInfos[_index].DisplayStateSfx();

            potentialBriefInfos[_index].StartLevelTween();

            //potentialBriefInfos[_index].StartLevelTween();

            var _nextPotential = GetNextPotential(potential.id);

            if (_nextPotential != 0)

            {