snxxz_scripts.git

parent: cb959aa1 | 补丁 | 提交 | ignore whitespace

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

client_Wu Xijin

2019-06-05 11a9a0701132a86e6f01ebf00ab287913fefa324

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

6个文件已修改

	System/FairyAu/FairyBasicFunctionWin.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/FairyBoss.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/FairyBossModel.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/FairyModel.cs	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Treasure/FairyTreasureCollectPanelPattern3.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/WindowJump/WindowJumpMgr.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/FairyAu/FairyBasicFunctionWin.cs

@@ -91,6 +91,7 @@
            }

            CheckFairyStoreOpen();

            CheckFairyMethodToOpen();

            CheckFairyBossOpen();

        }



        void CheckFairyStoreOpen()

@@ -101,6 +102,11 @@
        void CheckFairyMethodToOpen()

        {

            SkillBtn.image.color = SkillBtn.image.color.SetA(model.fairyMethodToOpen ? 1 : 0.5f);

        }



        void CheckFairyBossOpen()

        {

            bossBtn.image.color = bossBtn.image.color.SetA(model.fairyBossFuncOpen ? 1 : 0.5f);

        }



        void SkillBtna()

@@ -120,6 +126,11 @@


        private void OnBossBtn()

        {

            if (!model.fairyBossFuncOpen)

            {

                model.ProcessFairyBossErrorTip();

                return;

            }

            WindowCenter.Instance.Open<FairyBoss>();

        }




 System/FairyAu/FairyBoss.cs

@@ -263,14 +263,10 @@


        void DisplayFairyFood()

        {

            var singlepack = packModel.GetSinglePack(PackType.Item);

            var count = 0;

            if (singlepack != null)

            {

                count = singlepack.GetCountById(fairyBossModel.fairyBossFood);

            }

            ItemCellModel itemCellModel = new ItemCellModel(fairyBossModel.fairyBossFood, true, (ulong)count);

            m_FairyFood.Init(itemCellModel);

            var count = packModel.GetItemCountByID(PackType.Item, fairyBossModel.fairyBossFood);

            var itemData = new ItemCellModel(fairyBossModel.fairyBossFood, true, (ulong)count);

            m_FairyFood.Init(itemData);

            m_FairyFood.countText.text = count.ToString();

            m_FairyFood.countText.color = UIHelper.GetUIColor(count > 0 ? TextColType.Green : TextColType.Red);

            m_FairyFood.countText.gameObject.SetActive(true);

        }


 System/FairyAu/FairyBossModel.cs

@@ -27,6 +27,7 @@

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }

        public int MapId { get; private set; }
        public int OpenFairyBossNeed { get; private set; }
@@ -37,6 +38,7 @@
        public int fairyBossFood { get; private set; }
        public int fairyBossContinueTime { get; private set; }
        public int fairyBossPrepareTime { get; private set; }
        public int fairyLevelLimit { get; private set; }
        /// <summary>
        /// key---世界等级上限 value---预览物品id
        /// </summary>
@@ -74,6 +76,10 @@
            for (int i = 0; i < configs.Count; i++)
            {
                fairyBossWeekCntDict.Add(configs[i].familyLV, configs[i].bossFBCnt);
                if (fairyLevelLimit == 0 && configs[i].bossFBCnt > 0)

                {

                    fairyLevelLimit = configs[i].familyLV;

                }
            }

            GetDungeonContinueTime();
@@ -128,7 +134,7 @@
        {
            redpoint.state = RedPointState.None;
            PlayerFairyData fairyData = PlayerDatas.Instance.fairyData;
            if (!fairyData.HasFairy)
            if (!fairyModel.fairyBossFuncOpen)
            {
                return;
            }
@@ -164,7 +170,7 @@
        public bool IsFairyBossOpen()
        {
            PlayerFairyData fairyData = PlayerDatas.Instance.fairyData;
            if (!fairyData.HasFairy)
            if (!fairyModel.fairyBossFuncOpen)
            {
                return false;
            }

 System/FairyAu/FairyModel.cs

@@ -10,6 +10,7 @@
    public class FairyModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

    {

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

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

        public override void Init()

        {

            ParseConfig();

@@ -746,6 +747,36 @@
        }

        #endregion



        #region 仙盟Boss开启

        public bool fairyBossFuncOpen

        {

            get

            {

                if (PlayerDatas.Instance.fairyData.HasFairy)

                {

                    var fairy = PlayerDatas.Instance.fairyData.fairy;

                    if (fairy != null && fairy.FamilyLV >= fairyBossModel.fairyLevelLimit)

                    {

                        return true;

                    }

                }

                return false;

            }

        }



        public void ProcessFairyBossErrorTip()

        {

            if (!PlayerDatas.Instance.fairyData.HasFairy)

            {

                SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");

            }

            else if (PlayerDatas.Instance.fairyData.fairy.FamilyLV < fairyBossModel.fairyLevelLimit)

            {

                SysNotifyMgr.Instance.ShowTip("FairyBossLimit", fairyBossModel.fairyLevelLimit);

            }

        }

        #endregion



        public bool InFairyLeagueDungeon

        {

            get


 System/Treasure/FairyTreasureCollectPanelPattern3.cs

@@ -86,7 +86,8 @@
                case 305:

                    m_GotoBtnText.text = Language.Get("FairyTreasureGot");

                    m_ContainerLocked.gameObject.SetActive(false);

                    m_ReikiEffect.text = Language.Get("FairyTreasure_12", reikiRootModel.levelUpAddPoint, model.treasureAddReikiPoint.y);

                    m_ReikiEffect.text = Language.Get("FairyTreasure_12", reikiRootModel.levelUpAddPoint,

                        model.treasureAddReikiPoint.y + reikiRootModel.levelUpAddPoint);

                    m_PlayerLevel.text = Language.Get("FairyTreasure_13", PlayerDatas.Instance.baseData.LV);



                    var reikiPoint = 0;


 System/WindowJump/WindowJumpMgr.cs

@@ -776,13 +776,19 @@
            case JumpUIType.UnionTask2:

            case JumpUIType.UnionActive1:

            case JumpUIType.UnionActive2:

            case JumpUIType.UnionBoss:

                if (!PlayerDatas.Instance.fairyData.HasFairy)

                {

                    SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");

                    return false;

                }

                break;

            case JumpUIType.UnionBoss:

                if (!fairyModel.fairyBossFuncOpen)

                {

                    fairyModel.ProcessFairyBossErrorTip();

                    return false;

                }

                break;

            case JumpUIType.UnionMethod:

                if (!fairyModel.fairyMethodToOpen)

                {

			@@ -91,6 +91,7 @@
			}
			CheckFairyStoreOpen();
			CheckFairyMethodToOpen();
			CheckFairyBossOpen();
			}

			void CheckFairyStoreOpen()
			@@ -101,6 +102,11 @@
			void CheckFairyMethodToOpen()
			{
			SkillBtn.image.color = SkillBtn.image.color.SetA(model.fairyMethodToOpen ? 1 : 0.5f);
			}

			void CheckFairyBossOpen()
			{
			bossBtn.image.color = bossBtn.image.color.SetA(model.fairyBossFuncOpen ? 1 : 0.5f);
			}

			void SkillBtna()
			@@ -120,6 +126,11 @@

			private void OnBossBtn()
			{
			if (!model.fairyBossFuncOpen)
			{
			model.ProcessFairyBossErrorTip();
			return;
			}
			WindowCenter.Instance.Open<FairyBoss>();
			}

			@@ -263,14 +263,10 @@

			void DisplayFairyFood()
			{
			var singlepack = packModel.GetSinglePack(PackType.Item);
			var count = 0;
			if (singlepack != null)
			{
			count = singlepack.GetCountById(fairyBossModel.fairyBossFood);
			}
			ItemCellModel itemCellModel = new ItemCellModel(fairyBossModel.fairyBossFood, true, (ulong)count);
			m_FairyFood.Init(itemCellModel);
			var count = packModel.GetItemCountByID(PackType.Item, fairyBossModel.fairyBossFood);
			var itemData = new ItemCellModel(fairyBossModel.fairyBossFood, true, (ulong)count);
			m_FairyFood.Init(itemData);
			m_FairyFood.countText.text = count.ToString();
			m_FairyFood.countText.color = UIHelper.GetUIColor(count > 0 ? TextColType.Green : TextColType.Red);
			m_FairyFood.countText.gameObject.SetActive(true);
			}

			@@ -27,6 +27,7 @@

			DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
			PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
			FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }

			public int MapId { get; private set; }
			public int OpenFairyBossNeed { get; private set; }
			@@ -37,6 +38,7 @@
			public int fairyBossFood { get; private set; }
			public int fairyBossContinueTime { get; private set; }
			public int fairyBossPrepareTime { get; private set; }
			public int fairyLevelLimit { get; private set; }
			/// <summary>
			/// key---世界等级上限 value---预览物品id
			/// </summary>
			@@ -74,6 +76,10 @@
			for (int i = 0; i < configs.Count; i++)
			{
			fairyBossWeekCntDict.Add(configs[i].familyLV, configs[i].bossFBCnt);
			if (fairyLevelLimit == 0 && configs[i].bossFBCnt > 0)
			{
			fairyLevelLimit = configs[i].familyLV;
			}
			}

			GetDungeonContinueTime();
			@@ -128,7 +134,7 @@
			{
			redpoint.state = RedPointState.None;
			PlayerFairyData fairyData = PlayerDatas.Instance.fairyData;
			if (!fairyData.HasFairy)
			if (!fairyModel.fairyBossFuncOpen)
			{
			return;
			}
			@@ -164,7 +170,7 @@
			public bool IsFairyBossOpen()
			{
			PlayerFairyData fairyData = PlayerDatas.Instance.fairyData;
			if (!fairyData.HasFairy)
			if (!fairyModel.fairyBossFuncOpen)
			{
			return false;
			}

			@@ -10,6 +10,7 @@
			public class FairyModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
			{
			DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
			FairyBossModel fairyBossModel { get { return ModelCenter.Instance.GetModel<FairyBossModel>(); } }
			public override void Init()
			{
			ParseConfig();
			@@ -746,6 +747,36 @@
			}
			#endregion

			#region 仙盟Boss开启
			public bool fairyBossFuncOpen
			{
			get
			{
			if (PlayerDatas.Instance.fairyData.HasFairy)
			{
			var fairy = PlayerDatas.Instance.fairyData.fairy;
			if (fairy != null && fairy.FamilyLV >= fairyBossModel.fairyLevelLimit)
			{
			return true;
			}
			}
			return false;
			}
			}

			public void ProcessFairyBossErrorTip()
			{
			if (!PlayerDatas.Instance.fairyData.HasFairy)
			{
			SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");
			}
			else if (PlayerDatas.Instance.fairyData.fairy.FamilyLV < fairyBossModel.fairyLevelLimit)
			{
			SysNotifyMgr.Instance.ShowTip("FairyBossLimit", fairyBossModel.fairyLevelLimit);
			}
			}
			#endregion

			public bool InFairyLeagueDungeon
			{
			get

			@@ -86,7 +86,8 @@
			case 305:
			m_GotoBtnText.text = Language.Get("FairyTreasureGot");
			m_ContainerLocked.gameObject.SetActive(false);
			m_ReikiEffect.text = Language.Get("FairyTreasure_12", reikiRootModel.levelUpAddPoint, model.treasureAddReikiPoint.y);
			m_ReikiEffect.text = Language.Get("FairyTreasure_12", reikiRootModel.levelUpAddPoint,
			model.treasureAddReikiPoint.y + reikiRootModel.levelUpAddPoint);
			m_PlayerLevel.text = Language.Get("FairyTreasure_13", PlayerDatas.Instance.baseData.LV);

			var reikiPoint = 0;

			@@ -776,13 +776,19 @@
			case JumpUIType.UnionTask2:
			case JumpUIType.UnionActive1:
			case JumpUIType.UnionActive2:
			case JumpUIType.UnionBoss:
			if (!PlayerDatas.Instance.fairyData.HasFairy)
			{
			SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");
			return false;
			}
			break;
			case JumpUIType.UnionBoss:
			if (!fairyModel.fairyBossFuncOpen)
			{
			fairyModel.ProcessFairyBossErrorTip();
			return false;
			}
			break;
			case JumpUIType.UnionMethod:
			if (!fairyModel.fairyMethodToOpen)
			{