From ec03d591a58be4c7451a86e89674bba1c0f7f7dc Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 06 十二月 2018 19:25:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/ItemInfoWin.cs | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/System/KnapSack/Logic/ItemInfoWin.cs b/System/KnapSack/Logic/ItemInfoWin.cs
index 93aa5eb..7b5c6de 100644
--- a/System/KnapSack/Logic/ItemInfoWin.cs
+++ b/System/KnapSack/Logic/ItemInfoWin.cs
@@ -144,32 +144,21 @@
itemCell.Init(cellModel);
CheckUselimit();
- if(itemTipsModel.curAttrData.itemConfig.Effect1 != 215)
- {
- int type = 0;
- bool isContain = itemTipsModel.TryGetContainsParamsType(itemTipsModel.curAttrData.itemId,out type);
- if(isContain)
- {
- switch(type)
- {
- case 1:
- int fightPower = 0;
- itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);
- itemDesText.text = itemTipsModel.curAttrData.GetAllInfoDes().Replace("{0}",fightPower.ToString());
- break;
- }
- }
- else
- {
- itemDesText.text = itemTipsModel.curAttrData.GetAllInfoDes();
- }
- }
- else
+
+ string infoDes = itemTipsModel.curAttrData.GetAllInfoDes();
+ if(infoDes.Contains("{Exp}"))
{
ulong expValue = itemTipsModel.GetAddExpValue(itemTipsModel.curAttrData.itemConfig.EffectValueA1, itemTipsModel.curAttrData.itemConfig.EffectValueB1);
- itemDesText.text = itemTipsModel.curAttrData.GetAllInfoDes().Replace("{0}", UIHelper.ReplaceLargeNum(expValue));
+ infoDes = infoDes.Replace("{Exp}", UIHelper.ReplaceLargeNum(expValue));
+ }
+ if(infoDes.Contains("{FightPower}"))
+ {
+ int fightPower = 0;
+ itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);
+ infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());
}
+ itemDesText.text = infoDes;
operateBtn.SetActive(false);
CreateFuncBtn();
--
Gitblit v1.8.0