Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/MainInterfacePanel/DialogueDuidanceWin.cs

@@ -55,7 +55,7 @@
        }

        protected override void BindController()

        {

            var config = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TaskContinue");

            var config = Config.Instance.Get<FuncConfigConfig>("TaskContinue");

            FabaoId = int.Parse(config.Numerical1);

            AwaitSecond = int.Parse(config.Numerical2);

            PlayerHead();

@@ -73,7 +73,7 @@
            IsCloseWindow();

            typesPeaker = -1;

            storyMissionsID = taskmodel._TaskNow;

            var config = ConfigManager.Instance.GetTemplate<StoryMissionsConfig>(storyMissionsID);

            var config = Config.Instance.Get<StoryMissionsConfig>(storyMissionsID);

            if (config.TaskMusic != 0)

            {

                SoundPlayer.Instance.PlayNpcAudio(config.TaskMusic);

@@ -204,7 +204,7 @@
        }

        private void OnClickMarkRay()

        {

            var config = ConfigManager.Instance.GetTemplate<StoryMissionsConfig>(storyMissionsID);

            var config = Config.Instance.Get<StoryMissionsConfig>(storyMissionsID);

            if (config == null)

            {

                return;

@@ -230,7 +230,7 @@
        }

        private void OnClickSKIPButton()

        {

            var config = ConfigManager.Instance.GetTemplate<StoryMissionsConfig>(storyMissionsID);

            var config = Config.Instance.Get<StoryMissionsConfig>(storyMissionsID);

            if (config != null)

            {

                SessionEnd(TaskType.OK);

@@ -257,8 +257,8 @@


                m_PlayerNameText.text = PlayerDatas.Instance.baseData.PlayerName;



                string platercContentKey = ConfigManager.Instance.GetTemplate<StoryMissionsConfig>(storyMissionsID).content[IsMultistage];

                var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(string.Format(platercContentKey, stepNum));

                string platercContentKey = Config.Instance.Get<StoryMissionsConfig>(storyMissionsID).content[IsMultistage];

                var config = Config.Instance.Get<TASKINFOConfig>(string.Format(platercContentKey, stepNum));

                if (config != null)

                {

                    m_ContentText.text = config.show_writing;

@@ -276,16 +276,16 @@
                    m_BaseboardImageNPC.SetActive(true);

                    m_BaseboardImagePlayer.SetActive(false);

                }

                var configStoryMissions = ConfigManager.Instance.GetTemplate<StoryMissionsConfig>(storyMissionsID);

                var configStoryMissions = Config.Instance.Get<StoryMissionsConfig>(storyMissionsID);

                if (configStoryMissions == null)

                {

                    return;

                }

                int npcId = configStoryMissions.NpcID[IsMultistage];

                var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(npcId);

                var npcConfig = Config.Instance.Get<NPCConfig>(npcId);

                m_NPCNameText.text = npcConfig.charName;

                string npcContentKey = configStoryMissions.content[IsMultistage];

                var taskInfo = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(string.Format(npcContentKey, stepNum));

                var taskInfo = Config.Instance.Get<TASKINFOConfig>(string.Format(npcContentKey, stepNum));

                if (taskInfo == null)

                {

                    DebugEx.LogError("TASKINFOConfig中没有找到对应的Key");

@@ -319,8 +319,8 @@
        }

        private void PlayerHead()

        {

            string[] headStr1 = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("StoryTaskIcon").Numerical1.Split('|');

            string[] headStr2 = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("StoryTaskIcon").Numerical2.Split('|');

            string[] headStr1 = Config.Instance.Get<FuncConfigConfig>("StoryTaskIcon").Numerical1.Split('|');

            string[] headStr2 = Config.Instance.Get<FuncConfigConfig>("StoryTaskIcon").Numerical2.Split('|');

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

            {

                if (!PlayerIcon.ContainsKey(int.Parse(headStr1[i])))

@@ -334,7 +334,7 @@
        private bool IsDungeon()

        {

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);

            var mapConfig = Config.Instance.Get<MapConfig>(mapId);

            return mapConfig != null && mapConfig.MapFBType != 0;

        }

    }