snxxz_scripts.git

parent: 0d6a0d8a | 补丁 | 提交 | ignore whitespace

client_linchunjie

2018-12-20 cae093b97222b55285f7f6a67bee9744ef35e9b7

【1.4】聚魂功能

5个文件已修改

	System/GatheringSoul/GatherSoulBuildBehaviour.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/GatheringSoul/GatherSoulDungeonBehaviour.cs	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/GatheringSoul/GatherSoulDungeonGetItemWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/GatheringSoul/GatherSoulDungeonHintWin.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/GatheringSoul/GatherSoulDungeonItemCell.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/GatheringSoul/GatherSoulBuildBehaviour.cs

@@ -49,14 +49,8 @@
        {

            var attackDefendCount = model.GetDefendNpcCount(model.attckDefendNpcId);

            var iceDefendCount = model.GetDefendNpcCount(model.iceDefendNpcId);

            if (attackDefendCount < model.attackDefendCountLimit)

            {

                m_AttackDefend.gameObject.SetActive(true);

            }

            if (iceDefendCount < model.iceDefendCountLimit)

            {

                m_IceDefend.gameObject.SetActive(true);

            }

            m_AttackDefend.gameObject.SetActive(attackDefendCount < model.attackDefendCountLimit);

            m_IceDefend.gameObject.SetActive(iceDefendCount < model.iceDefendCountLimit);

        }



        private void BuildAttackDefend()


 System/GatheringSoul/GatherSoulDungeonBehaviour.cs

@@ -209,7 +209,24 @@


        private void ViewGetItem()

        {

            WindowCenter.Instance.Open<GatherSoulDungeonGetItemWin>();

            bool existItems = false;

            for (int i = 1; i <= model.dungeonWeelCount; i++)

            {

                List<GatherSoulDungeonModel.ItemInfo> list;

                if (model.TryGetDungeonItems(i,out list))

                {

                    existItems = true;

                    break;

                }

            }

            if (existItems)

            {

                WindowCenter.Instance.Open<GatherSoulDungeonGetItemWin>();

            }

            else

            {

                SysNotifyMgr.Instance.ShowTip("UnGetAnyGatherSoulItems");

            }

        }



        IEnumerator Co_MoveToNpc(GA_NpcCollect actor)


 System/GatheringSoul/GatherSoulDungeonGetItemWin.cs

@@ -16,7 +16,6 @@
    {

        [SerializeField] int m_LineCount = 5;

        [SerializeField] ScrollerController m_ScrollerControl;

        [SerializeField] Button m_Close;



        GatherSoulDungeonModel model

        {

@@ -29,7 +28,6 @@


        protected override void AddListeners()

        {

            m_Close.AddListener(CloseClick);

            m_ScrollerControl.OnRefreshCell += OnRefreshCell;

        }




 System/GatheringSoul/GatherSoulDungeonHintWin.cs

@@ -15,7 +15,6 @@
    [XLua.Hotfix]

    public class GatherSoulDungeonHintWin : Window

    {

        [SerializeField] Image m_BossIcon;

        [SerializeField] Text m_HelpRemind;



        [SerializeField] RectTransform m_ContainerReady;

@@ -78,12 +77,10 @@
            var mission = model.mission;

            if (mission.step <= 1)

            {

                m_BossIcon.SetSprite("");

                m_HelpRemind.text = UIHelper.ReplaceNewLine(Language.Get("GatherSoulHelpRemind_0"));

            }

            else

            {

                m_BossIcon.SetSprite("");

                m_HelpRemind.text = UIHelper.ReplaceNewLine(Language.Get("GatherSoulHelpRemind_1"));

            }

        }


 System/GatheringSoul/GatherSoulDungeonItemCell.cs

@@ -1,12 +1,15 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;



namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class GatherSoulDungeonItemCell : CellView

    {

        [SerializeField] GatherSoulItemBehaviour[] m_Items;

        [SerializeField] Image m_Cutline;



        GatherSoulDungeonModel model

        {

@@ -33,6 +36,8 @@
                    }

                }

            }



            m_Cutline.gameObject.SetActive(model.mission.wheel < weel);

        }

    }

}

			@@ -49,14 +49,8 @@
			{
			var attackDefendCount = model.GetDefendNpcCount(model.attckDefendNpcId);
			var iceDefendCount = model.GetDefendNpcCount(model.iceDefendNpcId);
			if (attackDefendCount < model.attackDefendCountLimit)
			{
			m_AttackDefend.gameObject.SetActive(true);
			}
			if (iceDefendCount < model.iceDefendCountLimit)
			{
			m_IceDefend.gameObject.SetActive(true);
			}
			m_AttackDefend.gameObject.SetActive(attackDefendCount < model.attackDefendCountLimit);
			m_IceDefend.gameObject.SetActive(iceDefendCount < model.iceDefendCountLimit);
			}

			private void BuildAttackDefend()

			@@ -209,7 +209,24 @@

			private void ViewGetItem()
			{
			WindowCenter.Instance.Open<GatherSoulDungeonGetItemWin>();
			bool existItems = false;
			for (int i = 1; i <= model.dungeonWeelCount; i++)
			{
			List<GatherSoulDungeonModel.ItemInfo> list;
			if (model.TryGetDungeonItems(i,out list))
			{
			existItems = true;
			break;
			}
			}
			if (existItems)
			{
			WindowCenter.Instance.Open<GatherSoulDungeonGetItemWin>();
			}
			else
			{
			SysNotifyMgr.Instance.ShowTip("UnGetAnyGatherSoulItems");
			}
			}

			IEnumerator Co_MoveToNpc(GA_NpcCollect actor)

			@@ -16,7 +16,6 @@
			{
			[SerializeField] int m_LineCount = 5;
			[SerializeField] ScrollerController m_ScrollerControl;
			[SerializeField] Button m_Close;

			GatherSoulDungeonModel model
			{
			@@ -29,7 +28,6 @@

			protected override void AddListeners()
			{
			m_Close.AddListener(CloseClick);
			m_ScrollerControl.OnRefreshCell += OnRefreshCell;
			}

			@@ -15,7 +15,6 @@
			[XLua.Hotfix]
			public class GatherSoulDungeonHintWin : Window
			{
			[SerializeField] Image m_BossIcon;
			[SerializeField] Text m_HelpRemind;

			[SerializeField] RectTransform m_ContainerReady;
			@@ -78,12 +77,10 @@
			var mission = model.mission;
			if (mission.step <= 1)
			{
			m_BossIcon.SetSprite("");
			m_HelpRemind.text = UIHelper.ReplaceNewLine(Language.Get("GatherSoulHelpRemind_0"));
			}
			else
			{
			m_BossIcon.SetSprite("");
			m_HelpRemind.text = UIHelper.ReplaceNewLine(Language.Get("GatherSoulHelpRemind_1"));
			}
			}

			@@ -1,12 +1,15 @@
			using System.Collections;
			using System.Collections.Generic;
			using UnityEngine;
			using UnityEngine.UI;

			namespace Snxxz.UI
			{
			[XLua.Hotfix]
			public class GatherSoulDungeonItemCell : CellView
			{
			[SerializeField] GatherSoulItemBehaviour[] m_Items;
			[SerializeField] Image m_Cutline;

			GatherSoulDungeonModel model
			{
			@@ -33,6 +36,8 @@
			}
			}
			}

			m_Cutline.gameObject.SetActive(model.mission.wheel < weel);
			}
			}
			}