snxxz_scripts.git

parent: 81d660a0 | 补丁 | 提交 | ignore whitespace

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

client_Wu Xijin

2019-03-18 2aa42813f3ae1c1f13a480effe6a9930f56c90d3

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

3个文件已删除

1 文件已重命名

7个文件已修改

1个文件已添加

	System/Auction/AuctionHelpModel.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/EquipGem/WingRefiningWin.cs	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/EquipGem/WingRefiningWin.cs.meta	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Mount/MountSkill.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Mount/MountSkill.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Mount/MountSkillWin.cs	400 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/RealmAnimationBehaviour.cs	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/RealmLevelUpBehaviour.cs	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/RealmModel.cs	102 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Realm/RealmWin.cs	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Tip/PromoteDetailsWin.cs	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Welfare/WelfareWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Auction/AuctionHelpModel.cs

@@ -103,7 +103,7 @@
                }

            }



        }     
        }



        public List<AuctionItemConfig> GetAuctionItemList(int index)//获取关注列表

        {

@@ -180,6 +180,16 @@
            }

            return score;

        }



        public bool WhetherEquipped(int equipLevel, int equipPlace)//是否装备

        {

            bool isBool = false;

            string equipGuid = string.Empty;

            var equipSet = equipModel.GetEquipSet(equipLevel);

            equipGuid = equipSet.GetEquip(equipPlace);

            isBool = !string.IsNullOrEmpty(equipGuid);

            return isBool;

        }

    }

}

 System/EquipGem/WingRefiningWin.cs

New file
@@ -0,0 +1,50 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Monday, March 18, 2019
//--------------------------------------------------------

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

namespace Snxxz.UI {
  
    public class WingRefiningWin : Window
    {

        [SerializeField] Button m_CloseBtn;
        #region Built-in
        protected override void BindController()
        {
        }

        protected override void AddListeners()
        {
            m_CloseBtn.AddListener(()=> { CloseImmediately(); });
        }

        protected override void OnPreOpen()
        {
        }

        protected override void OnAfterOpen()
        {
        }

        protected override void OnPreClose()
        {
        }

        protected override void OnAfterClose()
        {
        }
        #endregion
   
    }

}





 System/EquipGem/WingRefiningWin.cs.meta

File was renamed from System/Mount/MountSkillWin.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: a3a480a045b300446b446d03c5ae3b6e
timeCreated: 1510056065
guid: ebf763cedfa13704bb4f48945568225f
timeCreated: 1552891459
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Mount/MountSkill.cs

File was deleted

 System/Mount/MountSkill.cs.meta

File was deleted

 System/Mount/MountSkillWin.cs

File was deleted

 System/Realm/RealmAnimationBehaviour.cs

@@ -16,6 +16,7 @@
        [SerializeField] UIEffect[] m_EffectLines;

        [SerializeField] UIEffect m_EffectLevelUp;

        [SerializeField] UIEffect m_EffectBoss;

        [SerializeField] UIEffect m_EffectBase;



        [SerializeField, Header("小境界升级特效时长")] float m_NormalLevelUpEffectTime = 1.5f;

        [SerializeField, Header("大境界升级特效时长")] float m_SpecialLevelUpEffectTime = 4.5f;

@@ -98,7 +99,19 @@
                yield break;

            }



            if (m_EffectBoss.IsPlaying)

            {

                if (m_EffectBase.target != null)

                {

                    var obj = m_EffectBase.target.transform.Find("GameObject/b/b (3)");

                    if (obj != null)

                    {

                        obj.gameObject.SetActive(true);

                    }

                }

            }

            m_EffectBoss.StopImediatly();

            


            m_EffectLevelUp.StopImediatly();

            var config = RealmConfig.Get(model.displayRealmLevel - 1);

@@ -138,6 +151,15 @@
                    animator = m_EffectBoss.target.GetAnimator();

                    animator.Play("Effect_JingJieBJ_02", 0, 0);

                }



                if (m_EffectBase.target != null)

                {

                    var obj = m_EffectBase.target.transform.Find("GameObject/b/b (3)");

                    if (obj != null)

                    {

                        obj.gameObject.SetActive(false);

                    }

                }

            }



            if (onLevelUpComplete != null)


 System/Realm/RealmLevelUpBehaviour.cs

@@ -69,7 +69,7 @@
        private void OnLevelUp()

        {

            var error = 0;

            if (TryLevelUp(out error))

            if (model.TryLevelUp(out error))

            {

                CA523_tagCMRealmLVUp pak = new CA523_tagCMRealmLVUp();

                GameNetSystem.Instance.SendInfo(pak);

@@ -78,37 +78,6 @@
            {

                DisplayErrorTip(error);

            }

        }



        bool TryLevelUp(out int error)

        {

            error = 0;

            if (PlayerDatas.Instance.baseData.realmLevel >= realmLevel)

            {

                error = 100;

                return false;

            }

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

            if (PlayerDatas.Instance.baseData.LV < config.NeedLV)

            {

                error = 1;

                return false;

            }

            if (config.BossID != 0 && !model.isBossPass)

            {

                error = 2;

                return false;

            }

            if (config.NeedGood != 0)

            {

                var count = packModel.GetItemCountByID(PackType.Item, config.NeedGood);

                if (count < config.NeedNum)

                {

                    error = 3;

                    return false;

                }

            }

            return true;

        }



        void DisplayErrorTip(int error)


 System/Realm/RealmModel.cs

@@ -40,6 +40,8 @@


        int cacheMapId = 0;



        bool redpointDirty = false;



        public List<int> displayRealms = new List<int>();



        public int displayRealmLevel

@@ -57,10 +59,14 @@
        public event Action selectRealmRefresh;



        EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }

        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }



        public override void Init()

        {

            StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;

            PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;

            GlobalTimeEvent.Instance.secondEvent += PerSecond;

            packModel.refreshItemCountEvent += RefreshItemCountEvent;

            ParseConfig();

        }



@@ -71,11 +77,24 @@


        public void OnPlayerLoginOk()

        {

            redpointDirty = true;

        }



        public override void UnInit()

        {

            StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish;

            PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;

            packModel.refreshItemCountEvent -= RefreshItemCountEvent;

            GlobalTimeEvent.Instance.secondEvent -= PerSecond;

        }



        private void PerSecond()

        {

            if (redpointDirty)

            {

                RefreshRedpoint();

                redpointDirty = false;

            }

        }



        void ParseConfig()

@@ -151,6 +170,38 @@
                return m_RealmPreviewEquips[level].TryGetValue(job, out equips);

            }

            return false;

        }



        public bool TryLevelUp(out int error)

        {

            error = 0;

            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            if (realmLevel >= realmMaxLevel)

            {

                error = 100;

                return false;

            }

            var config = RealmConfig.Get(realmLevel);

            if (PlayerDatas.Instance.baseData.LV < config.NeedLV)

            {

                error = 1;

                return false;

            }

            if (config.BossID != 0 && !isBossPass)

            {

                error = 2;

                return false;

            }

            if (config.NeedGood != 0)

            {

                var count = packModel.GetItemCountByID(PackType.Item, config.NeedGood);

                if (count < config.NeedNum)

                {

                    error = 3;

                    return false;

                }

            }

            return true;

        }



        public bool IsUnlockEquipRealm(int realmLevel, out int level)

@@ -241,6 +292,7 @@
        public void ReceivePackage(HA311_tagMCSyncRealmInfo package)

        {

            isBossPass = package.IsPass == 1;

            RefreshRedpoint();

        }



        private void OnStageLoadFinish()

@@ -261,6 +313,28 @@
                    }

                }

                cacheMapId = mapId;

            }

        }



        private void PlayerDataRefreshEvent(PlayerDataType dataType)

        {

            if (dataType == PlayerDataType.RealmLevel

                || dataType == PlayerDataType.LV

                || dataType == PlayerDataType.FightPoint)

            {

                redpointDirty = true;

            }

        }



        private void RefreshItemCountEvent(PackType packType, int arg2, int itemId)

        {

            if (packType == PackType.Item)

            {

                var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);

                if (config != null && config.NeedGood == itemId)

                {

                    redpointDirty = true;

                }

            }

        }



@@ -287,5 +361,33 @@
            }

            WindowCenter.Instance.Open<RealmWin>();

        }



        void RefreshRedpoint()

        {

            var levelUpable = false;

            var challengeable = false;



            if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Realm))

            {

                var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

                if (realmLevel < realmMaxLevel)

                {

                    var config = RealmConfig.Get(realmLevel);

                    if (config.BossID != 0 && !isBossPass)

                    {

                        challengeable = PlayerDatas.Instance.baseData.FightPoint >= config.FightPower;

                    }



                    var error = 0;

                    if (TryLevelUp(out error))

                    {

                        levelUpable = true;

                    }

                }

            }



            levelUpRedpoint.state = levelUpable ? RedPointState.Simple : RedPointState.None;

            challengeRedpoint.state = challengeable ? RedPointState.Simple : RedPointState.None;

        }

    }

}

 System/Realm/RealmWin.cs

@@ -31,6 +31,7 @@
        [SerializeField] PositionTween m_RealmLevelUpTween;

        [SerializeField] UIEffect m_EffectCover;

        [SerializeField] UIEffect m_EffectBoss;

        [SerializeField] UIEffect m_EffectBase;



        int cacheRealmLevel = 0;



@@ -295,10 +296,12 @@


        void DisplayEffectBoss()

        {

            bool requireBossEffect = false;

            m_EffectBoss.StopImediatly();

            var config = RealmConfig.Get(model.displayRealmLevel);

            if (config.BossID != 0 && !model.isBossPass)

            {

                requireBossEffect = true;

                m_EffectBoss.Play();

                Animator animator = null;

                if (m_EffectBoss.target != null)

@@ -307,6 +310,16 @@
                    animator.Play("Effect_JingJieBJ_021", 0, 1);

                }

            }



            if (m_EffectBase.target != null)

            {

                var obj = m_EffectBase.target.transform.Find("GameObject/b/b (3)");

                if (obj != null)

                {

                    obj.gameObject.SetActive(!requireBossEffect);

                }

            }



        }



        private void PlayerDataRefreshEvent(PlayerDataType dataType)

@@ -334,6 +347,8 @@
                model.displayRealms.Clear();

                model.selectRealm = PlayerDatas.Instance.baseData.realmLevel + 1;

                DisplayRealmStages();

                DisplayCover();

                DisplayEffectBoss();

            }

            else

            {


 System/Tip/PromoteDetailsWin.cs

@@ -18,13 +18,16 @@
        [SerializeField] ScrollerController scrollerController;



        RolePromoteModel m_Model;

        RolePromoteModel model {

            get {

        RolePromoteModel model

        {

            get

            {

                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<RolePromoteModel>());

            }

        }



        TreasureModel treasureModel {

        TreasureModel treasureModel

        {

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

        }



@@ -78,7 +81,7 @@
                    WindowCenter.Instance.Open<RolePointWin>();

                    break;

                case RolePromoteModel.PromoteDetailType.EquipStrength:

                    WindowCenter.Instance.Open<EquipFrameWin>(false, 1);

                    //WindowCenter.Instance.Open<EquipReinforceWin>();

                    break;

                case RolePromoteModel.PromoteDetailType.Mount:

                    WindowCenter.Instance.Open<PetWin>(false, 1);

@@ -98,13 +101,13 @@
                    WindowCenter.Instance.Open<RolePromoteWin>();

                    break;

                case RolePromoteModel.PromoteDetailType.Wash:

                    WindowCenter.Instance.Open<EquipFrameWin>(false, 3);

                    //WindowCenter.Instance.Open<EquipReinforceWin>(false, 3);

                    break;

                case RolePromoteModel.PromoteDetailType.FairyHeart:

                    WindowCenter.Instance.Open<MethodToWin>();

                    break;

                case RolePromoteModel.PromoteDetailType.Gem:

                    WindowCenter.Instance.Open<EquipFrameWin>(false, 2);

                    //WindowCenter.Instance.Open<EquipReinforceWin>(false, 1);

                    break;

                case RolePromoteModel.PromoteDetailType.BlastFurnace:

                    WindowCenter.Instance.Open<BlastFurnaceWin>(false, 1);


 System/Welfare/WelfareWin.cs

@@ -99,7 +99,7 @@
            if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 40)

            {

                WindowJumpMgr.Instance.ClearJumpData();

                WindowCenter.Instance.Open<EquipFrameWin>(false, 1);

                //WindowCenter.Instance.Open<EquipReinforceWin>();

            }

            else

            {

			@@ -103,7 +103,7 @@
			}
			}

			}
			}

			public List<AuctionItemConfig> GetAuctionItemList(int index)//获取关注列表
			{
			@@ -180,6 +180,16 @@
			}
			return score;
			}

			public bool WhetherEquipped(int equipLevel, int equipPlace)//是否装备
			{
			bool isBool = false;
			string equipGuid = string.Empty;
			var equipSet = equipModel.GetEquipSet(equipLevel);
			equipGuid = equipSet.GetEquip(equipPlace);
			isBool = !string.IsNullOrEmpty(equipGuid);
			return isBool;
			}
			}

			}

New file
			@@ -0,0 +1,50 @@
			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Monday, March 18, 2019
			//--------------------------------------------------------

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

			namespace Snxxz.UI {

			public class WingRefiningWin : Window
			{
			[SerializeField] Button m_CloseBtn;
			#region Built-in
			protected override void BindController()
			{
			}

			protected override void AddListeners()
			{
			m_CloseBtn.AddListener(()=> { CloseImmediately(); });
			}

			protected override void OnPreOpen()
			{
			}

			protected override void OnAfterOpen()
			{
			}

			protected override void OnPreClose()
			{
			}

			protected override void OnAfterClose()
			{
			}
			#endregion

			}

			}

File was renamed from System/Mount/MountSkillWin.cs.meta
			@@ -1,6 +1,6 @@
			fileFormatVersion: 2
			guid: a3a480a045b300446b446d03c5ae3b6e
			timeCreated: 1510056065
			guid: ebf763cedfa13704bb4f48945568225f
			timeCreated: 1552891459
			licenseType: Pro
			MonoImporter:
			serializedVersion: 2

			@@ -16,6 +16,7 @@
			[SerializeField] UIEffect[] m_EffectLines;
			[SerializeField] UIEffect m_EffectLevelUp;
			[SerializeField] UIEffect m_EffectBoss;
			[SerializeField] UIEffect m_EffectBase;

			[SerializeField, Header("小境界升级特效时长")] float m_NormalLevelUpEffectTime = 1.5f;
			[SerializeField, Header("大境界升级特效时长")] float m_SpecialLevelUpEffectTime = 4.5f;
			@@ -98,7 +99,19 @@
			yield break;
			}

			if (m_EffectBoss.IsPlaying)
			{
			if (m_EffectBase.target != null)
			{
			var obj = m_EffectBase.target.transform.Find("GameObject/b/b (3)");
			if (obj != null)
			{
			obj.gameObject.SetActive(true);
			}
			}
			}
			m_EffectBoss.StopImediatly();


			m_EffectLevelUp.StopImediatly();
			var config = RealmConfig.Get(model.displayRealmLevel - 1);
			@@ -138,6 +151,15 @@
			animator = m_EffectBoss.target.GetAnimator();
			animator.Play("Effect_JingJieBJ_02", 0, 0);
			}

			if (m_EffectBase.target != null)
			{
			var obj = m_EffectBase.target.transform.Find("GameObject/b/b (3)");
			if (obj != null)
			{
			obj.gameObject.SetActive(false);
			}
			}
			}

			if (onLevelUpComplete != null)

			@@ -69,7 +69,7 @@
			private void OnLevelUp()
			{
			var error = 0;
			if (TryLevelUp(out error))
			if (model.TryLevelUp(out error))
			{
			CA523_tagCMRealmLVUp pak = new CA523_tagCMRealmLVUp();
			GameNetSystem.Instance.SendInfo(pak);
			@@ -78,37 +78,6 @@
			{
			DisplayErrorTip(error);
			}
			}

			bool TryLevelUp(out int error)
			{
			error = 0;
			if (PlayerDatas.Instance.baseData.realmLevel >= realmLevel)
			{
			error = 100;
			return false;
			}
			var config = RealmConfig.Get(realmLevel - 1);
			if (PlayerDatas.Instance.baseData.LV < config.NeedLV)
			{
			error = 1;
			return false;
			}
			if (config.BossID != 0 && !model.isBossPass)
			{
			error = 2;
			return false;
			}
			if (config.NeedGood != 0)
			{
			var count = packModel.GetItemCountByID(PackType.Item, config.NeedGood);
			if (count < config.NeedNum)
			{
			error = 3;
			return false;
			}
			}
			return true;
			}

			void DisplayErrorTip(int error)

			@@ -40,6 +40,8 @@

			int cacheMapId = 0;

			bool redpointDirty = false;

			public List<int> displayRealms = new List<int>();

			public int displayRealmLevel
			@@ -57,10 +59,14 @@
			public event Action selectRealmRefresh;

			EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }
			PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }

			public override void Init()
			{
			StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;
			PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
			GlobalTimeEvent.Instance.secondEvent += PerSecond;
			packModel.refreshItemCountEvent += RefreshItemCountEvent;
			ParseConfig();
			}

			@@ -71,11 +77,24 @@

			public void OnPlayerLoginOk()
			{
			redpointDirty = true;
			}

			public override void UnInit()
			{
			StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish;
			PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
			packModel.refreshItemCountEvent -= RefreshItemCountEvent;
			GlobalTimeEvent.Instance.secondEvent -= PerSecond;
			}

			private void PerSecond()
			{
			if (redpointDirty)
			{
			RefreshRedpoint();
			redpointDirty = false;
			}
			}

			void ParseConfig()
			@@ -151,6 +170,38 @@
			return m_RealmPreviewEquips[level].TryGetValue(job, out equips);
			}
			return false;
			}

			public bool TryLevelUp(out int error)
			{
			error = 0;
			var realmLevel = PlayerDatas.Instance.baseData.realmLevel;
			if (realmLevel >= realmMaxLevel)
			{
			error = 100;
			return false;
			}
			var config = RealmConfig.Get(realmLevel);
			if (PlayerDatas.Instance.baseData.LV < config.NeedLV)
			{
			error = 1;
			return false;
			}
			if (config.BossID != 0 && !isBossPass)
			{
			error = 2;
			return false;
			}
			if (config.NeedGood != 0)
			{
			var count = packModel.GetItemCountByID(PackType.Item, config.NeedGood);
			if (count < config.NeedNum)
			{
			error = 3;
			return false;
			}
			}
			return true;
			}

			public bool IsUnlockEquipRealm(int realmLevel, out int level)
			@@ -241,6 +292,7 @@
			public void ReceivePackage(HA311_tagMCSyncRealmInfo package)
			{
			isBossPass = package.IsPass == 1;
			RefreshRedpoint();
			}

			private void OnStageLoadFinish()
			@@ -261,6 +313,28 @@
			}
			}
			cacheMapId = mapId;
			}
			}

			private void PlayerDataRefreshEvent(PlayerDataType dataType)
			{
			if (dataType == PlayerDataType.RealmLevel
			\|\| dataType == PlayerDataType.LV
			\|\| dataType == PlayerDataType.FightPoint)
			{
			redpointDirty = true;
			}
			}

			private void RefreshItemCountEvent(PackType packType, int arg2, int itemId)
			{
			if (packType == PackType.Item)
			{
			var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
			if (config != null && config.NeedGood == itemId)
			{
			redpointDirty = true;
			}
			}
			}

			@@ -287,5 +361,33 @@
			}
			WindowCenter.Instance.Open<RealmWin>();
			}

			void RefreshRedpoint()
			{
			var levelUpable = false;
			var challengeable = false;

			if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Realm))
			{
			var realmLevel = PlayerDatas.Instance.baseData.realmLevel;
			if (realmLevel < realmMaxLevel)
			{
			var config = RealmConfig.Get(realmLevel);
			if (config.BossID != 0 && !isBossPass)
			{
			challengeable = PlayerDatas.Instance.baseData.FightPoint >= config.FightPower;
			}

			var error = 0;
			if (TryLevelUp(out error))
			{
			levelUpable = true;
			}
			}
			}

			levelUpRedpoint.state = levelUpable ? RedPointState.Simple : RedPointState.None;
			challengeRedpoint.state = challengeable ? RedPointState.Simple : RedPointState.None;
			}
			}
			}

			@@ -31,6 +31,7 @@
			[SerializeField] PositionTween m_RealmLevelUpTween;
			[SerializeField] UIEffect m_EffectCover;
			[SerializeField] UIEffect m_EffectBoss;
			[SerializeField] UIEffect m_EffectBase;

			int cacheRealmLevel = 0;

			@@ -295,10 +296,12 @@

			void DisplayEffectBoss()
			{
			bool requireBossEffect = false;
			m_EffectBoss.StopImediatly();
			var config = RealmConfig.Get(model.displayRealmLevel);
			if (config.BossID != 0 && !model.isBossPass)
			{
			requireBossEffect = true;
			m_EffectBoss.Play();
			Animator animator = null;
			if (m_EffectBoss.target != null)
			@@ -307,6 +310,16 @@
			animator.Play("Effect_JingJieBJ_021", 0, 1);
			}
			}

			if (m_EffectBase.target != null)
			{
			var obj = m_EffectBase.target.transform.Find("GameObject/b/b (3)");
			if (obj != null)
			{
			obj.gameObject.SetActive(!requireBossEffect);
			}
			}

			}

			private void PlayerDataRefreshEvent(PlayerDataType dataType)
			@@ -334,6 +347,8 @@
			model.displayRealms.Clear();
			model.selectRealm = PlayerDatas.Instance.baseData.realmLevel + 1;
			DisplayRealmStages();
			DisplayCover();
			DisplayEffectBoss();
			}
			else
			{

			@@ -18,13 +18,16 @@
			[SerializeField] ScrollerController scrollerController;

			RolePromoteModel m_Model;
			RolePromoteModel model {
			get {
			RolePromoteModel model
			{
			get
			{
			return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<RolePromoteModel>());
			}
			}

			TreasureModel treasureModel {
			TreasureModel treasureModel
			{
			get { return ModelCenter.Instance.GetModel<TreasureModel>(); }
			}

			@@ -78,7 +81,7 @@
			WindowCenter.Instance.Open<RolePointWin>();
			break;
			case RolePromoteModel.PromoteDetailType.EquipStrength:
			WindowCenter.Instance.Open<EquipFrameWin>(false, 1);
			//WindowCenter.Instance.Open<EquipReinforceWin>();
			break;
			case RolePromoteModel.PromoteDetailType.Mount:
			WindowCenter.Instance.Open<PetWin>(false, 1);
			@@ -98,13 +101,13 @@
			WindowCenter.Instance.Open<RolePromoteWin>();
			break;
			case RolePromoteModel.PromoteDetailType.Wash:
			WindowCenter.Instance.Open<EquipFrameWin>(false, 3);
			//WindowCenter.Instance.Open<EquipReinforceWin>(false, 3);
			break;
			case RolePromoteModel.PromoteDetailType.FairyHeart:
			WindowCenter.Instance.Open<MethodToWin>();
			break;
			case RolePromoteModel.PromoteDetailType.Gem:
			WindowCenter.Instance.Open<EquipFrameWin>(false, 2);
			//WindowCenter.Instance.Open<EquipReinforceWin>(false, 1);
			break;
			case RolePromoteModel.PromoteDetailType.BlastFurnace:
			WindowCenter.Instance.Open<BlastFurnaceWin>(false, 1);

			@@ -99,7 +99,7 @@
			if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 40)
			{
			WindowJumpMgr.Instance.ClearJumpData();
			WindowCenter.Instance.Open<EquipFrameWin>(false, 1);
			//WindowCenter.Instance.Open<EquipReinforceWin>();
			}
			else
			{