snxxz_scripts.git

parent: 3969acbf | 补丁 | 提交 | ignore whitespace

client_linchunjie

2019-04-18 69a1e18bec7d5538b9c0699fa97b9fa4206c17b7

3335 炼丹功能

2个文件已添加

4个文件已修改

	System/Alchemy/AlchemyBasicDrugWin.cs	89 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Alchemy/AlchemyDrugWin.cs	119 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Alchemy/AlchemyDrugWin.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Alchemy/AlchemyFairyDrugWin.cs	89 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Alchemy/AlchemyScrollBehaviour.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Alchemy/AlchemyStoveBehaviour.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Alchemy/AlchemyBasicDrugWin.cs

@@ -13,95 +13,8 @@
namespace Snxxz.UI

{



    public class AlchemyBasicDrugWin : Window

    public class AlchemyBasicDrugWin : AlchemyDrugWin

    {

        [SerializeField] AlchemyScrollBehaviour m_AlchemyScroll;

        [SerializeField] AlchemyDrugBriefBehaviour m_AlchemyDrug;

        [SerializeField] AlchemyStudyBehaviour m_AlchemyStudy;

        [SerializeField] AlchemyBriefBehaviour m_AlchemyBrief;

        [SerializeField] AlchemyStoveBehaviour m_AlchemyStove;



        AlchemyModel model { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }

        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

        }



        protected override void OnPreOpen()

        {

            SetDefaultSelect();



            m_AlchemyScroll.Display((int)AlchemyType.Normal);

            DisplayAlchmey();

            m_AlchemyDrug.Display();

            m_AlchemyStove.Display();



            model.selectAlchemyRefresh += SelectAlchemyRefresh;

            model.selectQualityRefresh += SelectQualityRefresh;

        }



        protected override void OnAfterOpen()

        {

        }



        protected override void OnPreClose()

        {

            m_AlchemyScroll.Dispose();

            m_AlchemyDrug.Dispose();

            m_AlchemyStudy.Dispose();

            m_AlchemyBrief.Dispose();

            m_AlchemyStove.Dispose();



            model.selectAlchemyRefresh -= SelectAlchemyRefresh;

            model.selectQualityRefresh -= SelectQualityRefresh;

        }



        protected override void OnAfterClose()

        {

        }

        #endregion



        void SetDefaultSelect()

        {

            var qualities = AlchemyConfig.GetAlchemyQualities((int)AlchemyType.Normal);

            model.selectQuality = qualities.First();



            var alchemys = AlchemyConfig.GetAlchemies((int)AlchemyType.Normal, model.selectQuality);

            model.selectAlchemy = alchemys[0];

        }



        private void SelectQualityRefresh()

        {

            var alchemys = AlchemyConfig.GetAlchemies((int)AlchemyType.Normal, model.selectQuality);

            model.selectAlchemy = alchemys[0];

        }



        private void SelectAlchemyRefresh()

        {

            DisplayAlchmey();

        }



        void DisplayAlchmey()

        {

            var grasp = model.IsGraspRecipe(model.selectAlchemy);

            m_AlchemyStudy.gameObject.SetActive(!grasp);

            m_AlchemyBrief.gameObject.SetActive(grasp);



            if (grasp)

            {

                m_AlchemyStudy.Display();

                m_AlchemyBrief.Dispose();

            }

            else

            {

                m_AlchemyBrief.Display();

                m_AlchemyStudy.Dispose();

            }

        }

    }

}




 System/Alchemy/AlchemyDrugWin.cs

New file
@@ -0,0 +1,119 @@
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Thursday, April 18, 2019

//--------------------------------------------------------



using System;

using System.Collections;

using System.Collections.Generic;

using System.Linq;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{



    public class AlchemyDrugWin : Window

    {

        [SerializeField] AlchemyType m_AlchemyType;

        [SerializeField] AlchemyScrollBehaviour m_AlchemyScroll;

        [SerializeField] AlchemyDrugBriefBehaviour m_AlchemyDrug;

        [SerializeField] AlchemyStudyBehaviour m_AlchemyStudy;

        [SerializeField] AlchemyBriefBehaviour m_AlchemyBrief;

        [SerializeField] AlchemyStoveBehaviour m_AlchemyStove;



        AlchemyModel model { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }

        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

        }



        protected override void OnPreOpen()

        {

            SetDefaultSelect();



            m_AlchemyScroll.Display((int)m_AlchemyType);

            DisplayAlchmey();

            m_AlchemyDrug.Display();

            m_AlchemyStove.Display();



            model.selectAlchemyRefresh += SelectAlchemyRefresh;

            model.selectQualityRefresh += SelectQualityRefresh;

            model.alchemyStateRefresh += AlchemyStateRefresh;

        }



        protected override void OnAfterOpen()

        {

        }



        protected override void OnPreClose()

        {

            m_AlchemyScroll.Dispose();

            m_AlchemyDrug.Dispose();

            m_AlchemyStudy.Dispose();

            m_AlchemyBrief.Dispose();

            m_AlchemyStove.Dispose();



            model.selectAlchemyRefresh -= SelectAlchemyRefresh;

            model.selectQualityRefresh -= SelectQualityRefresh;

            model.alchemyStateRefresh -= AlchemyStateRefresh;

        }



        protected override void OnAfterClose()

        {

        }

        #endregion



        void SetDefaultSelect()

        {

            var qualities = AlchemyConfig.GetAlchemyQualities((int)m_AlchemyType);

            model.selectQuality = qualities.First();



            var alchemys = AlchemyConfig.GetAlchemies((int)m_AlchemyType, model.selectQuality);

            model.selectAlchemy = alchemys[0];

        }



        private void SelectQualityRefresh()

        {

            var alchemys = AlchemyConfig.GetAlchemies((int)m_AlchemyType, model.selectQuality);

            model.selectAlchemy = alchemys[0];

        }



        private void SelectAlchemyRefresh()

        {

            DisplayAlchmey();

        }



        private void AlchemyStateRefresh()

        {

            DisplayAlchmey();

        }



        void DisplayAlchmey()

        {

            var grasp = model.IsGraspRecipe(model.selectAlchemy);

            m_AlchemyStudy.gameObject.SetActive(!grasp);

            m_AlchemyBrief.gameObject.SetActive(grasp);



            if (!grasp)

            {

                m_AlchemyStudy.Display();

                m_AlchemyBrief.Dispose();

            }

            else

            {

                m_AlchemyBrief.Display();

                m_AlchemyStudy.Dispose();

            }

        }

    }



}










 System/Alchemy/AlchemyDrugWin.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: ecacfe2835b59a74ab865dcae5030139
timeCreated: 1555571188
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/Alchemy/AlchemyFairyDrugWin.cs

@@ -13,95 +13,8 @@
namespace Snxxz.UI

{



    public class AlchemyFairyDrugWin : Window

    public class AlchemyFairyDrugWin : AlchemyDrugWin

    {

        [SerializeField] AlchemyScrollBehaviour m_AlchemyScroll;

        [SerializeField] AlchemyDrugBriefBehaviour m_AlchemyDrug;

        [SerializeField] AlchemyStudyBehaviour m_AlchemyStudy;

        [SerializeField] AlchemyBriefBehaviour m_AlchemyBrief;

        [SerializeField] AlchemyStoveBehaviour m_AlchemyStove;



        AlchemyModel model { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }

        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

        }



        protected override void OnPreOpen()

        {

            SetDefaultSelect();



            m_AlchemyScroll.Display((int)AlchemyType.Fairy);

            DisplayAlchmey();

            m_AlchemyDrug.Display();

            m_AlchemyStove.Display();



            model.selectAlchemyRefresh += SelectAlchemyRefresh;

            model.selectQualityRefresh += SelectQualityRefresh;

        }



        protected override void OnAfterOpen()

        {

        }



        protected override void OnPreClose()

        {

            m_AlchemyScroll.Dispose();

            m_AlchemyDrug.Dispose();

            m_AlchemyStudy.Dispose();

            m_AlchemyBrief.Dispose();

            m_AlchemyStove.Dispose();



            model.selectAlchemyRefresh -= SelectAlchemyRefresh;

            model.selectQualityRefresh -= SelectQualityRefresh;

        }



        protected override void OnAfterClose()

        {

        }

        #endregion



        void SetDefaultSelect()

        {

            var qualities = AlchemyConfig.GetAlchemyQualities((int)AlchemyType.Fairy);

            model.selectQuality = qualities.First();



            var alchemys = AlchemyConfig.GetAlchemies((int)AlchemyType.Fairy, model.selectQuality);

            model.selectAlchemy = alchemys[0];

        }



        private void SelectQualityRefresh()

        {

            var alchemys = AlchemyConfig.GetAlchemies((int)AlchemyType.Normal, model.selectQuality);

            model.selectAlchemy = alchemys[0];

        }



        private void SelectAlchemyRefresh()

        {

            DisplayAlchmey();

        }



        void DisplayAlchmey()

        {

            var grasp = model.IsGraspRecipe(model.selectAlchemy);

            m_AlchemyStudy.gameObject.SetActive(!grasp);

            m_AlchemyBrief.gameObject.SetActive(grasp);



            if (grasp)

            {

                m_AlchemyStudy.Display();

                m_AlchemyBrief.Dispose();

            }

            else

            {

                m_AlchemyBrief.Display();

                m_AlchemyStudy.Dispose();

            }

        }

    }



}


 System/Alchemy/AlchemyScrollBehaviour.cs

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


        void DisplayRecipes()

        {

            m_Controller.Refresh();

            var qualities = AlchemyConfig.GetAlchemyQualities(alchemyType);

            foreach (var quality in qualities)

            {

@@ -42,6 +43,7 @@
                    }

                }

            }

            m_Controller.Restart();

        }



        private void OnRefreshCell(ScrollerDataType type, CellView cell)


 System/Alchemy/AlchemyStoveBehaviour.cs

@@ -70,12 +70,12 @@
            {

                if (grasp && materials != null && i < materials.Count)

                {

                    m_AlchemyMaterials[i].SetLock(true);

                    m_AlchemyMaterials[i].SetLock(false);

                    m_AlchemyMaterials[i].Display(materials[i]);

                }

                else

                {

                    m_AlchemyMaterials[i].SetLock(false);

                    m_AlchemyMaterials[i].SetLock(true);

                }

            }

        }

			@@ -13,95 +13,8 @@
			namespace Snxxz.UI
			{

			public class AlchemyBasicDrugWin : Window
			public class AlchemyBasicDrugWin : AlchemyDrugWin
			{
			[SerializeField] AlchemyScrollBehaviour m_AlchemyScroll;
			[SerializeField] AlchemyDrugBriefBehaviour m_AlchemyDrug;
			[SerializeField] AlchemyStudyBehaviour m_AlchemyStudy;
			[SerializeField] AlchemyBriefBehaviour m_AlchemyBrief;
			[SerializeField] AlchemyStoveBehaviour m_AlchemyStove;

			AlchemyModel model { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }
			#region Built-in
			protected override void BindController()
			{
			}

			protected override void AddListeners()
			{
			}

			protected override void OnPreOpen()
			{
			SetDefaultSelect();

			m_AlchemyScroll.Display((int)AlchemyType.Normal);
			DisplayAlchmey();
			m_AlchemyDrug.Display();
			m_AlchemyStove.Display();

			model.selectAlchemyRefresh += SelectAlchemyRefresh;
			model.selectQualityRefresh += SelectQualityRefresh;
			}

			protected override void OnAfterOpen()
			{
			}

			protected override void OnPreClose()
			{
			m_AlchemyScroll.Dispose();
			m_AlchemyDrug.Dispose();
			m_AlchemyStudy.Dispose();
			m_AlchemyBrief.Dispose();
			m_AlchemyStove.Dispose();

			model.selectAlchemyRefresh -= SelectAlchemyRefresh;
			model.selectQualityRefresh -= SelectQualityRefresh;
			}

			protected override void OnAfterClose()
			{
			}
			#endregion

			void SetDefaultSelect()
			{
			var qualities = AlchemyConfig.GetAlchemyQualities((int)AlchemyType.Normal);
			model.selectQuality = qualities.First();

			var alchemys = AlchemyConfig.GetAlchemies((int)AlchemyType.Normal, model.selectQuality);
			model.selectAlchemy = alchemys[0];
			}

			private void SelectQualityRefresh()
			{
			var alchemys = AlchemyConfig.GetAlchemies((int)AlchemyType.Normal, model.selectQuality);
			model.selectAlchemy = alchemys[0];
			}

			private void SelectAlchemyRefresh()
			{
			DisplayAlchmey();
			}

			void DisplayAlchmey()
			{
			var grasp = model.IsGraspRecipe(model.selectAlchemy);
			m_AlchemyStudy.gameObject.SetActive(!grasp);
			m_AlchemyBrief.gameObject.SetActive(grasp);

			if (grasp)
			{
			m_AlchemyStudy.Display();
			m_AlchemyBrief.Dispose();
			}
			else
			{
			m_AlchemyBrief.Display();
			m_AlchemyStudy.Dispose();
			}
			}
			}
			}

New file
			@@ -0,0 +1,119 @@
			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Thursday, April 18, 2019
			//--------------------------------------------------------

			using System;
			using System.Collections;
			using System.Collections.Generic;
			using System.Linq;
			using UnityEngine;
			using UnityEngine.UI;

			namespace Snxxz.UI
			{

			public class AlchemyDrugWin : Window
			{
			[SerializeField] AlchemyType m_AlchemyType;
			[SerializeField] AlchemyScrollBehaviour m_AlchemyScroll;
			[SerializeField] AlchemyDrugBriefBehaviour m_AlchemyDrug;
			[SerializeField] AlchemyStudyBehaviour m_AlchemyStudy;
			[SerializeField] AlchemyBriefBehaviour m_AlchemyBrief;
			[SerializeField] AlchemyStoveBehaviour m_AlchemyStove;

			AlchemyModel model { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }
			#region Built-in
			protected override void BindController()
			{
			}

			protected override void AddListeners()
			{
			}

			protected override void OnPreOpen()
			{
			SetDefaultSelect();

			m_AlchemyScroll.Display((int)m_AlchemyType);
			DisplayAlchmey();
			m_AlchemyDrug.Display();
			m_AlchemyStove.Display();

			model.selectAlchemyRefresh += SelectAlchemyRefresh;
			model.selectQualityRefresh += SelectQualityRefresh;
			model.alchemyStateRefresh += AlchemyStateRefresh;
			}

			protected override void OnAfterOpen()
			{
			}

			protected override void OnPreClose()
			{
			m_AlchemyScroll.Dispose();
			m_AlchemyDrug.Dispose();
			m_AlchemyStudy.Dispose();
			m_AlchemyBrief.Dispose();
			m_AlchemyStove.Dispose();

			model.selectAlchemyRefresh -= SelectAlchemyRefresh;
			model.selectQualityRefresh -= SelectQualityRefresh;
			model.alchemyStateRefresh -= AlchemyStateRefresh;
			}

			protected override void OnAfterClose()
			{
			}
			#endregion

			void SetDefaultSelect()
			{
			var qualities = AlchemyConfig.GetAlchemyQualities((int)m_AlchemyType);
			model.selectQuality = qualities.First();

			var alchemys = AlchemyConfig.GetAlchemies((int)m_AlchemyType, model.selectQuality);
			model.selectAlchemy = alchemys[0];
			}

			private void SelectQualityRefresh()
			{
			var alchemys = AlchemyConfig.GetAlchemies((int)m_AlchemyType, model.selectQuality);
			model.selectAlchemy = alchemys[0];
			}

			private void SelectAlchemyRefresh()
			{
			DisplayAlchmey();
			}

			private void AlchemyStateRefresh()
			{
			DisplayAlchmey();
			}

			void DisplayAlchmey()
			{
			var grasp = model.IsGraspRecipe(model.selectAlchemy);
			m_AlchemyStudy.gameObject.SetActive(!grasp);
			m_AlchemyBrief.gameObject.SetActive(grasp);

			if (!grasp)
			{
			m_AlchemyStudy.Display();
			m_AlchemyBrief.Dispose();
			}
			else
			{
			m_AlchemyBrief.Display();
			m_AlchemyStudy.Dispose();
			}
			}
			}

			}

New file
			@@ -0,0 +1,12 @@
			fileFormatVersion: 2
			guid: ecacfe2835b59a74ab865dcae5030139
			timeCreated: 1555571188
			licenseType: Pro
			MonoImporter:
			serializedVersion: 2
			defaultReferences: []
			executionOrder: 0
			icon: {instanceID: 0}
			userData:
			assetBundleName:
			assetBundleVariant:

			@@ -13,95 +13,8 @@
			namespace Snxxz.UI
			{

			public class AlchemyFairyDrugWin : Window
			public class AlchemyFairyDrugWin : AlchemyDrugWin
			{
			[SerializeField] AlchemyScrollBehaviour m_AlchemyScroll;
			[SerializeField] AlchemyDrugBriefBehaviour m_AlchemyDrug;
			[SerializeField] AlchemyStudyBehaviour m_AlchemyStudy;
			[SerializeField] AlchemyBriefBehaviour m_AlchemyBrief;
			[SerializeField] AlchemyStoveBehaviour m_AlchemyStove;

			AlchemyModel model { get { return ModelCenter.Instance.GetModel<AlchemyModel>(); } }
			#region Built-in
			protected override void BindController()
			{
			}

			protected override void AddListeners()
			{
			}

			protected override void OnPreOpen()
			{
			SetDefaultSelect();

			m_AlchemyScroll.Display((int)AlchemyType.Fairy);
			DisplayAlchmey();
			m_AlchemyDrug.Display();
			m_AlchemyStove.Display();

			model.selectAlchemyRefresh += SelectAlchemyRefresh;
			model.selectQualityRefresh += SelectQualityRefresh;
			}

			protected override void OnAfterOpen()
			{
			}

			protected override void OnPreClose()
			{
			m_AlchemyScroll.Dispose();
			m_AlchemyDrug.Dispose();
			m_AlchemyStudy.Dispose();
			m_AlchemyBrief.Dispose();
			m_AlchemyStove.Dispose();

			model.selectAlchemyRefresh -= SelectAlchemyRefresh;
			model.selectQualityRefresh -= SelectQualityRefresh;
			}

			protected override void OnAfterClose()
			{
			}
			#endregion

			void SetDefaultSelect()
			{
			var qualities = AlchemyConfig.GetAlchemyQualities((int)AlchemyType.Fairy);
			model.selectQuality = qualities.First();

			var alchemys = AlchemyConfig.GetAlchemies((int)AlchemyType.Fairy, model.selectQuality);
			model.selectAlchemy = alchemys[0];
			}

			private void SelectQualityRefresh()
			{
			var alchemys = AlchemyConfig.GetAlchemies((int)AlchemyType.Normal, model.selectQuality);
			model.selectAlchemy = alchemys[0];
			}

			private void SelectAlchemyRefresh()
			{
			DisplayAlchmey();
			}

			void DisplayAlchmey()
			{
			var grasp = model.IsGraspRecipe(model.selectAlchemy);
			m_AlchemyStudy.gameObject.SetActive(!grasp);
			m_AlchemyBrief.gameObject.SetActive(grasp);

			if (grasp)
			{
			m_AlchemyStudy.Display();
			m_AlchemyBrief.Dispose();
			}
			else
			{
			m_AlchemyBrief.Display();
			m_AlchemyStudy.Dispose();
			}
			}
			}

			}

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

			void DisplayRecipes()
			{
			m_Controller.Refresh();
			var qualities = AlchemyConfig.GetAlchemyQualities(alchemyType);
			foreach (var quality in qualities)
			{
			@@ -42,6 +43,7 @@
			}
			}
			}
			m_Controller.Restart();
			}

			private void OnRefreshCell(ScrollerDataType type, CellView cell)

			@@ -70,12 +70,12 @@
			{
			if (grasp && materials != null && i < materials.Count)
			{
			m_AlchemyMaterials[i].SetLock(true);
			m_AlchemyMaterials[i].SetLock(false);
			m_AlchemyMaterials[i].Display(materials[i]);
			}
			else
			{
			m_AlchemyMaterials[i].SetLock(false);
			m_AlchemyMaterials[i].SetLock(true);
			}
			}
			}