From 1e08f6ae1a718b6c94a5d6d84bba5e0cf8115b3f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 23 四月 2019 10:43:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Pet/PetAttributeMethods.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/System/Pet/PetAttributeMethods.cs b/System/Pet/PetAttributeMethods.cs
index fbd8a8f..b14912c 100644
--- a/System/Pet/PetAttributeMethods.cs
+++ b/System/Pet/PetAttributeMethods.cs
@@ -81,7 +81,6 @@
private float timePlay = 0;//鐏靛疇鍔ㄤ綔鎾斁鏃堕棿
PetModel m_petModel;
PetModel petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>()); } }
- GetItemPathModel pathModel { get { return ModelCenter.Instance.GetModel<GetItemPathModel>(); } }
PackModel _playerPack;
PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
RidingAndPetActivationModel ridingModel { get { return ModelCenter.Instance.GetModel<RidingAndPetActivationModel>(); } }
@@ -445,7 +444,7 @@
}
else
{
- ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(petmodel.petUpgradeToolId);
+ EquipTipUtility.Show(petmodel.petUpgradeToolId);
}
@@ -457,7 +456,7 @@
int haveCnt = playerPack.GetItemCountByID(PackType.Item, petmodel.petUpgradeToolId);
if (haveCnt < costNum)
{
- ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(petmodel.petUpgradeToolId);
+ EquipTipUtility.Show(petmodel.petUpgradeToolId);
return;
}
isAutoTrain = !isAutoTrain;
@@ -634,7 +633,7 @@
FragmentBtn.RemoveAllListeners();
FragmentBtn.AddListener(() =>
{
- pathModel.SetPetMatUnlockModel(_item.ID);
+ EquipTipUtility.Show(_item.ID);
});
}
--
Gitblit v1.8.0