From 758817073b14c978566b2cb47ea8d71be0001143 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 17 十月 2025 14:14:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server
---
/dev/null | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt | 1 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Family.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt | 1 +
7 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.pyc
index cca0bfc..bdad8b2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Family.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Family.pyc
index 1dedbc0..3b2278a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Family.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Family.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 9a985c2..d8a21f8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
index e643a8d..bfddd40 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetLeaveFamilyTime.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetLeaveFamilyTime.pyc
deleted file mode 100644
index 90c19e6..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetLeaveFamilyTime.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
index b0869f2..e9cf29d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
@@ -385,6 +385,7 @@
FamilyRename 1|1000 24
FamilyReqJoin 30 5 0
FamilyPower {"1":2, "2":2, "3":2, "4":2}
+FamilyLeave [0, 60] [] 15 [50] []
Zhenbaoge 1 2888 360 [5,10,20,30]
ZhenbaogeCut -500 int(initPrice*cutWeight/totalWeight*1.0*(minRatio+randRatio*rand))
PersonalMail 200
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
index b0869f2..e9cf29d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
@@ -385,6 +385,7 @@
FamilyRename 1|1000 24
FamilyReqJoin 30 5 0
FamilyPower {"1":2, "2":2, "3":2, "4":2}
+FamilyLeave [0, 60] [] 15 [50] []
Zhenbaoge 1 2888 360 [5,10,20,30]
ZhenbaogeCut -500 int(initPrice*cutWeight/totalWeight*1.0*(minRatio+randRatio*rand))
PersonalMail 200
--
Gitblit v1.8.0