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

client_linchunjie

2018-11-23 4014351a7977256ff536d70dd4f18867aa60f9e9

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

 System/Dungeon/DungeonSweepResultWin.cs

@@ -29,7 +29,7 @@
        [SerializeField] UIEffect m_SweepResultEffect;

        [SerializeField] Button m_Again;

        [SerializeField] Button m_Close;



        [SerializeField] Text m_BtnText;

        DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }

        GetItemPathModel getItemPath { get { return ModelCenter.Instance.GetModel<GetItemPathModel>(); } }

@@ -50,6 +50,14 @@
        {

            DisplayResult();

            model.getDungeonResultEvent += DisplayResult;

            if (model.currentDungeon.mapId == 31140)

            {

                m_BtnText.text = Language.Get("RuneTowerSweepText12");

            }

            else

            {

                m_BtnText.text = Language.Get("MoppingUpEnd_Btn_Continue");

            }

        }



        protected override void OnAfterOpen()

@@ -151,7 +159,14 @@
            var error = 0;

            if (TestSweep(out error))

            {

                model.RequestSweep(model.currentDungeon);

                if (model.currentDungeon.mapId == 31140)//冰晶矿脉不允许再次扫荡

                {

                    CloseClick();

                }

                else

                {

                    model.RequestSweep(model.currentDungeon);

                }            
            }

            else

            {


 System/Dungeon/IceCrystalVeinWin.cs

@@ -110,6 +110,7 @@
            if (fbId == 31140)

            {

                StarAll = iceCrystalVeinModel.GetAllStar();

                SetGridBotton();

                m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见

            }

        }

@@ -309,7 +310,7 @@
                            m_Collar.SetActive(true);

                        }

                    }

                    ItemCellModel cellModel = new ItemCellModel(IceLode.ItemID, true, (ulong)1);

                    ItemCellModel cellModel = new ItemCellModel(IceLode.ItemID, true, (ulong)IceLode.ItemCount, IceLode.IsBind);

                    _ItemCell.Init(cellModel);

                    int type = i;

                    _ItemCell.cellBtn.SetListener(() =>

@@ -319,7 +320,7 @@
                            iceCrystalVeinModel.SendGetAward(IceLode.Index);

                            return;

                        }

                        ItemAttrData attrData = new ItemAttrData(IceLode.ItemID, false, (ulong)1);

                        ItemAttrData attrData = new ItemAttrData(IceLode.ItemID, false, (ulong)IceLode.ItemCount,-1, IceLode.IsBind);

                        itemTipsModel.SetItemTipsModel(attrData);

                        return;

                    });