snxxz_scripts.git

parent: d46c551a | 补丁 | 提交 | show whitespace

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

client_Wu Xijin

2018-09-21 b24abe465bdc9725f7225aea36b049c9f99a94a5

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

8个文件已修改

	System/Chat/ChatCenter.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Chat/ChatTip.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/NormalDungeonEntranceWin.cs	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/TrialDungeonEntranceWin.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Treasure/DragSelectComponent.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Treasure/PotentialItemBehaviour.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Treasure/TreasurePotentialBriefInfo.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Treasure/TreasurePotentialPanel.cs	51 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Chat/ChatCenter.cs

@@ -766,7 +766,7 @@
            {

                ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;

                WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

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

                WindowCenter.Instance.Open<SocialWin>();

            }

        }

        #endregion


 System/Chat/ChatTip.cs

@@ -155,7 +155,7 @@
        {

            ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;

            WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

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

            WindowCenter.Instance.Open<SocialWin>();

            return;

        }

        WindowCenter.Instance.Open<ChatWin>();

@@ -228,11 +228,11 @@
        {

            case ChatInfoType.Team:

                WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

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

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

                break;

            case ChatInfoType.Fairy:

                WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

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

                WindowCenter.Instance.Open<SocialWin>();

                break;

            default:

                WindowCenter.Instance.Open<ChatWin>();


 System/Dungeon/NormalDungeonEntranceWin.cs

@@ -46,7 +46,10 @@
        [SerializeField] ButtonEx m_GroupStart;

        [SerializeField] ButtonEx m_SingleStart;

        [SerializeField] ButtonEx m_AutoGroupStart;

        [SerializeField] ButtonEx m_Group;

        [SerializeField] Button m_CloseWin;



        [SerializeField] RectTransform m_ContainerGroup;



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

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

@@ -63,6 +66,7 @@
            m_SingleStart.AddListener(ChallengeDungeon);

            m_AutoGroupStart.AddListener(AutoGroupChallenge);

            m_Sweep.AddListener(SweepDungeon);

            m_Group.AddListener(OpenGroup);

            m_CloseWin.AddListener(CloseClick);

        }



@@ -99,6 +103,12 @@
        }

        #endregion



        private void OpenGroup()

        {

            var openGroup = m_ContainerGroup.gameObject.activeSelf;

            m_ContainerGroup.gameObject.SetActive(!openGroup);

        }



        private void UpdateDungeonEnterCD()

        {

            var dungeonId = model.GetDungeonId(model.currentDungeon);

@@ -118,6 +128,9 @@
            m_SingleStart.gameObject.SetActive(fbType == 1 || fbType == 2);

            m_AutoGroupStart.gameObject.SetActive(fbType == 2 || fbType == 3);



            m_ContainerGroup.gameObject.SetActive(false);

            m_Group.gameObject.SetActive(fbType == 2 || fbType == 3);



            m_EntranceBG.SetSprite(dungeonOpenTimeConfig.PanelImg);



            m_DungeonTitle.text = dungeonConfig.FBName;


 System/Dungeon/TrialDungeonEntranceWin.cs

@@ -40,6 +40,9 @@
        [SerializeField] Image m_BossRealm;

        [SerializeField] Text m_BossName;



        [SerializeField] RectTransform m_ContainerGroup;

        [SerializeField] Button m_Group;



        [SerializeField] TrialRewardsBehaviour[] m_RewardBehaviours;

        [SerializeField] ScrollRect m_RewardScroller;



@@ -72,6 +75,7 @@
            m_SingleStart.AddListener(ChallengeDungeon);

            m_AutoGroupStart.AddListener(AutoGroupChallenge);

            m_CloseWin.AddListener(CloseClick);

            m_Group.AddListener(OpenGroup);

        }



        protected override void OnPreOpen()

@@ -81,6 +85,9 @@
            m_GroupStart.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();

            m_SingleStart.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();

            m_AutoGroupStart.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();

            m_Group.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();

            m_ContainerGroup.gameObject.SetActive(false);



            DrawDungeonBaseInfo();

            DrawRewards();

        }

@@ -100,6 +107,15 @@
        }

        #endregion



        private void OpenGroup()

        {

            if (!CheckChallenge())

            {

                return;

            }

            var openGroup = m_ContainerGroup.gameObject.activeSelf;

            m_ContainerGroup.gameObject.SetActive(!openGroup);

        }



        private void DrawDungeonBaseInfo()

        {

@@ -113,6 +129,7 @@
            m_GroupStart.gameObject.SetActive(fbType == 2 || fbType == 3);

            m_SingleStart.gameObject.SetActive(fbType == 1 || fbType == 2);

            m_AutoGroupStart.gameObject.SetActive(fbType == 2 || fbType == 3);

            m_Group.gameObject.SetActive(fbType == 2 || fbType == 3);



            var playerLevel = PlayerDatas.Instance.baseData.LV;

            m_LevelLimit.gameObject.SetActive(playerLevel < dungeonConfig.LVLimitMin);


 System/Treasure/DragSelectComponent.cs

@@ -24,7 +24,8 @@
            if (Input.touchCount > 1 || NewBieCenter.Instance.inGuiding

                || WindowCenter.Instance.CheckOpen<TreasureNewStageWin>()

                || WindowCenter.Instance.CheckOpen<PotentialItemUseWin>()

                || WindowCenter.Instance.CheckOpen<TreasureSoulActiveWin>())

                || WindowCenter.Instance.CheckOpen<TreasureSoulActiveWin>()

                || WindowCenter.Instance.CheckOpen<GetItemPathWin>())

            {

                m_StartDrag = false;

                return;


 System/Treasure/PotentialItemBehaviour.cs

@@ -51,9 +51,9 @@
            m_ItemBehaviour.SetItem(potentialBook.itemId, 1);

            m_CostCount.text = StringUtility.Contact(own, "/", need);

            m_CostCount.color = own >= need ? UIHelper.GetUIColor(TextColType.White) : UIHelper.GetUIColor(TextColType.Red);

            m_Click.interactable = own >= need;

            //m_Click.interactable = own >= need;

            m_AddBtnText.color = own >= need ? UIHelper.GetUIColor(TextColType.NavyBrown) : UIHelper.GetUIColor(TextColType.White);

            m_Click.image.material = own >= need ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];

            //m_Click.image.material = own >= need ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];

            var config = Config.Instance.Get<TreasureSkillConfig>(potentialBook.levelUpId);

            var upRate = potentialBook.successRate - config.InitialRate;

            m_SuccessRatio.text = Language.Get("HallowsWin_UpSuccess", StringUtility.Contact((upRate * 0.01f).ToString("f0"), "%"));

@@ -61,15 +61,15 @@


        private void SelectPotentialBook()

        {

            if (own >= need)

            {

            //if (own >= need)

            //{

                model.selectedPotentialBook = potentialBook.itemId;

                WindowCenter.Instance.Close<PotentialItemUseWin>();

            }

            else

            {

                SysNotifyMgr.Instance.ShowTip("SPItemNotEnough");

            }

            //}

            //else

            //{

            //    SysNotifyMgr.Instance.ShowTip("SPItemNotEnough");

            //}

        }



        private void Awake()


 System/Treasure/TreasurePotentialBriefInfo.cs

@@ -80,7 +80,7 @@


        private void SelectPotential()

        {

            if (potential == null || !model.IsPotentialUnlock(model.selectedTreasure, potential.id))

            if (potential == null/* || !model.IsPotentialUnlock(model.selectedTreasure, potential.id)*/)

            {

                return;

            }


 System/Treasure/TreasurePotentialPanel.cs

@@ -84,7 +84,8 @@
                    var level = potential.level;

                    var isMax = level >= config.SkillMaxLV;

                    m_PotentialMaxLevelTip.gameObject.SetActive(isMax);

                    m_ContainerUpgrade.gameObject.SetActive(!isMax && FuncOpen.Instance.IsFuncOpen(82));

                    m_ContainerUpgrade.gameObject.SetActive(!isMax &&

                        FuncOpen.Instance.IsFuncOpen(82) && model.IsPotentialUnlock(m_Treasure.id, selectedPotential));

                    m_ContainerRequirement.gameObject.SetActive(!isMax);



                    if (!isMax)

@@ -93,7 +94,6 @@
                        DisplayUpgradeCost();

                        DisplayGetSkill();

                        DisplaySuccessRatio();

                        m_UpgradeImage.gray = !TestPotentialLevelUp();

                    }

                    else

                    {

@@ -526,13 +526,18 @@
            {

                return;

            }

            if (config.InitialRate >= 100)

            {

                model.selectedPotentialBook = 0;

                return;

            }

            var itemId = config.Meterial2ID.Length > 0 ? config.Meterial2ID[0] : 0;

            if (itemId != 0)

            {

                var own = playerPack.GetItemCountByID(PackType.rptItem, itemId);

                var need = config.MeterialNum2[0];

                //var own = playerPack.GetItemCountByID(PackType.rptItem, itemId);

                //var need = config.MeterialNum2[0];

                var rate = config.Rate[0];

                if (rate >= 60 && own >= need)

                if (rate >= 60)

                {

                    model.selectedPotentialBook = itemId;

                }

@@ -550,7 +555,6 @@
            m_SPOwn.text = UIHelper.ReplaceLargeNum(spOwn);

            m_SPNeed.text = StringUtility.Contact("/", UIHelper.ReplaceLargeNum(spNeed));

            m_SPOwn.color = spOwn >= spNeed ? UIHelper.GetUIColor(TextColType.DarkGreen) : UIHelper.GetUIColor(TextColType.Red);

            m_UpgradeImage.gray = spOwn < spNeed;

        }



        private void DisplayGetSkill(bool _levelUp = false)

@@ -591,9 +595,10 @@
        {

            var levelUpConfig = GetPotentialLevelUpConfig();

            m_SuccessRatio.text = StringUtility.Contact((levelUpConfig.rate * 0.01f).ToString("f0"), "%");

            m_RatioUp.gameObject.SetActive(model.selectedPotentialBook != 0);

            m_SuccessRatio.color = UIHelper.GetUIColor(model.selectedPotentialBook != 0 ? TextColType.DarkGreen : TextColType.LightYellow);

            m_UpgradeImage.gray = !TestPotentialLevelUp();

            m_RatioUp.gameObject.SetActive(model.selectedPotentialBook != 0 && levelUpConfig.rate > 0);

            m_SuccessRatio.color = UIHelper.GetUIColor(model.selectedPotentialBook != 0 && levelUpConfig.rate > 0

                ? TextColType.DarkGreen : TextColType.LightYellow);

            m_UpgradeImage.gray = levelUpConfig.rate == 0 && model.selectedPotentialBook == 0;

        }



        private void DisplayAddBookRedpoint()

@@ -644,7 +649,9 @@
                m_PotentialBook.SetItem(_potentialBookId, 1);



                var levelUpConfig = GetPotentialLevelUpConfig();

                m_PotentialCount.text = StringUtility.Contact(levelUpConfig.own, "/", levelUpConfig.need);

                bool satisfy = levelUpConfig.own >= levelUpConfig.need;

                m_PotentialCount.text = StringUtility.Contact(UIHelper.GetTextColorByItemColor(satisfy ?

                    TextColType.LightYellow : TextColType.Red, levelUpConfig.own.ToString()), "/", levelUpConfig.need);

            }



            DisplaySuccessRatio();

@@ -657,10 +664,14 @@
            if (packType == PackType.rptItem && config != null && config.Type == 6)

            {

                var levelUpConfig = GetPotentialLevelUpConfig();

                if (levelUpConfig.own < levelUpConfig.need)

                if (_id == model.selectedPotentialBook)

                {

                    model.selectedPotentialBook = 0;

                    DisplayPotentialBook(model.selectedPotentialBook);

                }

                //if (levelUpConfig.own < levelUpConfig.need)

                //{

                //    model.selectedPotentialBook = 0;

                //}

            }

        }



@@ -687,13 +698,21 @@
                        }

                        break;

                    case 3:

                        MessageWin.Inst.ShowFixedTip(Language.Get("Hallows_SpUnEnough"));

                        ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(148);

                        //MessageWin.Inst.ShowFixedTip(Language.Get("Hallows_SpUnEnough"));

                        break;

                    case 4:

                        SysNotifyMgr.Instance.ShowTip("TreasureUnsealed");

                        break;

                    case 6:

                        if (model.selectedPotentialBook != 0)

                        {

                            ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(model.selectedPotentialBook);

                        }

                        else

                        {

                        SysNotifyMgr.Instance.ShowTip("LevelUpZeroRate");

                        }

                        break;

                }



@@ -840,9 +859,10 @@
            }



            var levelUpConfig = GetPotentialLevelUpConfig();

            if (levelUpConfig.own < levelUpConfig.need || !ContainsPotentialBook(model.selectedPotentialBook))

            if (!ContainsPotentialBook(model.selectedPotentialBook))

            {

                model.selectedPotentialBook = 0;

                AutoSelectPotentialBook();

                //model.selectedPotentialBook = 0;

            }



            var curconfig = Config.Instance.Get<SkillConfig>(potential.id);

@@ -924,7 +944,6 @@
                    m_SPOwn.text = UIHelper.ReplaceLargeNum(spOwn);

                    m_SPNeed.text = StringUtility.Contact("/", UIHelper.ReplaceLargeNum(spNeed));

                    m_SPOwn.color = spOwn >= spNeed ? UIHelper.GetUIColor(TextColType.DarkGreen) : UIHelper.GetUIColor(TextColType.Red);

                    m_UpgradeImage.gray = !TestPotentialLevelUp();

                    break;

            }

        }

			@@ -766,7 +766,7 @@
			{
			ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;
			WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
			WindowCenter.Instance.Open<SocialWin>(false, 2);
			WindowCenter.Instance.Open<SocialWin>();
			}
			}
			#endregion

			@@ -155,7 +155,7 @@
			{
			ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;
			WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
			WindowCenter.Instance.Open<SocialWin>(false, 2);
			WindowCenter.Instance.Open<SocialWin>();
			return;
			}
			WindowCenter.Instance.Open<ChatWin>();
			@@ -228,11 +228,11 @@
			{
			case ChatInfoType.Team:
			WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
			WindowCenter.Instance.Open<SocialWin>(false, 1);
			WindowCenter.Instance.Open<SocialWin>(false, 2);
			break;
			case ChatInfoType.Fairy:
			WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
			WindowCenter.Instance.Open<SocialWin>(false, 2);
			WindowCenter.Instance.Open<SocialWin>();
			break;
			default:
			WindowCenter.Instance.Open<ChatWin>();

			@@ -46,7 +46,10 @@
			[SerializeField] ButtonEx m_GroupStart;
			[SerializeField] ButtonEx m_SingleStart;
			[SerializeField] ButtonEx m_AutoGroupStart;
			[SerializeField] ButtonEx m_Group;
			[SerializeField] Button m_CloseWin;

			[SerializeField] RectTransform m_ContainerGroup;

			DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
			TeamModel teamModel { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
			@@ -63,6 +66,7 @@
			m_SingleStart.AddListener(ChallengeDungeon);
			m_AutoGroupStart.AddListener(AutoGroupChallenge);
			m_Sweep.AddListener(SweepDungeon);
			m_Group.AddListener(OpenGroup);
			m_CloseWin.AddListener(CloseClick);
			}

			@@ -99,6 +103,12 @@
			}
			#endregion

			private void OpenGroup()
			{
			var openGroup = m_ContainerGroup.gameObject.activeSelf;
			m_ContainerGroup.gameObject.SetActive(!openGroup);
			}

			private void UpdateDungeonEnterCD()
			{
			var dungeonId = model.GetDungeonId(model.currentDungeon);
			@@ -118,6 +128,9 @@
			m_SingleStart.gameObject.SetActive(fbType == 1 \|\| fbType == 2);
			m_AutoGroupStart.gameObject.SetActive(fbType == 2 \|\| fbType == 3);

			m_ContainerGroup.gameObject.SetActive(false);
			m_Group.gameObject.SetActive(fbType == 2 \|\| fbType == 3);

			m_EntranceBG.SetSprite(dungeonOpenTimeConfig.PanelImg);

			m_DungeonTitle.text = dungeonConfig.FBName;

			@@ -40,6 +40,9 @@
			[SerializeField] Image m_BossRealm;
			[SerializeField] Text m_BossName;

			[SerializeField] RectTransform m_ContainerGroup;
			[SerializeField] Button m_Group;

			[SerializeField] TrialRewardsBehaviour[] m_RewardBehaviours;
			[SerializeField] ScrollRect m_RewardScroller;

			@@ -72,6 +75,7 @@
			m_SingleStart.AddListener(ChallengeDungeon);
			m_AutoGroupStart.AddListener(AutoGroupChallenge);
			m_CloseWin.AddListener(CloseClick);
			m_Group.AddListener(OpenGroup);
			}

			protected override void OnPreOpen()
			@@ -81,6 +85,9 @@
			m_GroupStart.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
			m_SingleStart.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
			m_AutoGroupStart.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
			m_Group.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
			m_ContainerGroup.gameObject.SetActive(false);

			DrawDungeonBaseInfo();
			DrawRewards();
			}
			@@ -100,6 +107,15 @@
			}
			#endregion

			private void OpenGroup()
			{
			if (!CheckChallenge())
			{
			return;
			}
			var openGroup = m_ContainerGroup.gameObject.activeSelf;
			m_ContainerGroup.gameObject.SetActive(!openGroup);
			}

			private void DrawDungeonBaseInfo()
			{
			@@ -113,6 +129,7 @@
			m_GroupStart.gameObject.SetActive(fbType == 2 \|\| fbType == 3);
			m_SingleStart.gameObject.SetActive(fbType == 1 \|\| fbType == 2);
			m_AutoGroupStart.gameObject.SetActive(fbType == 2 \|\| fbType == 3);
			m_Group.gameObject.SetActive(fbType == 2 \|\| fbType == 3);

			var playerLevel = PlayerDatas.Instance.baseData.LV;
			m_LevelLimit.gameObject.SetActive(playerLevel < dungeonConfig.LVLimitMin);

			@@ -24,7 +24,8 @@
			if (Input.touchCount > 1 \|\| NewBieCenter.Instance.inGuiding
			\|\| WindowCenter.Instance.CheckOpen<TreasureNewStageWin>()
			\|\| WindowCenter.Instance.CheckOpen<PotentialItemUseWin>()
			\|\| WindowCenter.Instance.CheckOpen<TreasureSoulActiveWin>())
			\|\| WindowCenter.Instance.CheckOpen<TreasureSoulActiveWin>()
			\|\| WindowCenter.Instance.CheckOpen<GetItemPathWin>())
			{
			m_StartDrag = false;
			return;

			@@ -51,9 +51,9 @@
			m_ItemBehaviour.SetItem(potentialBook.itemId, 1);
			m_CostCount.text = StringUtility.Contact(own, "/", need);
			m_CostCount.color = own >= need ? UIHelper.GetUIColor(TextColType.White) : UIHelper.GetUIColor(TextColType.Red);
			m_Click.interactable = own >= need;
			//m_Click.interactable = own >= need;
			m_AddBtnText.color = own >= need ? UIHelper.GetUIColor(TextColType.NavyBrown) : UIHelper.GetUIColor(TextColType.White);
			m_Click.image.material = own >= need ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];
			//m_Click.image.material = own >= need ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];
			var config = Config.Instance.Get<TreasureSkillConfig>(potentialBook.levelUpId);
			var upRate = potentialBook.successRate - config.InitialRate;
			m_SuccessRatio.text = Language.Get("HallowsWin_UpSuccess", StringUtility.Contact((upRate * 0.01f).ToString("f0"), "%"));
			@@ -61,15 +61,15 @@

			private void SelectPotentialBook()
			{
			if (own >= need)
			{
			//if (own >= need)
			//{
			model.selectedPotentialBook = potentialBook.itemId;
			WindowCenter.Instance.Close<PotentialItemUseWin>();
			}
			else
			{
			SysNotifyMgr.Instance.ShowTip("SPItemNotEnough");
			}
			//}
			//else
			//{
			// SysNotifyMgr.Instance.ShowTip("SPItemNotEnough");
			//}
			}

			private void Awake()

			@@ -80,7 +80,7 @@

			private void SelectPotential()
			{
			if (potential == null \|\| !model.IsPotentialUnlock(model.selectedTreasure, potential.id))
			if (potential == null/* \|\| !model.IsPotentialUnlock(model.selectedTreasure, potential.id)*/)
			{
			return;
			}

			@@ -84,7 +84,8 @@
			var level = potential.level;
			var isMax = level >= config.SkillMaxLV;
			m_PotentialMaxLevelTip.gameObject.SetActive(isMax);
			m_ContainerUpgrade.gameObject.SetActive(!isMax && FuncOpen.Instance.IsFuncOpen(82));
			m_ContainerUpgrade.gameObject.SetActive(!isMax &&
			FuncOpen.Instance.IsFuncOpen(82) && model.IsPotentialUnlock(m_Treasure.id, selectedPotential));
			m_ContainerRequirement.gameObject.SetActive(!isMax);

			if (!isMax)
			@@ -93,7 +94,6 @@
			DisplayUpgradeCost();
			DisplayGetSkill();
			DisplaySuccessRatio();
			m_UpgradeImage.gray = !TestPotentialLevelUp();
			}
			else
			{
			@@ -526,13 +526,18 @@
			{
			return;
			}
			if (config.InitialRate >= 100)
			{
			model.selectedPotentialBook = 0;
			return;
			}
			var itemId = config.Meterial2ID.Length > 0 ? config.Meterial2ID[0] : 0;
			if (itemId != 0)
			{
			var own = playerPack.GetItemCountByID(PackType.rptItem, itemId);
			var need = config.MeterialNum2[0];
			//var own = playerPack.GetItemCountByID(PackType.rptItem, itemId);
			//var need = config.MeterialNum2[0];
			var rate = config.Rate[0];
			if (rate >= 60 && own >= need)
			if (rate >= 60)
			{
			model.selectedPotentialBook = itemId;
			}
			@@ -550,7 +555,6 @@
			m_SPOwn.text = UIHelper.ReplaceLargeNum(spOwn);
			m_SPNeed.text = StringUtility.Contact("/", UIHelper.ReplaceLargeNum(spNeed));
			m_SPOwn.color = spOwn >= spNeed ? UIHelper.GetUIColor(TextColType.DarkGreen) : UIHelper.GetUIColor(TextColType.Red);
			m_UpgradeImage.gray = spOwn < spNeed;
			}

			private void DisplayGetSkill(bool _levelUp = false)
			@@ -591,9 +595,10 @@
			{
			var levelUpConfig = GetPotentialLevelUpConfig();
			m_SuccessRatio.text = StringUtility.Contact((levelUpConfig.rate * 0.01f).ToString("f0"), "%");
			m_RatioUp.gameObject.SetActive(model.selectedPotentialBook != 0);
			m_SuccessRatio.color = UIHelper.GetUIColor(model.selectedPotentialBook != 0 ? TextColType.DarkGreen : TextColType.LightYellow);
			m_UpgradeImage.gray = !TestPotentialLevelUp();
			m_RatioUp.gameObject.SetActive(model.selectedPotentialBook != 0 && levelUpConfig.rate > 0);
			m_SuccessRatio.color = UIHelper.GetUIColor(model.selectedPotentialBook != 0 && levelUpConfig.rate > 0
			? TextColType.DarkGreen : TextColType.LightYellow);
			m_UpgradeImage.gray = levelUpConfig.rate == 0 && model.selectedPotentialBook == 0;
			}

			private void DisplayAddBookRedpoint()
			@@ -644,7 +649,9 @@
			m_PotentialBook.SetItem(_potentialBookId, 1);

			var levelUpConfig = GetPotentialLevelUpConfig();
			m_PotentialCount.text = StringUtility.Contact(levelUpConfig.own, "/", levelUpConfig.need);
			bool satisfy = levelUpConfig.own >= levelUpConfig.need;
			m_PotentialCount.text = StringUtility.Contact(UIHelper.GetTextColorByItemColor(satisfy ?
			TextColType.LightYellow : TextColType.Red, levelUpConfig.own.ToString()), "/", levelUpConfig.need);
			}

			DisplaySuccessRatio();
			@@ -657,10 +664,14 @@
			if (packType == PackType.rptItem && config != null && config.Type == 6)
			{
			var levelUpConfig = GetPotentialLevelUpConfig();
			if (levelUpConfig.own < levelUpConfig.need)
			if (_id == model.selectedPotentialBook)
			{
			model.selectedPotentialBook = 0;
			DisplayPotentialBook(model.selectedPotentialBook);
			}
			//if (levelUpConfig.own < levelUpConfig.need)
			//{
			// model.selectedPotentialBook = 0;
			//}
			}
			}

			@@ -687,13 +698,21 @@
			}
			break;
			case 3:
			MessageWin.Inst.ShowFixedTip(Language.Get("Hallows_SpUnEnough"));
			ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(148);
			//MessageWin.Inst.ShowFixedTip(Language.Get("Hallows_SpUnEnough"));
			break;
			case 4:
			SysNotifyMgr.Instance.ShowTip("TreasureUnsealed");
			break;
			case 6:
			if (model.selectedPotentialBook != 0)
			{
			ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(model.selectedPotentialBook);
			}
			else
			{
			SysNotifyMgr.Instance.ShowTip("LevelUpZeroRate");
			}
			break;
			}

			@@ -840,9 +859,10 @@
			}

			var levelUpConfig = GetPotentialLevelUpConfig();
			if (levelUpConfig.own < levelUpConfig.need \|\| !ContainsPotentialBook(model.selectedPotentialBook))
			if (!ContainsPotentialBook(model.selectedPotentialBook))
			{
			model.selectedPotentialBook = 0;
			AutoSelectPotentialBook();
			//model.selectedPotentialBook = 0;
			}

			var curconfig = Config.Instance.Get<SkillConfig>(potential.id);
			@@ -924,7 +944,6 @@
			m_SPOwn.text = UIHelper.ReplaceLargeNum(spOwn);
			m_SPNeed.text = StringUtility.Contact("/", UIHelper.ReplaceLargeNum(spNeed));
			m_SPOwn.color = spOwn >= spNeed ? UIHelper.GetUIColor(TextColType.DarkGreen) : UIHelper.GetUIColor(TextColType.Red);
			m_UpgradeImage.gray = !TestPotentialLevelUp();
			break;
			}
			}