From 66909e1da5f3e0ff39dfe48d819d2128b574cfbd Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 14 三月 2019 09:33:06 +0800
Subject: [PATCH] Merge branch 'master' into ItemTip
---
System/Rune/RunePreviewCell.cs | 2 +-
System/Mount/MountSkillWin.cs | 4 ++--
System/OpenServerActivity/LuckyResultInfo.cs | 2 +-
System/Strengthening/GodBeastEntry.cs | 4 ++--
System/BlastFurnace/BlastFurnaceModel.cs | 2 +-
System/Chat/ChatCtrl.cs | 2 +-
Lua/Gen/UIHelperWrap.cs | 4 ++--
System/Realm/RealmLevelUpBehaviour.cs | 4 ++--
System/GatheringSoul/GatheringSoulModel.cs | 4 ++--
System/Realm/RealmHeartMagicBehaviour.cs | 2 +-
System/RuneTower/RuneTowerDungeonHintWin.cs | 4 ++--
System/BlastFurnace/MakerDrugSuccessWin.cs | 2 +-
System/Message/RichTableEvent.cs | 2 +-
System/Message/WordAnalysis.cs | 2 +-
Utility/UIHelper.cs | 2 +-
15 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Lua/Gen/UIHelperWrap.cs b/Lua/Gen/UIHelperWrap.cs
index 08ac570..df886d2 100644
--- a/Lua/Gen/UIHelperWrap.cs
+++ b/Lua/Gen/UIHelperWrap.cs
@@ -734,7 +734,7 @@
string _msg = LuaAPI.lua_tostring(L, 2);
bool _bright = LuaAPI.lua_toboolean(L, 3);
- string gen_ret = UIHelper.AppendStringColor( _itemColor, _msg, _bright );
+ string gen_ret = UIHelper.AppendColor( _itemColor, _msg, _bright );
LuaAPI.lua_pushstring(L, gen_ret);
@@ -746,7 +746,7 @@
int _itemColor = LuaAPI.xlua_tointeger(L, 1);
string _msg = LuaAPI.lua_tostring(L, 2);
- string gen_ret = UIHelper.AppendStringColor( _itemColor, _msg );
+ string gen_ret = UIHelper.AppendColor( _itemColor, _msg );
LuaAPI.lua_pushstring(L, gen_ret);
diff --git a/System/BlastFurnace/BlastFurnaceModel.cs b/System/BlastFurnace/BlastFurnaceModel.cs
index ce17248..2a727de 100644
--- a/System/BlastFurnace/BlastFurnaceModel.cs
+++ b/System/BlastFurnace/BlastFurnaceModel.cs
@@ -957,7 +957,7 @@
if (isOpenPrompting)
{
int recycleNum = playerPack.GetItemCountByID(PackType.Item, itemId);
- ConfirmCancel.IconConfirmCancel(Language.Get("Mail101"), Language.Get("BlastFurnace114", recycleNum, UIHelper.AppendStringColor(itemConfig.ItemColor, itemConfig.ItemName), exp * recycleNum), itemConfig.ID,
+ ConfirmCancel.IconConfirmCancel(Language.Get("Mail101"), Language.Get("BlastFurnace114", recycleNum, UIHelper.AppendColor(itemConfig.ItemColor, itemConfig.ItemName), exp * recycleNum), itemConfig.ID,
playerPack.GetItemCountByID(PackType.Item, itemConfig.ID), 0, "", Language.Get("ConfirmCancel102"), (bool isOk, bool isToggle) =>
{
if (isOk)
diff --git a/System/BlastFurnace/MakerDrugSuccessWin.cs b/System/BlastFurnace/MakerDrugSuccessWin.cs
index a0ad597..fdc9c7b 100644
--- a/System/BlastFurnace/MakerDrugSuccessWin.cs
+++ b/System/BlastFurnace/MakerDrugSuccessWin.cs
@@ -71,7 +71,7 @@
_exp = (int)FurnaceModel.addExp;
_getExpText.text = Language.Get("BlastFurnace106", _exp);
successEffect.Play();
- string itemName = UIHelper.AppendStringColor(_chinItemModel.ItemColor, _chinItemModel.ItemName);
+ string itemName = UIHelper.AppendColor(_chinItemModel.ItemColor, _chinItemModel.ItemName);
_getDrugText.text = Language.Get("BlastFurnace107", itemName);
if(FurnaceModel.IsReachMaxStoveLv())
diff --git a/System/Chat/ChatCtrl.cs b/System/Chat/ChatCtrl.cs
index 34aafd9..b261935 100644
--- a/System/Chat/ChatCtrl.cs
+++ b/System/Chat/ChatCtrl.cs
@@ -778,7 +778,7 @@
{
string append = string.Format("<a><Word info=item id={0} chatsenditem={1} chatsend=1/>|showitem={0} chatsenditem={1}</a>",
chatSendItem.itemId, detail);
- append = UIHelper.AppendStringColor(itemConfig.ItemColor, append);
+ append = UIHelper.AppendColor(itemConfig.ItemColor, append);
data.richText.Append(append);
}
catch (Exception e)
diff --git a/System/GatheringSoul/GatheringSoulModel.cs b/System/GatheringSoul/GatheringSoulModel.cs
index a800bc5..87386cb 100644
--- a/System/GatheringSoul/GatheringSoulModel.cs
+++ b/System/GatheringSoul/GatheringSoulModel.cs
@@ -846,13 +846,13 @@
if (composeModel.TryGetCompose(item.id, out compose))
{
var config = ItemConfig.Get(item.id);
- var baseName = UIHelper.AppendStringColor(config.ItemColor, config.ItemName, true);
+ var baseName = UIHelper.AppendColor(config.ItemColor, config.ItemName, true);
var sb = new StringBuilder();
for (int i = 0; i < compose.requireItems.Count; i++)
{
var itemId = compose.requireItems[i];
config = ItemConfig.Get(itemId);
- sb.Append(UIHelper.AppendStringColor(config.ItemColor, config.ItemName, true));
+ sb.Append(UIHelper.AppendColor(config.ItemColor, config.ItemName, true));
if (i < compose.requireItems.Count - 2)
{
sb.Append("銆�");
diff --git a/System/Message/RichTableEvent.cs b/System/Message/RichTableEvent.cs
index ad9730c..fea938f 100644
--- a/System/Message/RichTableEvent.cs
+++ b/System/Message/RichTableEvent.cs
@@ -577,6 +577,6 @@
{
colorType = text.colorType == RichText.ColorType.Dark ? 0 : 1;
}
- return UIHelper.AppendStringColor(_itemColor, info, colorType == 1);
+ return UIHelper.AppendColor(_itemColor, info, colorType == 1);
}
}
diff --git a/System/Message/WordAnalysis.cs b/System/Message/WordAnalysis.cs
index 83e5593..ec93da3 100644
--- a/System/Message/WordAnalysis.cs
+++ b/System/Message/WordAnalysis.cs
@@ -79,7 +79,7 @@
{
colorType = text.colorType == RichText.ColorType.Dark ? 0 : 1;
}
- result = UIHelper.AppendStringColor(presentColor, result, colorType == 1);
+ result = UIHelper.AppendColor(presentColor, result, colorType == 1);
}
m_StringBuilder.Append(result);
}
diff --git a/System/Mount/MountSkillWin.cs b/System/Mount/MountSkillWin.cs
index 546a95f..c00b33c 100644
--- a/System/Mount/MountSkillWin.cs
+++ b/System/Mount/MountSkillWin.cs
@@ -323,11 +323,11 @@
if (Number != 0)
{
var StrNum = StringUtility.Contact(Number, "/", config != null ? config.ExAttr5 : 0);
- _StageTxt.text = UIHelper.AppendStringColor(0, StrNum);
+ _StageTxt.text = UIHelper.AppendColor(0, StrNum);
}
else
{
- string StrNum = " <color=#ff2828>" + Number + "</color>" + UIHelper.AppendStringColor(0, "/" + (config != null ? config.ExAttr5 : 0));
+ string StrNum = " <color=#ff2828>" + Number + "</color>" + UIHelper.AppendColor(0, "/" + (config != null ? config.ExAttr5 : 0));
_StageTxt.text = StrNum;
}
}
diff --git a/System/OpenServerActivity/LuckyResultInfo.cs b/System/OpenServerActivity/LuckyResultInfo.cs
index 00cc2fd..37f141a 100644
--- a/System/OpenServerActivity/LuckyResultInfo.cs
+++ b/System/OpenServerActivity/LuckyResultInfo.cs
@@ -22,7 +22,7 @@
{
var itemConfig = ItemConfig.Get(luckyItem.itemId);
treasureDes = StringUtility.Contact(itemConfig.ItemName, "x", luckyItem.itemCount);
- treasureDes = UIHelper.AppendStringColor(itemConfig.ItemColor, treasureDes);
+ treasureDes = UIHelper.AppendColor(itemConfig.ItemColor, treasureDes);
}
infoText.text = Language.Get("LuckyTreasure106", playerName, treasureDes);
}
diff --git a/System/Realm/RealmHeartMagicBehaviour.cs b/System/Realm/RealmHeartMagicBehaviour.cs
index 5cbedb5..5e2450c 100644
--- a/System/Realm/RealmHeartMagicBehaviour.cs
+++ b/System/Realm/RealmHeartMagicBehaviour.cs
@@ -38,7 +38,7 @@
var config = RealmConfig.Get(realmLevel);
var fightPower = PlayerDatas.Instance.baseData.FightPoint;
var satisfy = fightPower >= config.FightPower;
- var label = UIHelper.AppendStringColor(satisfy ? TextColType.Green : TextColType.Red, fightPower.ToString());
+ var label = UIHelper.AppendColor(satisfy ? TextColType.Green : TextColType.Red, fightPower.ToString());
m_FightPower.text = StringUtility.Contact(label, "/", config.FightPower);
}
diff --git a/System/Realm/RealmLevelUpBehaviour.cs b/System/Realm/RealmLevelUpBehaviour.cs
index b634dce..7f24637 100644
--- a/System/Realm/RealmLevelUpBehaviour.cs
+++ b/System/Realm/RealmLevelUpBehaviour.cs
@@ -128,7 +128,7 @@
m_Condition.text = Language.Get("RealmConditionLevel", config.NeedLV);
var level = PlayerDatas.Instance.baseData.LV;
var satisfy = level >= config.NeedLV;
- var levelLabel = UIHelper.AppendStringColor(satisfy ? TextColType.Green : TextColType.Red, level.ToString());
+ var levelLabel = UIHelper.AppendColor(satisfy ? TextColType.Green : TextColType.Red, level.ToString());
m_Progress.text = StringUtility.Contact(levelLabel, "/", config.NeedLV);
}
@@ -137,7 +137,7 @@
var config = RealmConfig.Get(realmLevel);
m_Condition.text = Language.Get("RealmConditionBoss", config.Name);
var progress = model.isBossPass ? 1 : 0;
- var label = UIHelper.AppendStringColor(model.isBossPass ? TextColType.Green : TextColType.Red, progress.ToString());
+ var label = UIHelper.AppendColor(model.isBossPass ? TextColType.Green : TextColType.Red, progress.ToString());
m_Progress.text = StringUtility.Contact(label, "/", 1);
}
diff --git a/System/Rune/RunePreviewCell.cs b/System/Rune/RunePreviewCell.cs
index 39a601c..babb708 100644
--- a/System/Rune/RunePreviewCell.cs
+++ b/System/Rune/RunePreviewCell.cs
@@ -36,7 +36,7 @@
m_RuneBtn.onClick.RemoveAllListeners();
if (_itemCfg != null)
{
- m_RuneName.text = UIHelper.AppendStringColor(_itemCfg.ItemColor, _itemCfg.ItemName + "lv.1");
+ m_RuneName.text = UIHelper.AppendColor(_itemCfg.ItemColor, _itemCfg.ItemName + "lv.1");
m_RuneIcon.SetSprite(_itemCfg.IconKey);
m_RuneBtn.onClick.AddListener(()=>
{
diff --git a/System/RuneTower/RuneTowerDungeonHintWin.cs b/System/RuneTower/RuneTowerDungeonHintWin.cs
index c1a7055..c123b8e 100644
--- a/System/RuneTower/RuneTowerDungeonHintWin.cs
+++ b/System/RuneTower/RuneTowerDungeonHintWin.cs
@@ -74,7 +74,7 @@
m_Rune.Display(config.RuneDrop);
var itemConfig = ItemConfig.Get(config.RuneDrop);
- m_RuneDrop.text = Language.Get("RuneTower13", UIHelper.AppendStringColor(itemConfig.ItemColor, itemConfig.ItemName));
+ m_RuneDrop.text = Language.Get("RuneTower13", UIHelper.AppendColor(itemConfig.ItemColor, itemConfig.ItemName));
}
else if (config.Fixed == 1)
{
@@ -84,7 +84,7 @@
m_Rune.Display(config.RuneDrop);
var itemConfig = ItemConfig.Get(config.RuneDrop);
- m_RuneDrop.text = Language.Get("RuneTower23", UIHelper.AppendStringColor(itemConfig.ItemColor, itemConfig.ItemName));
+ m_RuneDrop.text = Language.Get("RuneTower23", UIHelper.AppendColor(itemConfig.ItemColor, itemConfig.ItemName));
}
else if (config.UnLockHole > 0)
{
diff --git a/System/Strengthening/GodBeastEntry.cs b/System/Strengthening/GodBeastEntry.cs
index 8c9a873..3ada287 100644
--- a/System/Strengthening/GodBeastEntry.cs
+++ b/System/Strengthening/GodBeastEntry.cs
@@ -59,12 +59,12 @@
if (IudetDogzEquipPlus != null && IudetDogzEquipPlus[0] > 0)
{
string str= itemConfig.ItemName + " +" + IudetDogzEquipPlus[0];
- m_Item_Text.text = UIHelper.AppendStringColor(itemConfig.ItemColor, str, true);
+ m_Item_Text.text = UIHelper.AppendColor(itemConfig.ItemColor, str, true);
}
else
{
string str = itemConfig.ItemName;
- m_Item_Text.text = UIHelper.AppendStringColor(itemConfig.ItemColor, str, true);
+ m_Item_Text.text = UIHelper.AppendColor(itemConfig.ItemColor, str, true);
}
if (locationMarker == currentlySelected)
{
diff --git a/Utility/UIHelper.cs b/Utility/UIHelper.cs
index 240f736..89fa845 100644
--- a/Utility/UIHelper.cs
+++ b/Utility/UIHelper.cs
@@ -665,7 +665,7 @@
}
}
- public static string AppendStringColor(int itemColor, string msg, bool bright = false)
+ public static string AppendColor(int itemColor, string msg, bool bright = false)
{
switch (itemColor)
{
--
Gitblit v1.8.0