From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Message/RichTableEvent.cs | 51 ++++++++++++++++++++++-----------------------------
1 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/Main/System/Message/RichTableEvent.cs b/Main/System/Message/RichTableEvent.cs
index ed93f1d..6816622 100644
--- a/Main/System/Message/RichTableEvent.cs
+++ b/Main/System/Message/RichTableEvent.cs
@@ -58,18 +58,11 @@
if (cfg != null)
{
var _itemColor = cfg.ItemColor;
- if (ItemLogicUtility.Instance.IsWing(id))//缈呰唨
- {
- Dictionary<int, List<int>> userdata = null;
- if (TryGetUserData(_dict, out userdata))
- {
- _itemColor = ItemLogicUtility.Instance.GetItemQuality(cfg.ID, userdata);
- }
- }
+
var itemName = cfg.ItemName;
if (_dict.ContainsKey("chatsend"))
{
- itemName = StringUtility.Contact("[", itemName, "]");
+ itemName = StringUtility.Concat("[", itemName, "]");
}
if (_dict.ContainsKey("count"))
{
@@ -77,7 +70,7 @@
int.TryParse(_dict["count"], out count);
if (count > 0)
{
- itemName = StringUtility.Contact(itemName, "x", count);
+ itemName = StringUtility.Concat(itemName, "x", count.ToString());
}
}
var suitLabel = string.Empty;
@@ -91,10 +84,10 @@
}
// if (ItemLogicUtility.Instance.IsSuitEquip(id))
// {
- // suitLabel = StringUtility.Contact("<Suitname=", UIHelper.GetEquipSuitName(id, colorType == 1), "/>|");
+ // suitLabel = StringUtility.Concat("<Suitname=", UIHelper.GetEquipSuitName(id, colorType == 1), "/>|");
// }
}
- return StringUtility.Contact(suitLabel, AppendColor(itemName, _itemColor, _dict));
+ return StringUtility.Concat(suitLabel, AppendColor(itemName, _itemColor, _dict));
}
else
{
@@ -111,7 +104,20 @@
NPCConfig cfg = NPCConfig.Get(id);
if (cfg != null)
{
- return cfg.NPCName;
+ return cfg.NPCName;
+ }
+ }
+ }
+ break;
+ case "hero":
+ {
+ int id = 0;
+ if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out id))
+ {
+ HeroConfig cfg = HeroConfig.Get(id);
+ if (cfg != null)
+ {
+ return UIHelper.AppendColor(UIHelper.GetUIColorByFunc(cfg.Quality), cfg.Name) ;
}
}
}
@@ -274,7 +280,7 @@
var config = ItemConfig.Get(_id);
if (config != null)
{
- return StringUtility.Contact(GetItemColorName(config.ItemColor), AppendColor(config.ItemName, config.ItemColor, _dict));
+ return StringUtility.Concat(GetItemColorName(config.ItemColor), AppendColor(config.ItemName, config.ItemColor, _dict));
}
}
}
@@ -372,7 +378,7 @@
break;
}
}
- goodsName = Language.Get("DayGoods_1", UIHelper.GetMoneyFormat(orderInfo.PayRMBNum));
+ goodsName = Language.Get("DayGoods_1", UIHelper.GetMoneyFormat(orderInfo.PayRMBNumOnSale));
}
return goodsName;
@@ -456,18 +462,5 @@
return UIHelper.AppendColor(_itemColor, info, colorType == 1);
}
- static bool TryGetUserData(Dictionary<string, string> href, out Dictionary<int, List<int>> userdata)
- {
- userdata = null;
- if (href.ContainsKey("itemplus"))
- {
- var itemplus = LitJson.JsonMapper.ToObject<ItemTipUtility.CustomItemPlus>(href["itemplus"]);
- userdata = ConfigParse.Analysis(itemplus.UserData);
- }
- else if (href.ContainsKey("userdata"))
- {
- userdata = ConfigParse.Analysis(href["userdata"]);
- }
- return false;
- }
+
}
--
Gitblit v1.8.0