From 68c2dba9d23d0efd774479e037e597772f4b2a85 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 12 三月 2019 14:54:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Message/RichTableEvent.cs | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/System/Message/RichTableEvent.cs b/System/Message/RichTableEvent.cs
index c60e822..aaec0d5 100644
--- a/System/Message/RichTableEvent.cs
+++ b/System/Message/RichTableEvent.cs
@@ -15,15 +15,6 @@
}
}
- EquipWashModel m_EquipWashModel;
- EquipWashModel equipWashModel
- {
- get
- {
- return m_EquipWashModel ?? (m_EquipWashModel = ModelCenter.Instance.GetModel<EquipWashModel>());
- }
- }
-
public RichTableEvent()
{
RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.TABLE, this);
@@ -408,12 +399,12 @@
private void OnSingleClickItemCell(int itemId, RichTextMgr.HrefInfo hrefInfo)
{
- uint[] stone = null;
+ int[] stone = null;
if (hrefInfo.mSplits.ContainsKey("stone"))
{
try
{
- stone = LitJson.JsonMapper.ToObject<uint[]>(hrefInfo.mSplits["stone"]);
+ stone = LitJson.JsonMapper.ToObject<int[]>(hrefInfo.mSplits["stone"]);
}
catch (Exception e)
{
@@ -512,6 +503,7 @@
itemId = chatSendItem.itemId;
itemCount = chatSendItem.count;
isBind = chatSendItem.isBind;
+ stone = chatSendItem.equipGems;
if (!string.IsNullOrEmpty(chatSendItem.useData))
{
userdatadic = ConfigParse.Analysis(chatSendItem.useData);
@@ -522,10 +514,6 @@
"", userdatadic);
attrData.SetGemModel(stone);
attrData.SetStrengthData(strengthenLv, GetStrengthenType(itemId));
- if (!_equipWash.Equals(default(RoleParticularModel.EquipWash)))
- {
- attrData.SetWashModel(equipWashModel.OnGetWashType(index), _equipWash.LV, _equipWash.Value);
- }
itemTipsModel.SetItemTipsModel(attrData);
}
--
Gitblit v1.8.0