From 8589ec3bb98ff6c0207d0783838454204956418e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 29 一月 2026 15:43:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Guild/GuildManager.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Main/System/Guild/GuildManager.cs b/Main/System/Guild/GuildManager.cs
index f6e8e11..c3141b7 100644
--- a/Main/System/Guild/GuildManager.cs
+++ b/Main/System/Guild/GuildManager.cs
@@ -180,7 +180,7 @@
public int zbgOrgPriceValue;
public int zbgChangFamilyCD;
public List<int> cutCntListForTalk = new List<int>();
-
+ public int familyRecordMaxCount;
void ParseConfig()
{
@@ -219,6 +219,9 @@
zbgOrgPriceValue = int.Parse(config.Numerical2);
zbgChangFamilyCD = int.Parse(config.Numerical3);
cutCntListForTalk = JsonMapper.ToObject<List<int>>(config.Numerical4);
+
+ config = FuncConfigConfig.Get("FamilyNote");
+ familyRecordMaxCount = int.Parse(config.Numerical1);
}
@@ -865,7 +868,7 @@
return false;
}
bool restart = false;
-
+
for (int i = 0; i < vNetData.FamilyActionList.Length; i++)
{
int playerID = (int)vNetData.FamilyActionList[i].Value1;
--
Gitblit v1.8.0