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

client_Hale

2019-04-12 37fe958376a003a36154bf9e4b456397f5c254b1

 System/Dungeon/TrialDungeonSelectWin.cs

@@ -26,7 +26,6 @@
        Button m_Close;

        [SerializeField]

        Text trialChallengeCntTxt;

        [SerializeField] Button m_Exchange;



        public event Action<Dungeon> dungeonSelectEvent;

        Dungeon m_CurrentSelectDungeon;

@@ -64,7 +63,7 @@
        {

            //m_Confirm.AddListener(ChallengeDungeon);

            m_Close.AddListener(CloseClick);

            m_Exchange.AddListener(Exchange);

            //m_Exchange.AddListener(Exchange);

        }



        protected override void OnPreOpen()

@@ -136,15 +135,15 @@
                TextColType.Red : TextColType.NavyBrown, completedTimes.ToString(), true), totalTimes);

        }



        private void Exchange()

        {

            if (!trialDungeonModel.CompleteTrialFloor(0))

            {

                trialDungeonModel.ProcessOpenTrialExchangeError();

                return;

            }

            WindowCenter.Instance.Open<TrialExchangeWin>();

        }

        //private void Exchange()

        //{

        //    if (!trialDungeonModel.CompleteTrialFloor(0))

        //    {

        //        trialDungeonModel.ProcessOpenTrialExchangeError();

        //        return;

        //    }

        //    WindowCenter.Instance.Open<TrialExchangeWin>();

        //}



    }