From 973edc44a04dceb8b48a32ca912e6167f86189d4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 25 八月 2025 17:38:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Utility/CommonFunc.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Main/Utility/CommonFunc.cs b/Main/Utility/CommonFunc.cs
index 4ad96aa..e52487b 100644
--- a/Main/Utility/CommonFunc.cs
+++ b/Main/Utility/CommonFunc.cs
@@ -4,9 +4,9 @@
public class CommonFunc
{
- public static Dictionary<int, ulong> AddDict(Dictionary<int, ulong> dic1, Dictionary<int, ulong> dic2)
+ public static Dictionary<int, long> AddDict(Dictionary<int, long> dic1, Dictionary<int, long> dic2)
{
- var resultDic = new Dictionary<int, ulong>(dic1);
+ var resultDic = new Dictionary<int, long>(dic1);
foreach (var data in dic2)
{
if (resultDic.ContainsKey(data.Key))
@@ -21,7 +21,7 @@
- public static List<Item> ChangeToItemList(Dictionary<int, ulong> dict)
+ public static List<Item> ChangeToItemList(Dictionary<int, long> dict)
{
List<Item> itemlist = new List<Item>();
if (dict == null)
--
Gitblit v1.8.0