snxxz_scripts.git

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

client_linchunjie

2019-04-22 f8ebb06a1fc89064277fe2ef1039bf1a4225758a

6512 【2.0】【前端】境界优化

4个文件已添加

3个文件已修改

	System/Realm/RealmNewEquipWin.cs	106 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/RealmNewEquipWin.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/RealmPromoteWin.cs	136 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/RealmPromoteWin.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/RealmPropertyUpWin.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/RealmWin.cs	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Role/PropertyBehaviour.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Realm/RealmNewEquipWin.cs

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

//    [Author]:           第二世界

//    [  Date ]:           Monday, April 22, 2019

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



using System;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{



    public class RealmNewEquipWin : Window

    {

        [SerializeField] RawImage m_RawPlayer;

        [SerializeField] Image m_EquipName;

        [SerializeField] Text m_CloseRemind;

        [SerializeField] Button m_Close;



        public static int realmLevel = 0;



        float timer = 0f;



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



        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

            m_Close.AddListener(OnClickClose);

        }



        protected override void OnPreOpen()

        {

            timer = 0f;

            m_CloseRemind.gameObject.SetActive(false);

            Display();

        }



        protected override void OnAfterOpen()

        {

        }



        protected override void OnPreClose()

        {

            UI3DModelExhibition.Instance.StopShow();

        }



        protected override void OnAfterClose()

        {

        }



        protected override void LateUpdate()

        {

            timer += Time.deltaTime;

            if (timer >= 2f)

            {

                if (!m_CloseRemind.gameObject.activeSelf)

                {

                    m_CloseRemind.gameObject.SetActive(true);

                }

            }

        }

        #endregion



        void Display()

        {

            var config = RealmConfig.Get(realmLevel);

            m_EquipName.SetSprite(config.equipNameIcon);





            var job = PlayerDatas.Instance.baseData.Job;

            int[] equips = null;

            model.TryGetRealmPreviewEquips(realmLevel, job, out equips);



            m_RawPlayer.gameObject.SetActive(true);

            UI3DModelExhibition.Instance.ShowPlayer(m_RawPlayer, new UI3DPlayerExhibitionData()

            {

                job = job,

                clothesId = equips != null && equips.Length > 0 ? equips[0] : 0,

                weaponId = equips != null && equips.Length > 1 ? equips[1] : 0,

                secondaryId = equips != null && equips.Length > 2 ? equips[2] : 0,

                suitLevel = 1,

            });

        }



        private void OnClickClose()

        {

            if (timer >= 2f)

            {

                CloseClick();

            }

        }



    }



}










 System/Realm/RealmNewEquipWin.cs.meta

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

 System/Realm/RealmPromoteWin.cs

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

//    [Author]:           第二世界

//    [  Date ]:           Monday, April 22, 2019

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



using System;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{



    public class RealmPromoteWin : Window

    {

        [SerializeField] Text m_FightPoint;

        [SerializeField] PropertyBehaviour[] m_Propertys;

        [SerializeField] Text m_ReikiPoint;

        [SerializeField] Image m_RealmIcon;

        [SerializeField] UIEffect m_Effect;

        [SerializeField] Button m_Close;



        [SerializeField] Transform m_CloseRemind;



        public static int realmLevel = 0;



        static Dictionary<int, int> propertys = new Dictionary<int, int>();



        float timer = 0f;



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



        #region Built-in

        protected override void BindController()

        {

        }



        protected override void AddListeners()

        {

            m_Close.AddListener(OnClickClose);

        }



        protected override void OnPreOpen()

        {

            timer = 0f;

            m_CloseRemind.gameObject.SetActive(false);

            Dispaly();

        }



        protected override void OnAfterOpen()

        {

        }



        protected override void OnPreClose()

        {

        }



        protected override void OnAfterClose()

        {

        }



        protected override void LateUpdate()

        {

            timer += Time.deltaTime;

            if (timer >= 2f)

            {

                if (!m_CloseRemind.gameObject.activeSelf)

                {

                    m_CloseRemind.gameObject.SetActive(true);

                }

            }

        }

        #endregion



        private void OnClickClose()

        {

            if (timer >= 2f)

            {

                CloseClick();

            }

        }



        void Dispaly()

        {

            propertys.Clear();



            var currentConfig = RealmConfig.Get(realmLevel);

            var lastConfig = RealmConfig.Get(realmLevel - 1);



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

            {

                propertys.Add(currentConfig.AddAttrType[i], currentConfig.AddAttrNum[i]);

            }

            if (lastConfig.AddAttrType != null && lastConfig.AddAttrType.Length > 0)

            {

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

                {

                    var property = lastConfig.AddAttrType[i];

                    if (propertys.ContainsKey(property))

                    {

                        propertys[property] -= lastConfig.AddAttrNum[i];

                    }

                }

            }



            var fightPoint = UIHelper.GetFightPower(propertys);

            m_FightPoint.text = fightPoint.ToString();



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

            {

                m_Propertys[i].gameObject.SetActive(i < currentConfig.AddAttrType.Length);

                if (i < currentConfig.AddAttrType.Length)

                {

                    var property = currentConfig.AddAttrType[i];

                    m_Propertys[i].DisplayRealm(property, currentConfig.AddAttrNum[i] - propertys[property], currentConfig.AddAttrNum[i]);

                }

            }



            m_ReikiPoint.text = model.realmLevelUpReikiPoint.ToString();



            m_RealmIcon.SetSprite(currentConfig.Img);



            var effectId = model.GetRealmCoverEffect(realmLevel);

            m_Effect.StopImediatly();

            m_Effect.effect = effectId;

            m_Effect.Play();

        }



    }



}










 System/Realm/RealmPromoteWin.cs.meta

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

 System/Realm/RealmPropertyUpWin.cs

@@ -279,11 +279,11 @@
        {

            switch (ActivateShow.activateType)

            {

                case ActivateShow.ActivateFunc.Realm:

                    m_ModelRawImage.gameObject.SetActive(true);

                    m_ModelRawImage.rectTransform.sizeDelta = new Vector2(680, 510);

                    UI3DModelExhibition.Instance.ShowPlayer(m_ModelRawImage, PlayerDatas.Instance.baseData.Job, RoleEquipType.Wing);

                    break;

                //case ActivateShow.ActivateFunc.Realm:

                //    m_ModelRawImage.gameObject.SetActive(true);

                //    m_ModelRawImage.rectTransform.sizeDelta = new Vector2(680, 510);

                //    UI3DModelExhibition.Instance.ShowPlayer(m_ModelRawImage, PlayerDatas.Instance.baseData.Job, RoleEquipType.Wing);

                //    break;

                case ActivateShow.ActivateFunc.GodWeapon:

                    m_ModelRawImage.gameObject.SetActive(true);

                    m_ModelRawImage.rectTransform.sizeDelta = new Vector2(600, 600);


 System/Realm/RealmWin.cs

@@ -104,6 +104,7 @@
            m_RealmAnimation.onBossAppearComplete += OnBossAppearComplete;

            m_RealmAnimation.onCoverChange += OnCoverChange;

            mainDateModel.customDisplayPower += CustomDisplayPower;

            WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent;



            cacheRealmLevel = PlayerDatas.Instance.baseData.realmLevel;

            cacheFightPower = PlayerDatas.Instance.baseData.FightPoint;

@@ -141,6 +142,7 @@
            m_RealmAnimation.onBossAppearComplete -= OnBossAppearComplete;

            mainDateModel.customDisplayPower -= CustomDisplayPower;

            m_RealmAnimation.onCoverChange -= OnCoverChange;

            WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent;



            HideRealmUp();

        }

@@ -460,14 +462,16 @@
            }

            DisplayUnlockEquip();



            RealmPromoteWin.realmLevel = model.displayRealmLevel;

            WindowCenter.Instance.Open<RealmPromoteWin>();

            if (model.displayRealms.Count > 0)

            {

                model.displayRealms.RemoveAt(0);

            }

            if (model.displayRealms.Count > 0)

            {

                TryStartAnimation();

            }

            //if (model.displayRealms.Count > 0)

            //{

            //    TryStartAnimation();

            //}



            DisplayRealmPool();

        }

@@ -488,14 +492,17 @@


            if (!m_RealmAnimation.rotating)

            {

                RealmPromoteWin.realmLevel = model.displayRealmLevel;

                WindowCenter.Instance.Open<RealmPromoteWin>();

                if (model.displayRealms.Count > 0)

                {

                    model.displayRealms.RemoveAt(0);

                }

                if (model.displayRealms.Count > 0)

                {

                    TryStartAnimation();

                }



                //if (model.displayRealms.Count > 0)

                //{

                //    TryStartAnimation();

                //}

            }



            DisplayRealmPool();

@@ -507,6 +514,33 @@
            customUpPower = 0;

        }



        private void WindowAfterCloseEvent(Window window)

        {

            if (window is RealmPromoteWin)

            {

                var equipLevel = 0;

                if (model.IsUnlockEquipRealm(RealmPromoteWin.realmLevel, out equipLevel))

                {

                    RealmNewEquipWin.realmLevel = RealmPromoteWin.realmLevel;

                    WindowCenter.Instance.Open<RealmNewEquipWin>();

                }

                else

                {

                    if (model.displayRealms.Count > 0)

                    {

                        TryStartAnimation();

                    }

                }

            }

            if (window is RealmNewEquipWin)

            {

                if (model.displayRealms.Count > 0)

                {

                    TryStartAnimation();

                }

            }

        }



        public void OnBossAppearComplete()

        {

            m_GotoBoss.gameObject.SetActive(true);


 System/Role/PropertyBehaviour.cs

@@ -32,6 +32,13 @@
            DisplayAddLabel(_property, _add);

        }



        public void DisplayRealm(int _property, int _value, int _add)

        {

            m_PropertyName.text = GetPropertyName(_property);

            m_PropertyValue.text = GetValueLabel(_property, _value);

            m_PropertyAdd.text = GetValueLabel(_property, _add);

        }



        public void DisplayGodWeaponAdd(int _property, int _value, int _add)

        {

            m_PropertyName.text = GetPropertyName(_property);

New file
			@@ -0,0 +1,106 @@
			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Monday, April 22, 2019
			//--------------------------------------------------------

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

			namespace Snxxz.UI
			{

			public class RealmNewEquipWin : Window
			{
			[SerializeField] RawImage m_RawPlayer;
			[SerializeField] Image m_EquipName;
			[SerializeField] Text m_CloseRemind;
			[SerializeField] Button m_Close;

			public static int realmLevel = 0;

			float timer = 0f;

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

			#region Built-in
			protected override void BindController()
			{
			}

			protected override void AddListeners()
			{
			m_Close.AddListener(OnClickClose);
			}

			protected override void OnPreOpen()
			{
			timer = 0f;
			m_CloseRemind.gameObject.SetActive(false);
			Display();
			}

			protected override void OnAfterOpen()
			{
			}

			protected override void OnPreClose()
			{
			UI3DModelExhibition.Instance.StopShow();
			}

			protected override void OnAfterClose()
			{
			}

			protected override void LateUpdate()
			{
			timer += Time.deltaTime;
			if (timer >= 2f)
			{
			if (!m_CloseRemind.gameObject.activeSelf)
			{
			m_CloseRemind.gameObject.SetActive(true);
			}
			}
			}
			#endregion

			void Display()
			{
			var config = RealmConfig.Get(realmLevel);
			m_EquipName.SetSprite(config.equipNameIcon);


			var job = PlayerDatas.Instance.baseData.Job;
			int[] equips = null;
			model.TryGetRealmPreviewEquips(realmLevel, job, out equips);

			m_RawPlayer.gameObject.SetActive(true);
			UI3DModelExhibition.Instance.ShowPlayer(m_RawPlayer, new UI3DPlayerExhibitionData()
			{
			job = job,
			clothesId = equips != null && equips.Length > 0 ? equips[0] : 0,
			weaponId = equips != null && equips.Length > 1 ? equips[1] : 0,
			secondaryId = equips != null && equips.Length > 2 ? equips[2] : 0,
			suitLevel = 1,
			});
			}

			private void OnClickClose()
			{
			if (timer >= 2f)
			{
			CloseClick();
			}
			}

			}

			}

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

New file
			@@ -0,0 +1,136 @@
			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Monday, April 22, 2019
			//--------------------------------------------------------

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

			namespace Snxxz.UI
			{

			public class RealmPromoteWin : Window
			{
			[SerializeField] Text m_FightPoint;
			[SerializeField] PropertyBehaviour[] m_Propertys;
			[SerializeField] Text m_ReikiPoint;
			[SerializeField] Image m_RealmIcon;
			[SerializeField] UIEffect m_Effect;
			[SerializeField] Button m_Close;

			[SerializeField] Transform m_CloseRemind;

			public static int realmLevel = 0;

			static Dictionary<int, int> propertys = new Dictionary<int, int>();

			float timer = 0f;

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

			#region Built-in
			protected override void BindController()
			{
			}

			protected override void AddListeners()
			{
			m_Close.AddListener(OnClickClose);
			}

			protected override void OnPreOpen()
			{
			timer = 0f;
			m_CloseRemind.gameObject.SetActive(false);
			Dispaly();
			}

			protected override void OnAfterOpen()
			{
			}

			protected override void OnPreClose()
			{
			}

			protected override void OnAfterClose()
			{
			}

			protected override void LateUpdate()
			{
			timer += Time.deltaTime;
			if (timer >= 2f)
			{
			if (!m_CloseRemind.gameObject.activeSelf)
			{
			m_CloseRemind.gameObject.SetActive(true);
			}
			}
			}
			#endregion

			private void OnClickClose()
			{
			if (timer >= 2f)
			{
			CloseClick();
			}
			}

			void Dispaly()
			{
			propertys.Clear();

			var currentConfig = RealmConfig.Get(realmLevel);
			var lastConfig = RealmConfig.Get(realmLevel - 1);

			for (int i = 0; i < currentConfig.AddAttrType.Length; i++)
			{
			propertys.Add(currentConfig.AddAttrType[i], currentConfig.AddAttrNum[i]);
			}
			if (lastConfig.AddAttrType != null && lastConfig.AddAttrType.Length > 0)
			{
			for (int i = 0; i < lastConfig.AddAttrType.Length; i++)
			{
			var property = lastConfig.AddAttrType[i];
			if (propertys.ContainsKey(property))
			{
			propertys[property] -= lastConfig.AddAttrNum[i];
			}
			}
			}

			var fightPoint = UIHelper.GetFightPower(propertys);
			m_FightPoint.text = fightPoint.ToString();

			for (int i = 0; i < m_Propertys.Length; i++)
			{
			m_Propertys[i].gameObject.SetActive(i < currentConfig.AddAttrType.Length);
			if (i < currentConfig.AddAttrType.Length)
			{
			var property = currentConfig.AddAttrType[i];
			m_Propertys[i].DisplayRealm(property, currentConfig.AddAttrNum[i] - propertys[property], currentConfig.AddAttrNum[i]);
			}
			}

			m_ReikiPoint.text = model.realmLevelUpReikiPoint.ToString();

			m_RealmIcon.SetSprite(currentConfig.Img);

			var effectId = model.GetRealmCoverEffect(realmLevel);
			m_Effect.StopImediatly();
			m_Effect.effect = effectId;
			m_Effect.Play();
			}

			}

			}

			@@ -279,11 +279,11 @@
			{
			switch (ActivateShow.activateType)
			{
			case ActivateShow.ActivateFunc.Realm:
			m_ModelRawImage.gameObject.SetActive(true);
			m_ModelRawImage.rectTransform.sizeDelta = new Vector2(680, 510);
			UI3DModelExhibition.Instance.ShowPlayer(m_ModelRawImage, PlayerDatas.Instance.baseData.Job, RoleEquipType.Wing);
			break;
			//case ActivateShow.ActivateFunc.Realm:
			// m_ModelRawImage.gameObject.SetActive(true);
			// m_ModelRawImage.rectTransform.sizeDelta = new Vector2(680, 510);
			// UI3DModelExhibition.Instance.ShowPlayer(m_ModelRawImage, PlayerDatas.Instance.baseData.Job, RoleEquipType.Wing);
			// break;
			case ActivateShow.ActivateFunc.GodWeapon:
			m_ModelRawImage.gameObject.SetActive(true);
			m_ModelRawImage.rectTransform.sizeDelta = new Vector2(600, 600);

			@@ -104,6 +104,7 @@
			m_RealmAnimation.onBossAppearComplete += OnBossAppearComplete;
			m_RealmAnimation.onCoverChange += OnCoverChange;
			mainDateModel.customDisplayPower += CustomDisplayPower;
			WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent;

			cacheRealmLevel = PlayerDatas.Instance.baseData.realmLevel;
			cacheFightPower = PlayerDatas.Instance.baseData.FightPoint;
			@@ -141,6 +142,7 @@
			m_RealmAnimation.onBossAppearComplete -= OnBossAppearComplete;
			mainDateModel.customDisplayPower -= CustomDisplayPower;
			m_RealmAnimation.onCoverChange -= OnCoverChange;
			WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent;

			HideRealmUp();
			}
			@@ -460,14 +462,16 @@
			}
			DisplayUnlockEquip();

			RealmPromoteWin.realmLevel = model.displayRealmLevel;
			WindowCenter.Instance.Open<RealmPromoteWin>();
			if (model.displayRealms.Count > 0)
			{
			model.displayRealms.RemoveAt(0);
			}
			if (model.displayRealms.Count > 0)
			{
			TryStartAnimation();
			}
			//if (model.displayRealms.Count > 0)
			//{
			// TryStartAnimation();
			//}

			DisplayRealmPool();
			}
			@@ -488,14 +492,17 @@

			if (!m_RealmAnimation.rotating)
			{
			RealmPromoteWin.realmLevel = model.displayRealmLevel;
			WindowCenter.Instance.Open<RealmPromoteWin>();
			if (model.displayRealms.Count > 0)
			{
			model.displayRealms.RemoveAt(0);
			}
			if (model.displayRealms.Count > 0)
			{
			TryStartAnimation();
			}

			//if (model.displayRealms.Count > 0)
			//{
			// TryStartAnimation();
			//}
			}

			DisplayRealmPool();
			@@ -507,6 +514,33 @@
			customUpPower = 0;
			}

			private void WindowAfterCloseEvent(Window window)
			{
			if (window is RealmPromoteWin)
			{
			var equipLevel = 0;
			if (model.IsUnlockEquipRealm(RealmPromoteWin.realmLevel, out equipLevel))
			{
			RealmNewEquipWin.realmLevel = RealmPromoteWin.realmLevel;
			WindowCenter.Instance.Open<RealmNewEquipWin>();
			}
			else
			{
			if (model.displayRealms.Count > 0)
			{
			TryStartAnimation();
			}
			}
			}
			if (window is RealmNewEquipWin)
			{
			if (model.displayRealms.Count > 0)
			{
			TryStartAnimation();
			}
			}
			}

			public void OnBossAppearComplete()
			{
			m_GotoBoss.gameObject.SetActive(true);

			@@ -32,6 +32,13 @@
			DisplayAddLabel(_property, _add);
			}

			public void DisplayRealm(int _property, int _value, int _add)
			{
			m_PropertyName.text = GetPropertyName(_property);
			m_PropertyValue.text = GetValueLabel(_property, _value);
			m_PropertyAdd.text = GetValueLabel(_property, _add);
			}

			public void DisplayGodWeaponAdd(int _property, int _value, int _add)
			{
			m_PropertyName.text = GetPropertyName(_property);