From 3a40ee1acff6579f0d2a08b97d3864b926d6d70a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 31 十月 2018 17:55:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/PackSendQuestMgr.cs | 2 +-
System/Compose/New/ComposeSecondTypeCell.cs | 2 +-
System/Compose/New/ComposeEquipWin.cs | 9 +++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/System/Compose/New/ComposeEquipWin.cs b/System/Compose/New/ComposeEquipWin.cs
index 5b53446..7855383 100644
--- a/System/Compose/New/ComposeEquipWin.cs
+++ b/System/Compose/New/ComposeEquipWin.cs
@@ -346,7 +346,7 @@
bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);
if (isTrailer)
{
- MessageWin.Inst.ShowFixedTip(StringUtility.Contact(thirdTypeData.itemCompound.levelNeed, "绾у紑鍚�"));
+ MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));
return;
}
}
@@ -601,7 +601,7 @@
int increaseRate = increases[2] / 100;
increaseRateItem.SetActive(true);
RefreshGridCellUI(increaseGridCell, false,increaseId,increaseNeedNum);
- increaseText.text = StringUtility.Contact("澧炲姞鎴愬姛鐜�", StringUtility.Contact(increaseRate, "%"));
+ increaseText.text = Language.Get("Compose109", StringUtility.Contact(increaseRate, "%"));
int haveIncreaseNum = playerPack.GetItemCountByID(PackType.rptItem, increaseId);
ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(increaseId);
isIncreaseRate = haveIncreaseNum >= increaseNeedNum ? isIncreaseRate : false;
@@ -624,7 +624,7 @@
else
{
isIncreaseRate = false;
- MessageWin.Inst.ShowFixedTip(StringUtility.Contact("澧炲姞鎴愬姛鐜囬渶瑕�",increaseNeedNum,itemConfig.ItemName,"鏁伴噺涓嶈冻"));
+ MessageWin.Inst.ShowFixedTip(Language.Get("Compose110", increaseNeedNum, itemConfig.ItemName));
}
}
RefreshComposeSuccessRate();
@@ -792,7 +792,8 @@
if(increaseRate > 0)
{
- successRateText.text = Language.Get("HallowsWin_Success", StringUtility.Contact(successRate / 100, "%","+",increaseRate,"%"));
+ string extraAddRate = UIHelper.GetTextColorByItemColor(TextColType.Green,StringUtility.Contact("+", increaseRate, "%"),true);
+ successRateText.text = Language.Get("HallowsWin_Success", StringUtility.Contact(successRate / 100, "%", extraAddRate));
}
else
{
diff --git a/System/Compose/New/ComposeSecondTypeCell.cs b/System/Compose/New/ComposeSecondTypeCell.cs
index 3bae91f..aa1b589 100644
--- a/System/Compose/New/ComposeSecondTypeCell.cs
+++ b/System/Compose/New/ComposeSecondTypeCell.cs
@@ -31,7 +31,7 @@
unlockObj.SetActive(!isTrailer);
unlockTypeName.text = itemCompound.thirdTypeName;
lockTypeName.text = itemCompound.thirdTypeName;
- lockLevel.text = StringUtility.Contact(itemCompound.levelNeed,"绾�");
+ lockLevel.text = StringUtility.Contact(itemCompound.levelNeed,Language.Get("Z1041"));
UpdateBtnImg(selectThirdType);
typeBtn.RemoveAllListeners();
typeBtn.AddListener(ClickTypeBtn);
diff --git a/System/KnapSack/Logic/PackSendQuestMgr.cs b/System/KnapSack/Logic/PackSendQuestMgr.cs
index 61adda1..da6ee9d 100644
--- a/System/KnapSack/Logic/PackSendQuestMgr.cs
+++ b/System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -703,7 +703,7 @@
}
int dungeonID = playerPack.GetDungeonIDByDrugID(useItemModel.itemInfo.ItemID);
- if (dungeonID != 0)
+ if (dungeonID != 0 && useItemModel.chinItemModel.Type == (int)ItemType.Buff)
{
MapConfig tagMapModel = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
if (tagMapModel.MapFBType == 0)
--
Gitblit v1.8.0