snxxz_scripts.git

parent: 7e5c7d1c | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2019-03-15 e48a50b8bf4628aecc62901a16976f9a6054d6f1

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

7个文件已修改

	Fight/Actor/State/SMB/Dead_4.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/EquipGem/EquipEvolutionWin.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/EquipGem/EquipStrengthFull.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/EquipGem/EquipStrengthRein.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/EquipGem/EquipStrengthUpper.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/EquipTrain/EquipTrainModel.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/New/CommonItemBaisc.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Fight/Actor/State/SMB/Dead_4.cs

@@ -167,10 +167,10 @@


        owner.needSyncGroundHeight = true;



        //if (owner.ActorType == GameObjType.gotNPC)

        //{

        //    GAMgr.Instance.Release(owner);

        //}

        if (owner is GA_NpcClientFightNorm)

        {

            GAMgr.Instance.Release(owner);

        }



#if UNITY_EDITOR

        string _content = string.Format("Dead_4 => {0} 退出了Dead状态", owner.ServerInstID);


 System/EquipGem/EquipEvolutionWin.cs

@@ -93,13 +93,14 @@
            m_ItemCell.Init(cellModel);

            if (advancedLv == 0)

            {

                m_TextAttributesA.text = "装备强化等级到达" + evolveNext.NeedPlusLV + "级";

                m_TextAttributesB.text = "消耗" + evolveNext.CostItemCount + "个强化水晶";

               
                m_TextAttributesA.text = Language.Get("ZBQH_05", evolveNext.NeedPlusLV);

                m_TextAttributesB.text = Language.Get("ZBQH_06", evolveNext.CostItemCount);

            }

            else

            {

                m_TextAttributesA.text = "装备强化等级到达" + evolve.NeedPlusLV + "级";

                m_TextAttributesB.text = "消耗" + evolve.CostItemCount + "个强化水晶";

                m_TextAttributesA.text = Language.Get("ZBQH_05", evolve.NeedPlusLV);

                m_TextAttributesB.text = Language.Get("ZBQH_06", evolve.CostItemCount);

            }



        }
@@ -160,6 +161,7 @@
            itemCount = playerPack.GetItemCountByID(PackType.Item, equipPlusEvolve.CostItemID);

            if (equipPlusEvolve.NeedPlusLV > equipLv)

            {

                ServerTipDetails.DisplayNormalTip(Language.Get("ZBQH_07"));

                DebugEx.LogError("所需强化等级不足");

                return false;

            }


 System/EquipGem/EquipStrengthFull.cs

@@ -92,13 +92,13 @@
            ulong needMoney = (ulong)itemPlusConfig.costCount;

            string MoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3));

            string NeedMoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(needMoney);

            if (money >= needMoney)

            if (money >= needMoney)
            {

                strMoneyText = "<color=#fffaf0>" + NeedMoneyStr + "/" + MoneyStr + "</color>";

            }

            else

            {

                strMoneyText = "<color=#ff0000>" + NeedMoneyStr + "/" + MoneyStr + "</color>";

                strMoneyText = Language.Get("ZBQH_03", NeedMoneyStr, MoneyStr);
            }
            else
            {
                strMoneyText = Language.Get("ZBQH_04", NeedMoneyStr, MoneyStr);
            }

            return strMoneyText;

        }

 System/EquipGem/EquipStrengthRein.cs

@@ -117,12 +117,12 @@
            string MoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3));
            string NeedMoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(needMoney);
            if (money >= needMoney)
            {
                strMoneyText = "<color=#fffaf0>" + NeedMoneyStr + "/"+ MoneyStr + "</color>";
            {               
                strMoneyText = Language.Get("ZBQH_03", NeedMoneyStr, MoneyStr);
            }
            else
            {
                strMoneyText = "<color=#ff0000>" + NeedMoneyStr + "/" + MoneyStr + "</color>";
                strMoneyText = Language.Get("ZBQH_04", NeedMoneyStr, MoneyStr);
            }
            return strMoneyText;
        }

 System/EquipGem/EquipStrengthUpper.cs

@@ -94,13 +94,13 @@
            ulong needMoney = (ulong)itemPlusConfig.costCount;

            string MoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3));

            string NeedMoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(needMoney);

            if (money >= needMoney)

            if (money >= needMoney)
            {

                strMoneyText = "<color=#fffaf0>" + NeedMoneyStr + "/" + MoneyStr + "</color>";

            }

            else

            {

                strMoneyText = "<color=#ff0000>" + NeedMoneyStr + "/" + MoneyStr + "</color>";

                strMoneyText = Language.Get("ZBQH_03", NeedMoneyStr, MoneyStr);
            }
            else
            {
                strMoneyText = Language.Get("ZBQH_04", NeedMoneyStr, MoneyStr);
            }

            return strMoneyText;

        }


 System/EquipTrain/EquipTrainModel.cs

@@ -130,6 +130,7 @@

                if (moneyNeed > moneyOwn)
                {
                    WindowCenter.Instance.Open<RechargeTipWin>();
                    return;
                }
            }

 System/KnapSack/New/CommonItemBaisc.cs

@@ -166,7 +166,7 @@
            var item = packModel.GetItemByGuid(guid);

            if (item != null && item.isAuction)

            {

                return 99;

                return 0;

            }



            if (item != null && ItemLogicUtility.Instance.IsOverdue(guid, itemId, item.useDataDict))

			@@ -167,10 +167,10 @@

			owner.needSyncGroundHeight = true;

			//if (owner.ActorType == GameObjType.gotNPC)
			//{
			// GAMgr.Instance.Release(owner);
			//}
			if (owner is GA_NpcClientFightNorm)
			{
			GAMgr.Instance.Release(owner);
			}

			#if UNITY_EDITOR
			string _content = string.Format("Dead_4 => {0} 退出了Dead状态", owner.ServerInstID);

			@@ -93,13 +93,14 @@
			m_ItemCell.Init(cellModel);
			if (advancedLv == 0)
			{
			m_TextAttributesA.text = "装备强化等级到达" + evolveNext.NeedPlusLV + "级";
			m_TextAttributesB.text = "消耗" + evolveNext.CostItemCount + "个强化水晶";

			m_TextAttributesA.text = Language.Get("ZBQH_05", evolveNext.NeedPlusLV);
			m_TextAttributesB.text = Language.Get("ZBQH_06", evolveNext.CostItemCount);
			}
			else
			{
			m_TextAttributesA.text = "装备强化等级到达" + evolve.NeedPlusLV + "级";
			m_TextAttributesB.text = "消耗" + evolve.CostItemCount + "个强化水晶";
			m_TextAttributesA.text = Language.Get("ZBQH_05", evolve.NeedPlusLV);
			m_TextAttributesB.text = Language.Get("ZBQH_06", evolve.CostItemCount);
			}

			}
			@@ -160,6 +161,7 @@
			itemCount = playerPack.GetItemCountByID(PackType.Item, equipPlusEvolve.CostItemID);
			if (equipPlusEvolve.NeedPlusLV > equipLv)
			{
			ServerTipDetails.DisplayNormalTip(Language.Get("ZBQH_07"));
			DebugEx.LogError("所需强化等级不足");
			return false;
			}

			@@ -92,13 +92,13 @@
			ulong needMoney = (ulong)itemPlusConfig.costCount;
			string MoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3));
			string NeedMoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(needMoney);
			if (money >= needMoney)
			if (money >= needMoney)
			{
			strMoneyText = "<color=#fffaf0>" + NeedMoneyStr + "/" + MoneyStr + "</color>";
			}
			else
			{
			strMoneyText = "<color=#ff0000>" + NeedMoneyStr + "/" + MoneyStr + "</color>";
			strMoneyText = Language.Get("ZBQH_03", NeedMoneyStr, MoneyStr);
			}
			else
			{
			strMoneyText = Language.Get("ZBQH_04", NeedMoneyStr, MoneyStr);
			}
			return strMoneyText;
			}

			@@ -117,12 +117,12 @@
			string MoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3));
			string NeedMoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(needMoney);
			if (money >= needMoney)
			{
			strMoneyText = "<color=#fffaf0>" + NeedMoneyStr + "/"+ MoneyStr + "</color>";
			{
			strMoneyText = Language.Get("ZBQH_03", NeedMoneyStr, MoneyStr);
			}
			else
			{
			strMoneyText = "<color=#ff0000>" + NeedMoneyStr + "/" + MoneyStr + "</color>";
			strMoneyText = Language.Get("ZBQH_04", NeedMoneyStr, MoneyStr);
			}
			return strMoneyText;
			}

			@@ -94,13 +94,13 @@
			ulong needMoney = (ulong)itemPlusConfig.costCount;
			string MoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(UIHelper.GetMoneyCnt(3));
			string NeedMoneyStr = ItemLogicUtility.Instance.OnChangeCoinsUnit(needMoney);
			if (money >= needMoney)
			if (money >= needMoney)
			{
			strMoneyText = "<color=#fffaf0>" + NeedMoneyStr + "/" + MoneyStr + "</color>";
			}
			else
			{
			strMoneyText = "<color=#ff0000>" + NeedMoneyStr + "/" + MoneyStr + "</color>";
			strMoneyText = Language.Get("ZBQH_03", NeedMoneyStr, MoneyStr);
			}
			else
			{
			strMoneyText = Language.Get("ZBQH_04", NeedMoneyStr, MoneyStr);
			}
			return strMoneyText;
			}

			@@ -130,6 +130,7 @@

			if (moneyNeed > moneyOwn)
			{
			WindowCenter.Instance.Open<RechargeTipWin>();
			return;
			}
			}

			@@ -166,7 +166,7 @@
			var item = packModel.GetItemByGuid(guid);
			if (item != null && item.isAuction)
			{
			return 99;
			return 0;
			}

			if (item != null && ItemLogicUtility.Instance.IsOverdue(guid, itemId, item.useDataDict))