少年修仙传客户端代码仓库
client_Hale
2018-12-20 1861675e34a3595f9aecd23029893f748d5576ad
Merge branch '【1.4】聚魂功能' of http://192.168.0.87:10010/r/snxxz_scripts into 【1.4】聚魂功能
4个文件已修改
22 ■■■■ 已修改文件
System/Dungeon/DungeonFightWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GatheringSoul/GatherSoulDungeonBehaviour.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GatheringSoul/GatherSoulDungeonHintWin.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GatheringSoul/GatherSoulDungeonModel.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/DungeonFightWin.cs
@@ -232,7 +232,7 @@
            else if (dataMapId == GatherSoulDungeonModel.DUNGEON_MAPID)
            {
                var mission = model.mission;
                if (mission.step == 0)
                if (mission.step <= 1)
                {
                    language = Language.Get("GatherSoulDungeonExitTip_0");
                }
System/GatheringSoul/GatherSoulDungeonBehaviour.cs
@@ -78,10 +78,10 @@
        void DisplayGenerateMonster()
        {
            m_GenerateMonster.gameObject.SetActive(model.mission.step == 0);
            m_GenerateMonster.gameObject.SetActive(model.mission.step == 1);
            if (model.GetDefendNpcCount(model.attckDefendNpcId) >= model.attackDefendCountLimit
                && model.GetDefendNpcCount(model.iceDefendNpcId) >= model.iceDefendCountLimit
                && model.mission.step == 0)
                && model.mission.step == 1)
            {
                m_GenerateMonsterRemind.gameObject.SetActive(true);
            }
@@ -145,7 +145,7 @@
        private void GenerateBoss()
        {
            var mission = model.mission;
            if (mission.step == 0)
            if (mission.step <= 1)
            {
                SysNotifyMgr.Instance.ShowTip("PleaseGenerateMonsterFirst");
            }
System/GatheringSoul/GatherSoulDungeonHintWin.cs
@@ -76,7 +76,7 @@
        void DisplayHelpRemind()
        {
            var mission = model.mission;
            if (mission.step == 0)
            if (mission.step <= 1)
            {
                m_BossIcon.SetSprite("");
                m_HelpRemind.text = UIHelper.ReplaceNewLine(Language.Get("GatherSoulHelpRemind_0"));
@@ -98,10 +98,10 @@
            {
                m_Title.text = dungeonConfig.FBName;
            }
            m_ContainerReady.gameObject.SetActive(mission.step == 0);
            m_ContainerTarget.gameObject.SetActive(mission.step > 0);
            m_ContainerHint.gameObject.SetActive(mission.step > 0);
            if (mission.step == 0)
            m_ContainerReady.gameObject.SetActive(mission.step <= 1);
            m_ContainerTarget.gameObject.SetActive(mission.step > 1);
            m_ContainerHint.gameObject.SetActive(mission.step > 1);
            if (mission.step <= 1)
            {
                m_AttackDefendCount.text = StringUtility.Contact(
                    model.GetDefendNpcCount(model.attckDefendNpcId), "/", model.attackDefendCountLimit);
System/GatheringSoul/GatherSoulDungeonModel.cs
@@ -91,7 +91,7 @@
        public void OnReceiveDungeonMessage(string _mission)
        {
            mission = LitJson.JsonMapper.ToObject<GatherSoulDungeonHelp>(_mission);
            if (clickGenerateMonster && mission.step == 1)
            if (clickGenerateMonster && mission.step == 2)
            {
                if (monsterAppearEvent != null)
                {
@@ -121,7 +121,7 @@
            clickGenerateMonster = false;
            bool requreStepHint = mission.step == 0 && (GetDefendNpcCount(attckDefendNpcId) < attackDefendCountLimit
            bool requreStepHint = mission.step == 1 && (GetDefendNpcCount(attckDefendNpcId) < attackDefendCountLimit
                || GetDefendNpcCount(iceDefendNpcId) < iceDefendCountLimit);
            if (requreStepHint && !WindowCenter.Instance.IsOpen<GatherSoulDungeonStepHintWin>())
            {