From f47ea60f59e0b2b8601583351e269151237c6708 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 28 一月 2019 11:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into SpringFestival
---
System/KnapSack/BetterItemGetBehaviour.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/System/KnapSack/BetterItemGetBehaviour.cs b/System/KnapSack/BetterItemGetBehaviour.cs
index 26253f9..4b98657 100644
--- a/System/KnapSack/BetterItemGetBehaviour.cs
+++ b/System/KnapSack/BetterItemGetBehaviour.cs
@@ -25,6 +25,9 @@
[SerializeField] Text coolTimeText;
[SerializeField] Button m_Puton;
[SerializeField] Button m_BetterEquipDetail;
+ [SerializeField] GameObject equipLvObj;
+ [SerializeField] Text equipLvText;
+
ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }
BetterEquipGetModel model { get { return ModelCenter.Instance.GetModel<BetterEquipGetModel>(); } }
@@ -143,8 +146,9 @@
private void ToOpenJadeDynastyKnapsack(ItemModel betterEquip)
{
- var model = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
- model.SetLookItemModel(betterEquip.itemInfo.ItemGUID);
+ var equipModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
+ equipModel.SetLookItemModel(betterEquip.itemInfo.ItemGUID);
+ model.ReportConfirmBetterEquip(model.currentEquipGuid);
}
private void ShowBetterEquipDetails()
@@ -153,7 +157,8 @@
if (model.TryGetBetterEquip(model.currentEquipGuid, out betterEquip))
{
var itemConfig = Config.Instance.Get<ItemConfig>(betterEquip.itemInfo.ItemID);
- itemTipsModel.SetItemTipsModel(PackType.rptItem, betterEquip.itemInfo.ItemGUID);
+ var packType = GeneralDefine.GetPackTypeByItemType(itemConfig.Type);
+ itemTipsModel.SetItemTipsModel(packType, betterEquip.itemInfo.ItemGUID);
}
}
@@ -170,6 +175,17 @@
m_FunctionTitle.text = Language.Get(itemConfig.ItemColor >= 3 ? "GoodEquip_See" : "GoodEquip_FitUp");
m_EquipBehaviour.Init(betterModel, true);
UpdateCoolTime(betterModel.itemInfo.ItemGUID);
+
+ if(betterModel.packType == PackType.rptJadeDynastyItem && betterModel.chinItemModel.EquipPlace > 0)
+ {
+ equipLvObj.SetActive(true);
+ string equipLvSB = Language.Get(StringUtility.Contact("Num_CHS_", betterModel.chinItemModel.LV));
+ equipLvText.text = Language.Get("L1091", equipLvSB);
+ }
+ else
+ {
+ equipLvObj.SetActive(false);
+ }
}
IEnumerator Co_Delay(string _guid)
--
Gitblit v1.8.0