Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

hwj35

2025-10-17 758817073b14c978566b2cb47ea8d71be0001143

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Family.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetLeaveFamilyTime.pyc

Binary files differ

 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                


 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