Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Dungeon/NormalDungeonEntranceWin.cs

@@ -46,7 +46,10 @@
        [SerializeField] ButtonEx m_GroupStart;

        [SerializeField] ButtonEx m_SingleStart;

        [SerializeField] ButtonEx m_AutoGroupStart;

        [SerializeField] ButtonEx m_Group;

        [SerializeField] Button m_CloseWin;



        [SerializeField] RectTransform m_ContainerGroup;



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

        TeamModel teamModel { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }

@@ -63,6 +66,7 @@
            m_SingleStart.AddListener(ChallengeDungeon);

            m_AutoGroupStart.AddListener(AutoGroupChallenge);

            m_Sweep.AddListener(SweepDungeon);

            m_Group.AddListener(OpenGroup);

            m_CloseWin.AddListener(CloseClick);

        }



@@ -99,6 +103,12 @@
        }

        #endregion



        private void OpenGroup()

        {

            var openGroup = m_ContainerGroup.gameObject.activeSelf;

            m_ContainerGroup.gameObject.SetActive(!openGroup);

        }



        private void UpdateDungeonEnterCD()

        {

            var dungeonId = model.GetDungeonId(model.currentDungeon);

@@ -118,6 +128,9 @@
            m_SingleStart.gameObject.SetActive(fbType == 1 || fbType == 2);

            m_AutoGroupStart.gameObject.SetActive(fbType == 2 || fbType == 3);



            m_ContainerGroup.gameObject.SetActive(false);

            m_Group.gameObject.SetActive(fbType == 2 || fbType == 3);



            m_EntranceBG.SetSprite(dungeonOpenTimeConfig.PanelImg);



            m_DungeonTitle.text = dungeonConfig.FBName;

@@ -133,7 +146,7 @@
                }

                else

                {

                    UI3DModelExhibition.Instance.BeginShowNPC(dungeonConfig.BossActorID[0], Vector3.zero, m_BossPortrayal);

                    UI3DModelExhibition.Instance.ShowNPC(dungeonConfig.BossActorID[0], Vector3.zero, m_BossPortrayal);

                }



            }