From 8432fb4e6b57e3de14b4f1fd3638577fea8ab345 Mon Sep 17 00:00:00 2001
From: cjc <213123@qq.com>
Date: 星期三, 18 三月 2026 11:57:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
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 c59f50a..1e57979 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
@@ -370,21 +370,21 @@
EncodingTex 0 utf8
EventReport [] [1100,1101,9001]
CreateRole 主公%s
-PlayerRename ["%s", "playerName"] 21 1|200
+PlayerRename ["%s", "playerName"] 21 1|200 18
CreateFamily 100 1
FamilyNameFormat ["%s", "familyName"] 21 50000 {}
FamilyRename 1|1000 24
FamilyReqJoin 30 5 1
FamilyPower {"1":2, "2":2, "3":2, "4":2}
FamilyLeave [0, 60] [] 15 [50] []
-FamilyLeaderAutoChange 72 24
+FamilyLeaderAutoChange 72 24 3|24|6
FamilyCross 8
Zhenbaoge 1 2888 60 [5,10,20,30]
ZhenbaogeCut -350 int(initPrice*cutWeight/totalWeight*1.0*(minRatio+randRatio*rand)) [3,10]
PersonalMail 200
BillboardSet [] {0:1000, 1:9999, 2:9999, 3:9999, 4:9999, 6:9999, 7:9999, 8:9999, 9:9999, 10:10000, 150:10000} {}
-OSABillboard {"3":[1, 3], "4":[2, 4], "7":[2, 4], "8":[2, 4], "9":[4, 6]} {"1":[[5,40,0],[8,800,0],[7,40000,0]],"2":[[5,30,0],[8,600,0],[7,30000,0]],"3":[[5,20,0],[8,400,0],[7,20000,0]],"5":[[5,15,0],[8,300,0],[7,15000,0]],"10":[[5,10,0],[8,200,0],[7,10000,0]],"20":[[5,8,0],[8,160,0],[7,8000,0]],"50":[[5,6,0],[8,120,0],[7,6000,0]],"100":[[5,4,0],[8,80,0],[7,4000,0]],"200":[[5,4,0],[8,60,0],[7,3000,0]],"2000":[[5,2,0],[8,40,0],[7,2000,0]]} {"1":[[1005,1,0],[1001,3,0],[1,2000,0]],"2":[[1013,40,0],[1001,3,0],[1,1800,0]],"3":[[1013,30,0],[1001,2,0],[1,1500,0]],"5":[[1013,20,0],[1001,2,0],[1,1000,0]],"10":[[1001,2,0],[7,10000,0]],"20":[[1001,1,0],[7,8000,0]],"50":[[1003,1,0],[7,6000,0]],"100":[[1003,1,0],[7,4000,0]],"200":[[1002,1,0],[7,3000,0]],"2000":[[1002,1,0],[7,2000,0]]} {"1":[[1005,1,0],[1001,3,0],[1,2000,0]],"2":[[1013,40,0],[1001,3,0],[1,1800,0]],"3":[[1013,30,0],[1001,2,0],[1,1500,0]],"5":[[1013,20,0],[1001,2,0],[1,1000,0]],"10":[[1001,2,0],[7,10000,0]],"20":[[1001,1,0],[7,8000,0]],"50":[[1003,1,0],[7,6000,0]],"100":[[1003,1,0],[7,4000,0]],"200":[[1002,1,0],[7,3000,0]],"2000":[[1002,1,0],[7,2000,0]]}
-OSABillboardTrain {"7":0.01, "8":1, "9":50, "10":25} {"1":10, "2":25, "3":50, "4":100, "5":200} {"1":[[1005,1,0],[1001,3,0],[1,2000,0]],"2":[[1013,40,0],[1001,3,0],[1,1800,0]],"3":[[1013,30,0],[1001,2,0],[1,1500,0]],"5":[[1013,20,0],[1001,2,0],[1,1000,0]],"10":[[1001,2,0],[7,10000,0]],"20":[[1001,1,0],[7,8000,0]],"50":[[1003,1,0],[7,6000,0]],"100":[[1003,1,0],[7,4000,0]],"200":[[1002,1,0],[7,3000,0]],"2000":[[1002,1,0],[7,2000,0]]} 1|10 {"1":[[1005,1,0],[1001,3,0],[1,2000,0]],"2":[[1013,40,0],[1001,3,0],[1,1800,0]],"3":[[1013,30,0],[1001,2,0],[1,1500,0]],"5":[[1013,20,0],[1001,2,0],[1,1000,0]],"10":[[1001,2,0],[7,10000,0]],"20":[[1001,1,0],[7,8000,0]],"50":[[1003,1,0],[7,6000,0]],"100":[[1003,1,0],[7,4000,0]],"200":[[1002,1,0],[7,3000,0]],"2000":[[1002,1,0],[7,2000,0]]}
+OSABillboard {"3":[1, 3], "4":[2, 4], "8":[3, 5], "7":[4, 6], "9":[5, 7]} {"1":[[5,40],[8,800],[3,800],[7,40000],[3002,1]],"2":[[5,30],[8,600],[3,600],[7,30000],[3003,1]],"3":[[5,20],[8,400],[3,400],[7,20000],[3004,1]],"5":[[5,15],[8,300],[3,300],[7,15000]],"10":[[5,10],[8,200],[3,200],[7,10000]],"20":[[5,8],[8,160],[3,160],[7,8000]],"50":[[5,6],[8,120],[3,120],[7,6000]],"100":[[5,4],[8,80],[3,80],[7,4000]],"200":[[5,4],[8,60],[3,60],[7,3000]],"2000":[[5,2],[8,40],[3,40],[7,2000]]} {"1":[[1005,1],[1001,3],[7,40000],[1,2000],[3005,1]],"2":[[1013,40],[1001,3],[7,30000],[1,1800],[3006,1]],"3":[[1013,30],[1001,2],[7,20000],[1,1500],[3007,1]],"5":[[1013,20],[1001,2],[7,15000],[1,1000]],"10":[[1001,2],[7,10000],[1,800]],"20":[[1001,1],[7,8000],[1,500]],"50":[[1003,1],[7,6000],[1,400]],"100":[[1003,1],[7,4000],[1,200]],"200":[[1002,1],[7,3000],[1,150]],"2000":[[1002,1],[7,2000],[1,100]]} {"1":[[202,120],[32,120],[200,500],[1,2000],[3011,1]],"2":[[202,100],[32,100],[200,400],[1,1800],[3012,1]],"3":[[202,80],[32,80],[200,300],[1,1500],[3013,1]],"5":[[202,60],[32,60],[200,250],[1,1000]],"10":[[201,100],[32,50],[200,220],[1,800]],"20":[[201,80],[32,40],[200,200],[1,500]],"50":[[201,60],[32,30],[200,180],[1,400]],"100":[[201,40],[32,20],[200,150],[1,200]],"200":[[201,30],[32,10],[200,100],[1,150]],"2000":[[201,20],[32,10],[200,50],[1,100]]}
+OSABillboardTrain {"7":0.04, "8":10, "9":500, "10":100} {"1":10, "2":25, "3":50, "4":200, "5":500} {"1":[[1005,1],[10,100],[8,800],[1,2000],[3008,1]],"2":[[1013,40],[10,80],[8,600],[1,1800],[3009,1]],"3":[[1013,30],[10,60],[8,400],[1,1500],[3010,1]],"5":[[1013,20],[10,50],[8,300],[1,1000]],"10":[[10,40],[8,200],[1,800]],"20":[[10,35],[8,160],[1,500]],"50":[[10,30],[8,120],[1,400]],"100":[[10,20],[8,80],[1,200]],"200":[[10,10],[8,60],[1,150]],"2000":[[10,5],[8,40],[1,100]]} 10|100 {"1":[[31,160],[30,800],[1,2000],[10000,200],[3014,1]],"2":[[31,120],[30,600],[1,1800],[10000,150],[3015,1]],"3":[[31,80],[30,400],[1,1500],[10000,120],[3016,1]],"5":[[31,60],[30,300],[1,1000],[10000,80]],"10":[[31,40],[30,200],[1,800],[10000,50]],"20":[[31,32],[30,160],[1,500]],"50":[[31,24],[30,120],[1,400]],"100":[[31,16],[30,80],[1,200]],"200":[[31,12],[30,60],[1,150]],"2000":[[31,8],[30,40],[1,100]]}
OSACelebration 7 {"2000":[[3,100]],"4000":[[7,10000]],"6000":[[2,20000]],"9000":[[8,100]],"12000":[[1005,1]]} 20
TalkCD {"0":3,"3":3}
TalkCache {0:100, 1:100, 3:30}
@@ -470,9 +470,9 @@
MinggeCfg [6,11,21] 30 31
MinggeTY 7|10 [-1, 1] long(round(baseValue*plusValue*attrProportion*randfloat(0.95,1.05))) [201,202,203,204] [9000011,9000021,9000031,9000041,9000051,9000061,9000071,9000081,9000091,9000101]
OperationAction 7 ["ActLunhuidian"]
-HeroAppear [97,98,99]
-QunyingSet 8
+HeroAppear [97,98,99] {"5":[[113,35,35,255],[191,29,29,255]]}
+QunyingSet 8 [5100010,5200010,5300010,5400010]
QunyingChallenge 10 180 [[34,25]]
-QunyingMatch {1:[[10, 5]], 2:[[-1, 1], [10, 4]], 3:[[-2, 2], [10, 3]], 4:[[-3, 3], [10, 2]], 10:[[-9, 4], [10, 1]],50:[[-10, 1], [-8, 1], [-6, 1], [-4, 1], [10, 1]], 200:[[-20, 1], [-15, 1], [-10, 1], [-5, 1], [20, 1]], 500:[[-100, 1],[-80, 1],[-50, 1],[-10, 1],[50, 1]], 1500:[[-200, 1], [-150, 1], [-100, 1],[-50, 1],[50, 1]], 5000:[[-400, 1], [-300, 1], [-100, 1],[-50, 1],[50, 1]], 10000:[[-650, 1], [-550, 1], [-100, 1],[-50, 1],[50, 1]]} 1|10 99
-QunyingAward {"1":[[1012,5,0],[5,5,0]],"2":[[1012,4,0],[5,4,0]],"3":[[1012,3,0],[5,3,0]],"5":[[1012,2,0],[5,2,0]],"10":[[1008,3,0],[5,1,0]],"50":[[1008,2,0],[5,1,0]],"100":[[1008,1,0],[5,1,0]],"200":[[1010,3,0],[5,1,0]],"500":[[1010,2,0],[5,1,0]],"9999":[[1010,1,0],[5,1,0]]} {"1":[[1013,20,0],[5,30,0]],"2":[[1013,15,0],[5,25,0]],"3":[[1013,10,0],[5,20,0]],"5":[[1013,8,0],[5,15,0]],"10":[[1013,6,0],[5,10,0]],"50":[[1013,5,0],[5,8,0]],"100":[[1009,10,0],[5,6,0]],"200":[[1009,8,0],[5,5,0]],"500":[[1009,6,0],[5,4,0]],"9999":[[1009,4,0],[5,3,0]]} {"1":[[1,1500],[10,40]],"2":[[1,1200],[10,35]],"3":[[1,1000],[10,30]],"5":[[1,800],[10,25]],"10":[[1,600],[10,20]],"20":[[1,500],[10,18]],"50":[[1,400],[10,15]],"100":[[1,350],[10,12]],"200":[[1,300],[10,10]],"2000":[[1,150],[10,6]],"5000":[[1,100],[10,3]]} {"1":0,"2":1,"3":2,"5":3,"10":4,"20":5,"50":6,"100":7,"200":8,"2000":9,"5000":10}
+QunyingMatch {1:[[10, 5]], 2:[[-1, 1], [10, 4]], 3:[[-2, 2], [10, 3]], 4:[[-3, 3], [10, 2]], 10:[[-9, 4], [10, 1]],50:[[-10, 1], [-8, 1], [-6, 1], [-4, 1], [10, 1]], 200:[[-20, 1], [-15, 1], [-10, 1], [-5, 1], [20, 1]], 500:[[-100, 1],[-80, 1],[-50, 1],[-10, 1],[50, 1]], 1500:[[-200, 1], [-150, 1], [-100, 1],[-50, 1],[50, 1]], 5000:[[-400, 1], [-300, 1], [-100, 1],[-50, 1],[50, 1]], 9999:[[-650, 1], [-550, 1], [-100, 1],[-50, 1],[50, 1]], 10001:[[-650, 1], [-550, 1], [-100, 1],[-50, 1]]} 1|10 99
+QunyingAward {"1":[[1012,5,0],[5,15,0]],"2":[[1012,4,0],[5,12,0]],"3":[[1012,3,0],[5,10,0]],"5":[[1012,2,0],[5,8,0]],"10":[[1008,3,0],[5,6,0]],"20":[[1008,2,0],[5,5,0]],"50":[[1008,1,0],[5,4,0]],"100":[[1010,4,0],[5,3,0]],"200":[[1010,3,0],[5,2,0]],"2000":[[1010,2,0],[5,2,0]],"5000":[[1010,1,0],[5,1,0]]} {"1":[[1013,20,0],[5,50,0]],"2":[[1013,15,0],[5,40,0]],"3":[[1013,10,0],[5,30,0]],"5":[[1013,8,0],[5,25,0]],"10":[[1013,6,0],[5,20,0]],"20":[[1013,5,0],[5,15,0]],"50":[[1009,10,0],[5,13,0]],"100":[[1009,8,0],[5,10,0]],"200":[[1009,6,0],[5,8,0]],"2000":[[1009,5,0],[5,5,0]],"5000":[[1009,4,0],[5,3,0]]} {"1":[[1,1500],[10,40]],"2":[[1,1200],[10,35]],"3":[[1,1000],[10,30]],"5":[[1,800],[10,25]],"10":[[1,600],[10,20]],"20":[[1,500],[10,18]],"50":[[1,400],[10,15]],"100":[[1,350],[10,12]],"200":[[1,300],[10,10]],"2000":[[1,150],[10,6]],"5000":[[1,100],[10,3]]} {"1":0,"2":1,"3":2,"5":3,"10":4,"20":5,"50":6,"100":7,"200":8,"2000":9,"5000":10}
QunyingCross 0
--
Gitblit v1.8.0