snxxz_scripts.git

parent: 5f4500fe | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2019-06-27 a75d59d85a0d99b01140d56ccd1615df2ee9583f

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

2个文件已删除

7个文件已修改

	Fight/Actor/AI/HeroAI_Base.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/Actor/AI/HeroAI_D7_ZMSL.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/EquipStar/EquipStarModel.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/ItemTip/ItemTipUtility.cs	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/ItemTip/WingTipWin.cs	199 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/ItemTip/WingTipWin.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/New/KnapSackEventMgr.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/SpiritWeapon/SpiritWeaponModel.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/StoreWin.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Fight/Actor/AI/HeroAI_Base.cs

@@ -250,9 +250,10 @@
                            if (_singleModel != null)

                            {

                                // 如果有守护

                                var _itemModel = _singleModel.GetItemByIndex((int)RoleEquipType.Guard);

                                if (_itemModel != null // 有守护

                                 && GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能

                                var _equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(0, (int)RoleEquipType.Guard));

                                var _guard = PlayerBackModel.GetItemByIndex(PackType.Equip, _equipIndex);

                                if (_guard != null // 有守护

                                 && GeneralDefine.GuardianPickUpID.Contains(_guard.itemId))// 守护有拾取功能

                                {

                                    _needPickupSelf = false;

                                }

@@ -265,9 +266,10 @@
                        if (_singleModel != null)

                        {

                            // 如果有守护

                            var _itemModel = _singleModel.GetItemByIndex((int)RoleEquipType.Guard);

                            if (_itemModel != null // 有守护

                             && GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能

                            var _equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(0, (int)RoleEquipType.Guard));

                            var _guard = PlayerBackModel.GetItemByIndex(PackType.Equip, _equipIndex);

                            if (_guard != null // 有守护

                             && GeneralDefine.GuardianPickUpID.Contains(_guard.itemId))// 守护有拾取功能

                            {

                                _needPickupSelf = false;

                            }


 Fight/Actor/AI/HeroAI_D7_ZMSL.cs

@@ -75,7 +75,7 @@


        float _chkDistSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, m_PointList[0]);



        if (_chkDistSqrt < 64)

        if (_chkDistSqrt < 64 && m_PointList.Count > 1)

        {

            m_PointList.RemoveAt(0);

        }


 System/EquipStar/EquipStarModel.cs

@@ -513,7 +513,7 @@
                        var minCount = Mathf.Min(config.CostEquipCnt, items.Count);
                        for (int i = 1; i <= 5; i++)
                        {
                            materials[i].value = i <= minCount ? items[i].guid : string.Empty;
                            materials[i].value = i <= minCount ? items[i - 1].guid : string.Empty;
                        }
                    }
                }

 System/ItemTip/ItemTipUtility.cs

@@ -20,7 +20,6 @@
            GatherSoul,

            KingTreasure,

            PetMount,

            Wing,

            SpiritWeapon,

        }

@@ -286,9 +285,6 @@
                case TipType.PetMount:

                    WindowCenter.Instance.Open<PetMountTipWin>();

                    break;

                case TipType.Wing:

                    WindowCenter.Instance.Open<WingTipWin>();

                    break;

                case TipType.SpiritWeapon:

                    WindowCenter.Instance.Open<SpiritWeaponTipWin>();

                    break;

@@ -371,9 +367,6 @@
                case TipType.PetMount:

                    WindowCenter.Instance.Open<PetMountTipWin>();

                    break;

                case TipType.Wing:

                    WindowCenter.Instance.Open<WingTipWin>();

                    break;

                case TipType.SpiritWeapon:

                    WindowCenter.Instance.Open<SpiritWeaponTipWin>();

                    break;

@@ -414,9 +407,9 @@
                        WindowCenter.Instance.Open<PetMountTipWin>();
                        break;
                    case 113:
                        WindowCenter.Instance.Open<WingTipWin>();
                        break;
                    case 114:
                    case 114:

                    case 116:

                    case 117:
                        WindowCenter.Instance.Open<SpiritWeaponTipWin>();
                        break;
                    default:

 System/ItemTip/WingTipWin.cs

File was deleted

 System/ItemTip/WingTipWin.cs.meta

File was deleted

 System/KnapSack/New/KnapSackEventMgr.cs

@@ -60,11 +60,7 @@


    public void HideItemPopWin()

    {

        if (WindowCenter.Instance.IsOpen<WingTipWin>())

        {

            HideWingsWin();

        }

        else if (WindowCenter.Instance.IsOpen<ItemTipWin>())

        if (WindowCenter.Instance.IsOpen<ItemTipWin>())

        {

            HideItemWin();

        }


 System/SpiritWeapon/SpiritWeaponModel.cs

@@ -4,6 +4,7 @@

namespace Snxxz.UI
{
    [XLua.LuaCallCSharp]
    public class SpiritWeaponModel : Model
    {
        public static bool hasAutoEquipWing {

 System/Store/StoreWin.cs

@@ -345,6 +345,7 @@
                        ItemCellModel cellModel = new ItemCellModel(config.ID, true, 0,"", PackType.Deleted, true);

                        shopItemCell.itemCell.button.enabled = false;

                        shopItemCell.itemCell.Init(cellModel);

                        shopItemCell.itemCell.stateIcon.gameObject.SetActive(false);

                        shopItemCell.itemNameText.text = config.ItemName;

                        shopItemCell.coinsIcon.SetIconWithMoneyType(shopInfo.MoneyType);

                        ulong shopCost = (ulong)(shopInfo.MoneyNumber);

			@@ -250,9 +250,10 @@
			if (_singleModel != null)
			{
			// 如果有守护
			var _itemModel = _singleModel.GetItemByIndex((int)RoleEquipType.Guard);
			if (_itemModel != null // 有守护
			&& GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能
			var _equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(0, (int)RoleEquipType.Guard));
			var _guard = PlayerBackModel.GetItemByIndex(PackType.Equip, _equipIndex);
			if (_guard != null // 有守护
			&& GeneralDefine.GuardianPickUpID.Contains(_guard.itemId))// 守护有拾取功能
			{
			_needPickupSelf = false;
			}
			@@ -265,9 +266,10 @@
			if (_singleModel != null)
			{
			// 如果有守护
			var _itemModel = _singleModel.GetItemByIndex((int)RoleEquipType.Guard);
			if (_itemModel != null // 有守护
			&& GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))// 守护有拾取功能
			var _equipIndex = EquipSet.ClientPlaceToServerPlace(new Int2(0, (int)RoleEquipType.Guard));
			var _guard = PlayerBackModel.GetItemByIndex(PackType.Equip, _equipIndex);
			if (_guard != null // 有守护
			&& GeneralDefine.GuardianPickUpID.Contains(_guard.itemId))// 守护有拾取功能
			{
			_needPickupSelf = false;
			}

			@@ -75,7 +75,7 @@

			float _chkDistSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, m_PointList[0]);

			if (_chkDistSqrt < 64)
			if (_chkDistSqrt < 64 && m_PointList.Count > 1)
			{
			m_PointList.RemoveAt(0);
			}

			@@ -513,7 +513,7 @@
			var minCount = Mathf.Min(config.CostEquipCnt, items.Count);
			for (int i = 1; i <= 5; i++)
			{
			materials[i].value = i <= minCount ? items[i].guid : string.Empty;
			materials[i].value = i <= minCount ? items[i - 1].guid : string.Empty;
			}
			}
			}

			@@ -20,7 +20,6 @@
			GatherSoul,
			KingTreasure,
			PetMount,
			Wing,
			SpiritWeapon,
			}

			@@ -286,9 +285,6 @@
			case TipType.PetMount:
			WindowCenter.Instance.Open<PetMountTipWin>();
			break;
			case TipType.Wing:
			WindowCenter.Instance.Open<WingTipWin>();
			break;
			case TipType.SpiritWeapon:
			WindowCenter.Instance.Open<SpiritWeaponTipWin>();
			break;
			@@ -371,9 +367,6 @@
			case TipType.PetMount:
			WindowCenter.Instance.Open<PetMountTipWin>();
			break;
			case TipType.Wing:
			WindowCenter.Instance.Open<WingTipWin>();
			break;
			case TipType.SpiritWeapon:
			WindowCenter.Instance.Open<SpiritWeaponTipWin>();
			break;
			@@ -414,9 +407,9 @@
			WindowCenter.Instance.Open<PetMountTipWin>();
			break;
			case 113:
			WindowCenter.Instance.Open<WingTipWin>();
			break;
			case 114:
			case 114:
			case 116:
			case 117:
			WindowCenter.Instance.Open<SpiritWeaponTipWin>();
			break;
			default:

			@@ -60,11 +60,7 @@

			public void HideItemPopWin()
			{
			if (WindowCenter.Instance.IsOpen<WingTipWin>())
			{
			HideWingsWin();
			}
			else if (WindowCenter.Instance.IsOpen<ItemTipWin>())
			if (WindowCenter.Instance.IsOpen<ItemTipWin>())
			{
			HideItemWin();
			}

			@@ -4,6 +4,7 @@

			namespace Snxxz.UI
			{
			[XLua.LuaCallCSharp]
			public class SpiritWeaponModel : Model
			{
			public static bool hasAutoEquipWing {

			@@ -345,6 +345,7 @@
			ItemCellModel cellModel = new ItemCellModel(config.ID, true, 0,"", PackType.Deleted, true);
			shopItemCell.itemCell.button.enabled = false;
			shopItemCell.itemCell.Init(cellModel);
			shopItemCell.itemCell.stateIcon.gameObject.SetActive(false);
			shopItemCell.itemNameText.text = config.ItemName;
			shopItemCell.coinsIcon.SetIconWithMoneyType(shopInfo.MoneyType);
			ulong shopCost = (ulong)(shopInfo.MoneyNumber);