Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 1c4c5c5cb829334303bff98837a69a9653dca714

 System/Dungeon/TrialDungeonEntranceWin.cs

@@ -40,8 +40,8 @@
        [SerializeField] Image m_BossRealm;

        [SerializeField] Text m_BossName;



        [SerializeField]

        ItemBehaviour[] m_RewardBehaviours;

        [SerializeField] TrialRewardsBehaviour[] m_RewardBehaviours;

        [SerializeField] ScrollRect m_RewardScroller;



        DungeonModel m_Model;

        DungeonModel model {

@@ -58,6 +58,8 @@
        }



        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }



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



        #region Built-in

        protected override void BindController()

@@ -153,12 +155,20 @@
            var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(_npcId);

            if (npcConfig != null)

            {

                var realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(npcConfig.Realm);

                if (realmConfig != null)

                if (ConfigManager.Instance.ContainKey<RealmConfig>(npcConfig.ClientRealm))

                {

                    m_BossRealm.gameObject.SetActive(true);

                    m_BossRealm.SetSprite(realmConfig.Img);

                    var realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(npcConfig.ClientRealm);

                    if (realmConfig != null)

                    {

                        m_BossRealm.SetSprite(realmConfig.Img);

                    }

                }

                else

                {

                    m_BossRealm.gameObject.SetActive(false);

                }



                m_BossName.text = npcConfig.charName;

            }

        }

@@ -176,16 +186,17 @@


        private void DrawRewards()

        {

            m_RewardScroller.verticalNormalizedPosition = 1;

            var dongeonId = model.DungeonMap(model.selectedTrialDungeon);

            var config = ConfigManager.Instance.GetTemplate<DungeonConfig>(dongeonId);

            var rewards = config.Rewards;

            for (int i = 0; i < m_RewardBehaviours.Length; i++)

            {

                var behaviour = m_RewardBehaviours[i];

                if (i < rewards.Length)

                int[] rewards = null;

                if (trialDungeonModel.TryGetTrialRewards(config.LineID, m_RewardBehaviours[i].grade, out rewards))

                {

                    behaviour.gameObject.SetActive(true);

                    behaviour.SetItem(rewards[i], 0);

                    behaviour.Display(rewards);

                }

                else

                {