From 39001a600fcae2bcf27c225df8752d75fb92fef4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 11:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Invest/InvestModel.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Main/System/Invest/InvestModel.cs b/Main/System/Invest/InvestModel.cs
index cebccca..a1f8f9c 100644
--- a/Main/System/Invest/InvestModel.cs
+++ b/Main/System/Invest/InvestModel.cs
@@ -6,9 +6,9 @@
public class InvestModel : GameSystemManager<InvestModel>
{
- public ILOpenServerActivityProxy activity;
+ // public ILOpenServerActivityProxy activity;
- public const int FuncID = 119;
+ public const int FuncID = 25;
//鎶曡祫瀵瑰簲濂栧姳
@@ -32,7 +32,7 @@
public event Action onSelectUpdate;
- public event Action onInvestUpdate;
+ public event Action<int> onInvestUpdate;
public const int redpointID = 20931;
public Redpoint redpoint = new Redpoint(MainRedDot.REDPOINT_OPENSERVER, redpointID);
@@ -116,7 +116,7 @@
items.Add(new Item()
{
id = itemArray[j][0],
- countEx = (ulong)itemArray[j][1],
+ countEx = itemArray[j][1],
bind = itemArray[j][2],
});
}
@@ -150,9 +150,9 @@
}
//鑾峰緱鍗曟姇璧勭殑鎬绘敹鐩�
- public ulong GetTotalIncome(int type)
+ public long GetTotalIncome(int type)
{
- ulong income = 0;
+ long income = 0;
if (m_InvestItems.ContainsKey(type))
{
var keyList = m_InvestItems[type].Keys.ToList();
@@ -250,7 +250,7 @@
{
if (id == FuncID)
{
- activity.StateUpdate(id);
+ // activity.StateUpdate(id);
UpdateRedpoint();
}
@@ -305,7 +305,7 @@
if (onInvestUpdate != null)
{
- onInvestUpdate();
+ onInvestUpdate(package.InvestType);
}
}
--
Gitblit v1.8.0