snxxz_scripts.git

parent: 7f6fa9c3 | 补丁 | 提交 | ignore whitespace

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

client_Hale

2019-06-22 4ff6d7e9d58af8e482e9bd3484ed07d9221d5b2f

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

9个文件已修改

	System/Alchemy/AlchemyBaseWin.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/ItemTip/EquipTipWin.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/ItemTip/ItemTipWin.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/ItemTip/PetMountTipWin.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/ItemTip/SpiritWeaponTipWin.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/ItemTip/TipGetWaysWidget.cs	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/ItemTip/WingTipWin.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/OSGiftModel.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Skill/TreasureSkillWin.cs	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Alchemy/AlchemyBaseWin.cs

@@ -27,6 +27,10 @@
        protected override void OnActived()

        {

            base.OnActived();

            if (WindowCenter.Instance.IsOpen<AlchemyDrugLimitWin>())

            {

                WindowCenter.Instance.Close<AlchemyDrugLimitWin>();

            }

        }



        protected override void OnPreClose()


 System/ItemTip/EquipTipWin.cs

@@ -297,6 +297,7 @@
                            if (!getWaysWidget.gameObject.activeSelf)
                            {
                                getWaysWidget.Display(getWay);
                                getWaysWidget.Bind("EquipTipWin");
                            }
                            else
                            {

 System/ItemTip/ItemTipWin.cs

@@ -167,6 +167,7 @@
                    if (!m_GetWaysWidget.gameObject.activeSelf)
                    {
                        m_GetWaysWidget.Display(getWay);
                        m_GetWaysWidget.Bind("ItemTipWin");
                    }
                    else
                    {

 System/ItemTip/PetMountTipWin.cs

@@ -203,6 +203,7 @@
                    if (!m_GetWaysWidget.gameObject.activeSelf)
                    {
                        m_GetWaysWidget.Display(getWay);
                        m_GetWaysWidget.Bind("PetMountTipWin");
                    }
                    else
                    {

 System/ItemTip/SpiritWeaponTipWin.cs

@@ -122,6 +122,7 @@
                    if (!m_GetWaysWidget.gameObject.activeSelf)
                    {
                        m_GetWaysWidget.Display(getWay);
                        m_GetWaysWidget.Bind("SpiritWeaponTipWin");
                    }
                    else
                    {

 System/ItemTip/TipGetWaysWidget.cs

@@ -6,7 +6,8 @@
using System.Collections;
using UnityEngine.UI;
using DG.Tweening;

using System;



namespace Snxxz.UI
{

@@ -14,6 +15,8 @@
    {
        [SerializeField] WayCell[] m_GetWays;
        [SerializeField] CanvasGroup m_AlphaTween;

        string windowName;

        public void Display(ItemTipUtility.GetWay getWay)
        {
@@ -25,6 +28,8 @@
                    var way = getWay.ways[i];
                    behaviour.gameObject.SetActive(true);
                    behaviour.Display(way);
                    behaviour.RemoveAllListeners();
                    behaviour.AddListener(OnGetWay);
                }
                else
                {
@@ -35,7 +40,20 @@
            this.gameObject.SetActive(true);
            m_AlphaTween.alpha = 0;
            m_AlphaTween.DOFade(1, 0.5f);
        }
        }



        public void Bind(string windowName)

        {

            this.windowName = windowName;

        }



        private void OnGetWay()

        {

            if (!string.IsNullOrEmpty(windowName))

            {

                WindowCenter.Instance.Close(windowName);

            }

        }


        public void Hide()
        {

 System/ItemTip/WingTipWin.cs

@@ -137,6 +137,7 @@
                    if (!m_GetWaysWidget.gameObject.activeSelf)
                    {
                        m_GetWaysWidget.Display(getWay);
                        m_GetWaysWidget.Bind("WingTipWin");
                    }
                    else
                    {

 System/OpenServerActivity/OSGiftModel.cs

@@ -244,7 +244,7 @@
        {

            for (int i = 0; i < alreadyOpens.Count; i++)

            {

                if (gifts[i].payType == jumpGiftId)

                if (gifts[alreadyOpens[i]].payType == jumpGiftId)

                {

                    jumpGiftId = 0;

                    return alreadyOpens[i];


 System/Skill/TreasureSkillWin.cs

@@ -74,12 +74,6 @@


            Display();



            var index = displaySkills.IndexOf(model.selectSkill);

            if (index != -1)

            {

                m_Controller.JumpIndex(index);

            }



            model.treasureSkillRefresh += TreasureSkillRefresh;

            model.selectRefresh += SelectRefresh;

            model.skillLevelUpRefresh += SkillLevelUpRefresh;

@@ -88,6 +82,20 @@
            WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent;

        }



        protected override void OnActived()

        {

            base.OnActived();



            var index = displaySkills.IndexOf(model.selectSkill);

            if (index != -1)

            {

                var offset = 0f;

                m_Controller.JumpIndex(index, ref offset);

                var rect = m_Controller.mScrollRect.transform as RectTransform;

                m_Controller.JumpIndex(offset - rect.rect.height / 2 + 50, 0, EnhancedUI.EnhancedScroller.EnhancedScroller.TweenType.immediate);

            }

        }



        protected override void OnAfterOpen()

        {

        }

			@@ -27,6 +27,10 @@
			protected override void OnActived()
			{
			base.OnActived();
			if (WindowCenter.Instance.IsOpen<AlchemyDrugLimitWin>())
			{
			WindowCenter.Instance.Close<AlchemyDrugLimitWin>();
			}
			}

			protected override void OnPreClose()

			@@ -297,6 +297,7 @@
			if (!getWaysWidget.gameObject.activeSelf)
			{
			getWaysWidget.Display(getWay);
			getWaysWidget.Bind("EquipTipWin");
			}
			else
			{

			@@ -167,6 +167,7 @@
			if (!m_GetWaysWidget.gameObject.activeSelf)
			{
			m_GetWaysWidget.Display(getWay);
			m_GetWaysWidget.Bind("ItemTipWin");
			}
			else
			{

			@@ -203,6 +203,7 @@
			if (!m_GetWaysWidget.gameObject.activeSelf)
			{
			m_GetWaysWidget.Display(getWay);
			m_GetWaysWidget.Bind("PetMountTipWin");
			}
			else
			{

			@@ -122,6 +122,7 @@
			if (!m_GetWaysWidget.gameObject.activeSelf)
			{
			m_GetWaysWidget.Display(getWay);
			m_GetWaysWidget.Bind("SpiritWeaponTipWin");
			}
			else
			{

			@@ -6,7 +6,8 @@
			using System.Collections;
			using UnityEngine.UI;
			using DG.Tweening;

			using System;

			namespace Snxxz.UI
			{

			@@ -14,6 +15,8 @@
			{
			[SerializeField] WayCell[] m_GetWays;
			[SerializeField] CanvasGroup m_AlphaTween;

			string windowName;

			public void Display(ItemTipUtility.GetWay getWay)
			{
			@@ -25,6 +28,8 @@
			var way = getWay.ways[i];
			behaviour.gameObject.SetActive(true);
			behaviour.Display(way);
			behaviour.RemoveAllListeners();
			behaviour.AddListener(OnGetWay);
			}
			else
			{
			@@ -35,7 +40,20 @@
			this.gameObject.SetActive(true);
			m_AlphaTween.alpha = 0;
			m_AlphaTween.DOFade(1, 0.5f);
			}
			}

			public void Bind(string windowName)
			{
			this.windowName = windowName;
			}

			private void OnGetWay()
			{
			if (!string.IsNullOrEmpty(windowName))
			{
			WindowCenter.Instance.Close(windowName);
			}
			}

			public void Hide()
			{

			@@ -137,6 +137,7 @@
			if (!m_GetWaysWidget.gameObject.activeSelf)
			{
			m_GetWaysWidget.Display(getWay);
			m_GetWaysWidget.Bind("WingTipWin");
			}
			else
			{

			@@ -244,7 +244,7 @@
			{
			for (int i = 0; i < alreadyOpens.Count; i++)
			{
			if (gifts[i].payType == jumpGiftId)
			if (gifts[alreadyOpens[i]].payType == jumpGiftId)
			{
			jumpGiftId = 0;
			return alreadyOpens[i];

			@@ -74,12 +74,6 @@

			Display();

			var index = displaySkills.IndexOf(model.selectSkill);
			if (index != -1)
			{
			m_Controller.JumpIndex(index);
			}

			model.treasureSkillRefresh += TreasureSkillRefresh;
			model.selectRefresh += SelectRefresh;
			model.skillLevelUpRefresh += SkillLevelUpRefresh;
			@@ -88,6 +82,20 @@
			WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent;
			}

			protected override void OnActived()
			{
			base.OnActived();

			var index = displaySkills.IndexOf(model.selectSkill);
			if (index != -1)
			{
			var offset = 0f;
			m_Controller.JumpIndex(index, ref offset);
			var rect = m_Controller.mScrollRect.transform as RectTransform;
			m_Controller.JumpIndex(offset - rect.rect.height / 2 + 50, 0, EnhancedUI.EnhancedScroller.EnhancedScroller.TweenType.immediate);
			}
			}

			protected override void OnAfterOpen()
			{
			}