From 9e89e605d5429babb4b33df2e47ea86dff9d2ba7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 20 十一月 2025 11:55:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/ItemTip/BoxGetItemModel.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/Main/System/ItemTip/BoxGetItemModel.cs b/Main/System/ItemTip/BoxGetItemModel.cs
index 2800b24..407c53f 100644
--- a/Main/System/ItemTip/BoxGetItemModel.cs
+++ b/Main/System/ItemTip/BoxGetItemModel.cs
@@ -2,6 +2,7 @@
using LitJson;
using System.Collections.Generic;
+using UnityEngine;
/// <summary>
/// 瀹濈鍔熻兘 + 鑾峰彇濂栧姳鐣岄潰
@@ -76,14 +77,19 @@
// ModelCenter.Instance.GetModel<FairySiegeActModel>()?.OnUpdateAwardInfoAction(netPack);
// return;
// }
- if (!commonShowAwardEvents.Contains(eventName))
+ // if (!commonShowAwardEvents.Contains(eventName))
+ // return;
+ if (string.IsNullOrEmpty(eventName))
+ {
+ Debug.Log("鑾峰緱鐗╁搧灞曠ず 鏃犱簨浠跺悕");
return;
+ }
List<Item> showItems = new List<Item>();
if (netPack.Exp != 0 || netPack.ExpPoint != 0)
{
- ulong expValue = netPack.Exp + netPack.ExpPoint * (ulong)Constants.ExpPointValue;
+ long expValue = netPack.Exp + netPack.ExpPoint * Constants.ExpPointValue;
showItems.Add(new Item(GeneralDefine.expDisplayId, expValue));
}
if (netPack.MoneyList.Length != 0)
@@ -91,9 +97,9 @@
for (int i = 0; i < netPack.MoneyLen; i++)
{
var moneyType = netPack.MoneyList[i].MoneyType;
- if (GeneralDefine.moneyDisplayIds.ContainsKey(moneyType) && netPack.MoneyList[i].MoneyValue != 0)
+ if (GeneralDefine.MoneyDisplayModel.ContainsKey(moneyType) && netPack.MoneyList[i].MoneyValue != 0)
{
- showItems.Add(new Item(GeneralDefine.moneyDisplayIds[moneyType], netPack.MoneyList[i].MoneyValue));
+ showItems.Add(new Item(GeneralDefine.MoneyDisplayModel[moneyType], netPack.MoneyList[i].MoneyValue));
}
}
@@ -103,7 +109,9 @@
{
for (int i = 0; i < netPack.ItemLen; i++)
{
- showItems.Add(new Item((int)netPack.ItemList[i].ItemID, netPack.ItemList[i].Count, netPack.ItemList[i].IsBind));
+ showItems.Add(new Item((int)netPack.ItemList[i].ItemID,
+ netPack.ItemList[i].Count + netPack.ItemList[i].CountEx * Constants.ExpPointValue,
+ netPack.ItemList[i].IsBind));
}
}
@@ -303,7 +311,7 @@
var selectlistDict = ConfigParse.GetDic<int, int>(config.SelectList);
foreach (var item in selectlistDict)
{
- itemIDs.Add(new Item(item.Key, (ulong)item.Value));
+ itemIDs.Add(new Item(item.Key, item.Value));
}
}
@@ -312,7 +320,7 @@
var itemListDict = ConfigParse.GetDic<int, int>(config.FixedItem);
foreach (var item in itemListDict)
{
- itemIDs.Add(new Item(item.Key, (ulong)item.Value));
+ itemIDs.Add(new Item(item.Key, item.Value));
}
}
@@ -322,7 +330,7 @@
for (int i = 0; i < arr.Count; i++)
{
- itemIDs.Add(new Item(int.Parse(arr[i][1][0].ToString()), ulong.Parse(arr[i][1][1].ToString())));
+ itemIDs.Add(new Item(int.Parse(arr[i][1][0].ToString()), long.Parse(arr[i][1][1].ToString())));
}
}
@@ -332,7 +340,7 @@
for (int i = 0; i < arr.Count; i++)
{
- itemIDs.Add(new Item(int.Parse(arr[i][1][0].ToString()), ulong.Parse(arr[i][1][1].ToString())));
+ itemIDs.Add(new Item(int.Parse(arr[i][1][0].ToString()), long.Parse(arr[i][1][1].ToString())));
}
}
--
Gitblit v1.8.0