snxxz_scripts.git

parent: 407509dc | 补丁 | 提交 | ignore whitespace

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

client_Hale

2019-01-03 d7fa608095c66c7e37bfd133cdbbbdb127e3f235

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

12个文件已修改

	Core/GameEngine/DataToCtl/NeverConnectState.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Login/LoginStage.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/CrossServerOneVsOne/FightingPKWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/BoxInfoWin.cs	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/EquipTip.cs	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/GuardTip.cs	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/ItemInfoWin.cs	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/ItemTipsModel.cs	75 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/UnionWarehouseEquipTip.cs	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/WingsTip.cs	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/New/GetWingsPathTips.cs	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Login/CrossServerLogin.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/GameEngine/DataToCtl/NeverConnectState.cs

@@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Snxxz.UI;

public class NeverConnectState : NetState

{
@@ -8,6 +9,7 @@
    public override void OnEnter()

    {

        base.OnEnter();

        NetLinkWin.Hide();

    }

    protected override void Update()


 Core/GameEngine/Login/LoginStage.cs

@@ -13,8 +13,9 @@
        checkClientTimer = Time.time + 60f;

        checkAssetVersionTimer = Time.time + 70f;



        WindowCenter.Instance.Close<FightingPKWin>();

        WindowCenter.Instance.Open<LaunchBackGroundWin>(true);



        
        var backGroundWin = WindowCenter.Instance.Get<LaunchBackGroundWin>();

        if (backGroundWin != null)

        {


 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -126,7 +126,7 @@
        }

        protected override void LateUpdate()

        {

            if (PlayerDatas.Instance.hero.aiHandler.IsAuto())

            if (PlayerDatas.Instance.hero!=null && PlayerDatas.Instance.hero.aiHandler.IsAuto())

            {

                m_AutoImg.SetActive(false);

            }


 System/KnapSack/Logic/BoxInfoWin.cs

@@ -180,25 +180,7 @@
            operateBtn.SetActive(false);



            CreateFuncBtn();

          
            if (itemTipsModel.curAttrData.itemConfig.ExpireTime > 0)

            {



                List<int> itemEffectTime = itemTipsModel.curAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);

                if (itemEffectTime != null && itemEffectTime[0] != 0 && itemTipsModel.curAttrData.guid != "")

                {

                    RefreshRemainTime(itemTipsModel.curAttrData.guid);

                }

                else

                {

                    SetDateLimitUI(itemTipsModel.curAttrData.itemConfig.ExpireTime);

                }



            }

            else

            {

                dateText.gameObject.SetActive(false);

            }

            RefreshRemainTime(itemTipsModel.curAttrData.guid);

        }



        private void CheckUselimit()

@@ -282,14 +264,12 @@
            {

                return;

            }

            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);

            if (cool != null)

            double remainTime = 0;

            bool isRemain = itemTipsModel.curAttrData.TryGetItemRemainTime(out remainTime);

            dateText.gameObject.SetActive(isRemain);

            if (isRemain)

            {

                SetDateLimitUI(cool.GetRemainTime());

            }

            else

            {

                SetDateLimitUI(0);

                SetDateLimitUI(remainTime);

            }

        }




 System/KnapSack/Logic/EquipTip.cs

@@ -225,23 +225,7 @@
            container_FightPower.SetActive(itemTipsModel.IsPeerlessEquip(itemAttrData.itemId));

            fightPowerText.text = itemTipsModel.GetEquipFightPower(itemAttrData.score).ToString();

            CheckUselimit();



            if (itemAttrData.itemConfig.ExpireTime > 0)

            {

                List<int> itemEffectTime = itemAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);

                if(itemEffectTime != null && itemEffectTime[0] != 0 && itemAttrData.guid != "")

                {

                    RefreshRemainTime(itemAttrData.guid);

                }

                else

                {

                    SetDateLimitUI(itemAttrData.itemConfig.ExpireTime);

                }

            }

            else

            {

                dateText.gameObject.SetActive(false);

            }

            RefreshRemainTime(itemAttrData.guid);

            #endregion



            #region 设置MidUI

@@ -379,14 +363,13 @@
            {

                return;

            }

            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);

            if (cool != null)



            double remainTime = 0;

            bool isRemain = itemAttrData.TryGetItemRemainTime(out remainTime);

            dateText.gameObject.SetActive(isRemain);

            if(isRemain)

            {

                SetDateLimitUI(cool.GetRemainTime());

            }

            else

            {

                SetDateLimitUI(0);

                SetDateLimitUI(remainTime);

            }

        }




 System/KnapSack/Logic/GuardTip.cs

@@ -195,23 +195,7 @@
                needLvValue.color = conditionColor;

            }





            if (itemAttrData.itemConfig.ExpireTime > 0)

            {

                List<int> itemEffectTime = itemAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);

                if (itemEffectTime != null && itemEffectTime[0] != 0 && itemAttrData.guid != "")

                {

                    RefreshRemainTime(itemAttrData.guid);

                }

                else

                {

                    SetDateLimitUI(itemAttrData.itemConfig.ExpireTime);

                }

            }

            else

            {

                dateText.gameObject.SetActive(false);

            }

            RefreshRemainTime(itemAttrData.guid);

            #endregion



            #region 设置MidUI

@@ -245,14 +229,12 @@
            {

                return;

            }

            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);

            if (cool != null)

            double remainTime = 0;

            bool isRemain = itemAttrData.TryGetItemRemainTime(out remainTime);

            dateText.gameObject.SetActive(isRemain);

            if (isRemain)

            {

                SetDateLimitUI(cool.GetRemainTime());

            }

            else

            {

                SetDateLimitUI(0);

                SetDateLimitUI(remainTime);

            }

        }




 System/KnapSack/Logic/ItemInfoWin.cs

@@ -163,25 +163,7 @@


            CreateFuncBtn();



            if (itemTipsModel.curAttrData.itemConfig.ExpireTime > 0)

            {



                List<int> itemEffectTime = itemTipsModel.curAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);

                if (itemEffectTime != null && itemEffectTime[0] != 0 && itemTipsModel.curAttrData.guid != "")

                {

                    RefreshRemainTime(itemTipsModel.curAttrData.guid);

                }

                else

                {

                    SetDateLimitUI(itemTipsModel.curAttrData.itemConfig.ExpireTime);

                }



            }

            else

            {

                dateText.gameObject.SetActive(false);

            }



            RefreshRemainTime(itemTipsModel.curAttrData.guid);

            switch (itemTipsModel.curAttrData.itemConfig.Type)

            {

                case 125:

@@ -291,14 +273,12 @@
            {

                return;

            }

            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);

            if (cool != null)

            double remainTime = 0;

            bool isRemain = itemTipsModel.curAttrData.TryGetItemRemainTime(out remainTime);

            dateText.gameObject.SetActive(isRemain);

            if (isRemain)

            {

                SetDateLimitUI(cool.GetRemainTime());

            }

            else

            {

                SetDateLimitUI(0);

                SetDateLimitUI(remainTime);

            }

        }




 System/KnapSack/Logic/ItemTipsModel.cs

@@ -36,7 +36,8 @@
        public Dictionary<int, string> petAndMountQualityDict = new Dictionary<int, string>();

        public Dictionary<int, List<int>> itemParamsDict { get; private set; }

        public string expValueFormula = "";



        public Dictionary<int, string> exhaustedAttrFormula { get; private set; }

        public Dictionary<int, int> exhaustedMaxLvDict { get; private set; }

        public int[] guardAutoDrops;



        public int[] gemOpenLvs { get; private set; }

@@ -82,6 +83,17 @@
            m_storeModel.RefreshTCBPlayerDataEvent += RefreshOfflinePluginTime;



            exhaustedFunc = Config.Instance.Get<FuncConfigConfig>("OutOfPrintValue");

            exhaustedAttrFormula = new Dictionary<int, string>();

            JsonData exhaustedJsonData = JsonMapper.ToObject(exhaustedFunc.Numerical2);

            foreach(var key in exhaustedJsonData.Keys)

            {

                int attrId = int.Parse(key);

                exhaustedAttrFormula.Add(attrId,exhaustedJsonData[key].ToString());

            }



            FuncConfigConfig OutOfPrintValueDes = Config.Instance.Get<FuncConfigConfig>("OutOfPrintValueDes");

            exhaustedMaxLvDict = ConfigParse.GetDic<int, int>(OutOfPrintValueDes.Numerical1);



            FuncConfigConfig suitlimitModel = Config.Instance.Get<FuncConfigConfig>("EquipSuitLimit");

            equipSuitStar = int.Parse(suitlimitModel.Numerical2);



@@ -1726,16 +1738,17 @@
        #region 设置绝版属性

        public string GetExhaustedAtrr(ItemAttrData attrData)

        {

            return SetExhaustedAttr(attrData.exhaustedMaxDataDict.Keys.ToList(),attrData.exhaustedMaxDataDict.Values.ToList());

            return SetExhaustedAttr(attrData,attrData.exhaustedMaxDataDict.Keys.ToList(),attrData.exhaustedMaxDataDict.Values.ToList());

        }



        //即将丢弃

        public string GetEquipExhaustedAtrr(List<int> idlist, List<int> valuelist)

        {

            return SetExhaustedAttr(idlist, valuelist);

            //return SetExhaustedAttr(idlist, valuelist);

            return "";

        }



        private string SetExhaustedAttr(List<int> idlist, List<int> valuelist)

        private string SetExhaustedAttr(ItemAttrData attrData,List<int> idlist, List<int> valuelist)

        {

            if (idlist == null)

                return "";

@@ -1751,10 +1764,10 @@
                    switch ((AttrEnum)idlist[i])

                    {

                        case AttrEnum.OnlyFinalHurt:

                            s = Language.Get("EquipTip_ExtraDamage",GetExhaustedAttrValue(valuelist[i]),valuelist[i]);

                            s = Language.Get("EquipTip_ExtraDamage",GetExhaustedAttrValue(idlist[i],valuelist[i]),GetExhaustedMaxLv(attrData.itemConfig.LV),valuelist[i]);

                            break;

                        case AttrEnum.PVPAtkBackHP:

                            s = Language.Get("EquipTip_ExtraHpBack", GetExhaustedAttrValue(valuelist[i]), valuelist[i]);

                            s = Language.Get("EquipTip_ExtraHpBack", GetExhaustedAttrValue(idlist[i], valuelist[i]), GetExhaustedMaxLv(attrData.itemConfig.LV), valuelist[i]);

                            break;

                    }

                  

@@ -1772,12 +1785,24 @@
            return attrSB.ToString();

        }



        private int GetExhaustedAttrValue(int value)

        private int GetExhaustedAttrValue(int attrId,int value)

        {

            Equation.Instance.Clear();

            Equation.Instance.AddKeyValue("maxOOPValue",value);

            Equation.Instance.AddKeyValue("lv", PlayerDatas.Instance.baseData.LV);

            return Equation.Instance.Eval<int>(exhaustedFunc.Numerical1);

            string formula = string.Empty;

            if(exhaustedAttrFormula.ContainsKey(attrId))

            {

                formula = exhaustedAttrFormula[attrId];

            }

            return Equation.Instance.Eval<int>(formula);

        }



        public int GetExhaustedMaxLv(int equipLV)

        {

            int maxLv = 0;

            exhaustedMaxLvDict.TryGetValue(equipLV,out maxLv);

            return maxLv;

        }

        #endregion



@@ -2826,6 +2851,40 @@
            return cnt;

        }



        public bool TryGetItemRemainTime(out double remainTime)

        {

            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);

            if (cool != null)

            {

                remainTime = cool.GetRemainTime();

                return true;

            }

            else

            {

                remainTime = itemConfig.ExpireTime;

                var getTimes = GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);

                var serverSurplusTimes = GetUseDataModel((int)ItemUseDataKey.Def_IudetTotalTime);

                if(remainTime > 0)

                {

                    if (getTimes != null && serverSurplusTimes != null)

                    {

                        int getTime = getTimes[0];

                        int serverSurplusTime = serverSurplusTimes[0];

                        if (getTime > 0)

                        {

                            double time = modelInterface.GetTimeOffest(TimeUtility.GetTime((uint)getTime));

                            time = time > 0 ? time : 0;

                            remainTime = (serverSurplusTime > 0 ? serverSurplusTime : itemConfig.ExpireTime) - time;

                        }

                    }

                    return true;

                }

               
            }

            return false;

        }





        #region 预览定制属性逻辑处理

        public bool CheckIsCustomItem()

        {


 System/KnapSack/Logic/UnionWarehouseEquipTip.cs

@@ -187,22 +187,7 @@
            container_FightPower.SetActive(itemTipsModel.IsPeerlessEquip(itemAttrData.itemId));

            fightPowerText.text = itemTipsModel.GetEquipFightPower(itemAttrData.score).ToString();

            CheckUselimit();

            if (itemAttrData.itemConfig.ExpireTime > 0)

            {

                List<int> itemEffectTime = itemAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);

                if (itemEffectTime != null && itemEffectTime[0] != 0 && itemAttrData.guid != "")

                {

                    RefreshRemainTime(itemAttrData.guid);

                }

                else

                {

                    SetDateLimitUI(itemAttrData.itemConfig.ExpireTime);

                }

            }

            else

            {

                dateText.gameObject.SetActive(false);

            }

            RefreshRemainTime(itemAttrData.guid);

            #endregion



            #region 设置MidUI

@@ -340,14 +325,12 @@
                return;

            }



            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);

            if(cool != null)

            double remainTime = 0;

            bool isRemain = itemAttrData.TryGetItemRemainTime(out remainTime);

            dateText.gameObject.SetActive(isRemain);

            if (isRemain)

            {

                SetDateLimitUI(cool.GetRemainTime());

            }

            else

            {

                SetDateLimitUI(0);

                SetDateLimitUI(remainTime);

            }

        }




 System/KnapSack/Logic/WingsTip.cs

@@ -207,24 +207,8 @@
                conditionText.gameObject.SetActive(false);

                conditionValueText.gameObject.SetActive(false);

            }

          


            if (itemAttrData.itemConfig.ExpireTime > 0)

            {

                List<int> itemEffectTime = itemAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);

                if (itemEffectTime != null && itemEffectTime[0] != 0 && itemAttrData.guid != "")

                {

                    RefreshRemainTime(itemAttrData.guid);

                }

                else

                {

                    SetDateLimitUI(itemAttrData.itemConfig.ExpireTime);

                }

            }

            else

            {

                dateText.gameObject.SetActive(false);

            }

            RefreshRemainTime(itemAttrData.guid);

            #endregion



            #region 设置MidUI

@@ -271,14 +255,12 @@
            {

                return;

            }

            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);

            if (cool != null)

            double remainTime = 0;

            bool isRemain = itemAttrData.TryGetItemRemainTime(out remainTime);

            dateText.gameObject.SetActive(isRemain);

            if (isRemain)

            {

                SetDateLimitUI(cool.GetRemainTime());

            }

            else

            {

                SetDateLimitUI(0);

                SetDateLimitUI(remainTime);

            }

        }




 System/KnapSack/New/GetWingsPathTips.cs

@@ -219,23 +219,7 @@
                conditionValueText.gameObject.SetActive(false);

            }





            if (itemAttrData.itemConfig.ExpireTime > 0)

            {

                List<int> itemEffectTime = itemAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);

                if (itemEffectTime != null && itemEffectTime[0] != 0 && itemAttrData.guid != "")

                {

                    RefreshRemainTime(itemAttrData.guid);

                }

                else

                {

                    SetDateLimitUI(itemAttrData.itemConfig.ExpireTime);

                }

            }

            else

            {

                dateText.gameObject.SetActive(false);

            }

            RefreshRemainTime(itemAttrData.guid);

            #endregion



            #region 设置MidUI

@@ -266,14 +250,13 @@
            {

                return;

            }

            ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);

            if (cool != null)



            double remainTime = 0;

            bool isRemain = itemAttrData.TryGetItemRemainTime(out remainTime);

            dateText.gameObject.SetActive(isRemain);

            if (isRemain)

            {

                SetDateLimitUI(cool.GetRemainTime());

            }

            else

            {

                SetDateLimitUI(0);

                SetDateLimitUI(remainTime);

            }

        }




 System/Login/CrossServerLogin.cs

@@ -15,7 +15,6 @@


        public bool reconnectBackGround { get; set; }



        int reLoginTime = 0;

        Clock loginOverTimeClock;

        float lastLoginTime = 0f;

        int reLoginTimes = 0;

@@ -59,7 +58,7 @@
                MaxProDef = (int)matchOK.MatchPlayer[0].MaxProDef,

            };



            Clock.Create(DateTime.Now + new TimeSpan(5 * TimeSpan.TicksPerSecond), () =>

            Clock.Create(DateTime.Now + new TimeSpan(3 * TimeSpan.TicksPerSecond), () =>

            {

                if (oneVsOnePlayerData.waitForLoginCrossServer)

                {

@@ -246,11 +245,12 @@


        private void ProcessLoginFailure()

        {

            StopLoginOverTimeProcess();

            busy = false;

            ExceptionCatcher.ReportException("登录跨服出现异常", StringUtility.Contact("角色:", PlayerDatas.Instance.baseData.PlayerName));

            var sendInfo = new CC003_tagCGForceQuitCrossState();

            GameNetSystem.Instance.SendInfo(sendInfo);



            GameNetSystem.Instance.crossServerConnected_Loigc = false;

            Clock.Create(DateTime.Now + new TimeSpan(2 * TimeSpan.TicksPerSecond), () =>

            {

                loginModel.ReAccountLogin();

			@@ -1,6 +1,7 @@
			using System.Collections;
			using System.Collections.Generic;
			using UnityEngine;
			using Snxxz.UI;

			public class NeverConnectState : NetState
			{
			@@ -8,6 +9,7 @@
			public override void OnEnter()
			{
			base.OnEnter();
			NetLinkWin.Hide();
			}

			protected override void Update()

			@@ -13,8 +13,9 @@
			checkClientTimer = Time.time + 60f;
			checkAssetVersionTimer = Time.time + 70f;

			WindowCenter.Instance.Close<FightingPKWin>();
			WindowCenter.Instance.Open<LaunchBackGroundWin>(true);


			var backGroundWin = WindowCenter.Instance.Get<LaunchBackGroundWin>();
			if (backGroundWin != null)
			{

			@@ -126,7 +126,7 @@
			}
			protected override void LateUpdate()
			{
			if (PlayerDatas.Instance.hero.aiHandler.IsAuto())
			if (PlayerDatas.Instance.hero!=null && PlayerDatas.Instance.hero.aiHandler.IsAuto())
			{
			m_AutoImg.SetActive(false);
			}

			@@ -180,25 +180,7 @@
			operateBtn.SetActive(false);

			CreateFuncBtn();

			if (itemTipsModel.curAttrData.itemConfig.ExpireTime > 0)
			{

			List<int> itemEffectTime = itemTipsModel.curAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);
			if (itemEffectTime != null && itemEffectTime[0] != 0 && itemTipsModel.curAttrData.guid != "")
			{
			RefreshRemainTime(itemTipsModel.curAttrData.guid);
			}
			else
			{
			SetDateLimitUI(itemTipsModel.curAttrData.itemConfig.ExpireTime);
			}

			}
			else
			{
			dateText.gameObject.SetActive(false);
			}
			RefreshRemainTime(itemTipsModel.curAttrData.guid);
			}

			private void CheckUselimit()
			@@ -282,14 +264,12 @@
			{
			return;
			}
			ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);
			if (cool != null)
			double remainTime = 0;
			bool isRemain = itemTipsModel.curAttrData.TryGetItemRemainTime(out remainTime);
			dateText.gameObject.SetActive(isRemain);
			if (isRemain)
			{
			SetDateLimitUI(cool.GetRemainTime());
			}
			else
			{
			SetDateLimitUI(0);
			SetDateLimitUI(remainTime);
			}
			}

			@@ -225,23 +225,7 @@
			container_FightPower.SetActive(itemTipsModel.IsPeerlessEquip(itemAttrData.itemId));
			fightPowerText.text = itemTipsModel.GetEquipFightPower(itemAttrData.score).ToString();
			CheckUselimit();

			if (itemAttrData.itemConfig.ExpireTime > 0)
			{
			List<int> itemEffectTime = itemAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);
			if(itemEffectTime != null && itemEffectTime[0] != 0 && itemAttrData.guid != "")
			{
			RefreshRemainTime(itemAttrData.guid);
			}
			else
			{
			SetDateLimitUI(itemAttrData.itemConfig.ExpireTime);
			}
			}
			else
			{
			dateText.gameObject.SetActive(false);
			}
			RefreshRemainTime(itemAttrData.guid);
			#endregion

			#region 设置MidUI
			@@ -379,14 +363,13 @@
			{
			return;
			}
			ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);
			if (cool != null)

			double remainTime = 0;
			bool isRemain = itemAttrData.TryGetItemRemainTime(out remainTime);
			dateText.gameObject.SetActive(isRemain);
			if(isRemain)
			{
			SetDateLimitUI(cool.GetRemainTime());
			}
			else
			{
			SetDateLimitUI(0);
			SetDateLimitUI(remainTime);
			}
			}

			@@ -195,23 +195,7 @@
			needLvValue.color = conditionColor;
			}


			if (itemAttrData.itemConfig.ExpireTime > 0)
			{
			List<int> itemEffectTime = itemAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);
			if (itemEffectTime != null && itemEffectTime[0] != 0 && itemAttrData.guid != "")
			{
			RefreshRemainTime(itemAttrData.guid);
			}
			else
			{
			SetDateLimitUI(itemAttrData.itemConfig.ExpireTime);
			}
			}
			else
			{
			dateText.gameObject.SetActive(false);
			}
			RefreshRemainTime(itemAttrData.guid);
			#endregion

			#region 设置MidUI
			@@ -245,14 +229,12 @@
			{
			return;
			}
			ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);
			if (cool != null)
			double remainTime = 0;
			bool isRemain = itemAttrData.TryGetItemRemainTime(out remainTime);
			dateText.gameObject.SetActive(isRemain);
			if (isRemain)
			{
			SetDateLimitUI(cool.GetRemainTime());
			}
			else
			{
			SetDateLimitUI(0);
			SetDateLimitUI(remainTime);
			}
			}

			@@ -163,25 +163,7 @@

			CreateFuncBtn();

			if (itemTipsModel.curAttrData.itemConfig.ExpireTime > 0)
			{

			List<int> itemEffectTime = itemTipsModel.curAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);
			if (itemEffectTime != null && itemEffectTime[0] != 0 && itemTipsModel.curAttrData.guid != "")
			{
			RefreshRemainTime(itemTipsModel.curAttrData.guid);
			}
			else
			{
			SetDateLimitUI(itemTipsModel.curAttrData.itemConfig.ExpireTime);
			}

			}
			else
			{
			dateText.gameObject.SetActive(false);
			}

			RefreshRemainTime(itemTipsModel.curAttrData.guid);
			switch (itemTipsModel.curAttrData.itemConfig.Type)
			{
			case 125:
			@@ -291,14 +273,12 @@
			{
			return;
			}
			ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);
			if (cool != null)
			double remainTime = 0;
			bool isRemain = itemTipsModel.curAttrData.TryGetItemRemainTime(out remainTime);
			dateText.gameObject.SetActive(isRemain);
			if (isRemain)
			{
			SetDateLimitUI(cool.GetRemainTime());
			}
			else
			{
			SetDateLimitUI(0);
			SetDateLimitUI(remainTime);
			}
			}

			@@ -36,7 +36,8 @@
			public Dictionary<int, string> petAndMountQualityDict = new Dictionary<int, string>();
			public Dictionary<int, List<int>> itemParamsDict { get; private set; }
			public string expValueFormula = "";

			public Dictionary<int, string> exhaustedAttrFormula { get; private set; }
			public Dictionary<int, int> exhaustedMaxLvDict { get; private set; }
			public int[] guardAutoDrops;

			public int[] gemOpenLvs { get; private set; }
			@@ -82,6 +83,17 @@
			m_storeModel.RefreshTCBPlayerDataEvent += RefreshOfflinePluginTime;

			exhaustedFunc = Config.Instance.Get<FuncConfigConfig>("OutOfPrintValue");
			exhaustedAttrFormula = new Dictionary<int, string>();
			JsonData exhaustedJsonData = JsonMapper.ToObject(exhaustedFunc.Numerical2);
			foreach(var key in exhaustedJsonData.Keys)
			{
			int attrId = int.Parse(key);
			exhaustedAttrFormula.Add(attrId,exhaustedJsonData[key].ToString());
			}

			FuncConfigConfig OutOfPrintValueDes = Config.Instance.Get<FuncConfigConfig>("OutOfPrintValueDes");
			exhaustedMaxLvDict = ConfigParse.GetDic<int, int>(OutOfPrintValueDes.Numerical1);

			FuncConfigConfig suitlimitModel = Config.Instance.Get<FuncConfigConfig>("EquipSuitLimit");
			equipSuitStar = int.Parse(suitlimitModel.Numerical2);

			@@ -1726,16 +1738,17 @@
			#region 设置绝版属性
			public string GetExhaustedAtrr(ItemAttrData attrData)
			{
			return SetExhaustedAttr(attrData.exhaustedMaxDataDict.Keys.ToList(),attrData.exhaustedMaxDataDict.Values.ToList());
			return SetExhaustedAttr(attrData,attrData.exhaustedMaxDataDict.Keys.ToList(),attrData.exhaustedMaxDataDict.Values.ToList());
			}

			//即将丢弃
			public string GetEquipExhaustedAtrr(List<int> idlist, List<int> valuelist)
			{
			return SetExhaustedAttr(idlist, valuelist);
			//return SetExhaustedAttr(idlist, valuelist);
			return "";
			}

			private string SetExhaustedAttr(List<int> idlist, List<int> valuelist)
			private string SetExhaustedAttr(ItemAttrData attrData,List<int> idlist, List<int> valuelist)
			{
			if (idlist == null)
			return "";
			@@ -1751,10 +1764,10 @@
			switch ((AttrEnum)idlist[i])
			{
			case AttrEnum.OnlyFinalHurt:
			s = Language.Get("EquipTip_ExtraDamage",GetExhaustedAttrValue(valuelist[i]),valuelist[i]);
			s = Language.Get("EquipTip_ExtraDamage",GetExhaustedAttrValue(idlist[i],valuelist[i]),GetExhaustedMaxLv(attrData.itemConfig.LV),valuelist[i]);
			break;
			case AttrEnum.PVPAtkBackHP:
			s = Language.Get("EquipTip_ExtraHpBack", GetExhaustedAttrValue(valuelist[i]), valuelist[i]);
			s = Language.Get("EquipTip_ExtraHpBack", GetExhaustedAttrValue(idlist[i], valuelist[i]), GetExhaustedMaxLv(attrData.itemConfig.LV), valuelist[i]);
			break;
			}

			@@ -1772,12 +1785,24 @@
			return attrSB.ToString();
			}

			private int GetExhaustedAttrValue(int value)
			private int GetExhaustedAttrValue(int attrId,int value)
			{
			Equation.Instance.Clear();
			Equation.Instance.AddKeyValue("maxOOPValue",value);
			Equation.Instance.AddKeyValue("lv", PlayerDatas.Instance.baseData.LV);
			return Equation.Instance.Eval<int>(exhaustedFunc.Numerical1);
			string formula = string.Empty;
			if(exhaustedAttrFormula.ContainsKey(attrId))
			{
			formula = exhaustedAttrFormula[attrId];
			}
			return Equation.Instance.Eval<int>(formula);
			}

			public int GetExhaustedMaxLv(int equipLV)
			{
			int maxLv = 0;
			exhaustedMaxLvDict.TryGetValue(equipLV,out maxLv);
			return maxLv;
			}
			#endregion

			@@ -2826,6 +2851,40 @@
			return cnt;
			}

			public bool TryGetItemRemainTime(out double remainTime)
			{
			ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);
			if (cool != null)
			{
			remainTime = cool.GetRemainTime();
			return true;
			}
			else
			{
			remainTime = itemConfig.ExpireTime;
			var getTimes = GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);
			var serverSurplusTimes = GetUseDataModel((int)ItemUseDataKey.Def_IudetTotalTime);
			if(remainTime > 0)
			{
			if (getTimes != null && serverSurplusTimes != null)
			{
			int getTime = getTimes[0];
			int serverSurplusTime = serverSurplusTimes[0];
			if (getTime > 0)
			{
			double time = modelInterface.GetTimeOffest(TimeUtility.GetTime((uint)getTime));
			time = time > 0 ? time : 0;
			remainTime = (serverSurplusTime > 0 ? serverSurplusTime : itemConfig.ExpireTime) - time;
			}
			}
			return true;
			}

			}
			return false;
			}


			#region 预览定制属性逻辑处理
			public bool CheckIsCustomItem()
			{

			@@ -187,22 +187,7 @@
			container_FightPower.SetActive(itemTipsModel.IsPeerlessEquip(itemAttrData.itemId));
			fightPowerText.text = itemTipsModel.GetEquipFightPower(itemAttrData.score).ToString();
			CheckUselimit();
			if (itemAttrData.itemConfig.ExpireTime > 0)
			{
			List<int> itemEffectTime = itemAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);
			if (itemEffectTime != null && itemEffectTime[0] != 0 && itemAttrData.guid != "")
			{
			RefreshRemainTime(itemAttrData.guid);
			}
			else
			{
			SetDateLimitUI(itemAttrData.itemConfig.ExpireTime);
			}
			}
			else
			{
			dateText.gameObject.SetActive(false);
			}
			RefreshRemainTime(itemAttrData.guid);
			#endregion

			#region 设置MidUI
			@@ -340,14 +325,12 @@
			return;
			}

			ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);
			if(cool != null)
			double remainTime = 0;
			bool isRemain = itemAttrData.TryGetItemRemainTime(out remainTime);
			dateText.gameObject.SetActive(isRemain);
			if (isRemain)
			{
			SetDateLimitUI(cool.GetRemainTime());
			}
			else
			{
			SetDateLimitUI(0);
			SetDateLimitUI(remainTime);
			}
			}

			@@ -207,24 +207,8 @@
			conditionText.gameObject.SetActive(false);
			conditionValueText.gameObject.SetActive(false);
			}


			if (itemAttrData.itemConfig.ExpireTime > 0)
			{
			List<int> itemEffectTime = itemAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);
			if (itemEffectTime != null && itemEffectTime[0] != 0 && itemAttrData.guid != "")
			{
			RefreshRemainTime(itemAttrData.guid);
			}
			else
			{
			SetDateLimitUI(itemAttrData.itemConfig.ExpireTime);
			}
			}
			else
			{
			dateText.gameObject.SetActive(false);
			}
			RefreshRemainTime(itemAttrData.guid);
			#endregion

			#region 设置MidUI
			@@ -271,14 +255,12 @@
			{
			return;
			}
			ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);
			if (cool != null)
			double remainTime = 0;
			bool isRemain = itemAttrData.TryGetItemRemainTime(out remainTime);
			dateText.gameObject.SetActive(isRemain);
			if (isRemain)
			{
			SetDateLimitUI(cool.GetRemainTime());
			}
			else
			{
			SetDateLimitUI(0);
			SetDateLimitUI(remainTime);
			}
			}

			@@ -219,23 +219,7 @@
			conditionValueText.gameObject.SetActive(false);
			}


			if (itemAttrData.itemConfig.ExpireTime > 0)
			{
			List<int> itemEffectTime = itemAttrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetCreateTime);
			if (itemEffectTime != null && itemEffectTime[0] != 0 && itemAttrData.guid != "")
			{
			RefreshRemainTime(itemAttrData.guid);
			}
			else
			{
			SetDateLimitUI(itemAttrData.itemConfig.ExpireTime);
			}
			}
			else
			{
			dateText.gameObject.SetActive(false);
			}
			RefreshRemainTime(itemAttrData.guid);
			#endregion

			#region 设置MidUI
			@@ -266,14 +250,13 @@
			{
			return;
			}
			ItemCDCool cool = KnapsackTimeCDMgr.Instance.GetItemCoolById(guid);
			if (cool != null)

			double remainTime = 0;
			bool isRemain = itemAttrData.TryGetItemRemainTime(out remainTime);
			dateText.gameObject.SetActive(isRemain);
			if (isRemain)
			{
			SetDateLimitUI(cool.GetRemainTime());
			}
			else
			{
			SetDateLimitUI(0);
			SetDateLimitUI(remainTime);
			}
			}

			@@ -15,7 +15,6 @@

			public bool reconnectBackGround { get; set; }

			int reLoginTime = 0;
			Clock loginOverTimeClock;
			float lastLoginTime = 0f;
			int reLoginTimes = 0;
			@@ -59,7 +58,7 @@
			MaxProDef = (int)matchOK.MatchPlayer[0].MaxProDef,
			};

			Clock.Create(DateTime.Now + new TimeSpan(5 * TimeSpan.TicksPerSecond), () =>
			Clock.Create(DateTime.Now + new TimeSpan(3 * TimeSpan.TicksPerSecond), () =>
			{
			if (oneVsOnePlayerData.waitForLoginCrossServer)
			{
			@@ -246,11 +245,12 @@

			private void ProcessLoginFailure()
			{
			StopLoginOverTimeProcess();
			busy = false;
			ExceptionCatcher.ReportException("登录跨服出现异常", StringUtility.Contact("角色:", PlayerDatas.Instance.baseData.PlayerName));
			var sendInfo = new CC003_tagCGForceQuitCrossState();
			GameNetSystem.Instance.SendInfo(sendInfo);

			GameNetSystem.Instance.crossServerConnected_Loigc = false;
			Clock.Create(DateTime.Now + new TimeSpan(2 * TimeSpan.TicksPerSecond), () =>
			{
			loginModel.ReAccountLogin();