snxxz_scripts.git

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

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

client_Wu Xijin

2018-08-29 08468164a0221d2327fee694525395704e194820

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

13个文件已修改

	Core/GameEngine/Model/Config/GetItemWaysConfig.cs	83 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/Config/GetItemWaysConfig.cs.meta	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA407_tagGCFamilyStoreItemClear.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/BlastFurnace/GetEquipPathTips.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/BlastFurnace/GetEquipPathWin.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/BlastFurnace/GetItemPathModel.cs	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/BlastFurnace/GetItemPathWin.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/BlastFurnace/GetPetMatPathWin.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/BlastFurnace/GetWaysWin.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/PlayerFairyAuTreasureData.cs	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/WarehouseTipsWin.cs	35 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/ImpactRankPromoteCell.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Treasure/TreasurePotentialPanel.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/GameEngine/Model/Config/GetItemWaysConfig.cs

@@ -1,33 +1,32 @@
//--------------------------------------------------------

//    [Author]:            第二世界

//    [  Date ]:           Monday, August 27, 2018

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



using UnityEngine;

using System;



namespace TableConfig {



    
    public partial class GetItemWaysConfig : ConfigBase {



//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Wednesday, August 29, 2018
//--------------------------------------------------------

using UnityEngine;
using System;

namespace TableConfig {

    
    public partial class GetItemWaysConfig : ConfigBase {

        public int ID { get ; private set ; }

        public string name { get ; private set; } 

        public string Icon { get ; private set; } 

        public string Text { get ; private set; } 

        public string SelectActive { get ; private set; } 
        public int OpenpanelId { get ; private set ; }

        public int FuncOpenId { get ; private set ; }

        public int ActiveType { get ; private set ; }



        public override string getKey()

        {

            return ID.ToString();

        }



        public override void Parse() {

            try

            {

        public int ActiveType { get ; private set ; }

        public override string getKey()
        {
            return ID.ToString();
        }

        public override void Parse() {
            try
            {
                ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 

            

                name = rawContents[1].Trim();

@@ -36,24 +35,22 @@
            

                Text = rawContents[3].Trim();

            

                SelectActive = rawContents[4].Trim();

                OpenpanelId=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 
            

                OpenpanelId=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
                FuncOpenId=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
            

                FuncOpenId=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
			
                ActiveType=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0; 
            }

            catch (Exception ex)

            {

                DebugEx.Log(ex);

            }

        }

	
    }



}









                ActiveType=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
            }
            catch (Exception ex)
            {
                DebugEx.Log(ex);
            }
        }
	
    }

}





 Core/GameEngine/Model/Config/GetItemWaysConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 1a2d1561c3b3d9d40b6ff80cbeb37298
timeCreated: 1535360341
timeCreated: 1535526077
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA407_tagGCFamilyStoreItemClear.cs

@@ -17,7 +17,7 @@
            {

                playerFairyAuTreasureData.FamilyStoreDel(vNetData.IndexList[i], vNetData.ClearType);

            }

            playerFairyAuTreasureData.WarehouseToRefresh();

            playerFairyAuTreasureData.WarehouseToRefresh(vNetData.IndexList);

        }

    }


}



 System/BlastFurnace/GetEquipPathTips.cs

@@ -651,12 +651,8 @@


        public void ClickWayCell(GetItemWaysConfig itemWaysModel)

        {

            if(!string.IsNullOrEmpty(itemWaysModel.SelectActive) && itemWaysModel.SelectActive != "")

            {

                QuestModel.currentDailyQuest = int.Parse(itemWaysModel.SelectActive);

            }

            CloseWin();

            WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);

            ModelCenter.Instance.GetModel<GetItemPathModel>().ClickGetWay(itemAttrData.itemId,itemWaysModel);

        }



        #endregion


 System/BlastFurnace/GetEquipPathWin.cs

@@ -623,12 +623,8 @@


        public void ClickWayCell(GetItemWaysConfig itemWaysModel)

        {

            if(!string.IsNullOrEmpty(itemWaysModel.SelectActive) && itemWaysModel.SelectActive != "")

            {

                QuestModel.currentDailyQuest = int.Parse(itemWaysModel.SelectActive);

            }

            CloseImmediately();

            WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);

            itemPathModel.ClickGetWay(itemPathModel.chinItemModel.ID,itemWaysModel);

        }



        #endregion


 System/BlastFurnace/GetItemPathModel.cs

@@ -201,6 +201,19 @@
       return  OpenServerActivityCenter.Instance.IsActivityOpen(activeType);

    }



    public void ClickGetWay(int itemId, GetItemWaysConfig itemWaysModel)

    {

        if (itemWaysModel == null) return;



        switch(itemWaysModel.ID)

        {

            case 38:

                ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>().JumpItemID = itemId;

                break;

        }

        WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);

    }



    #region 设置弹框位置

    private RectTransform infoTip = null;

    private RectTransform waysTip = null;


 System/BlastFurnace/GetItemPathWin.cs

@@ -419,12 +419,8 @@


        public void ClickWayCell(GetItemWaysConfig itemWaysModel)

        {

            if (!string.IsNullOrEmpty(itemWaysModel.SelectActive) && itemWaysModel.SelectActive != "")

            {

                QuestModel.currentDailyQuest = int.Parse(itemWaysModel.SelectActive);

            }

            CloseImmediately();

            WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);

            itemPathModel.ClickGetWay(itemPathModel.chinItemModel.ID, itemWaysModel);

        }



        #endregion


 System/BlastFurnace/GetPetMatPathWin.cs

@@ -329,12 +329,8 @@


        public void ClickWayCell(GetItemWaysConfig itemWaysModel)

        {

            if (!string.IsNullOrEmpty(itemWaysModel.SelectActive) && itemWaysModel.SelectActive != "")

            {

                QuestModel.currentDailyQuest = int.Parse(itemWaysModel.SelectActive);

            }

            CloseImmediately();

            WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);

            itemPathModel.ClickGetWay(itemPathModel.chinItemModel.ID,itemWaysModel);

        }



        #endregion


 System/BlastFurnace/GetWaysWin.cs

@@ -111,12 +111,8 @@

        public void ClickWayCell(GetItemWaysConfig itemWaysModel)
        {
            if (!string.IsNullOrEmpty(itemWaysModel.SelectActive) && itemWaysModel.SelectActive != "")
            {
                QuestModel.currentDailyQuest = int.Parse(itemWaysModel.SelectActive);
            }
            CloseImmediately();
            WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);
            itemPathModel.ClickGetWay(itemPathModel.chinItemModel.ID, itemWaysModel);
        }

        private void CloseWin()

 System/FairyAu/PlayerFairyAuTreasureData.cs

@@ -55,9 +55,10 @@
    public static event OnFamilyActionInfo Event_FamilyActionInfo;//家族行为信息的刷新
    public delegate void OnFamilyStoreItemInfo();
    public static event OnFamilyStoreItemInfo Event_FamilyStoreItemInfo;//仓库信息的刷新
    public static event Action<List<int>> Del_FamilyStoreItemInfo;//仓库信息物品的删除
    public int _FairyAuIntegral = 0;//获取仙盟积分

    public int JumpItemID = 0;//跳转获取ID
    public int JumpItemID = 0;//
    public override void Init()
    {
        
@@ -113,16 +114,22 @@



    }

    public void WarehouseToRefresh()//仓库刷新
    {
        if (Event_FamilyStoreItemInfo != null)
        {
            Event_FamilyStoreItemInfo();
    }

    List<int> List = new List<int>();
    public void WarehouseToRefresh(byte [] _list)//仓库刷新
    {

        List.Clear();
        for (int i = 0; i < _list.Length; i++)

        {

            List.Add(_list[i]+1);

        }
           

        if (Del_FamilyStoreItemInfo != null)

        {

            Del_FamilyStoreItemInfo(List);

        }






    }
    public void FamilyStoreDel(int _index ,int ClearType)//家族仓库物品删除(清除的格子索引, 仅单格子清除时有效,从0开始代表第一格,0-单格子清除; 1-所有物品清除)
    {

 System/FairyAu/WarehouseTipsWin.cs

@@ -111,6 +111,7 @@
            _FamilyPosition = (int)PlayerDatas.Instance.fairyData.mine.FamilyLV;

            PlayerFairyAuTreasureData.Event_FairyAuIntegral += FairyAuIntegral;//仙盟积分刷新

            PlayerFairyAuTreasureData.Event_FamilyStoreItemInfo += FamilyStoreItemInfo;//仓库信息刷新

            PlayerFairyAuTreasureData.Del_FamilyStoreItemInfo += Del_FamilyStoreItemInfo;//仓库物品删除

            PlayerFairyAuTreasureData.Event_FamilyActionInfo += FamilyActionInfo;//家族行为信息刷新

            _GridlineCtrl.OnRefreshCell += OnRefreshGridCell;

            _bool = false;

@@ -149,6 +150,7 @@
            PlayerFairyAuTreasureData.Event_FairyAuIntegral -= FairyAuIntegral;//仙盟积分刷新

            PlayerFairyAuTreasureData.Event_FamilyStoreItemInfo -= FamilyStoreItemInfo;//仓库信息刷新

            PlayerFairyAuTreasureData.Event_FamilyActionInfo -= FamilyActionInfo;//家族行为信息刷新

            PlayerFairyAuTreasureData.Del_FamilyStoreItemInfo -= Del_FamilyStoreItemInfo;//仓库物品删除

            _GridlineCtrl.OnRefreshCell -= OnRefreshGridCell;

        }



@@ -265,6 +267,7 @@
                _CA610.StoreItemIndex = (byte)(_indexList);

                _CA610.ItemID = (uint)_WPID;

                _CA610.ExcangeCount = 1;

                ClearItemID(_indexList);

                GameNetSystem.Instance.SendInfo(_CA610);

                KnapSackEventMgr.Instance.HideItemPopWin();

            }

@@ -911,6 +914,20 @@
            SetItemID();//获取高亮特效物品ID

            _GridlineCtrl.m_Scorller.RefreshActiveCellViews();//刷新当前可见

        }



        void Del_FamilyStoreItemInfo(List<int> List)//物品删除

        {

            QueryFamilyAction();//家族行为信息查询      
            _listArray.Clear();

            foreach (int key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)

            {

                _listArray.Add(key);

            }

            SetItemID();//获取高亮特效物品ID

            _GridlineCtrl.m_Scorller.RefreshActiveCellViews();//刷新当前可见



        }



        void FamilyActionInfo()

        {

            _listArray.Clear();

@@ -1003,6 +1020,7 @@
            int Order = 0;//阶数

            int Color = 0;//颜色

            int Star = 0;//颜色

            int EquipPlace = 0;//装备位置

            if (playerFairyAuTreasureData.JumpItemID == 0)

            {

                return;

@@ -1016,21 +1034,32 @@
            Order = itemconfig.LV;

            Color = itemconfig.ItemColor;

            Star = itemconfig.StarLevel;

            EquipPlace = itemconfig.EquipPlace;

            foreach (var key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)

            {

                var item_config = Config.Instance.Get<ItemConfig>(key);

                if (item_config.EquipPlace == 0 && item_config.EquipPlace > 10)

                var Item_ID = playerFairyAuTreasureData._DicfamilyStoreItem[key].ItemID;

                var item_config = Config.Instance.Get<ItemConfig>(Item_ID);

                if (item_config==null && item_config.EquipPlace == 0 && item_config.EquipPlace > 10)

                {

                    continue;

                }

                if (item_config.LV >= Order && item_config.ItemColor >= Color

                    && item_config.StarLevel >= Star && PlayerDatas.Instance.baseData.Job == item_config.JobLimit / 100)

                    && item_config.StarLevel >= Star && EquipPlace == item_config.EquipPlace

                    && PlayerDatas.Instance.baseData.Job == item_config.JobLimit / 100)

                {

                    DicHighlight.Add(key,1);

                }

            }



        }



        private void ClearItemID(int Index)

        {

            if (DicHighlight.ContainsKey(Index))

            {

                DicHighlight.Clear();

            }

        }

    }

}




 System/OpenServerActivity/ImpactRankPromoteCell.cs

@@ -55,10 +55,6 @@

        private void ClickWayCell(GetItemWaysConfig cfg)
        {
            if (!string.IsNullOrEmpty(cfg.SelectActive) && cfg.SelectActive != "")
            {
                QuestModel.currentDailyQuest = int.Parse(cfg.SelectActive);
            }
            WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)cfg.OpenpanelId);
        }
    }

 System/Treasure/TreasurePotentialPanel.cs

@@ -468,6 +468,7 @@
            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();

        }



        private void DisplayAddBookRedpoint()

@@ -565,6 +566,9 @@
                        break;

                    case 4:

                        SysNotifyMgr.Instance.ShowTip("TreasureUnsealed");

                        break;

                    case 6:

                        SysNotifyMgr.Instance.ShowTip("LevelUpZeroRate");

                        break;

                }



@@ -770,7 +774,8 @@


        private bool TestPotentialLevelUp(out int _error)

        {

            //1.人物等级要求不足；2.前置技能等级不足；3.sp不足;4.法宝未获得;5.已经最大等级

            //1.人物等级要求不足；2.前置技能等级不足；3.sp不足;4.法宝未获得;5.已经最大等级;6.概率为0

            _error = 0;

            if (m_Treasure.state != TreasureState.Collected)

            {

                _error = 4;

@@ -806,7 +811,14 @@


            if (m_Treasure.GetPotential(selectedPotential).level >= skillConfig.SkillMaxLV)

            {

                _error = 4;

                _error = 5;

                return false;

            }



            var levelUpConfig = GetPotentialLevelUpConfig();

            if (levelUpConfig.rate == 0)

            {

                _error = 6;

                return false;

            }

			@@ -1,33 +1,32 @@
			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Monday, August 27, 2018
			//--------------------------------------------------------

			using UnityEngine;
			using System;

			namespace TableConfig {


			public partial class GetItemWaysConfig : ConfigBase {

			//--------------------------------------------------------
			// [Author]: 第二世界
			// [ Date ]: Wednesday, August 29, 2018
			//--------------------------------------------------------

			using UnityEngine;
			using System;

			namespace TableConfig {


			public partial class GetItemWaysConfig : ConfigBase {

			public int ID { get ; private set ; }
			public string name { get ; private set; }
			public string Icon { get ; private set; }
			public string Text { get ; private set; }
			public string SelectActive { get ; private set; }
			public int OpenpanelId { get ; private set ; }
			public int FuncOpenId { get ; private set ; }
			public int ActiveType { get ; private set ; }

			public override string getKey()
			{
			return ID.ToString();
			}

			public override void Parse() {
			try
			{
			public int ActiveType { get ; private set ; }

			public override string getKey()
			{
			return ID.ToString();
			}

			public override void Parse() {
			try
			{
			ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;

			name = rawContents[1].Trim();
			@@ -36,24 +35,22 @@

			Text = rawContents[3].Trim();

			SelectActive = rawContents[4].Trim();
			OpenpanelId=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0;

			OpenpanelId=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0;
			FuncOpenId=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0;

			FuncOpenId=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0;

			ActiveType=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0;
			}
			catch (Exception ex)
			{
			DebugEx.Log(ex);
			}
			}

			}

			}




			ActiveType=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0;
			}
			catch (Exception ex)
			{
			DebugEx.Log(ex);
			}
			}

			}

			}

			@@ -1,6 +1,6 @@
			fileFormatVersion: 2
			guid: 1a2d1561c3b3d9d40b6ff80cbeb37298
			timeCreated: 1535360341
			timeCreated: 1535526077
			licenseType: Pro
			MonoImporter:
			serializedVersion: 2

			@@ -17,7 +17,7 @@
			{
			playerFairyAuTreasureData.FamilyStoreDel(vNetData.IndexList[i], vNetData.ClearType);
			}
			playerFairyAuTreasureData.WarehouseToRefresh();
			playerFairyAuTreasureData.WarehouseToRefresh(vNetData.IndexList);
			}
			}
			}

			@@ -651,12 +651,8 @@

			public void ClickWayCell(GetItemWaysConfig itemWaysModel)
			{
			if(!string.IsNullOrEmpty(itemWaysModel.SelectActive) && itemWaysModel.SelectActive != "")
			{
			QuestModel.currentDailyQuest = int.Parse(itemWaysModel.SelectActive);
			}
			CloseWin();
			WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);
			ModelCenter.Instance.GetModel<GetItemPathModel>().ClickGetWay(itemAttrData.itemId,itemWaysModel);
			}

			#endregion

			@@ -623,12 +623,8 @@

			public void ClickWayCell(GetItemWaysConfig itemWaysModel)
			{
			if(!string.IsNullOrEmpty(itemWaysModel.SelectActive) && itemWaysModel.SelectActive != "")
			{
			QuestModel.currentDailyQuest = int.Parse(itemWaysModel.SelectActive);
			}
			CloseImmediately();
			WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);
			itemPathModel.ClickGetWay(itemPathModel.chinItemModel.ID,itemWaysModel);
			}

			#endregion

			@@ -201,6 +201,19 @@
			return OpenServerActivityCenter.Instance.IsActivityOpen(activeType);
			}

			public void ClickGetWay(int itemId, GetItemWaysConfig itemWaysModel)
			{
			if (itemWaysModel == null) return;

			switch(itemWaysModel.ID)
			{
			case 38:
			ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>().JumpItemID = itemId;
			break;
			}
			WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);
			}

			#region 设置弹框位置
			private RectTransform infoTip = null;
			private RectTransform waysTip = null;

			@@ -419,12 +419,8 @@

			public void ClickWayCell(GetItemWaysConfig itemWaysModel)
			{
			if (!string.IsNullOrEmpty(itemWaysModel.SelectActive) && itemWaysModel.SelectActive != "")
			{
			QuestModel.currentDailyQuest = int.Parse(itemWaysModel.SelectActive);
			}
			CloseImmediately();
			WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);
			itemPathModel.ClickGetWay(itemPathModel.chinItemModel.ID, itemWaysModel);
			}

			#endregion

			@@ -329,12 +329,8 @@

			public void ClickWayCell(GetItemWaysConfig itemWaysModel)
			{
			if (!string.IsNullOrEmpty(itemWaysModel.SelectActive) && itemWaysModel.SelectActive != "")
			{
			QuestModel.currentDailyQuest = int.Parse(itemWaysModel.SelectActive);
			}
			CloseImmediately();
			WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);
			itemPathModel.ClickGetWay(itemPathModel.chinItemModel.ID,itemWaysModel);
			}

			#endregion

			@@ -111,12 +111,8 @@

			public void ClickWayCell(GetItemWaysConfig itemWaysModel)
			{
			if (!string.IsNullOrEmpty(itemWaysModel.SelectActive) && itemWaysModel.SelectActive != "")
			{
			QuestModel.currentDailyQuest = int.Parse(itemWaysModel.SelectActive);
			}
			CloseImmediately();
			WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemWaysModel.OpenpanelId);
			itemPathModel.ClickGetWay(itemPathModel.chinItemModel.ID, itemWaysModel);
			}

			private void CloseWin()

			@@ -55,9 +55,10 @@
			public static event OnFamilyActionInfo Event_FamilyActionInfo;//家族行为信息的刷新
			public delegate void OnFamilyStoreItemInfo();
			public static event OnFamilyStoreItemInfo Event_FamilyStoreItemInfo;//仓库信息的刷新
			public static event Action<List<int>> Del_FamilyStoreItemInfo;//仓库信息物品的删除
			public int _FairyAuIntegral = 0;//获取仙盟积分

			public int JumpItemID = 0;//跳转获取ID
			public int JumpItemID = 0;//
			public override void Init()
			{

			@@ -113,16 +114,22 @@



			}

			public void WarehouseToRefresh()//仓库刷新
			{
			if (Event_FamilyStoreItemInfo != null)
			{
			Event_FamilyStoreItemInfo();
			}
			List<int> List = new List<int>();
			public void WarehouseToRefresh(byte [] _list)//仓库刷新
			{
			List.Clear();
			for (int i = 0; i < _list.Length; i++)
			{
			List.Add(_list[i]+1);
			}


			if (Del_FamilyStoreItemInfo != null)
			{
			Del_FamilyStoreItemInfo(List);
			}



			}
			public void FamilyStoreDel(int _index ,int ClearType)//家族仓库物品删除(清除的格子索引, 仅单格子清除时有效,从0开始代表第一格,0-单格子清除; 1-所有物品清除)
			{

			@@ -111,6 +111,7 @@
			_FamilyPosition = (int)PlayerDatas.Instance.fairyData.mine.FamilyLV;
			PlayerFairyAuTreasureData.Event_FairyAuIntegral += FairyAuIntegral;//仙盟积分刷新
			PlayerFairyAuTreasureData.Event_FamilyStoreItemInfo += FamilyStoreItemInfo;//仓库信息刷新
			PlayerFairyAuTreasureData.Del_FamilyStoreItemInfo += Del_FamilyStoreItemInfo;//仓库物品删除
			PlayerFairyAuTreasureData.Event_FamilyActionInfo += FamilyActionInfo;//家族行为信息刷新
			_GridlineCtrl.OnRefreshCell += OnRefreshGridCell;
			_bool = false;
			@@ -149,6 +150,7 @@
			PlayerFairyAuTreasureData.Event_FairyAuIntegral -= FairyAuIntegral;//仙盟积分刷新
			PlayerFairyAuTreasureData.Event_FamilyStoreItemInfo -= FamilyStoreItemInfo;//仓库信息刷新
			PlayerFairyAuTreasureData.Event_FamilyActionInfo -= FamilyActionInfo;//家族行为信息刷新
			PlayerFairyAuTreasureData.Del_FamilyStoreItemInfo -= Del_FamilyStoreItemInfo;//仓库物品删除
			_GridlineCtrl.OnRefreshCell -= OnRefreshGridCell;
			}

			@@ -265,6 +267,7 @@
			_CA610.StoreItemIndex = (byte)(_indexList);
			_CA610.ItemID = (uint)_WPID;
			_CA610.ExcangeCount = 1;
			ClearItemID(_indexList);
			GameNetSystem.Instance.SendInfo(_CA610);
			KnapSackEventMgr.Instance.HideItemPopWin();
			}
			@@ -911,6 +914,20 @@
			SetItemID();//获取高亮特效物品ID
			_GridlineCtrl.m_Scorller.RefreshActiveCellViews();//刷新当前可见
			}

			void Del_FamilyStoreItemInfo(List<int> List)//物品删除
			{
			QueryFamilyAction();//家族行为信息查询
			_listArray.Clear();
			foreach (int key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)
			{
			_listArray.Add(key);
			}
			SetItemID();//获取高亮特效物品ID
			_GridlineCtrl.m_Scorller.RefreshActiveCellViews();//刷新当前可见

			}

			void FamilyActionInfo()
			{
			_listArray.Clear();
			@@ -1003,6 +1020,7 @@
			int Order = 0;//阶数
			int Color = 0;//颜色
			int Star = 0;//颜色
			int EquipPlace = 0;//装备位置
			if (playerFairyAuTreasureData.JumpItemID == 0)
			{
			return;
			@@ -1016,21 +1034,32 @@
			Order = itemconfig.LV;
			Color = itemconfig.ItemColor;
			Star = itemconfig.StarLevel;
			EquipPlace = itemconfig.EquipPlace;
			foreach (var key in playerFairyAuTreasureData._DicfamilyStoreItem.Keys)
			{
			var item_config = Config.Instance.Get<ItemConfig>(key);
			if (item_config.EquipPlace == 0 && item_config.EquipPlace > 10)
			var Item_ID = playerFairyAuTreasureData._DicfamilyStoreItem[key].ItemID;
			var item_config = Config.Instance.Get<ItemConfig>(Item_ID);
			if (item_config==null && item_config.EquipPlace == 0 && item_config.EquipPlace > 10)
			{
			continue;
			}
			if (item_config.LV >= Order && item_config.ItemColor >= Color
			&& item_config.StarLevel >= Star && PlayerDatas.Instance.baseData.Job == item_config.JobLimit / 100)
			&& item_config.StarLevel >= Star && EquipPlace == item_config.EquipPlace
			&& PlayerDatas.Instance.baseData.Job == item_config.JobLimit / 100)
			{
			DicHighlight.Add(key,1);
			}
			}

			}

			private void ClearItemID(int Index)
			{
			if (DicHighlight.ContainsKey(Index))
			{
			DicHighlight.Clear();
			}
			}
			}
			}

			@@ -55,10 +55,6 @@

			private void ClickWayCell(GetItemWaysConfig cfg)
			{
			if (!string.IsNullOrEmpty(cfg.SelectActive) && cfg.SelectActive != "")
			{
			QuestModel.currentDailyQuest = int.Parse(cfg.SelectActive);
			}
			WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)cfg.OpenpanelId);
			}
			}

			@@ -468,6 +468,7 @@
			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();
			}

			private void DisplayAddBookRedpoint()
			@@ -565,6 +566,9 @@
			break;
			case 4:
			SysNotifyMgr.Instance.ShowTip("TreasureUnsealed");
			break;
			case 6:
			SysNotifyMgr.Instance.ShowTip("LevelUpZeroRate");
			break;
			}

			@@ -770,7 +774,8 @@

			private bool TestPotentialLevelUp(out int _error)
			{
			//1.人物等级要求不足；2.前置技能等级不足；3.sp不足;4.法宝未获得;5.已经最大等级
			//1.人物等级要求不足；2.前置技能等级不足；3.sp不足;4.法宝未获得;5.已经最大等级;6.概率为0
			_error = 0;
			if (m_Treasure.state != TreasureState.Collected)
			{
			_error = 4;
			@@ -806,7 +811,14 @@

			if (m_Treasure.GetPotential(selectedPotential).level >= skillConfig.SkillMaxLV)
			{
			_error = 4;
			_error = 5;
			return false;
			}

			var levelUpConfig = GetPotentialLevelUpConfig();
			if (levelUpConfig.rate == 0)
			{
			_error = 6;
			return false;
			}