Merge branch 'master' into leonard

leonard Wu

2018-08-03 7cc84329c52b6e39cd979eb33a126e059b9bf36c

 System/Dungeon/TrialDungeonSelectWin.cs

@@ -26,6 +26,7 @@
        Button m_Close;
        [SerializeField]
        Text trialChallengeCntTxt;
        [SerializeField] Button m_Exchange;

        public event Action<Dungeon> dungeonSelectEvent;
        Dungeon m_CurrentSelectDungeon;
@@ -61,6 +62,7 @@
        {
            //m_Confirm.AddListener(ChallengeDungeon);
            m_Close.AddListener(CloseClick);
            m_Exchange.AddListener(Exchange);
        }

        protected override void OnPreOpen()
@@ -116,6 +118,11 @@
            currentSelectDungeon = dungeons.Count > 0 ? dungeons[0] : default(Dungeon);
        }

        private void Exchange()
        {
            WindowCenter.Instance.Open<TrialExchangeWin>();
        }

    }

}