snxxz_scripts.git

parent: 4d0e4978 | 补丁 | 提交 | ignore whitespace

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

client_Wu Xijin

2019-01-03 804cb1066599774a0b9f87e776fb6dffb113272a

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

8个文件已修改

	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	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/UnionWarehouseEquipTip.cs	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/WingsTip.cs	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/New/GetWingsPathTips.cs	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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

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

            }

        }

			@@ -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);
			}
			}

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